From 58e4c139c07bec6ec087b786e1615f51f439327a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 03 三月 2025 15:21:58 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 0da930a..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,7 @@
 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;
@@ -24,6 +25,9 @@
 
     @Autowired
     private WcsApiService wcsApiService;
+
+    @Autowired
+    private PlatformService platformService;
 
 
     /**
@@ -137,7 +141,16 @@
         return  wcsApiService.getPlatforms();
     }
 
-
+//    /**
+//     * 缁戝畾璁㈠崟涓庨泦璐у尯鍏崇郴
+//     * @param platform
+//     * @return
+//     */
+//    @PostMapping("/bind/shipping/platform")
+//    public R bindShippingAndPlatform(@RequestBody BindPlatformParam platform) {
+//        return platformService.bindShippingPlatform(platform);
+//    }
+//
 
 
 }

--
Gitblit v1.9.1