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

入库单行

Browse Source
This commit is contained in:
JinLu.Yin 2022-05-22 23:56:26 +08:00
parent ae7351970e
commit 12fbe70df1
2 changed files with 94 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java
View File

@ -4,7 +4,11 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ktg.common.constant.UserConstants;
import com.ktg.mes.wm.service.IWmItemRecptLineService;
import com.ktg.common.utils.StringUtils;
import com.ktg.mes.wm.domain.WmStorageArea;
import com.ktg.mes.wm.domain.WmStorageLocation;
import com.ktg.mes.wm.domain.WmWarehouse;
import com.ktg.mes.wm.service.*;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@ -21,7 +25,6 @@ import com.ktg.common.core.controller.BaseController;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.enums.BusinessType;
import com.ktg.mes.wm.domain.WmItemRecpt;
import com.ktg.mes.wm.service.IWmItemRecptService;
import com.ktg.common.utils.poi.ExcelUtil;
import com.ktg.common.core.page.TableDataInfo;
@ -41,6 +44,15 @@ public class WmItemRecptController extends BaseController
@Autowired
private IWmItemRecptLineService wmItemRecptLineService;
@Autowired
private IWmWarehouseService wmWarehouseService;
@Autowired
private IWmStorageLocationService wmStorageLocationService;
@Autowired
private IWmStorageAreaService wmStorageAreaService;
/**
* 查询物料入库单列表
*/
@ -87,6 +99,23 @@ public class WmItemRecptController extends BaseController
if(UserConstants.NOT_UNIQUE.equals(wmItemRecptService.checkRecptCodeUnique(wmItemRecpt))){
return AjaxResult.error("单据编号已存在！");
}
if(StringUtils.isNotNull(wmItemRecpt.getWarehouseId())){
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmItemRecpt.getWarehouseId());
wmItemRecpt.setWarehouseCode(warehouse.getWarehouseCode());
wmItemRecpt.setWarehouseName(warehouse.getWarehouseName());
}
if(StringUtils.isNotNull(wmItemRecpt.getLocationId())){
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmItemRecpt.getLocationId());
wmItemRecpt.setLocationCode(location.getLocationCode());
wmItemRecpt.setLocationName(location.getLocationName());
}
if(StringUtils.isNotNull(wmItemRecpt.getAreaId())){
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmItemRecpt.getAreaId());
wmItemRecpt.setAreaCode(area.getAreaCode());
wmItemRecpt.setAreaName(area.getAreaName());
}
return toAjax(wmItemRecptService.insertWmItemRecpt(wmItemRecpt));
}
@ -98,6 +127,21 @@ public class WmItemRecptController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody WmItemRecpt wmItemRecpt)
{
if(StringUtils.isNotNull(wmItemRecpt.getWarehouseId())){
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmItemRecpt.getWarehouseId());
wmItemRecpt.setWarehouseCode(warehouse.getWarehouseCode());
wmItemRecpt.setWarehouseName(warehouse.getWarehouseName());
}
if(StringUtils.isNotNull(wmItemRecpt.getLocationId())){
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmItemRecpt.getLocationId());
wmItemRecpt.setLocationCode(location.getLocationCode());
wmItemRecpt.setLocationName(location.getLocationName());
}
if(StringUtils.isNotNull(wmItemRecpt.getAreaId())){
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmItemRecpt.getAreaId());
wmItemRecpt.setAreaCode(area.getAreaCode());
wmItemRecpt.setAreaName(area.getAreaName());
}
return toAjax(wmItemRecptService.updateWmItemRecpt(wmItemRecpt));
}

48
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptLineController.java
View File

@ -2,6 +2,14 @@ package com.ktg.mes.wm.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ktg.common.utils.StringUtils;
import com.ktg.mes.wm.domain.WmStorageArea;
import com.ktg.mes.wm.domain.WmStorageLocation;
import com.ktg.mes.wm.domain.WmWarehouse;
import com.ktg.mes.wm.service.IWmStorageAreaService;
import com.ktg.mes.wm.service.IWmStorageLocationService;
import com.ktg.mes.wm.service.IWmWarehouseService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -34,6 +42,16 @@ public class WmItemRecptLineController extends BaseController
@Autowired
private IWmItemRecptLineService wmItemRecptLineService;
@Autowired
private IWmWarehouseService wmWarehouseService;
@Autowired
private IWmStorageLocationService wmStorageLocationService;
@Autowired
private IWmStorageAreaService wmStorageAreaService;
/**
* 查询物料入库单行列表
*/
@ -77,6 +95,21 @@ public class WmItemRecptLineController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody WmItemRecptLine wmItemRecptLine)
{
if(StringUtils.isNotNull(wmItemRecptLine.getWarehouseId())){
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmItemRecptLine.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());
}
if(StringUtils.isNotNull(wmItemRecptLine.getAreaId())){
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmItemRecptLine.getAreaId());
wmItemRecptLine.setAreaCode(area.getAreaCode());
wmItemRecptLine.setAreaName(area.getAreaName());
}
return toAjax(wmItemRecptLineService.insertWmItemRecptLine(wmItemRecptLine));
}
@ -88,6 +121,21 @@ public class WmItemRecptLineController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody WmItemRecptLine wmItemRecptLine)
{
if(StringUtils.isNotNull(wmItemRecptLine.getWarehouseId())){
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmItemRecptLine.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());
}
if(StringUtils.isNotNull(wmItemRecptLine.getAreaId())){
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmItemRecptLine.getAreaId());
wmItemRecptLine.setAreaCode(area.getAreaCode());
wmItemRecptLine.setAreaName(area.getAreaName());
}
return toAjax(wmItemRecptLineService.updateWmItemRecptLine(wmItemRecptLine));
}