From 4078d04a5ba8939886721ac47905c3c924ee1e64 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 16 五月 2024 14:02:23 +0800
Subject: [PATCH] ERP接口
---
src/main/java/com/zy/asrs/controller/OpenController.java | 64 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 06b718e..f92440c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -288,9 +288,12 @@
return R.parse(BaseRes.PARAM);
}
- openService.syncOrder(param,true,"閲囪喘鍏ュ簱鍗�");
+ String docName = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟";
+ boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
- return R.ok("鍏ュ簱鍗曟嵁鎺ュ彈鎴愬姛");
+ openService.syncOrder(param,pakin,docName);
+
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
}
@@ -304,12 +307,22 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
+ if(!Cools.eq("鐢熶骇",param.getCVouchtype())){
+ String docName = param.getIQuantity() > 0 ? "閾跺骇濮斿鍏ュ簱鍗�" : "閾跺骇濮斿鍏ュ簱閫�璐у崟";
+ boolean pakin = param.getIQuantity() > 0 ? true : false;
+ mappingPakInOrderParam(param,pakin,docName);
- openService.syncOrder(mappingPakInOrderParam(param),true,"鐢熶骇鍏ュ簱鍗�");
- openService.syncOrder(mappingPakOutOrderParam(param),false,"鐢熶骇鍑哄簱鍗�");
+ String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇濮斿鏉愭枡鍑哄簱鍗�" : "閾跺骇濮斿鏉愭枡閫�鏂欏崟";
+ boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
+ mappingPakOutOrderParam(param,pakin1,docName1);
+ }else {
+ String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�" : "閾跺骇鐢熶骇鏉愭枡閫�鏂欏崟";
+ boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
+ mappingPakOutOrderParam(param,pakin1,docName1);
+ }
- return R.ok("鍑哄簱鍗曟嵁鎺ュ彈鎴愬姛");
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
}
@@ -333,19 +346,20 @@
}
- private OrderSyncParam mappingPakInOrderParam(OrderProdSyncParam param){
+ private void mappingPakInOrderParam(OrderProdSyncParam param,boolean pakin,String docName){
//鐢熸垚鍗曟嵁涓讳綋
OrderSyncParam orderSyncParam = new OrderSyncParam();
- orderSyncParam.setCPOID(param.getOrderNoT());
+ orderSyncParam.set鎿嶄綔绯荤粺鍙�(param.get鎿嶄綔绯荤粺鍙�());
+ orderSyncParam.setcPOID(param.getOrderNoT());
orderSyncParam.setDdate(param.getOrderTime());
- orderSyncParam.setCMemo("");
+ orderSyncParam.setcMemo(param.getCMemo());
//鐢熸垚鍗曟嵁鏄庣粏
OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
- orderDetl.setCInvCode(param.getCInvCode());
- orderDetl.setIQuantity(param.getIQuantity());
+ orderDetl.setcInvCode(param.getCInvCode());
+ orderDetl.setiQuantity(param.getIQuantity());
orderDetl.setCsocode(param.getCsocode());
- orderDetl.setBFree1(null);
+ orderDetl.setbFree1(param.getBFree1());
//娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
@@ -353,34 +367,44 @@
orderSyncParam.setChildren(orderDetls);
- return orderSyncParam;
+// String docName = param.getIQuantity() > 0 ? "閾跺骇浜у搧鐢熶骇鍏ュ簱鍗�" : "鍏ュ簱閫�鍥炲崟";
+// boolean pakin = param.getIQuantity() > 0 ? true : false;
+
+ openService.syncOrder(orderSyncParam,pakin,docName);
+
+ //return orderSyncParam;
}
- private OrderSyncParam mappingPakOutOrderParam(OrderProdSyncParam param){
+ private void mappingPakOutOrderParam(OrderProdSyncParam param,boolean pakin,String docName){
OrderSyncParam orderSyncParam = new OrderSyncParam();
- List<OrderProdSyncParam.ChildInfo> child = param.getChild();
+ List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
//鐢熸垚鍗曟嵁涓讳綋
- orderSyncParam.setCPOID(child.get(0).getOrderNoT());
+ orderSyncParam.set鎿嶄綔绯荤粺鍙�(param.get鎿嶄綔绯荤粺鍙�());
+ orderSyncParam.setcPOID(child.get(0).getOrderNoT());
orderSyncParam.setDdate(param.getOrderTime());
- orderSyncParam.setCMemo("");
+ orderSyncParam.setcMemo("");
//鐢熸垚鍗曟嵁鏄庣粏
List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
for(OrderProdSyncParam.ChildInfo childInfo : child){
OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
- orderDetl.setCInvCode(childInfo.getCInvCode());
- orderDetl.setIQuantity(childInfo.getIQuantity());
+ orderDetl.setcInvCode(childInfo.getCInvCode());
+ orderDetl.setiQuantity(childInfo.getIQuantity());
orderDetl.setCsocode(param.getCsocode());
- orderDetl.setBFree1(childInfo.getBFree1());
+ orderDetl.setbFree1(childInfo.getBFree1());
orderDetl.setID(childInfo.getIDs() + "");
+ orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
+
orderDetls.add(orderDetl);
}
orderSyncParam.setChildren(orderDetls);
- return orderSyncParam;
+ openService.syncOrder(orderSyncParam,false,docName);
+
+ //return orderSyncParam;
}
}
--
Gitblit v1.9.1