From d5dd468ac86e1482095c97bbfa268bfe3042fd18 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期五, 16 一月 2026 16:17:36 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/controller/KopenApiController.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/KopenApiController.java b/src/main/java/com/zy/api/controller/KopenApiController.java
index dee3217..340f1b3 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -43,14 +43,33 @@
*/
@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, "add");
+ }
+
+ /**
+ * 涓婃灦娲惧伐鍗曞彉鏇�
+ * @author Ryan
+ * @date 2025/11/24 15:22
+ * @param params
+ * @return com.core.common.R
+ */
+ @ApiOperation("涓婃灦娲惧伐鍗曞彉鏇�")
+ @PostMapping("/sendInDispatchCancel")
+ public XSR dispatchUpdate(@RequestBody List<PubOrderParams> params) {
+ if (Objects.isNull(params)) {
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return kopenApiService.receiveOrders(params);
+// if (Objects.isNull(params.getType())) {
+// return XSR.error("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
+// }
+ return kopenApiService.receiveOrders(params, "update");
}
/**
@@ -79,14 +98,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,14 +117,33 @@
*/
@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, "add");
+ }
+
+ /**
+ * 澶囪揣鎸囩ず娲惧伐鍗曞彉鏇�
+ * @author Ryan
+ * @date 2025/11/24 15:22
+ * @param params
+ * @return com.core.common.R
+ */
+ @ApiOperation("澶囪揣鎸囩ず娲惧伐鍗曞彉鏇�")
+ @PostMapping("/sendOutDispacthCancel")
+ public XSR sendOutDispatchCancel(@RequestBody List<PubOrderParams> params) {
+ if (Objects.isNull(params)) {
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return kopenApiService.sendOutDispatch(params);
+// if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
+// return XSR.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
+// }
+ return kopenApiService.sendOutDispatch(params, "update");
}
@@ -138,12 +176,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);
}
@@ -157,7 +192,7 @@
* @return com.core.common.R
*/
@ApiOperation("鏌ヨWMS搴撳瓨淇℃伅")
- @PostMapping("/getStockInfo")
+ @PostMapping("/getPartsStock")
public XSR getStockInfo(@RequestBody PageRequestParams params) {
return kopenApiService.getStockInfo(params);
}
--
Gitblit v1.9.1