From cc6dae7468506691bfb23ca81be5e14045771bce Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 15 一月 2025 20:43:59 +0800
Subject: [PATCH] # 拍灯容器流动流程修改 发货确认功能开发 部分功能优化
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
index a97164a..022198e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -2,7 +2,9 @@
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.request.ContainerArrivedParam;
+import com.zy.asrs.wms.apis.wcs.entity.request.RfidSingalRequest;
import com.zy.asrs.wms.apis.wcs.entity.request.TasksStatusCallbackParam;
import com.zy.asrs.wms.apis.wcs.services.WcsApiService;
import com.zy.asrs.wms.system.controller.BaseController;
@@ -10,6 +12,9 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+import java.util.Objects;
@Slf4j
@RestController
@@ -61,7 +66,10 @@
}
/**
- * 瀹瑰櫒娴佸姩閫氱煡
+ * 瀹瑰櫒娴佸姩閫氱煡锛堝綋鍓嶇墿鏂欐挱绉嶅畬鎴愶級
+ * //fixme 姝ゆ帴鍙ｅ皢涓嶅啀鍗曠嫭璋冪敤
+ * 1. 鏇存柊褰撳墠浠诲姟鐗╂枡淇℃伅
+ * 2.
* @param code 瀹瑰櫒缂栫爜
* @return
*/
@@ -70,9 +78,54 @@
if (StringUtil.isNullOrEmpty(code)) {
return R.error("瀹瑰櫒缂栫爜涓嶈兘涓虹┖锛侊紒锛�");
}
-
return wcsApiService.containerConveryor(code);
}
+ /**
+ * 鍙戦�佸懡浠ょ粰鐢靛瓙鏍囩锛屽彲浠ユ帶鍒剁數瀛愭爣绛句寒鐏鑹插強鐏伅绛夈��
+ *
+ * 1. 鍒ゆ柇褰撳墠瀹瑰櫒鏄惁杩樻湁鐗╂枡鏈嫞锛屾湭鎷ｅ畬闂伅锛屾嫞瀹岄�氱煡瀹瑰櫒娴佸姩锛屽苟鐏伅
+ * 2. 瀹瑰櫒娴佸姩鍒ゆ柇锛屽鏋滄枡绠辨病鏈夌墿鏂� code浼�200锛� 鏈夌墿鏂欎紶100 鎵ц鍥炲簱浠诲姟, IOTYP = 4
+ *
+ * @param request
+ * @return
+ */
+ @PostMapping("/slap/light")
+ public R slapLightLogic(@RequestBody Map<String, Object> request) {
+ if (Objects.isNull(request)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(request.get("taskNo"))) {
+ throw new CoolException("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(request.get("orderNO"))){
+ throw new CoolException("褰撳墠浠诲姟璁㈠崟鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+
+ wcsApiService.slapLightLogic(request);
+
+ return R.ok();
+ }
+
+
+
+ /**
+ * 淇″彿鍥炰紶鎺ュ彛锛屽洖浼犵數瀛愭爣绛剧姸鎬佸彉鍖栧唴瀹圭粰涓婃父绯荤粺銆�
+ * 褰撲汉涓烘搷浣滐紙姣斿鎷嶇伅锛屾洿鏀规暟瀛楋紝鏀剧绛夛級瀵艰嚧鐢靛瓙鏍囩鐨勭姸鎬佸拰淇″彿绛夊彂鐢熷彉鍖栥�佹垨璁惧鏈韩鍙戠敓寮傚父鏃讹紝ESS鎺ユ敹鍒颁俊鍙峰悗锛岄�氳繃璇ユ帴鍙ｅ皢淇″彿鍥炰紶缁欎笂娓哥郴缁熴��
+ *
+ * RFID鍥炶皟鎺ュ彛
+ *
+ * @param request
+ * @return
+ */
+ public R rfidCallback(@RequestBody RfidSingalRequest request) {
+ if (Objects.isNull(request)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return wcsApiService.rfidCallback(request);
+ }
+
+
+
}
--
Gitblit v1.9.1