From d399d0e898d2405d31911fd1d9dfebbf150f7e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Fri, 16 Jun 2023 11:15:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/WmItemRecptLineMobController.java | 38 ++++++++++++++++++- .../mobile/WmItemRecptMobController.java | 12 ++++++ .../mapper/system/UserTaskMapper.xml | 6 +-- 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptLineMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptLineMobController.java index c198635..a895750 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptLineMobController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptLineMobController.java @@ -77,19 +77,37 @@ public class WmItemRecptLineMobController extends BaseController { WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmItemRecptLine.getWarehouseId()); wmItemRecptLine.setWarehouseCode(warehouse.getWarehouseCode()); wmItemRecptLine.setWarehouseName(warehouse.getWarehouseName()); + }else if(StringUtils.isNotNull(wmItemRecptLine.getWarehouseCode())){ + WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(wmItemRecptLine.getWarehouseCode()); + wmItemRecptLine.setWarehouseId(warehouse.getWarehouseId()); + wmItemRecptLine.setWarehouseCode(warehouse.getWarehouseCode()); + wmItemRecptLine.setWarehouseName(warehouse.getWarehouseName()); } + if(StringUtils.isNotNull(wmItemRecptLine.getLocationId())){ WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmItemRecptLine.getLocationId()); wmItemRecptLine.setLocationCode(location.getLocationCode()); wmItemRecptLine.setLocationName(location.getLocationName()); + } else if(StringUtils.isNotNull(wmItemRecptLine.getLocationCode())){ + WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationCode(wmItemRecptLine.getLocationCode()); + wmItemRecptLine.setLocationId(location.getLocationId()); + wmItemRecptLine.setLocationCode(location.getLocationCode()); + wmItemRecptLine.setLocationName(location.getLocationName()); } + if(StringUtils.isNotNull(wmItemRecptLine.getAreaId())){ WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmItemRecptLine.getAreaId()); wmItemRecptLine.setAreaCode(area.getAreaCode()); wmItemRecptLine.setAreaName(area.getAreaName()); + } else if(StringUtils.isNotNull(wmItemRecptLine.getAreaCode())){ + WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaCode(wmItemRecptLine.getAreaCode()); + wmItemRecptLine.setAreaId(area.getAreaId()); + wmItemRecptLine.setAreaCode(area.getAreaCode()); + wmItemRecptLine.setAreaName(area.getAreaName()); } wmItemRecptLine.setCreateBy(getUsername()); - return toAjax(wmItemRecptLineService.insertWmItemRecptLine(wmItemRecptLine)); + wmItemRecptLineService.insertWmItemRecptLine(wmItemRecptLine); + return AjaxResult.success(wmItemRecptLine); } /** @@ -105,20 +123,38 @@ public class WmItemRecptLineMobController extends BaseController { WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmItemRecptLine.getWarehouseId()); wmItemRecptLine.setWarehouseCode(warehouse.getWarehouseCode()); wmItemRecptLine.setWarehouseName(warehouse.getWarehouseName()); + }else if(StringUtils.isNotNull(wmItemRecptLine.getWarehouseCode())){ + WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(wmItemRecptLine.getWarehouseCode()); + wmItemRecptLine.setWarehouseId(warehouse.getWarehouseId()); + wmItemRecptLine.setWarehouseCode(warehouse.getWarehouseCode()); + wmItemRecptLine.setWarehouseName(warehouse.getWarehouseName()); } + if(StringUtils.isNotNull(wmItemRecptLine.getLocationId())){ WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmItemRecptLine.getLocationId()); wmItemRecptLine.setLocationCode(location.getLocationCode()); wmItemRecptLine.setLocationName(location.getLocationName()); + } else if(StringUtils.isNotNull(wmItemRecptLine.getLocationCode())){ + WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationCode(wmItemRecptLine.getLocationCode()); + wmItemRecptLine.setLocationId(location.getLocationId()); + wmItemRecptLine.setLocationCode(location.getLocationCode()); + wmItemRecptLine.setLocationName(location.getLocationName()); } + if(StringUtils.isNotNull(wmItemRecptLine.getAreaId())){ WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmItemRecptLine.getAreaId()); wmItemRecptLine.setAreaCode(area.getAreaCode()); wmItemRecptLine.setAreaName(area.getAreaName()); + } else if(StringUtils.isNotNull(wmItemRecptLine.getAreaCode())){ + WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaCode(wmItemRecptLine.getAreaCode()); + wmItemRecptLine.setAreaId(area.getAreaId()); + wmItemRecptLine.setAreaCode(area.getAreaCode()); + wmItemRecptLine.setAreaName(area.getAreaName()); } return toAjax(wmItemRecptLineService.updateWmItemRecptLine(wmItemRecptLine)); } + /** * 删除物料入库单行 */ diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptMobController.java index 25211ad..827e1f4 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptMobController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptMobController.java @@ -113,6 +113,18 @@ public class WmItemRecptMobController extends BaseController { return toAjax(wmItemRecptService.updateWmItemRecpt(wmItemRecpt)); } + /** + * 获取物料入库单详细信息 + */ + @ApiOperation("获取物料入库单详细信息接口") + @PreAuthorize("@ss.hasPermi('mes:wm:itemrecpt:query')") + @GetMapping(value = "/{recptId}") + public AjaxResult getInfo(@PathVariable("recptId") Long recptId) + { + return AjaxResult.success(wmItemRecptService.selectWmItemRecptByRecptId(recptId)); + } + + /** * 删除物料入库单 */ diff --git a/ktg-system/src/main/resources/mapper/system/UserTaskMapper.xml b/ktg-system/src/main/resources/mapper/system/UserTaskMapper.xml index 80dd860..b48f241 100644 --- a/ktg-system/src/main/resources/mapper/system/UserTaskMapper.xml +++ b/ktg-system/src/main/resources/mapper/system/UserTaskMapper.xml @@ -17,7 +17,7 @@ \ No newline at end of file