From 10f65a42b77e2c5642ea56b715f25ea4f024fd3f Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 25 四月 2025 10:58:48 +0800
Subject: [PATCH] #新增明细编号
---
src/main/java/com/zy/asrs/controller/OpenController.java | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cb34a46..13ae2f9 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -33,16 +33,29 @@
@Autowired
private OpenService openService;
- @PostMapping("/order/matSync/default/v1")
+ @PostMapping("/mat/sync/auth/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) MatSyncParam param,
+ @RequestBody(required = false) List<MatSyncParam> param,
HttpServletRequest request){
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
openService.syncMat(param);
+ return R.ok();
+ }
+
+ @PostMapping("/stock/upload/auth/v1")
+ @AppAuth(memo = "搴撳瓨涓婃姤")
+ public synchronized R syncStockUpload(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) List<MatSyncParam> param,
+ HttpServletRequest request){
+// auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.check(param);
return R.ok();
}
@@ -66,7 +79,7 @@
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakin/default/v1")
+ @PostMapping("/pakin/execute/auth/v1")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
@@ -77,11 +90,14 @@
if (Cools.isEmpty(param.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ if (Cools.isEmpty(param.getBillType())) {
+ return R.error("鍗曟嵁绫诲瀷[billType]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ if (Cools.isEmpty(param.getCreateTime())) {
+ return R.error("鍗曟嵁鏄庣粏[createTime]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getMatList())) {
+ return R.error("鍗曟嵁鏄庣粏[matList]涓嶈兘涓虹┖");
}
openService.pakinOrderCreate(param);
return R.ok();
@@ -101,7 +117,7 @@
/**
* 娣诲姞鍑哄簱鍗�
*/
- @PostMapping("/order/pakout/default/v1")
+ @PostMapping("/pakout/execute/auth/v1")
@AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakoutParam param,
@@ -110,20 +126,20 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getLgort())) {
- return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
- }
- if (!param.getLgort().equals("5006")) {
- return R.ok();
- }
+// if (Cools.isEmpty(param.getLgort())) {
+// return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
+// }
+// if (!param.getLgort().equals("5006")) {
+// return R.ok();
+// }
if (Cools.isEmpty(param.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ if (Cools.isEmpty(param.getBillType())) {
+ return R.error("鍗曟嵁绫诲瀷[billType]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ if (Cools.isEmpty(param.getMatList())) {
+ return R.error("鍗曟嵁鏄庣粏[matList]涓嶈兘涓虹┖");
}
openService.pakoutOrderCreate(param);
return R.ok();
@@ -173,7 +189,7 @@
param.setOrderType("鎵撳寘涓婄嚎鍗�");
param.setOrderTime(DateUtils.convert(new Date()));
List<DetlDto> orderDetails = new ArrayList<>();
- param.setOrderDetails(orderDetails);
+ param.setMatList(orderDetails);
for (int i = 0; i < 3; i++) {
DetlDto detlDto = new DetlDto();
switch (i) {
--
Gitblit v1.9.1