4 Commits 8e8d6475b7 ... ecdac7494c

Autor SHA1 Mensagem Data
  “lqy ecdac7494c 12.30代码提交 1 mês atrás
  “lqy 67af9c8f40 12.30代码提交 1 mês atrás
  “lqy b2ed6862da Merge remote-tracking branch 'origin/master' 1 mês atrás
  “lqy dcf8b7f8f8 12.30代码提交 1 mês atrás

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

@@ -79,9 +79,9 @@ private YDClient ydClient;
 ////                .updateFormDataJson(JSONObject.toJSONString(UtilMap.map(employ,id)))//xz04
 //                .useLatestVersion(true)
 //                .build(), YDConf.FORM_OPERATION.update);
-        ydHuaGaoService.synckdYdMaterial();
+//        ydHuaGaoService.synckdYdMaterial();
 //        ydHuaGaoService.synckdYdPayment();
-//        ydHuaGaoService.synckdYdTRANSFER();
+        ydHuaGaoService.synckdYdTRANSFER();
 //        ydHuaGaoService.syncKdYdReceivable();
 //        kdYdZpService.insertkdYdZp(data);
 //        ydHuaGaoService.synckdYdOutbound();

+ 2 - 0
mjava-huagao/src/main/java/com/malk/huagao/entity/KdYdTransferDetail.java

@@ -50,6 +50,8 @@ public class KdYdTransferDetail implements Serializable {
 
     private String xlh;
 
+    private String kddh;
+
     private String drcw;
 
     private String drckzt;

+ 3 - 3
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdOrderServiceImpl.java

@@ -73,9 +73,9 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
 
         String djlx = UtilMap.getString(formData, "selectField_mejowmna");
         String khmc = UtilMap.getString(formData, "textField_mejnamf2");
-        String djbh = UtilMap.getString(formData, "serialNumberField_mewfgzku");
+        String djbh = UtilMap.getString(formData, "textField_mjs6fuwo");
         if("2".equals(type)){
-             djbh = UtilMap.getString(formData, "serialNumberField_mewfgzku");
+             djbh = UtilMap.getString(formData, "textField_mjs6fuwo");
         }
         LocalDateTime rq = parseTimestamp(UtilMap.getString(formData, "dateField_mejowmnb"));
         String khxypj = UtilMap.getString(formData, "selectField_mewirdx4");
@@ -250,7 +250,7 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
                     kdYdOrderDetail.setSl(sl);
                     kdYdOrderDetail.setSe(zse);
                     kdYdOrderDetail.setJe(zje);
-                    existing.setBz(bz1);
+                    kdYdOrderDetail.setBz(bz1);
                     kdYdOrderDetail.setJshj(zjshj);
                     kdYdOrderDetail.setJj(jj);
                     kdYdOrderDetail.setZkl(zkl);

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

@@ -1235,7 +1235,7 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                     List<Map> ddlist = (List<Map>) ydClient.queryData(
                             YDParam.builder()
                                     .formUuid("FORM-B62CAE3075CE4098B17BB86C90FFA21C9B7C")
-                                    .searchCondition(JSON.toJSONString(UtilMap.map("serialNumberField_mewfgzku", xsddbh)))
+                                    .searchCondition(JSON.toJSONString(UtilMap.map("textField_mjs6fuwo", xsddbh)))
                                     .build(),
                             YDConf.FORM_QUERY.retrieve_list_all
                     ).getData();
@@ -1244,9 +1244,9 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                         for (Map<String, Object> khitem : ddlist) {
                             Map<String, Object> khformData = (Map<String, Object>) khitem.get("formData");
 
-                            if (khformData != null && xsddbh.equals(khformData.get("serialNumberField_mewfgzku"))) {
+                            if (khformData != null && xsddbh.equals(khformData.get("textField_mjs6fuwo"))) {
                                 ddformInstanceId = (String) khitem.get("formInstanceId");
-                                ddbh = (String) khformData.get("serialNumberField_mewfgzku");
+                                ddbh = (String) khformData.get("textField_mjs6fuwo");
                                 break;
                             }
                         }
@@ -1419,6 +1419,7 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                     tablemap.put("textField_mhubzsaw", kdYdTransferDetail.getWlmc());
                     tablemap.put("textField_mhubzsax", kdYdTransferDetail.getGgxh());
                     tablemap.put("textField_mhubzsay", kdYdTransferDetail.getDw());
+                    tablemap.put("textareaField_mjshnw4c", kdYdTransferDetail.getKddh());
                     tablemap.put("numberField_mhubzsaz", String.valueOf(kdYdTransferDetail.getDbsl()));
                     tablemap.put("textField_mhubzsb0", kdYdTransferDetail.getPh());
                     tablemap.put("textField_mhubzsb1", kdYdTransferDetail.getDcck());
@@ -1451,7 +1452,6 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                     tableList.add(tablemap);
                     kdYdTransferDetail.setSyncStatus("1");
                     kdYdTransferDetailMapper.updateById(kdYdTransferDetail);
-                    tableList.add(tablemap);
 
                 }
                 String xsddbh = kdYdTransfer.getDdbh();
@@ -1472,7 +1472,7 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                     List<Map<String, Object>> ddlist = (List<Map<String, Object>>) ydClient.queryData(
                             YDParam.builder()
                                     .formUuid("FORM-B62CAE3075CE4098B17BB86C90FFA21C9B7C")
-                                    .searchCondition(JSON.toJSONString(UtilMap.map("serialNumberField_mewfgzku", xsddbh)))
+                                    .searchCondition(JSON.toJSONString(UtilMap.map("textField_mjs6fuwo", xsddbh)))
                                     .build(),
                             YDConf.FORM_QUERY.retrieve_list_all
                     ).getData();
@@ -1483,7 +1483,7 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                             if (khformData == null) continue;
 
                             // 安全获取字段值(避免 ClassCastException)
-                            Object serialObj = khformData.get("serialNumberField_mewfgzku");
+                            Object serialObj = khformData.get("textField_mjs6fuwo");
                             String serialStr = serialObj instanceof String ? (String) serialObj : String.valueOf(serialObj);
 
                             if (xsddbh.equals(serialStr)) {

+ 1 - 1
mjava-huagao/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: dev
   servlet:
     multipart:
       max-file-size: 100MB