From 2cf6f25ee51dea59dbd1e2183a06796961bb8644 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 23 十二月 2024 19:38:09 +0800
Subject: [PATCH] 添加出库流程
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 147 ++++++++++++++++++++++---------------------------
1 files changed, 66 insertions(+), 81 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WcsApiController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
similarity index 75%
copy from zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WcsApiController.java
copy to zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
index 4dee651..46cfc43 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WcsApiController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -1,81 +1,66 @@
-package com.zy.asrs.wms.apis.wcs.controller;
-
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.wms.apis.wcs.entity.request.ContainerArrivedParam;
-import com.zy.asrs.wms.apis.wcs.entity.request.ConveyorStarParam;
-import com.zy.asrs.wms.apis.wcs.entity.request.TasksStatusCallbackParam;
-import com.zy.asrs.wms.apis.wcs.services.WcsApiService;
-import io.netty.util.internal.StringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RequestMapping("/openapi/")
-@RestController
-public class WcsApiController {
-
- @Autowired
- private WcsApiService wcsApiService;
-
-
- /***
- * 瀹瑰櫒鍒拌揪鎺ユ敹
- * @param arrivedParam
- * @return
- */
- @PostMapping("/container/arrived")
- public R containerArrivedNotify(@RequestBody ContainerArrivedParam arrivedParam) {
-
- if (StringUtil.isNullOrEmpty(arrivedParam.getContainerCode())) {
- return R.error("瀹瑰櫒缂栫爜涓嶈兘涓虹┖锛侊紒");
- }
- if (StringUtil.isNullOrEmpty(arrivedParam.getSlotCode())) {
- return R.error("杈撻�佺嚎鑺傜偣缂栫爜涓嶈兘涓虹┖锛侊紒");
- }
-
- return wcsApiService.containerArrivedNotify(arrivedParam);
-
- }
-
-
- /**
- * ESS涓婃姤浠诲姟鐘舵�佹帴鍙�
- * @param callbackParam
- * @return
- */
- @PostMapping("/receive/tasks/status")
- public R receiveTaskStatus(@RequestBody TasksStatusCallbackParam callbackParam) {
- if (!StringUtil.isNullOrEmpty(callbackParam.getEventType())) {
- if (StringUtil.isNullOrEmpty(callbackParam.getContainerCode())) {
- return R.error("瀹瑰櫒缂栫爜涓嶈兘涓虹┖锛侊紒");
- }
- if (StringUtil.isNullOrEmpty(callbackParam.getTaskCode())) {
- return R.error("浠诲姟缂栫爜涓嶈兘涓虹┖锛侊紒");
- }
- boolean result = wcsApiService.receiveTaskStatus(callbackParam);
- } else {
- return R.error("涓婃姤浜嬩欢绫诲瀷涓嶈兘涓虹┖锛侊紒");
- }
-
- return R.success();
- }
-
-
-// /**
-// * 涓嬪彂鐐瑰鐐规惉杩愪换鍔�
-// * @param
-// * @return
-// */
-// @PostMapping("/carry")
-// public R publishTaskOfCarry() {
-// PublishTasksReponse reponse = wcsApiService.publishTaskOfCarry();
-// if (reponse.getCode() == 0) {
-// return R.ok(reponse.getData());
-// } else {
-// return R.error(reponse.getMsg());
-// }
-// }
-
-}
+package com.zy.asrs.wms.apis.wcs.controller;
+
+
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.apis.wcs.entity.request.ContainerArrivedParam;
+import com.zy.asrs.wms.apis.wcs.entity.request.TasksStatusCallbackParam;
+import com.zy.asrs.wms.apis.wcs.services.WcsApiService;
+import io.netty.util.internal.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/out/stock/")
+public class OutStockController {
+
+ @Autowired
+ private WcsApiService wcsApiService;
+
+ /**
+ * 鍑哄簱浠诲姟-鎺ユ敹鍥炶皟鐘舵�佹帴鍙�
+ * @param callbackParam
+ * @return
+ */
+ @PostMapping("/receive/tasks/status")
+ public R receiveTaskStatus(@RequestBody TasksStatusCallbackParam callbackParam) {
+ if (!StringUtil.isNullOrEmpty(callbackParam.getEventType())) {
+ if (StringUtil.isNullOrEmpty(callbackParam.getContainerCode())) {
+ return R.error("瀹瑰櫒缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ if (StringUtil.isNullOrEmpty(callbackParam.getTaskCode())) {
+ return R.error("浠诲姟缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ wcsApiService.receiveTaskStatus(callbackParam, "outStock");
+ } else {
+ return R.error("涓婃姤浜嬩欢绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+
+ return R.success();
+ }
+
+ /***
+ * 瀹瑰櫒鍒拌揪鎺ユ敹
+ * @param arrivedParam
+ * @return
+ */
+ @PostMapping("/container/arrived")
+ public R containerArrivedNotify(@RequestBody ContainerArrivedParam arrivedParam) {
+
+ if (StringUtil.isNullOrEmpty(arrivedParam.getContainerCode())) {
+ return R.error("瀹瑰櫒缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ if (StringUtil.isNullOrEmpty(arrivedParam.getSlotCode())) {
+ return R.error("杈撻�佺嚎鑺傜偣缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+
+ return wcsApiService.containerArrivedNotify(arrivedParam, "outStock");
+
+ }
+
+
+}
--
Gitblit v1.9.1