6.16代码提交

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

@@ -115,6 +115,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             String xslx = UtilMap.getString(formData, "selectField_mgrn6p2d");
             String bzfs = UtilMap.getString(formData, "selectField_mf6a0h5y");
             String bz = UtilMap.getString(formData, "textareaField_mejnamfb");
+            String ckddh = UtilMap.getString(formData, "textField_mqg2b2g5");
 //            LocalDateTime hhsj = parseTimestamp(UtilMap.getString(formData, "dateField_mf6a0h67"));
             LocalDateTime hhsj = Optional.ofNullable(
                             parseTimestamp(UtilMap.getString(formData, "dateField_mf6a0h67"))
@@ -155,11 +156,15 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
                     String zbq = safeGetString(item, "numberField_mf6a0h6v");
                     String kddh = safeGetString(item, "textField_mf6a0h6w");
                     String mdh = safeGetString(item, "textField_mf6a0h6y");
+                    String sku = safeGetString(item, "textField_mqg2b2g6");
+                    String skuh = safeGetString(item, "textField_mqg2p1zi");
                     LocalDateTime yhrq = parseTimestamp(safeGetString(item, "dateField_mejnamfo"));
 
                     table1Map.put("wlbm", wlbm);
                     table1Map.put("detailId", detailId);
                     table1Map.put("wlmc", wlmc);
+                    table1Map.put("sku", sku);
+                    table1Map.put("skuh", skuh);
                     table1Map.put("ggxh", ggxh);
                     table1Map.put("xsdw", xsdw);
                     table1Map.put("jjsl", jjsl);
@@ -187,6 +192,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             deliveryData.put("djlx", djlx);
             deliveryData.put("orderId", orderId);
             deliveryData.put("rq", rq);
+            deliveryData.put("ckddh", ckddh);
             deliveryData.put("kh", kh);
             deliveryData.put("jsbb", jsbb);
             deliveryData.put("djbh", djbh);

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

@@ -210,6 +210,7 @@ public class KdYdMaterialServiceImpl extends ServiceImpl<KdYdMaterialMapper, KdY
                     String jbdw = safeGetStringValue(kdYdMaterial, "jbdw");
                     String ssxl = safeGetStringValue(kdYdMaterial, "ssxl");
                     String jx = safeGetStringValue(kdYdMaterial, "jx");
+                    String sku = safeGetStringValue(kdYdMaterial, "sku");
 
                     // 修复：安全处理sd字段
                     Object sdObj = kdYdMaterial.get("sd");
@@ -272,6 +273,7 @@ public class KdYdMaterialServiceImpl extends ServiceImpl<KdYdMaterialMapper, KdY
                     updateFormData.put("dateField_ml4ikfa0", kssj);
                     updateFormData.put("dateField_ml4ikfa1", jzsj);
                     updateFormData.put("textField_mfxbtce6", sjzt);
+                    updateFormData.put("textField_mqg2328v", sku);
 
                     if (sd != null) {
                         updateFormData.put("numberField_mfxbtceb", sd);

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

@@ -189,6 +189,7 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
             String jshjstr = UtilMap.getString(formData, "numberField_mewfgzkv");
             BigDecimal jshj = toBigDecimal(jshjstr);
             String sfhs = UtilMap.getString(formData, "radioField_mfxv2vg4");
+            String ckddh = UtilMap.getString(formData, "textField_mqg2b2g5");
             String jws = UtilMap.getString(formData, "radioField_mfxv2vgm");
             List<Map> tableField = (List<Map>) formData.get("tableField_mfbx1pqi");
             List<Map> tableFieldPayment = (List<Map>) formData.get("tableField_mhiui6v5");
@@ -204,6 +205,7 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
                     String wlbm = safeGetString(item, "textField_mfbx1pqt");
 //                    String wlbm = "010101010003";
                     String wlmc = safeGetString(item, "textField_mfbx1pqs");
+                    String sku = safeGetString(item, "textField_mqg2b2g6");
                     String tcfpfs = safeGetString(item, "textField_mpqmsz2q");
                     String yjfpfs = safeGetString(item, "textField_mpqmsz2r");
                     String fpxsy = safeGetString(item, "textField_mpqmsz2s");
@@ -231,6 +233,7 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
                     // 设置明细字段
                     table1Map.put("detailId", detailId);
                     table1Map.put("wlbm", wlbm);
+                    table1Map.put("sku", sku);
                     table1Map.put("wlmc", wlmc);
                     table1Map.put("ggxh", ggxh);
                     table1Map.put("xsdw", xsdw);
@@ -296,6 +299,7 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
             // 示例映射，实际需要根据数据库表结构调整
             orderData.put("djlx", djlx);                    // 单据类型
             orderData.put("djbh", djbh);                    // 单据编号
+            orderData.put("ckddh", ckddh);                    // 单据编号
             orderData.put("khmc", khmc);                    // 客户名称
             orderData.put("rq", rq);                        // 日期
             orderData.put("khxypj", khxypj);                // 客户信用评级