From 3b7adc0bb693dfb65c4fa4c37cd0438cef2f6081 Mon Sep 17 00:00:00 2001
From: xins <xins@mesnac.com>
Date: Fri, 29 Mar 2024 10:35:31 +0800
Subject: [PATCH] =?UTF-8?q?1.9.2=20WMS=EF=BC=9APDA=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=A7=BB=E5=BA=93=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BB=93=E5=BA=93=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=92=8C=E8=8E=B7=E5=8F=96=E5=BA=93=E4=BD=8D=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/controller/WmsMobileController.java   | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java
index b0d8959..20a1224 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java
@@ -57,6 +57,9 @@ public class WmsMobileController extends BaseController {
     @Autowired
     private IWmsBaseWarehouseService wmsBaseWarehouseService;
 
+    @Autowired
+    private IWmsBaseLocationService wmsBaseLocationService;
+
     @Autowired
     private IWmsProductStockService wmsProductStockService;
 
@@ -411,6 +414,32 @@ public class WmsMobileController extends BaseController {
     //todo：入库时校验warehousematerial,入库出库需要校验库位状态，是否是移库合库锁定等
 
 
+
+
+
+
+    /**
+     * 获取仓库信息列表
+     */
+//    @RequiresPermissions("wms:rawoutstock:query")
+    @GetMapping(value = "/getWarehouses")
+    public AjaxResult getWarehouses() {
+        WmsBaseWarehouse queryWarehouse = new WmsBaseWarehouse();
+        queryWarehouse.setWarehouseType(WmsConstants.WMS_WAREHOUSE_TYPE_NORMAL);
+        List<WmsBaseWarehouse> warehouses = wmsBaseWarehouseService.selectWmsBaseWarehouseList(queryWarehouse);
+        return success(warehouses);
+    }
+
+    /**
+     * 获取库位信息列表
+     */
+//    @RequiresPermissions("wms:rawoutstock:query")
+    @GetMapping(value = "/getLocations")
+    public AjaxResult getLocations(WmsBaseLocation baseLocation) {
+        List<WmsBaseLocation> baseLocations = wmsBaseLocationService.selectWmsBaseLocationList(baseLocation);
+        return success(baseLocations);
+    }
+
     /**
      * 人工申请移库
      */
@@ -437,8 +466,8 @@ public class WmsMobileController extends BaseController {
      * 获取人工移库记明细
      */
 //    @RequiresPermissions("wms:rawoutstock:query")
-    @GetMapping(value = "/getMoveDetail/{taskCode}")
-    public AjaxResult getMoveDetail(@PathVariable("taskCode") String taskCode) {
+    @GetMapping(value = "/getMoveListByTaskCode/{taskCode}")
+    public AjaxResult getMoveListByTaskCode(@PathVariable("taskCode") String taskCode) {
         WmsMove queryMove = new WmsMove();
         queryMove.setTaskCode(taskCode);
         List<WmsMove> wmsMoveList = wmsMoveService.selectWmsMoveJoinList(queryMove);