From 43f9cf624b83c9d3d0e2280a1404dcc52695a18d Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期一, 29 十二月 2025 16:01:08 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/api/controller/KopenApiController.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/KopenApiController.java b/src/main/java/com/zy/api/controller/KopenApiController.java
index a504ae8..6d7c2cf 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -43,13 +43,13 @@
*/
@ApiOperation("涓婃灦娲惧伐鍗�")
@PostMapping("/sendInDispatch")
- public XSR receiveOrders(@RequestBody PubOrderParams params) {
+ public XSR receiveOrders(@RequestBody List<PubOrderParams> params) {
if (Objects.isNull(params)) {
return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(params.getType())) {
- return XSR.error("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
- }
+// if (Objects.isNull(params.getType())) {
+// return XSR.error("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
+// }
return kopenApiService.receiveOrders(params);
}
@@ -79,14 +79,14 @@
*/
@ApiOperation("涓婃灦娲惧伐鍗曞弽棣�")
@PostMapping("/getInDispatchResult")
- public XSR getInDispatchResult(@RequestBody ReportOrderParam params) {
+ public XSR getInDispatchResult(@RequestBody List<ReportOrderParam> params) {
if (Objects.isNull(params)) {
return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) {
- return XSR.error("鍙栨秷鏉′欢涓嶈兘涓虹┖锛侊紒");
- }
- return kopenApiService.getInDispatchResult(params);
+// if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) {
+// return XSR.error("鍙栨秷鏉′欢涓嶈兘涓虹┖锛侊紒");
+// }
+ return kopenApiService.getInDispatchResult(params, null);
}
/**
@@ -98,13 +98,13 @@
*/
@ApiOperation("澶囪揣鎸囩ず娲惧伐鍗曚笅鍙�")
@PostMapping("/sendOutDispatch")
- public XSR sendStockPrepareDispatch(@RequestBody PubOrderParams params) {
+ public XSR sendStockPrepareDispatch(@RequestBody List<PubOrderParams> params) {
if (Objects.isNull(params)) {
return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
- return XSR.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
- }
+// if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
+// return XSR.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
+// }
return kopenApiService.sendOutDispatch(params);
}
@@ -138,12 +138,9 @@
*/
@ApiOperation("澶囪揣鍗曚笅鍙�")
@PostMapping("/getOutDetails")
- public XSR getOutDetails(@RequestBody StockUpOrderParams params) {
+ public XSR getOutDetails(@RequestBody List<StockUpOrderParams> params) {
if (Objects.isNull(params)) {
return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
- if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
- return XSR.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
}
return kopenApiService.getOutDetails(params);
}
@@ -172,14 +169,15 @@
*/
@ApiOperation("闆朵欢鎹熸孩鍗曚笅鍙�")
@PostMapping("/sendBSBYDetails")
- public XSR sendStockAdjust(@RequestBody StockAdjustParams params) {
- if (Objects.isNull(params)) {
+ public XSR sendStockAdjust(@RequestBody List<StockAdjustParams> params) {
+ if (Objects.isNull(params) || params.isEmpty()) {
return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
- if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
- return XSR.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
}
return kopenApiService.sendStockAdjust(params, 1L);
}
+
+
+
+
}
--
Gitblit v1.9.1