12.25代码提交

mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdCustomerController.java

@@ -1,5 +1,6 @@
 package com.malk.huagao.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.malk.huagao.service.IKdYdCustomerService;
 import com.malk.huagao.service.IKdYdZpService;
@@ -46,17 +47,21 @@ private YDClient ydClient;
 //        String ins = String.valueOf(data.get("formInstId"));
 //
 //
-        DDR_New ddrNew = ydClient.queryData(YDParam.builder()
-                .formUuid("FORM-E64114E9F2C9426E91F92886EDFFA2C08Q90")
-                .build(), YDConf.FORM_QUERY.retrieve_search_form_id);
+//        DDR_New ddrNew = ydClient.queryData(YDParam.builder()
+//                .formUuid("FORM-E64114E9F2C9426E91F92886EDFFA2C08Q90")
+//                .build(), YDConf.FORM_QUERY.retrieve_search_form_id);
+//
+//        System.out.println(ddrNew.getTotalCount());
+//
+//        ydClient.operateData(YDParam.builder()
+//                .formUuid("FORM-E64114E9F2C9426E91F92886EDFFA2C08Q90")
+//                .asynchronousExecution(true)
+//                .formInstanceIdList((List<String>) ddrNew.getData())
+//                .build(), YDConf.FORM_OPERATION.delete_batch);
+
+
 
-        System.out.println(ddrNew.getTotalCount());
 
-        ydClient.operateData(YDParam.builder()
-                .formUuid("FORM-E64114E9F2C9426E91F92886EDFFA2C08Q90")
-                .asynchronousExecution(true)
-                .formInstanceIdList((List<String>) ddrNew.getData())
-                .build(), YDConf.FORM_OPERATION.delete_batch);
 //        ydClient.operateData(YDParam.builder()
 //                .formInstanceId(ins)
 //      .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("numberField_mhirg0kz","156")))//xz04
@@ -65,6 +70,7 @@ private YDClient ydClient;
 //                .build(), YDConf.FORM_OPERATION.update);
 //        ydHuaGaoService.synckdYdMaterial();
 //        ydHuaGaoService.synckdYdPayment();
+//        ydHuaGaoService.synckdYdTRANSFER();
 //        ydHuaGaoService.syncKdYdReceivable();
 //        kdYdZpService.insertkdYdZp(data);
 //        ydHuaGaoService.synckdYdOutbound();

mjava-huagao/src/main/java/com/malk/huagao/schedule/YdScheduleTask.java

@@ -8,6 +8,7 @@ import com.malk.huagao.service.YdHuaGaoService;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
 import com.malk.server.aliwork.YDSearch;
+import com.malk.server.dingtalk.DDR_New;
 import com.malk.service.aliwork.YDClient;
 import com.malk.utils.UtilMap;
 import lombok.extern.slf4j.Slf4j;
@@ -179,4 +180,25 @@ private YdHuaGaoService ydHuaGaoService;
             log.error("【synckdYdTRANSFER同步任务】执行过程中发生严重错误", e);
         }
     }
+
+//    @Scheduled(cron = "0/1 * * * * ?")
+    public void synckddel() {
+        log.info("定时删除物料表");
+        try {
+            MDC.put("MDC_KEY_PID","1003");
+            DDR_New ddrNew = ydClient.queryData(YDParam.builder()
+                    .formUuid("FORM-E64114E9F2C9426E91F92886EDFFA2C08Q90")
+                    .build(), YDConf.FORM_QUERY.retrieve_search_form_id);
+
+            System.out.println(ddrNew.getTotalCount());
+
+            ydClient.operateData(YDParam.builder()
+                    .formUuid("FORM-E64114E9F2C9426E91F92886EDFFA2C08Q90")
+                    .asynchronousExecution(true)
+                    .formInstanceIdList((List<String>) ddrNew.getData())
+                    .build(), YDConf.FORM_OPERATION.delete_batch);
+        } catch (Exception e) {
+            log.error("【synckdYdTRANSFER同步任务】执行过程中发生严重错误", e);
+        }
+    }
 }

mjava-huagao/src/main/java/com/malk/huagao/service/impl/YdHuaGaoServiceImpl.java

@@ -1490,7 +1490,7 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
 
 // 只有所有必要字段都非空时才填充关联字段
                 if (jydate != null && ghrq != null && jyyy != null && jtyy != null
-                        && xsy != null && khxypj != null && ddformInstanceId != null) {
+                        && xsy != null && khxypj != null) {
 
                     updateMap.put("dateField_mdya1lom", jydate);
                     updateMap.put("dateField_meqpbxsj", ghrq);
@@ -1498,11 +1498,12 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                     updateMap.put("textareaField_meqpbxsd", jtyy); // 注意：原代码这里写成了 jyyy，已修正为 jtyy
                     updateMap.put("employeeField_mejowmng", xsy);
                     updateMap.put("selectField_mewirdx4", khxypj);
-                    updateMap.put("textField_miquh5zj", ddformInstanceId);
+
                     updateMap.put("attachmentField_mfoqcctz", fj);
                 }
 
 // 基础字段同步（这些字段即使为空也会覆盖，符合原逻辑）
+                updateMap.put("textField_miquh5zj", ddformInstanceId);
                 updateMap.put("selectField_mhubzsa5", kdYdTransfer.getDjlx());
                 updateMap.put("textField_mhubzsas", kdYdTransfer.getKh());
                 updateMap.put("textField_miptelgh", kdYdTransfer.getDdbh());