退料单行上的仓库处理。
This commit is contained in:
parent
d7d23ea22c
commit
a21cfdf96c
@ -2,6 +2,14 @@ package com.ktg.mes.wm.controller;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
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.security.access.prepost.PreAuthorize;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
@ -34,6 +42,15 @@ public class WmRtIssueLineController extends BaseController
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IWmRtIssueLineService wmRtIssueLineService;
|
private IWmRtIssueLineService wmRtIssueLineService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IWmWarehouseService wmWarehouseService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IWmStorageLocationService wmStorageLocationService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IWmStorageAreaService wmStorageAreaService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询生产退料单行列表
|
* 查询生产退料单行列表
|
||||||
*/
|
*/
|
||||||
@ -77,6 +94,21 @@ public class WmRtIssueLineController extends BaseController
|
|||||||
@PostMapping
|
@PostMapping
|
||||||
public AjaxResult add(@RequestBody WmRtIssueLine wmRtIssueLine)
|
public AjaxResult add(@RequestBody WmRtIssueLine wmRtIssueLine)
|
||||||
{
|
{
|
||||||
|
if(StringUtils.isNotNull(wmRtIssueLine.getWarehouseId())){
|
||||||
|
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmRtIssueLine.getWarehouseId());
|
||||||
|
wmRtIssueLine.setWarehouseCode(warehouse.getWarehouseCode());
|
||||||
|
wmRtIssueLine.setWarehouseName(warehouse.getWarehouseName());
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotNull(wmRtIssueLine.getLocationId())){
|
||||||
|
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmRtIssueLine.getLocationId());
|
||||||
|
wmRtIssueLine.setLocationCode(location.getLocationCode());
|
||||||
|
wmRtIssueLine.setLocationName(location.getLocationName());
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotNull(wmRtIssueLine.getAreaId())){
|
||||||
|
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmRtIssueLine.getAreaId());
|
||||||
|
wmRtIssueLine.setAreaCode(area.getAreaCode());
|
||||||
|
wmRtIssueLine.setAreaName(area.getAreaName());
|
||||||
|
}
|
||||||
return toAjax(wmRtIssueLineService.insertWmRtIssueLine(wmRtIssueLine));
|
return toAjax(wmRtIssueLineService.insertWmRtIssueLine(wmRtIssueLine));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -88,6 +120,21 @@ public class WmRtIssueLineController extends BaseController
|
|||||||
@PutMapping
|
@PutMapping
|
||||||
public AjaxResult edit(@RequestBody WmRtIssueLine wmRtIssueLine)
|
public AjaxResult edit(@RequestBody WmRtIssueLine wmRtIssueLine)
|
||||||
{
|
{
|
||||||
|
if(StringUtils.isNotNull(wmRtIssueLine.getWarehouseId())){
|
||||||
|
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmRtIssueLine.getWarehouseId());
|
||||||
|
wmRtIssueLine.setWarehouseCode(warehouse.getWarehouseCode());
|
||||||
|
wmRtIssueLine.setWarehouseName(warehouse.getWarehouseName());
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotNull(wmRtIssueLine.getLocationId())){
|
||||||
|
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmRtIssueLine.getLocationId());
|
||||||
|
wmRtIssueLine.setLocationCode(location.getLocationCode());
|
||||||
|
wmRtIssueLine.setLocationName(location.getLocationName());
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotNull(wmRtIssueLine.getAreaId())){
|
||||||
|
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmRtIssueLine.getAreaId());
|
||||||
|
wmRtIssueLine.setAreaCode(area.getAreaCode());
|
||||||
|
wmRtIssueLine.setAreaName(area.getAreaName());
|
||||||
|
}
|
||||||
return toAjax(wmRtIssueLineService.updateWmRtIssueLine(wmRtIssueLine));
|
return toAjax(wmRtIssueLineService.updateWmRtIssueLine(wmRtIssueLine));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -99,7 +146,6 @@ public class WmRtIssueLineController extends BaseController
|
|||||||
@DeleteMapping("/{lineIds}")
|
@DeleteMapping("/{lineIds}")
|
||||||
public AjaxResult remove(@PathVariable Long[] lineIds)
|
public AjaxResult remove(@PathVariable Long[] lineIds)
|
||||||
{
|
{
|
||||||
|
|
||||||
return toAjax(wmRtIssueLineService.deleteWmRtIssueLineByLineIds(lineIds));
|
return toAjax(wmRtIssueLineService.deleteWmRtIssueLineByLineIds(lineIds));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user