mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移动端生产领料、生产退料的新增接口，仓库属性更新修改为根据code进行。

Browse Source
This commit is contained in:
yinjinlu-pc\尹金路 2025-01-16 17:48:50 +08:00
parent 30e5302a9b
commit 9132b2a7f4
2 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmProductRectpLineMobController.java
View File

@ -73,21 +73,26 @@ public class WmProductRectpLineMobController extends BaseController {
@PostMapping @PostMapping
public AjaxResult add(@RequestBody WmProductRecptLine wmProductRecptLine) public AjaxResult add(@RequestBody WmProductRecptLine wmProductRecptLine)
{ {
if(StringUtils.isNotNull(wmProductRecptLine.getWarehouseId())){ if(StringUtils.isNotNull(wmProductRecptLine.getWarehouseCode())){
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmProductRecptLine.getWarehouseId()); WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(wmProductRecptLine.getWarehouseCode());
wmProductRecptLine.setWarehouseCode(warehouse.getWarehouseCode()); wmProductRecptLine.setWarehouseId(warehouse.getWarehouseId());
wmProductRecptLine.setWarehouseName(warehouse.getWarehouseName()); wmProductRecptLine.setWarehouseName(warehouse.getWarehouseName());
} }
if(StringUtils.isNotNull(wmProductRecptLine.getLocationId())){
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmProductRecptLine.getLocationId()); if(StringUtils.isNotNull(wmProductRecptLine.getLocationCode())){
wmProductRecptLine.setLocationCode(location.getLocationCode()); WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationCode(wmProductRecptLine.getLocationCode());
wmProductRecptLine.setLocationId(location.getLocationId());
wmProductRecptLine.setLocationName(location.getLocationName()); 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.setAreaName(area.getAreaName());
} }
wmProductRecptLine.setCreateBy(getUsername()); wmProductRecptLine.setCreateBy(getUsername());
wmProductRecptLineService.insertWmProductRecptLine(wmProductRecptLine); wmProductRecptLineService.insertWmProductRecptLine(wmProductRecptLine);
return AjaxResult.success(wmProductRecptLine); return AjaxResult.success(wmProductRecptLine);
@ -102,19 +107,21 @@ public class WmProductRectpLineMobController extends BaseController {
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody WmProductRecptLine wmProductRecptLine) public AjaxResult edit(@RequestBody WmProductRecptLine wmProductRecptLine)
{ {
if(StringUtils.isNotNull(wmProductRecptLine.getWarehouseId())){ if(StringUtils.isNotNull(wmProductRecptLine.getWarehouseCode())){
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmProductRecptLine.getWarehouseId()); WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(wmProductRecptLine.getWarehouseCode());
wmProductRecptLine.setWarehouseCode(warehouse.getWarehouseCode()); wmProductRecptLine.setWarehouseId(warehouse.getWarehouseId());
wmProductRecptLine.setWarehouseName(warehouse.getWarehouseName()); wmProductRecptLine.setWarehouseName(warehouse.getWarehouseName());
} }
if(StringUtils.isNotNull(wmProductRecptLine.getLocationId())){
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmProductRecptLine.getLocationId()); if(StringUtils.isNotNull(wmProductRecptLine.getLocationCode())){
wmProductRecptLine.setLocationCode(location.getLocationCode()); WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationCode(wmProductRecptLine.getLocationCode());
wmProductRecptLine.setLocationId(location.getLocationId());
wmProductRecptLine.setLocationName(location.getLocationName()); wmProductRecptLine.setLocationName(location.getLocationName());
} }
if(StringUtils.isNotNull(wmProductRecptLine.getAreaId())){
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmProductRecptLine.getAreaId()); if(StringUtils.isNotNull(wmProductRecptLine.getAreaCode())){
wmProductRecptLine.setAreaCode(area.getAreaCode()); WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaCode(wmProductRecptLine.getAreaCode());
wmProductRecptLine.setAreaId(area.getAreaId());
wmProductRecptLine.setAreaName(area.getAreaName()); wmProductRecptLine.setAreaName(area.getAreaName());
} }
return toAjax(wmProductRecptLineService.updateWmProductRecptLine(wmProductRecptLine)); return toAjax(wmProductRecptLineService.updateWmProductRecptLine(wmProductRecptLine));

36
ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtIssueLineMobController.java
View File

@ -78,19 +78,19 @@ public class WmRtIssueLineMobController extends BaseController {
wmRtIssueLine.setBatchCode(stock.getBatchCode()); wmRtIssueLine.setBatchCode(stock.getBatchCode());
} }
if(StringUtils.isNotNull(wmRtIssueLine.getWarehouseId())){ if(StringUtils.isNotNull(wmRtIssueLine.getWarehouseCode())){
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmRtIssueLine.getWarehouseId()); WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(wmRtIssueLine.getWarehouseCode());
wmRtIssueLine.setWarehouseCode(warehouse.getWarehouseCode()); wmRtIssueLine.setWarehouseId(warehouse.getWarehouseId());
wmRtIssueLine.setWarehouseName(warehouse.getWarehouseName()); wmRtIssueLine.setWarehouseName(warehouse.getWarehouseName());
} }
if(StringUtils.isNotNull(wmRtIssueLine.getLocationId())){ if(StringUtils.isNotNull(wmRtIssueLine.getLocationCode())){
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmRtIssueLine.getLocationId()); WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationCode(wmRtIssueLine.getLocationCode());
wmRtIssueLine.setLocationCode(location.getLocationCode()); wmRtIssueLine.setLocationId(location.getLocationId());
wmRtIssueLine.setLocationName(location.getLocationName()); wmRtIssueLine.setLocationName(location.getLocationName());
} }
if(StringUtils.isNotNull(wmRtIssueLine.getAreaId())){ if(StringUtils.isNotNull(wmRtIssueLine.getAreaCode())){
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmRtIssueLine.getAreaId()); WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaCode(wmRtIssueLine.getAreaCode());
wmRtIssueLine.setAreaCode(area.getAreaCode()); wmRtIssueLine.setAreaId(area.getAreaId());
wmRtIssueLine.setAreaName(area.getAreaName()); wmRtIssueLine.setAreaName(area.getAreaName());
} }
wmRtIssueLine.setCreateBy(getUsername()); wmRtIssueLine.setCreateBy(getUsername());
@ -116,19 +116,19 @@ public class WmRtIssueLineMobController extends BaseController {
wmRtIssueLine.setBatchCode(stock.getBatchCode()); wmRtIssueLine.setBatchCode(stock.getBatchCode());
} }
if(StringUtils.isNotNull(wmRtIssueLine.getWarehouseId())){ if(StringUtils.isNotNull(wmRtIssueLine.getWarehouseCode())){
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmRtIssueLine.getWarehouseId()); WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(wmRtIssueLine.getWarehouseCode());
wmRtIssueLine.setWarehouseCode(warehouse.getWarehouseCode()); wmRtIssueLine.setWarehouseId(warehouse.getWarehouseId());
wmRtIssueLine.setWarehouseName(warehouse.getWarehouseName()); wmRtIssueLine.setWarehouseName(warehouse.getWarehouseName());
} }
if(StringUtils.isNotNull(wmRtIssueLine.getLocationId())){ if(StringUtils.isNotNull(wmRtIssueLine.getLocationCode())){
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmRtIssueLine.getLocationId()); WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationCode(wmRtIssueLine.getLocationCode());
wmRtIssueLine.setLocationCode(location.getLocationCode()); wmRtIssueLine.setLocationId(location.getLocationId());
wmRtIssueLine.setLocationName(location.getLocationName()); wmRtIssueLine.setLocationName(location.getLocationName());
} }
if(StringUtils.isNotNull(wmRtIssueLine.getAreaId())){ if(StringUtils.isNotNull(wmRtIssueLine.getAreaCode())){
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmRtIssueLine.getAreaId()); WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaCode(wmRtIssueLine.getAreaCode());
wmRtIssueLine.setAreaCode(area.getAreaCode()); wmRtIssueLine.setAreaId(area.getAreaId());
wmRtIssueLine.setAreaName(area.getAreaName()); wmRtIssueLine.setAreaName(area.getAreaName());
} }
return toAjax(wmRtIssueLineService.updateWmRtIssueLine(wmRtIssueLine)); return toAjax(wmRtIssueLineService.updateWmRtIssueLine(wmRtIssueLine));