From 8d589bc8baeadc9d29c2523cf766040a5f5e5995 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 07 五月 2024 00:30:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 139 ++++++++++++++++++++++++++++++++--------------
1 files changed, 97 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 93fe59d..06b718e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -156,27 +156,9 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- MatSyncParam matSyncParam = openService.syncMat(param);
- if (Cools.isEmpty(matSyncParam.getMats()) || matSyncParam.getMats().size() <=0 ) {
- return R.error("鏁版嵁寮傚父");
- }
- StringBuilder Msg= new StringBuilder("鍘熷洜锛�");
- int MsgT=0,MsgF=0;
- for (MatSyncParam.Mats matParam:matSyncParam.getMats()){
- if (matParam.isType()){
- MsgT++;
- }else {
- MsgF++;
- Msg.append(matParam.getMatnr()).append(":").append(matParam.getMemo()).append(";");
- }
- }
- if (MsgF==0){
- return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�");
- }else if (MsgT==0){
- return R.ok("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
- }else {
- return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
- }
+ openService.syncMat(param);
+
+ return R.ok("鏇存柊鎴愬姛");
}
@@ -244,57 +226,78 @@
return R.parse(BaseRes.PARAM);
}
- int MsgT = 0;
- int MsgF = 0;
- StringBuilder Msg= new StringBuilder("鍘熷洜锛�");
+ int msgU = 0;
+ int msgT = 0;
+ int msgF = 0;
+ StringBuilder msg= new StringBuilder("鍘熷洜锛�");
List<MatInfoParam> matDetails = (List<MatInfoParam>) param.get("matDetails");
for (Object matDetail : matDetails){
MatInfoParam matInfoParam = JSONObject.parseObject(JSON.toJSONString(matDetail),MatInfoParam.class);
if (Cools.isEmpty(matDetails)) {
- MsgF++;
+ msgF++;
continue;
}
openService.syncMat(matInfoParam);
- if(matInfoParam.isType()){
- MsgT++;
- }else {
- MsgF++;
- Msg.append(matInfoParam.getCinvcode()).append(":").append(matInfoParam.getMemo()).append(";");
+ if(matInfoParam.isUpdate()){
+ msgU++;
+ }else if(matInfoParam.isInsert()){
+ msgT++;
+ } else if(matInfoParam.isError()){
+ msgF++;
+ msg.append(matInfoParam.getCinvcode()).append(":").append(matInfoParam.getMemo()).append(";");
}
}
-
- if (MsgF==0){
- return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�");
- }else if (MsgT==0){
- return R.ok("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
- }else {
- return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
+ String message = "";
+ boolean success = false;
+ if(msgT != 0){
+ message += "鎴愬姛鎺ユ敹鐗╂枡锛�"+msgT+"涓�";
+ success = true;
}
+ if(msgU != 0){
+ message += "鎴愬姛淇敼鐗╂枡锛�"+msgU+"涓�";
+ success = true;
+ }
+ if(msgF != 0){
+ message += "鎺ユ敹鐗╂枡澶辫触锛�"+msgF+"涓�;"+msg;
+ }
+ if(success){
+ return R.ok(message);
+ }else {
+ return R.error(message);
+ }
+
+// if (MsgF==0){
+// return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�");
+// }else if (MsgT==0){
+// return R.error("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
+// }else {
+// return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
+// }
}
@PostMapping("/order/pakin/default/v1")
@AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁")
public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String, Object> param,
+ @RequestBody(required = true) OrderSyncParam param,
HttpServletRequest request){
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- openService.syncOrder(param);
+ openService.syncOrder(param,true,"閲囪喘鍏ュ簱鍗�");
return R.ok("鍏ュ簱鍗曟嵁鎺ュ彈鎴愬姛");
}
@PostMapping("/order/pakout/default/v1")
- @AppAuth(memo = "鐢熸垚鍑哄簱鍗曟嵁")
+ @AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String, Object> param,
+ @RequestBody(required = false) OrderProdSyncParam param,
HttpServletRequest request){
auth(appkey, param, request);
@@ -302,7 +305,9 @@
return R.parse(BaseRes.PARAM);
}
- openService.syncOrder(param);
+ openService.syncOrder(mappingPakInOrderParam(param),true,"鐢熶骇鍏ュ簱鍗�");
+ openService.syncOrder(mappingPakOutOrderParam(param),false,"鐢熶骇鍑哄簱鍗�");
+
return R.ok("鍑哄簱鍗曟嵁鎺ュ彈鎴愬姛");
@@ -328,4 +333,54 @@
}
+ private OrderSyncParam mappingPakInOrderParam(OrderProdSyncParam param){
+ //鐢熸垚鍗曟嵁涓讳綋
+ OrderSyncParam orderSyncParam = new OrderSyncParam();
+ orderSyncParam.setCPOID(param.getOrderNoT());
+ orderSyncParam.setDdate(param.getOrderTime());
+ orderSyncParam.setCMemo("");
+
+ //鐢熸垚鍗曟嵁鏄庣粏
+ OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
+ orderDetl.setCInvCode(param.getCInvCode());
+ orderDetl.setIQuantity(param.getIQuantity());
+ orderDetl.setCsocode(param.getCsocode());
+ orderDetl.setBFree1(null);
+
+ //娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
+ List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
+ orderDetls.add(orderDetl);
+
+ orderSyncParam.setChildren(orderDetls);
+
+ return orderSyncParam;
+ }
+
+ private OrderSyncParam mappingPakOutOrderParam(OrderProdSyncParam param){
+ OrderSyncParam orderSyncParam = new OrderSyncParam();
+
+ List<OrderProdSyncParam.ChildInfo> child = param.getChild();
+
+ //鐢熸垚鍗曟嵁涓讳綋
+ orderSyncParam.setCPOID(child.get(0).getOrderNoT());
+ orderSyncParam.setDdate(param.getOrderTime());
+ 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.setCsocode(param.getCsocode());
+ orderDetl.setBFree1(childInfo.getBFree1());
+ orderDetl.setID(childInfo.getIDs() + "");
+ orderDetls.add(orderDetl);
+ }
+ orderSyncParam.setChildren(orderDetls);
+
+ return orderSyncParam;
+ }
+
}
--
Gitblit v1.9.1