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 warehouses = wmsBaseWarehouseService.selectWmsBaseWarehouseList(queryWarehouse); + return success(warehouses); + } + + /** + * 获取库位信息列表 + */ +// @RequiresPermissions("wms:rawoutstock:query") + @GetMapping(value = "/getLocations") + public AjaxResult getLocations(WmsBaseLocation baseLocation) { + List 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 wmsMoveList = wmsMoveService.selectWmsMoveJoinList(queryMove);