From 452f6c14af80b89d941e7dadf54bc203e63ccfec Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 07 一月 2026 09:28:07 +0800
Subject: [PATCH] 上架派工单变更 备货单变更
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 8 ++++----
src/main/java/com/zy/api/service/KopenApiService.java | 4 ++--
src/main/java/com/zy/api/controller/KopenApiController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
3 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/KopenApiController.java b/src/main/java/com/zy/api/controller/KopenApiController.java
index 6d7c2cf..39f4d29 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -50,7 +50,26 @@
// if (Objects.isNull(params.getType())) {
// return XSR.error("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
// }
- return kopenApiService.receiveOrders(params);
+ 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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+// if (Objects.isNull(params.getType())) {
+// return XSR.error("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
+// }
+ return kopenApiService.receiveOrders(params, "update");
}
/**
@@ -105,7 +124,26 @@
// if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
// return XSR.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
// }
- return kopenApiService.sendOutDispatch(params);
+ 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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+// if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
+// return XSR.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
+// }
+ return kopenApiService.sendOutDispatch(params, "update");
}
diff --git a/src/main/java/com/zy/api/service/KopenApiService.java b/src/main/java/com/zy/api/service/KopenApiService.java
index 1f5b14f..269ea44 100644
--- a/src/main/java/com/zy/api/service/KopenApiService.java
+++ b/src/main/java/com/zy/api/service/KopenApiService.java
@@ -22,7 +22,7 @@
* @param params
* @return com.core.common.R
*/
- XSR receiveOrders(List<PubOrderParams> params);
+ XSR receiveOrders(List<PubOrderParams> params, String type);
/**
* 鍩虹闆朵欢鍙樻洿
@@ -55,7 +55,7 @@
* @param params
* @return
*/
- XSR sendOutDispatch(List<PubOrderParams> params);
+ XSR sendOutDispatch(List<PubOrderParams> params, String type);
/**
* 澶囪揣鍗曚笅鍙�
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index c565ee8..077d077 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -82,12 +82,12 @@
* @date 2025/11/24 14:49
*/
@Override
- public XSR receiveOrders(List<PubOrderParams> orderParams) {
+ public XSR receiveOrders(List<PubOrderParams> orderParams, String type) {
orderParams.forEach(params -> {
if (params.getType().equals(OrderWkType.getTypeVal(params.getType()))) {
throw new CoolException("褰撳墠绫诲瀷涓嶆槸涓婃灦娲惧伐鍗曪紒锛�");
}
- addOrUpdateOrders(params, "add");
+ addOrUpdateOrders(params, type);
});
return XSR.ok("鍗曟嵁涓嬪彂鎴愬姛锛侊紒");
@@ -179,7 +179,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public XSR sendOutDispatch(List<PubOrderParams> pubOrderParams) {
+ public XSR sendOutDispatch(List<PubOrderParams> pubOrderParams, String type) {
if (Objects.isNull(pubOrderParams) || pubOrderParams.isEmpty()) {
return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -195,7 +195,7 @@
throw new CoolException("鍏徃ID涓嶈兘涓虹┖锛侊紒");
}
- addOrUpdateOrders(params, "add");
+ addOrUpdateOrders(params, type);
});
return XSR.ok("澶囪揣鎸囩ず娲惧伐鍗曚笅鍙戞垚鍔燂紒锛�");
--
Gitblit v1.9.1