From 4fb06a58ed5df46f29af1e9fa65cfd40335263ad Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 18 一月 2025 17:06:18 +0800
Subject: [PATCH] # 6. 大屏添加作业类型 (全盘,还是分拣  IOType) 10.平库出库时,当前平库ID是写死在Sql里,需修改 11.平库出库没有判断是否预约出库,且生成拣货单时没有锁定库存,需确认是否考虑回库问题 26. 已拣过货的任务明细,可以再次拣货,拣货明细需添加一个拣货状态 47. 确认发货前,需判断是否已绑定至集货区 48. CTU出库后,库位103不再删除原有库位信息

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 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 022198e..d595118 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
@@ -7,6 +7,8 @@
 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.asrs.entity.param.BindPlatformParam;
+import com.zy.asrs.wms.asrs.service.PlatformService;
 import com.zy.asrs.wms.system.controller.BaseController;
 import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -23,6 +25,10 @@
 
     @Autowired
     private WcsApiService wcsApiService;
+
+    @Autowired
+    private PlatformService platformService;
+
 
     /**
      * 鍑哄簱浠诲姟-鎺ユ敹鍥炶皟鐘舵�佹帴鍙�
@@ -99,7 +105,7 @@
         if (Objects.isNull(request.get("taskNo"))) {
             throw new CoolException("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
         }
-        if (Objects.isNull(request.get("orderNO"))){
+        if (Objects.isNull(request.get("orderNo"))){
             throw new CoolException("褰撳墠浠诲姟璁㈠崟鍙蜂笉鑳戒负绌猴紒锛�");
         }
 
@@ -113,12 +119,11 @@
     /**
      * 淇″彿鍥炰紶鎺ュ彛锛屽洖浼犵數瀛愭爣绛剧姸鎬佸彉鍖栧唴瀹圭粰涓婃父绯荤粺銆�
      * 褰撲汉涓烘搷浣滐紙姣斿鎷嶇伅锛屾洿鏀规暟瀛楋紝鏀剧绛夛級瀵艰嚧鐢靛瓙鏍囩鐨勭姸鎬佸拰淇″彿绛夊彂鐢熷彉鍖栥�佹垨璁惧鏈韩鍙戠敓寮傚父鏃讹紝ESS鎺ユ敹鍒颁俊鍙峰悗锛岄�氳繃璇ユ帴鍙e皢淇″彿鍥炰紶缁欎笂娓哥郴缁熴��
-     *
      * RFID鍥炶皟鎺ュ彛
-     *
      * @param request
      * @return
      */
+    @PostMapping("/")
     public R rfidCallback(@RequestBody RfidSingalRequest request) {
         if (Objects.isNull(request)) {
             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -127,5 +132,25 @@
     }
 
 
+    /**
+     * 鑾峰彇鎵�鏈夐泦璐у尯
+     * @return
+     */
+    @GetMapping("/all/platforms")
+    public R getPlatforms() {
+        return  wcsApiService.getPlatforms();
+    }
+
+//    /**
+//     * 缁戝畾璁㈠崟涓庨泦璐у尯鍏崇郴
+//     * @param platform
+//     * @return
+//     */
+//    @PostMapping("/bind/shipping/platform")
+//    public R bindShippingAndPlatform(@RequestBody BindPlatformParam platform) {
+//        return platformService.bindShippingPlatform(platform);
+//    }
+//
+
 
 }

--
Gitblit v1.9.1