From af7735421399789ec5a47a352906acc3abe306ca Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 五月 2024 08:58:47 +0800
Subject: [PATCH] #异常捕捉
---
src/main/java/com/zy/asrs/controller/OpenController.java | 93 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 71 insertions(+), 22 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..7b763f5 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -149,6 +149,7 @@
* 鍟嗗搧淇℃伅鍚屾鎺ュ彛
*/
@PostMapping("/mat/v1")
+ @AppAuth(memo = "鐗╂枡鍚屾鎺ュ彛")
public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
HttpServletRequest request){
@@ -278,6 +279,25 @@
}
+ @PostMapping("/order/pak/default/v1")
+ @AppAuth(memo = "鐢熸垚閫�璐цˉ璐у崟鎹�")
+ public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = true) OrderSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ String docName = param.get鎿嶄綔鍗曟嵁();
+ boolean pakin = param.getPakin() == 1 ? true : false;
+
+ openService.syncOrder(param,pakin,docName);
+
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
+
+ }
+
@PostMapping("/order/pakin/default/v1")
@AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁")
public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
@@ -288,15 +308,19 @@
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("鍗曟嵁鎺ュ彈鎴愬姛");
}
@PostMapping("/order/pakout/default/v1")
@AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
+ //@RequestBody(required = false) HashMap<String,Object> param,
@RequestBody(required = false) OrderProdSyncParam param,
HttpServletRequest request){
@@ -304,12 +328,24 @@
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,"鐢熶骇鍑哄簱鍗�");
+ if(!Cools.isEmpty(param.getChildren())){
+ String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇濮斿鏉愭枡鍑哄簱鍗�" : "閾跺骇濮斿鏉愭枡閫�鏂欏崟";
+ boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
+ mappingPakOutOrderParam(param,pakin1,docName1);
+ }
+ }else if(!Cools.isEmpty(param.getChildren())) {
+ 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 +369,22 @@
}
- 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.setCsocode(param.getCsocode());
- orderDetl.setBFree1(null);
+ orderDetl.setcInvCode(param.getCInvCode());
+ orderDetl.setiQuantity(param.getIQuantity());
+ orderDetl.setcDefine22(param.getDefine24());
+ orderDetl.setbFree1(param.getBFree1());
+ orderDetl.setId(param.getId());
+ orderDetl.setIvouchrowno(param.getIvouchrowno());
//娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
@@ -353,34 +392,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.setID(childInfo.getIDs() + "");
+ 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