From 3aed7236f2db67dd90115a39bc8f1465e4cc8b73 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 16 十二月 2025 14:34:08 +0800
Subject: [PATCH] 立库完成入库添加库区信息
---
src/main/java/com/zy/api/controller/KopenApiController.java | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/KopenApiController.java b/src/main/java/com/zy/api/controller/KopenApiController.java
index f44fd0f..bdbe26e 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -1,10 +1,12 @@
package com.zy.api.controller;
-import com.alibaba.fastjson.JSON;
+
import com.core.common.R;
import com.zy.api.entity.OrderParams;
+import com.zy.api.entity.PubOrderParams;
+import com.zy.api.entity.ReportOrderParam;
+import com.zy.api.entity.SyncMatParmas;
import com.zy.api.service.KopenApiService;
-import com.zy.asrs.entity.Mat;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -12,8 +14,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
-import java.util.Map;
import java.util.Objects;
@RestController
@@ -32,8 +32,8 @@
* @return com.core.common.R
*/
@ApiOperation("涓婃灦娲惧伐鍗�")
- @PostMapping("/order/add")
- public R receiveOrders(@RequestBody OrderParams params) {
+ @PostMapping("/sendInDispatch")
+ public R receiveOrders(@RequestBody PubOrderParams params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -52,19 +52,55 @@
* @return com.core.common.R
*/
@ApiOperation("闆朵欢淇℃伅鏁版嵁鏇存柊")
- @PostMapping("/sync/mat")
- public R basMatUpdate(@RequestBody Map<String, String> params) {
- if (Objects.isNull(params.get("matnrs"))) {
+ @PostMapping("/sendPartsMaster")
+ public R basMatUpdate(@RequestBody SyncMatParmas params) {
+ if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (params.get("matnrs").isEmpty()) {
- return R.error("鍙樻洿闆朵欢鏄庣粏涓嶈兘涓虹┖锛侊紒");
+ if (Objects.isNull(params.getPro_komcode())) {
+ return R.error("闆朵欢缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- List<Mat> mats = JSON.parseArray(params.get("matnrs"), Mat.class);
- return kopenApiService.basMatupdate(mats);
+ return kopenApiService.basMatupdate(params);
}
+ /**
+ * 涓婃灦娲惧伐鍗曞弽棣�
+ * @author Ryan
+ * @date 2025/11/24 15:20
+ * @param params
+ * @return com.core.common.R
+ */
+ @ApiOperation("涓婃灦娲惧伐鍗曞弽棣�")
+ @PostMapping("/getInDispatchResult")
+ public R getInDispatchResult(@RequestBody ReportOrderParam params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) {
+ return R.error("鍙栨秷鏉′欢涓嶈兘涓虹┖锛侊紒");
+ }
+ return kopenApiService.getInDispatchResult(params);
+ }
+
+ /**
+ * 澶囪揣鎸囩ず娲惧伐鍗曚笅鍙�
+ * @author Ryan
+ * @date 2025/11/24 15:21
+ * @param params
+ * @return com.core.common.R
+ */
+ @ApiOperation("澶囪揣鎸囩ず娲惧伐鍗曚笅鍙�")
+ @PostMapping("/sendOutDispatch")
+ public R sendStockPrepareDispatch(@RequestBody PubOrderParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
+ return R.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
+ }
+ return kopenApiService.sendOutDispatch(params);
+ }
}
--
Gitblit v1.9.1