1

src/main/java/net/chenlin/dp/modules/api/controller/PayrequestController.java

@@ -47,7 +47,12 @@ public class PayrequestController {
                 Payrequest payrequest1 = payrequestService.yonyouGetPayrequest(payrequest);
                 if (payrequest1!=null){
                   //  payrequestService.createPayrequest(processCode,1313665313L,"20264331162691",412163022L,payrequest1);
-                    payrequestService.createPayrequest(processCode,Long.valueOf(agentid),userid,Long.valueOf(deptid),payrequest1);
+                    Object payrequest2 = payrequestService.createPayrequest(processCode, Long.valueOf(agentid), userid, Long.valueOf(deptid), payrequest1);
+                    if (payrequest2!=null &&!"".equals(payrequest2)){
+                        DynamicDataSource.setDataSource("slave-data-source");
+                        sysUserService.autoRIdByPayequest(payrequest,payrequest2.toString());
+                        DynamicDataSource.setDataSource("");
+                    }
 
                 }
 

src/main/java/net/chenlin/dp/modules/api/controller/PurchaseOrderController.java

@@ -47,7 +47,12 @@ public class PurchaseOrderController {
                 YonyouPurchaseOrder purchaseOrder = purchaseOrderService.yonyouGetPurchaseOrder(purchaseOrders);
                 if (purchaseOrder!=null){
                    // purchaseOrderService.createPurchaseOrder(processCode,1313665313L,"20264331162691",412163022L,purchaseOrder);
-                    purchaseOrderService.createPurchaseOrder(processCode,Long.valueOf(agentid),userid,Long.valueOf(deptid),purchaseOrder);
+                    Object purchaseOrder1 = purchaseOrderService.createPurchaseOrder(processCode, Long.valueOf(agentid), userid, Long.valueOf(deptid), purchaseOrder);
+                    if (purchaseOrder1!=null &&!"".equals(purchaseOrder1)){
+                        DynamicDataSource.setDataSource("slave-data-source");
+                        sysUserService.autoRIdByOrder(purchaseOrders,purchaseOrder1.toString());
+                        DynamicDataSource.setDataSource("");
+                    }
                 }
             }
         }

src/main/java/net/chenlin/dp/modules/api/controller/SaleOrderController.java

@@ -50,7 +50,12 @@ public class SaleOrderController {
                 YonyouSaleOrder yonyouSaleOrder = service.yonyouGetSaleOrder(saleOrder);
                 if (yonyouSaleOrder!=null){
 //                    service.createOrder(processCode,1313665313L,"20264331162691",412163022L,yonyouSaleOrder);
-                    service.createOrder(processCode,Long.valueOf(agentid),userid,Long.valueOf(deptid),yonyouSaleOrder);
+                    Object order = service.createOrder(processCode, Long.valueOf(agentid), userid, Long.valueOf(deptid), yonyouSaleOrder);
+                    if (order!=null &&!order.equals("")){
+                        DynamicDataSource.setDataSource("slave-data-source");
+                        sysUserService.autoRIdBySale(saleOrder,order.toString());
+                        DynamicDataSource.setDataSource("");
+                    }
                 }
             }
         }

src/main/java/net/chenlin/dp/modules/api/service/PayrequestService.java

@@ -190,7 +190,7 @@ public class PayrequestService extends BaseService {
      * @param map 数据
      * @throws ApiException
      */
-    public void createPayrequest(String processCode, Long agentid, String userid, Long deptid, Payrequest so) throws ApiException {
+    public Object createPayrequest(String processCode, Long agentid, String userid, Long deptid, Payrequest so) throws ApiException {
         DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/processinstance/create");
         OapiProcessinstanceCreateRequest req = new OapiProcessinstanceCreateRequest();
         req.setAgentId(agentid);
@@ -323,6 +323,14 @@ public class PayrequestService extends BaseService {
             dingdingOpenInterface.getToken();
             OapiProcessinstanceCreateResponse rsp = client.execute(req, dingdingOpenInterface.gettoken);
             System.out.println(rsp.getBody());
+            String code = rsp.getErrorCode();
+            if (code.equals("0")||code.equals(0)){
+                return rsp.getProcessInstanceId();
+            }else {
+                return null;
+            }
+        }else {
+            return null;
         }
     }
 

src/main/java/net/chenlin/dp/modules/api/service/PurchaseOrderService.java

@@ -147,7 +147,7 @@ public class PurchaseOrderService {
      * @param map 数据
      * @throws ApiException
      */
-    public void createPurchaseOrder(String processCode, Long agentid, String userid, Long deptid, YonyouPurchaseOrder so) throws ApiException {
+    public Object createPurchaseOrder(String processCode, Long agentid, String userid, Long deptid, YonyouPurchaseOrder so) throws ApiException {
         DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/processinstance/create");
         OapiProcessinstanceCreateRequest req = new OapiProcessinstanceCreateRequest();
         req.setAgentId(agentid);
@@ -333,6 +333,14 @@ public class PurchaseOrderService {
             dingdingOpenInterface.getToken();
             OapiProcessinstanceCreateResponse rsp = client.execute(req, dingdingOpenInterface.gettoken);
             System.out.println(rsp.getBody());
+            String code = rsp.getErrorCode();
+            if (code.equals("0")||code.equals(0)){
+                return rsp.getProcessInstanceId();
+            }else {
+                return null;
+            }
+        }else {
+            return null;
         }
     }
 

src/main/java/net/chenlin/dp/modules/api/service/SaleOrderService.java

@@ -165,7 +165,7 @@ public class SaleOrderService {
      * @param map 数据
      * @throws ApiException
      */
-    public void createOrder(String processCode, Long agentid, String userid, Long deptid, YonyouSaleOrder so) throws ApiException {
+    public Object createOrder(String processCode, Long agentid, String userid, Long deptid, YonyouSaleOrder so) throws ApiException {
         String useridshenh = prop.getProperty("shenhe_userid");
         DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/processinstance/create");
         OapiProcessinstanceCreateRequest req = new OapiProcessinstanceCreateRequest();
@@ -334,7 +334,16 @@ public class SaleOrderService {
             dingdingOpenInterface.getToken();
             OapiProcessinstanceCreateResponse rsp = client.execute(req, dingdingOpenInterface.gettoken);
             System.out.println(rsp.getBody());
+            String code = rsp.getErrorCode();
+            if (code.equals("0")||code.equals(0)){
+                return rsp.getProcessInstanceId();
+            }else {
+                return null;
+            }
+        }else {
+            return null;
         }
+
     }
 
 

src/main/java/net/chenlin/dp/modules/sys/dao/SysUserMapper.java

@@ -78,6 +78,7 @@ public interface SysUserMapper extends BaseMapper<SysUserEntity> {
 	 */
 	 List<String>querySaleOrderDate(@Param("date")String date,@Param("endDate")String endDate);
 
+	 int autoRIdBySale(@Param("cSOCode")String cSOCode,@Param("instanceId")String instanceId);
 	/**
 	 * 采购订单
 	 * @param date
@@ -86,6 +87,7 @@ public interface SysUserMapper extends BaseMapper<SysUserEntity> {
 	 */
 	List<String>queryPurchaseOrderDate(@Param("date")String date,@Param("endDate")String endDate);
 
+	int autoRIdByOrder(@Param("cSOCode")String cSOCode,@Param("instanceId")String instanceId);
 	/**
 	 * 付款申请单
 	 * @param date
@@ -93,4 +95,5 @@ public interface SysUserMapper extends BaseMapper<SysUserEntity> {
 	 * @return
 	 */
 	List<String>queryPayrequestDate(@Param("date")String date,@Param("endDate")String endDate);
+	int autoRIdByPayequest(@Param("cSOCode")String cSOCode,@Param("instanceId")String instanceId);
 }

src/main/java/net/chenlin/dp/modules/sys/mapper/SysUserMapper.xml

@@ -118,7 +118,7 @@
 			u.user_id = #{value}
 	</select>
     <select id="querySaleOrderDate" resultType="java.lang.String">
-		select cSOCode  from SO_SOMain where  (iStatus='0' or iStatus is null)
+		select cSOCode  from SO_SOMain where  (iStatus='0' or iStatus is null) and cDefine11 is null
 		<if  test="date!=null and ''!=date">
 			and CONVERT(varchar(100), dcreatesystime, 120)>=#{date}
 		</if>
@@ -133,7 +133,7 @@
 	</update>
 
 	<select id="queryPurchaseOrderDate" resultType="java.lang.String">
-		select cPOID from PO_Pomain where  (iverifystateex='0' or iverifystateex is null)
+		select cPOID from PO_Pomain where  (iverifystateex='0' or iverifystateex is null) and cDefine11 is null
 		<if  test="date!=null and ''!=date">
 			and 	CONVERT(varchar(100), cmaketime, 120)>=#{date}
 		</if>
@@ -147,7 +147,7 @@
 	</update>
 
 	<select id="queryPayrequestDate" resultType="java.lang.String">
-		select cVouchID from AP_ApplyPayVouch where cCheckMan is null
+		select cVouchID from AP_ApplyPayVouch where cCheckMan is null  and cDefine11 is null
 		<if  test="date!=null and ''!=date">
 			and 	CONVERT(varchar(100), dcreatesystime, 120)>=#{date}
 		</if>
@@ -156,7 +156,7 @@
 		</if>
 	</select>
 
-	<update id="autoRIdByOrder">
+	<update id="autoRIdByPayequest">
 		update AP_ApplyPayVouch set cDefine11 = #{instanceId} where cVouchID = #{cSOCode}
 	</update>
 

src/main/java/net/chenlin/dp/modules/sys/service/SysUserService.java

@@ -151,5 +151,7 @@ public interface SysUserService {
 	List<String>querySaleOrderDate(String date,String endDate);
 	List<String>queryPurchaseOrderDate(String date,String endDate);
 	List<String>queryPayrequestDate(String date,String endDate);
-
+	int autoRIdBySale(String cSOCode,String instanceId);
+	int autoRIdByOrder(String cSOCode,String instanceId);
+	int autoRIdByPayequest(String cSOCode,String instanceId);
 }

src/main/java/net/chenlin/dp/modules/sys/service/impl/SysUserServiceImpl.java

@@ -316,6 +316,20 @@ public class SysUserServiceImpl implements SysUserService {
 		return sysUserMapper.queryPayrequestDate(date,endDate);
 	}
 
+	@Override
+	public int autoRIdBySale(String cSOCode, String instanceId) {
+		return sysUserMapper.autoRIdBySale(cSOCode,instanceId);
+	}
+
+	@Override
+	public int autoRIdByOrder(String cSOCode, String instanceId) {
+		return sysUserMapper.autoRIdByOrder(cSOCode,instanceId);
+	}
+
+	@Override
+	public int autoRIdByPayequest(String cSOCode, String instanceId) {
+		return sysUserMapper.autoRIdByPayequest(cSOCode,instanceId);
+	}
 
 
 }

src/main/resources/application-sit.yml

@@ -1,16 +1,27 @@
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.jdbc.Driver
     druid:
-      master-data-source:  #主库数据源
-        url: jdbc:mysql://localhost:3306/jinmilong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+      master-data-source:
+        driverClassName: com.mysql.jdbc.Driver
+        url: jdbc:mysql://127.0.0.1:3306/jinmilong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
         username: root
-        password: root
-      slave-data-source:  #从库数据源
-        url: jdbc:mysql://localhost:3306/jinmilong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-        username: root
-        password: root
+        password: 123
+      slave-data-source:
+        driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        url: jdbc:sqlserver://10.0.0.199:1433;DatabaseName=UFDATA_998_2021
+        username: sa
+        password: 123@qaz
+      last-data-source:
+        driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        url: jdbc:sqlserver://10.0.0.199:1433;DatabaseName=CRM_U8_System
+        username: sa
+        password: 123@qaz
+#      slave-data-source:
+#        driverClassName: oracle.jdbc.driver.OracleDriver
+#        url: jdbc:oracle:thin:@139.196.93.8:1521:gxhq
+#        username: icappx
+#        password: 1
       initial-size: 10
       max-active: 100
       min-idle: 10
@@ -32,19 +43,7 @@ spring:
         stat:
           log-slow-sql: true
           slow-sql-millis: 1000
-          merge-sql: true
+          merge-sql: false
         wall:
           config:
             multi-statement-allow: true
-  reids:
-    host: 127.0.0.1
-    port: 6379
-    password:
-    database: 0
-    timeout: 1000
-    jedis:
-      pool:
-        max-active: 6000
-        max-wait: 1000
-        max-idle: 400
-