From 9132b2a7f43c62ea7599984a8e7fce40f4537aca 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: Thu, 16 Jan 2025 17:48:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=A2=86=E6=96=99=E3=80=81=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E5=B1=9E=E6=80=A7=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=A0=B9=E6=8D=AEcode=E8=BF=9B=E8=A1=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmProductRectpLineMobController.java | 43 +++++++++++-------- .../mobile/WmRtIssueLineMobController.java | 36 ++++++++-------- 2 files changed, 43 insertions(+), 36 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmProductRectpLineMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmProductRectpLineMobController.java index 4c94528..700fa45 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmProductRectpLineMobController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmProductRectpLineMobController.java @@ -73,21 +73,26 @@ public class WmProductRectpLineMobController extends BaseController { @PostMapping public AjaxResult add(@RequestBody WmProductRecptLine wmProductRecptLine) { - if(StringUtils.isNotNull(wmProductRecptLine.getWarehouseId())){ - WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmProductRecptLine.getWarehouseId()); - wmProductRecptLine.setWarehouseCode(warehouse.getWarehouseCode()); + if(StringUtils.isNotNull(wmProductRecptLine.getWarehouseCode())){ + WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(wmProductRecptLine.getWarehouseCode()); + wmProductRecptLine.setWarehouseId(warehouse.getWarehouseId()); wmProductRecptLine.setWarehouseName(warehouse.getWarehouseName()); } - if(StringUtils.isNotNull(wmProductRecptLine.getLocationId())){ - WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmProductRecptLine.getLocationId()); - wmProductRecptLine.setLocationCode(location.getLocationCode()); + + if(StringUtils.isNotNull(wmProductRecptLine.getLocationCode())){ + WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationCode(wmProductRecptLine.getLocationCode()); + wmProductRecptLine.setLocationId(location.getLocationId()); wmProductRecptLine.setLocationName(location.getLocationName()); } - if(StringUtils.isNotNull(wmProductRecptLine.getAreaId())){ - WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmProductRecptLine.getAreaId()); - wmProductRecptLine.setAreaCode(area.getAreaCode()); + + + if(StringUtils.isNotNull(wmProductRecptLine.getAreaCode())){ + WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaCode(wmProductRecptLine.getAreaCode()); + wmProductRecptLine.setAreaId(area.getAreaId()); wmProductRecptLine.setAreaName(area.getAreaName()); } + + wmProductRecptLine.setCreateBy(getUsername()); wmProductRecptLineService.insertWmProductRecptLine(wmProductRecptLine); return AjaxResult.success(wmProductRecptLine); @@ -102,19 +107,21 @@ public class WmProductRectpLineMobController extends BaseController { @PutMapping public AjaxResult edit(@RequestBody WmProductRecptLine wmProductRecptLine) { - if(StringUtils.isNotNull(wmProductRecptLine.getWarehouseId())){ - WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmProductRecptLine.getWarehouseId()); - wmProductRecptLine.setWarehouseCode(warehouse.getWarehouseCode()); + if(StringUtils.isNotNull(wmProductRecptLine.getWarehouseCode())){ + WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(wmProductRecptLine.getWarehouseCode()); + wmProductRecptLine.setWarehouseId(warehouse.getWarehouseId()); wmProductRecptLine.setWarehouseName(warehouse.getWarehouseName()); } - if(StringUtils.isNotNull(wmProductRecptLine.getLocationId())){ - WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmProductRecptLine.getLocationId()); - wmProductRecptLine.setLocationCode(location.getLocationCode()); + + if(StringUtils.isNotNull(wmProductRecptLine.getLocationCode())){ + WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationCode(wmProductRecptLine.getLocationCode()); + wmProductRecptLine.setLocationId(location.getLocationId()); wmProductRecptLine.setLocationName(location.getLocationName()); } - if(StringUtils.isNotNull(wmProductRecptLine.getAreaId())){ - WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmProductRecptLine.getAreaId()); - wmProductRecptLine.setAreaCode(area.getAreaCode()); + + if(StringUtils.isNotNull(wmProductRecptLine.getAreaCode())){ + WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaCode(wmProductRecptLine.getAreaCode()); + wmProductRecptLine.setAreaId(area.getAreaId()); wmProductRecptLine.setAreaName(area.getAreaName()); } return toAjax(wmProductRecptLineService.updateWmProductRecptLine(wmProductRecptLine)); diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtIssueLineMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtIssueLineMobController.java index a9db00a..906b060 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtIssueLineMobController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtIssueLineMobController.java @@ -78,19 +78,19 @@ public class WmRtIssueLineMobController extends BaseController { wmRtIssueLine.setBatchCode(stock.getBatchCode()); } - if(StringUtils.isNotNull(wmRtIssueLine.getWarehouseId())){ - WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmRtIssueLine.getWarehouseId()); - wmRtIssueLine.setWarehouseCode(warehouse.getWarehouseCode()); + if(StringUtils.isNotNull(wmRtIssueLine.getWarehouseCode())){ + WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(wmRtIssueLine.getWarehouseCode()); + wmRtIssueLine.setWarehouseId(warehouse.getWarehouseId()); wmRtIssueLine.setWarehouseName(warehouse.getWarehouseName()); } - if(StringUtils.isNotNull(wmRtIssueLine.getLocationId())){ - WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmRtIssueLine.getLocationId()); - wmRtIssueLine.setLocationCode(location.getLocationCode()); + if(StringUtils.isNotNull(wmRtIssueLine.getLocationCode())){ + WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationCode(wmRtIssueLine.getLocationCode()); + wmRtIssueLine.setLocationId(location.getLocationId()); wmRtIssueLine.setLocationName(location.getLocationName()); } - if(StringUtils.isNotNull(wmRtIssueLine.getAreaId())){ - WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmRtIssueLine.getAreaId()); - wmRtIssueLine.setAreaCode(area.getAreaCode()); + if(StringUtils.isNotNull(wmRtIssueLine.getAreaCode())){ + WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaCode(wmRtIssueLine.getAreaCode()); + wmRtIssueLine.setAreaId(area.getAreaId()); wmRtIssueLine.setAreaName(area.getAreaName()); } wmRtIssueLine.setCreateBy(getUsername()); @@ -116,19 +116,19 @@ public class WmRtIssueLineMobController extends BaseController { wmRtIssueLine.setBatchCode(stock.getBatchCode()); } - if(StringUtils.isNotNull(wmRtIssueLine.getWarehouseId())){ - WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmRtIssueLine.getWarehouseId()); - wmRtIssueLine.setWarehouseCode(warehouse.getWarehouseCode()); + if(StringUtils.isNotNull(wmRtIssueLine.getWarehouseCode())){ + WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(wmRtIssueLine.getWarehouseCode()); + wmRtIssueLine.setWarehouseId(warehouse.getWarehouseId()); wmRtIssueLine.setWarehouseName(warehouse.getWarehouseName()); } - if(StringUtils.isNotNull(wmRtIssueLine.getLocationId())){ - WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmRtIssueLine.getLocationId()); - wmRtIssueLine.setLocationCode(location.getLocationCode()); + if(StringUtils.isNotNull(wmRtIssueLine.getLocationCode())){ + WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationCode(wmRtIssueLine.getLocationCode()); + wmRtIssueLine.setLocationId(location.getLocationId()); wmRtIssueLine.setLocationName(location.getLocationName()); } - if(StringUtils.isNotNull(wmRtIssueLine.getAreaId())){ - WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmRtIssueLine.getAreaId()); - wmRtIssueLine.setAreaCode(area.getAreaCode()); + if(StringUtils.isNotNull(wmRtIssueLine.getAreaCode())){ + WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaCode(wmRtIssueLine.getAreaCode()); + wmRtIssueLine.setAreaId(area.getAreaId()); wmRtIssueLine.setAreaName(area.getAreaName()); } return toAjax(wmRtIssueLineService.updateWmRtIssueLine(wmRtIssueLine));