Browse Source

采购自动拆单默认字段
NC定时

fyz 1 week ago
parent
commit
23f292ca8a

+ 1 - 1
mjava-lanyun/src/main/java/com/malk/lanyun/schedule/ScheduleTask.java

@@ -159,7 +159,7 @@ public class ScheduleTask {
     /**
      * 20点20分全量同步账龄表
      */
-    @Async
+//    @Async
     @Scheduled(cron = "0 20 20 * * ?")
     void syncAgingTask(){
         log.info("全量同步账龄表");

+ 1 - 0
mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/NCServiceImpl.java

@@ -269,6 +269,7 @@ public class NCServiceImpl implements NCService {
         try {
             // 加载 JDBC 驱动
             Class.forName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
+
             // 建立连接
             connection = DriverManager.getConnection(sqlBean.getUrl(), sqlBean.getUsername(), sqlBean.getPassword());
 

+ 24 - 7
mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/TimerServiceImpl.java

@@ -13,6 +13,7 @@ import com.malk.lanyun.entity.Salary;
 import com.malk.lanyun.service.TimerService;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
+import com.malk.server.common.McException;
 import com.malk.server.dingtalk.DDR_New;
 import com.malk.service.aliwork.YDClient;
 import com.malk.service.aliwork.YDService;
@@ -850,13 +851,29 @@ public class TimerServiceImpl implements TimerService {
             log.info("日常物耗流程id为:{}",formInstId);
             log.info("初始物耗费用合计为:{}",firstCost);
             log.info("本次物耗费用合计为:{}",nowCost);
-            ydClient.operateData(YDParam.builder()
-                    .appType("APP_ERBDTFS82HOVBPL3NFH0")
-                    .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
-                    .formInstanceId(formInstId)
-                    //更新初始物耗总计
-                    .updateFormDataJson(JSON.toJSONString(UtilMap.map("numberField_m0xizy3q", nowCost)))
-                    .build(), YDConf.FORM_OPERATION.update);
+            try {
+                ydClient.operateData(YDParam.builder()
+                        .appType("APP_ERBDTFS82HOVBPL3NFH0")
+                        .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
+                        .formInstanceId(formInstId)
+                        //更新初始物耗总计
+                        .updateFormDataJson(JSON.toJSONString(UtilMap.map("numberField_m0xizy3q", nowCost)))
+                        .build(), YDConf.FORM_OPERATION.update);
+            } catch (McException e) {
+                try {
+                    Thread.sleep(3000);
+                } catch (InterruptedException ex) {
+                    ex.printStackTrace();
+                }
+                ydClient.operateData(YDParam.builder()
+                        .appType("APP_ERBDTFS82HOVBPL3NFH0")
+                        .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
+                        .formInstanceId(formInstId)
+                        //更新初始物耗总计
+                        .updateFormDataJson(JSON.toJSONString(UtilMap.map("numberField_m0xizy3q", nowCost)))
+                        .build(), YDConf.FORM_OPERATION.update);
+                e.printStackTrace();
+            }
         }
     }
 

+ 1 - 1
mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/purchaseServiceImpl.java

@@ -233,7 +233,7 @@ public class purchaseServiceImpl implements PurchaseService {
 //                .searchFieldJson(JSON.toJSONString(UtilMap.map("dateField_ltxstp81, selectField_mgswtsqu",UtilMap.getList(formData,"cascadeDateField_miybkcsm"),"是")))
 //                .build());
         //过滤参与批量发起为否、可采购数量大于0、非临时采购的数据
-        dataList = dataList.stream().filter(map -> !"临时采购".equals(map.get("textField_ltxstp8h")) && UtilMap.getInt(map,"numberField_ltxyjf0s") > 0).collect(Collectors.toList());
+        dataList = dataList.stream().filter(map -> !"020128".equals(UtilMap.getString(map,"textField_ltxstp8g")) && !UtilMap.getString(map,"textField_ltxstp8h").contains("临时采购") && UtilMap.getInt(map,"numberField_ltxyjf0s") > 0).collect(Collectors.toList());
 
         //分组求和
         Map<Object, Long> groupCountMap = dataList.stream()