Merge branch 'master' of https://mc.cloudpure.cn/mjava/cont

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

@@ -149,6 +149,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
                     String sjr = safeGetString(item, "textField_mejnamf6");
                     String sjdh = safeGetString(item, "textField_mejnamf7");
                     String sjdz = safeGetString(item, "textareaField_mf6a0h5e");
+                    String bz1 = safeGetString(item, "textareaField_mf6a0h6q");
                     String zbq = safeGetString(item, "numberField_mf6a0h6v");
                     String kddh = safeGetString(item, "textField_mf6a0h6w");
                     String mdh = safeGetString(item, "textField_mf6a0h6y");
@@ -161,6 +162,7 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
                     table1Map.put("xsdw", xsdw);
                     table1Map.put("jjsl", jjsl);
 //                    table1Map.put("count", count);
+                    table1Map.put("bz1", bz1);
                     table1Map.put("ssxl", ssxl);
                     table1Map.put("yhrq", yhrq);
                     table1Map.put("sfzp", sfzp);

mjava-mc/src/main/java/com/malk/mc/service/impl/McYdServiceImpl.java

@@ -272,8 +272,8 @@ public class McYdServiceImpl implements McYdService {
 
     @Override
     public McR multiLocationOutbound(Map map) {
-
         String formInstId = UtilMap.getString(map,"formInstId");//实例id(出库单)
+        log.info("出库单实例id：" + formInstId);
         Map d = ydClient.queryData(YDParam.builder().formInstId(formInstId)
                 .formUuid("FORM-3208DFE5463549A9A57FB94358A75E80PV5F")
                 .appType("APP_GNQ1RGK68X4JNZUEU8RQ")
@@ -347,6 +347,7 @@ public class McYdServiceImpl implements McYdService {
     @Override
     public McR WarehouseStorage(Map map) {
         String formInstId = UtilMap.getString(map,"formInstId");//实例id(入库单)
+        log.info("入库单实例id："+formInstId);
         Map d = ydClient.queryData(YDParam.builder().formInstId(formInstId)
                 .formUuid("FORM-6DED8EB4CF0446DB8841C7798E106F2886OH")
                 .appType("APP_GNQ1RGK68X4JNZUEU8RQ")
@@ -422,6 +423,7 @@ public class McYdServiceImpl implements McYdService {
     @Override
     public McR ProductReturn(Map map) {
         String formInstId = UtilMap.getString(map,"formInstId");//实例id(退货单)
+        log.info("退货单实例id："+formInstId);
         Map data = ydClient.queryData(YDParam.builder().formInstId(formInstId)
                 .formUuid("FORM-E40A23253F2F43FEAF0E40F274A67B34OQC9")
                 .appType("APP_GNQ1RGK68X4JNZUEU8RQ")
@@ -500,6 +502,7 @@ public class McYdServiceImpl implements McYdService {
     @Override
     public McR allocateTransfer(Map map) {
         String formInstId = UtilMap.getString(map,"formInstId");//实例id(调拨流程)
+        log.info("调拨流程实例id:"+formInstId);
         Map data = ydClient.queryData(YDParam.builder().formInstId(formInstId)
                 .formUuid("FORM-C6360F0CA28543E8BA99A1DDCF90964FSJEM")
                 .appType("APP_GNQ1RGK68X4JNZUEU8RQ")
@@ -642,6 +645,7 @@ public class McYdServiceImpl implements McYdService {
     @Override
     public McR goodsInandOut(Map map) {
         String formInstId = UtilMap.getString(map,"formInstId");//实例id(进货退货流程)
+        log.info("进货退货流程实例id："+formInstId);
         Map data = ydClient.queryData(YDParam.builder().formInstId(formInstId)
                 .formUuid("FORM-0D92610ED4AA4B81988CA190EE9A119EX37F")
                 .appType("APP_GNQ1RGK68X4JNZUEU8RQ")