From 7deaef70a6d20a7f1fb86b3af3d58ad76135bc20 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期三, 28 八月 2024 10:27:42 +0800
Subject: [PATCH] 配置
---
src/main/java/com/zy/asrs/controller/OpenController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f92440c..88bca34 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,7 +308,7 @@
return R.parse(BaseRes.PARAM);
}
- String docName = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟";
+ String docName = !Cools.isEmpty(param.getOrderType()) ? param.getOrderType() : param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟";
boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
openService.syncOrder(param,pakin,docName);
@@ -297,9 +317,30 @@
}
+ /*
+ 鐩樼偣鎺ュ彛
+ */
+ @PostMapping("/check/default/v1")
+ @AppAuth(memo = "搴撳瓨鐩樼偣")
+ public synchronized R checkLoc(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = true) CheckParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ openService.checkAndAdjustLocDetl(param);
+
+ 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){
@@ -312,11 +353,13 @@
boolean pakin = param.getIQuantity() > 0 ? true : false;
mappingPakInOrderParam(param,pakin,docName);
- String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇濮斿鏉愭枡鍑哄簱鍗�" : "閾跺骇濮斿鏉愭枡閫�鏂欏崟";
- boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
- mappingPakOutOrderParam(param,pakin1,docName1);
+ 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 {
+ }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);
@@ -358,8 +401,10 @@
OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
orderDetl.setcInvCode(param.getCInvCode());
orderDetl.setiQuantity(param.getIQuantity());
- orderDetl.setCsocode(param.getCsocode());
+ orderDetl.setcDefine22(param.getDefine24());
orderDetl.setbFree1(param.getBFree1());
+ orderDetl.setId(param.getId());
+ orderDetl.setIvouchrowno(param.getIvouchrowno());
//娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
@@ -395,7 +440,7 @@
orderDetl.setiQuantity(childInfo.getIQuantity());
orderDetl.setCsocode(param.getCsocode());
orderDetl.setbFree1(childInfo.getBFree1());
- orderDetl.setID(childInfo.getIDs() + "");
+ orderDetl.setId(childInfo.getIds());
orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
orderDetls.add(orderDetl);
--
Gitblit v1.9.1