From 290e5fd2e74efe19326f56e38c3391aaae23ffc5 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期三, 24 十二月 2025 17:14:09 +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 | 72 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/KopenApiController.java b/src/main/java/com/zy/api/controller/KopenApiController.java
index 122fa3f..f426e4a 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -1,14 +1,16 @@
package com.zy.api.controller;
-import com.core.common.R;
-import com.zy.api.entity.OrderParams;
+import com.zy.api.controller.params.PageRequestParams;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
+import com.zy.api.entity.StockAdjustParams;
import com.zy.api.entity.StockUpOrderParams;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.entity.dto.XSR;
import com.zy.api.service.KopenApiService;
+import com.zy.common.web.BaseController;
+
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -26,7 +28,7 @@
@Slf4j
@RestController
@RequestMapping("/kopen")
-public class KopenApiController {
+public class KopenApiController extends BaseController{
@Autowired
private KopenApiService kopenApiService;
@@ -41,19 +43,19 @@
*/
@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);
}
/**
* 涓婃父涓嬪彂闆朵欢鏁版嵁鍙樻洿
- * s
+ *
* @author Ryan
* @date 2025/11/24 15:19
* @param params
@@ -68,7 +70,6 @@
return kopenApiService.basMatupdate(params);
}
-
/**
* 涓婃灦娲惧伐鍗曞弽棣�
* @author Ryan
@@ -78,13 +79,13 @@
*/
@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("鍙栨秷鏉′欢涓嶈兘涓虹┖锛侊紒");
- }
+// if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) {
+// return XSR.error("鍙栨秷鏉′欢涓嶈兘涓虹┖锛侊紒");
+// }
return kopenApiService.getInDispatchResult(params);
}
@@ -97,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);
}
@@ -137,17 +138,46 @@
*/
@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);
}
+ /**
+ * 鏌ヨWMS搴撳瓨淇℃伅
+ * @author Ryan
+ * @date 2025/11/24 15:22
+ * @param params
+ * @return com.core.common.R
+ */
+ @ApiOperation("鏌ヨWMS搴撳瓨淇℃伅")
+ @PostMapping("/getStockInfo")
+ public XSR getStockInfo(@RequestBody PageRequestParams params) {
+ return kopenApiService.getStockInfo(params);
+ }
+
+
+ /**
+ * 闆朵欢鎹熸孩鍗曚笅鍙�
+ * @author Ryan
+ * @date 2025/11/24 15:22
+ * @param params
+ * @return com.core.common.R
+ */
+ @ApiOperation("闆朵欢鎹熸孩鍗曚笅鍙�")
+ @PostMapping("/sendBSBYDetails")
+ public XSR sendStockAdjust(@RequestBody List<StockAdjustParams> params) {
+ if (Objects.isNull(params) || params.isEmpty()) {
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return kopenApiService.sendStockAdjust(params, 1L);
+ }
+
+
+
}
--
Gitblit v1.9.1