转移单

This commit is contained in:
DESKTOP-J7ED0MB\yinjinlu 2022-12-04 16:29:32 +08:00
parent a49b8da925
commit 4b31c0b804
2 changed files with 83 additions and 11 deletions

View File

@ -48,11 +48,7 @@ public class WmTransferController extends BaseController
@Autowired @Autowired
private IWmWarehouseService wmWarehouseService; private IWmWarehouseService wmWarehouseService;
@Autowired
private IWmStorageLocationService wmStorageLocationService;
@Autowired
private IWmStorageAreaService wmStorageAreaService;
/** /**
* 查询转移单列表 * 查询转移单列表

View File

@ -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;
@ -28,16 +36,24 @@ import com.ktg.common.core.page.TableDataInfo;
* @date 2022-11-28 * @date 2022-11-28
*/ */
@RestController @RestController
@RequestMapping("/wm/transferline") @RequestMapping("/mes/wm/transferline")
public class WmTransferLineController extends BaseController public class WmTransferLineController extends BaseController
{ {
@Autowired @Autowired
private IWmTransferLineService wmTransferLineService; private IWmTransferLineService wmTransferLineService;
@Autowired
private IWmWarehouseService wmWarehouseService;
@Autowired
private IWmStorageLocationService wmStorageLocationService;
@Autowired
private IWmStorageAreaService wmStorageAreaService;
/** /**
* 查询转移单行列表 * 查询转移单行列表
*/ */
@PreAuthorize("@ss.hasPermi('wm:transferline:list')") @PreAuthorize("@ss.hasPermi('mes:wm:transferline:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(WmTransferLine wmTransferLine) public TableDataInfo list(WmTransferLine wmTransferLine)
{ {
@ -49,7 +65,7 @@ public class WmTransferLineController extends BaseController
/** /**
* 导出转移单行列表 * 导出转移单行列表
*/ */
@PreAuthorize("@ss.hasPermi('wm:transferline:export')") @PreAuthorize("@ss.hasPermi('mes:wm:transferline:export')")
@Log(title = "转移单行", businessType = BusinessType.EXPORT) @Log(title = "转移单行", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, WmTransferLine wmTransferLine) public void export(HttpServletResponse response, WmTransferLine wmTransferLine)
@ -62,7 +78,7 @@ public class WmTransferLineController extends BaseController
/** /**
* 获取转移单行详细信息 * 获取转移单行详细信息
*/ */
@PreAuthorize("@ss.hasPermi('wm:transferline:query')") @PreAuthorize("@ss.hasPermi('mes:wm:transferline:query')")
@GetMapping(value = "/{lineId}") @GetMapping(value = "/{lineId}")
public AjaxResult getInfo(@PathVariable("lineId") Long lineId) public AjaxResult getInfo(@PathVariable("lineId") Long lineId)
{ {
@ -72,29 +88,89 @@ public class WmTransferLineController extends BaseController
/** /**
* 新增转移单行 * 新增转移单行
*/ */
@PreAuthorize("@ss.hasPermi('wm:transferline:add')") @PreAuthorize("@ss.hasPermi('mes:wm:transferline:add')")
@Log(title = "转移单行", businessType = BusinessType.INSERT) @Log(title = "转移单行", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody WmTransferLine wmTransferLine) public AjaxResult add(@RequestBody WmTransferLine wmTransferLine)
{ {
if(StringUtils.isNotNull(wmTransferLine.getFromWarehouseId())){
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmTransferLine.getFromWarehouseId());
wmTransferLine.setFromWarehouseCode(warehouse.getWarehouseCode());
wmTransferLine.setFromWarehouseName(warehouse.getWarehouseName());
}
if(StringUtils.isNotNull(wmTransferLine.getFromLocationId())){
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmTransferLine.getFromLocationId());
wmTransferLine.setFromLocationCode(location.getLocationCode());
wmTransferLine.setFromLocationName(location.getLocationName());
}
if(StringUtils.isNotNull(wmTransferLine.getFromAreaId())){
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmTransferLine.getFromAreaId());
wmTransferLine.setFromAreaCode(area.getAreaCode());
wmTransferLine.setFromAreaName(area.getAreaName());
}
if(StringUtils.isNotNull(wmTransferLine.getToWarehouseId())){
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmTransferLine.getToWarehouseId());
wmTransferLine.setToWarehouseCode(warehouse.getWarehouseCode());
wmTransferLine.setToWarehouseName(warehouse.getWarehouseName());
}
if(StringUtils.isNotNull(wmTransferLine.getFromLocationId())){
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmTransferLine.getToLocationId());
wmTransferLine.setToLocationCode(location.getLocationCode());
wmTransferLine.setToLocationName(location.getLocationName());
}
if(StringUtils.isNotNull(wmTransferLine.getFromAreaId())){
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmTransferLine.getToAreaId());
wmTransferLine.setToAreaCode(area.getAreaCode());
wmTransferLine.setToAreaName(area.getAreaName());
}
return toAjax(wmTransferLineService.insertWmTransferLine(wmTransferLine)); return toAjax(wmTransferLineService.insertWmTransferLine(wmTransferLine));
} }
/** /**
* 修改转移单行 * 修改转移单行
*/ */
@PreAuthorize("@ss.hasPermi('wm:transferline:edit')") @PreAuthorize("@ss.hasPermi('mes:wm:transferline:edit')")
@Log(title = "转移单行", businessType = BusinessType.UPDATE) @Log(title = "转移单行", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody WmTransferLine wmTransferLine) public AjaxResult edit(@RequestBody WmTransferLine wmTransferLine)
{ {
if(StringUtils.isNotNull(wmTransferLine.getFromWarehouseId())){
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmTransferLine.getFromWarehouseId());
wmTransferLine.setFromWarehouseCode(warehouse.getWarehouseCode());
wmTransferLine.setFromWarehouseName(warehouse.getWarehouseName());
}
if(StringUtils.isNotNull(wmTransferLine.getFromLocationId())){
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmTransferLine.getFromLocationId());
wmTransferLine.setFromLocationCode(location.getLocationCode());
wmTransferLine.setFromLocationName(location.getLocationName());
}
if(StringUtils.isNotNull(wmTransferLine.getFromAreaId())){
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmTransferLine.getFromAreaId());
wmTransferLine.setFromAreaCode(area.getAreaCode());
wmTransferLine.setFromAreaName(area.getAreaName());
}
if(StringUtils.isNotNull(wmTransferLine.getToWarehouseId())){
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmTransferLine.getToWarehouseId());
wmTransferLine.setToWarehouseCode(warehouse.getWarehouseCode());
wmTransferLine.setToWarehouseName(warehouse.getWarehouseName());
}
if(StringUtils.isNotNull(wmTransferLine.getFromLocationId())){
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmTransferLine.getToLocationId());
wmTransferLine.setToLocationCode(location.getLocationCode());
wmTransferLine.setToLocationName(location.getLocationName());
}
if(StringUtils.isNotNull(wmTransferLine.getFromAreaId())){
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmTransferLine.getToAreaId());
wmTransferLine.setToAreaCode(area.getAreaCode());
wmTransferLine.setToAreaName(area.getAreaName());
}
return toAjax(wmTransferLineService.updateWmTransferLine(wmTransferLine)); return toAjax(wmTransferLineService.updateWmTransferLine(wmTransferLine));
} }
/** /**
* 删除转移单行 * 删除转移单行
*/ */
@PreAuthorize("@ss.hasPermi('wm:transferline:remove')") @PreAuthorize("@ss.hasPermi('mes:wm:transferline:remove')")
@Log(title = "转移单行", businessType = BusinessType.DELETE) @Log(title = "转移单行", businessType = BusinessType.DELETE)
@DeleteMapping("/{lineIds}") @DeleteMapping("/{lineIds}")
public AjaxResult remove(@PathVariable Long[] lineIds) public AjaxResult remove(@PathVariable Long[] lineIds)