From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/controller/OpenController.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 875c707..9ab5435 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -123,7 +123,7 @@
case "MO":
mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟");
if (!Cools.isEmpty(param.getChildren())) {
- mappingOrderParamChild(param, false, "閾跺骇濮斿鐢熶骇鏉愭枡鍑哄簱鍗�");
+ mappingOrderParamChild(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
}
break;
case "OM":
@@ -157,7 +157,8 @@
mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡");
break;
default:
- log.info("鏈煡鐨勫崟鎹被鍨�:{}", docName);
+ log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
+ mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
break;
}
@@ -211,15 +212,15 @@
mappingPakOutOrderParam(param, true, "閾跺骇閲囪喘鍏ュ簱鍗�");
break;
case "MO":
- mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟");
- if (!Cools.isEmpty(param.getChildren())) {
- mappingOrderParamChild(param, false, "閾跺骇濮斿鐢熶骇鏉愭枡鍑哄簱鍗�");
- }
- break;
- case "OM":
mappingPakInOrderParam(param, true, "閾跺骇鐢熶骇璁㈠崟");
if (!Cools.isEmpty(param.getChildren())) {
mappingOrderParamChild(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
+ }
+ break;
+ case "OM":
+ mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟");
+ if (!Cools.isEmpty(param.getChildren())) {
+ mappingOrderParamChild(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
}
break;
case "閲囪喘鍏ュ簱鍗曢��璐�":
@@ -247,7 +248,8 @@
mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡");
break;
default:
- log.info("鏈煡鐨勫崟鎹被鍨�:{}", docName);
+ log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
+ mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
break;
}
@@ -307,7 +309,7 @@
//鐢熸垚鍗曟嵁鏄庣粏
OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
- Synchro.Copy(param,orderDetl);
+ Synchro.Copy(param, orderDetl);
//orderDetl.setcInvCode(param.getCInvCode());
//orderDetl.setiQuantity(param.getIQuantity());
orderDetl.setCDefine22(param.getIvouchrowno());
@@ -350,7 +352,7 @@
//orderDetl.setiQuantity(childInfo.getIQuantity());
orderDetl.setCsocode(param.getCsocode());
//orderDetl.setbFree1(childInfo.getBFree1());
- orderDetl.setId(childInfo.getIds());
+ orderDetl.setId(Cools.isEmpty(childInfo.getIPOsID()) ? childInfo.getId() : childInfo.getIPOsID());
orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
@@ -368,6 +370,7 @@
List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
Synchro.Copy(param, orderSyncParam);
+ orderSyncParam.set鎿嶄綔绯荤粺鍙�(param.get鎿嶄綔绯荤粺鍙�());
orderSyncParam.setCPOID(child.get(0).getOrderNoT());
orderSyncParam.setDdate(param.getOrderTime());
@@ -380,8 +383,7 @@
orderDetl.setCDefine22(param.getIvouchrowno());
orderDetl.setCsocode(param.getCsocode());
orderDetl.setId(childInfo.getIds());
- orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
-
+ //orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
orderDetls.add(orderDetl);
}
orderSyncParam.setChildren(orderDetls);
--
Gitblit v1.9.1