删除权限注解,出入库移库
This commit is contained in:
@@ -40,7 +40,6 @@ public class WmsCategoryController extends BaseController {
|
||||
/**
|
||||
* 查询通用分类列表
|
||||
*/
|
||||
@SaCheckPermission("klp:category:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsCategoryVo> list(WmsCategoryBo bo, PageQuery pageQuery) {
|
||||
return iWmsCategoryService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +48,6 @@ public class WmsCategoryController extends BaseController {
|
||||
/**
|
||||
* 导出通用分类列表
|
||||
*/
|
||||
@SaCheckPermission("klp:category:export")
|
||||
@Log(title = "通用分类", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsCategoryBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +60,6 @@ public class WmsCategoryController extends BaseController {
|
||||
*
|
||||
* @param categoryId 主键
|
||||
*/
|
||||
@SaCheckPermission("klp:category:query")
|
||||
@GetMapping("/{categoryId}")
|
||||
public R<WmsCategoryVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long categoryId) {
|
||||
@@ -72,7 +69,6 @@ public class WmsCategoryController extends BaseController {
|
||||
/**
|
||||
* 新增通用分类
|
||||
*/
|
||||
@SaCheckPermission("klp:category:add")
|
||||
@Log(title = "通用分类", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -96,7 +92,6 @@ public class WmsCategoryController extends BaseController {
|
||||
*
|
||||
* @param categoryIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("klp:category:remove")
|
||||
@Log(title = "通用分类", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{categoryIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
@@ -40,7 +40,6 @@ public class WmsOrderController extends BaseController {
|
||||
/**
|
||||
* 查询订单主列表
|
||||
*/
|
||||
@SaCheckPermission("klp:order:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsOrderVo> list(WmsOrderBo bo, PageQuery pageQuery) {
|
||||
return iWmsOrderService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +48,6 @@ public class WmsOrderController extends BaseController {
|
||||
/**
|
||||
* 导出订单主列表
|
||||
*/
|
||||
@SaCheckPermission("klp:order:export")
|
||||
@Log(title = "订单主", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsOrderBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +60,6 @@ public class WmsOrderController extends BaseController {
|
||||
*
|
||||
* @param orderId 主键
|
||||
*/
|
||||
@SaCheckPermission("klp:order:query")
|
||||
@GetMapping("/{orderId}")
|
||||
public R<WmsOrderVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long orderId) {
|
||||
@@ -72,7 +69,6 @@ public class WmsOrderController extends BaseController {
|
||||
/**
|
||||
* 新增订单主
|
||||
*/
|
||||
@SaCheckPermission("klp:order:add")
|
||||
@Log(title = "订单主", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -83,7 +79,6 @@ public class WmsOrderController extends BaseController {
|
||||
/**
|
||||
* 修改订单主
|
||||
*/
|
||||
@SaCheckPermission("klp:order:edit")
|
||||
@Log(title = "订单主", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -96,7 +91,6 @@ public class WmsOrderController extends BaseController {
|
||||
*
|
||||
* @param orderIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("klp:order:remove")
|
||||
@Log(title = "订单主", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{orderIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
@@ -40,7 +40,6 @@ public class WmsOrderDetailController extends BaseController {
|
||||
/**
|
||||
* 查询订单明细列表
|
||||
*/
|
||||
@SaCheckPermission("klp:orderDetail:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsOrderDetailVo> list(WmsOrderDetailBo bo, PageQuery pageQuery) {
|
||||
return iWmsOrderDetailService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +48,6 @@ public class WmsOrderDetailController extends BaseController {
|
||||
/**
|
||||
* 导出订单明细列表
|
||||
*/
|
||||
@SaCheckPermission("klp:orderDetail:export")
|
||||
@Log(title = "订单明细", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsOrderDetailBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +60,6 @@ public class WmsOrderDetailController extends BaseController {
|
||||
*
|
||||
* @param detailId 主键
|
||||
*/
|
||||
@SaCheckPermission("klp:orderDetail:query")
|
||||
@GetMapping("/{detailId}")
|
||||
public R<WmsOrderDetailVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long detailId) {
|
||||
@@ -72,7 +69,6 @@ public class WmsOrderDetailController extends BaseController {
|
||||
/**
|
||||
* 新增订单明细
|
||||
*/
|
||||
@SaCheckPermission("klp:orderDetail:add")
|
||||
@Log(title = "订单明细", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -83,7 +79,6 @@ public class WmsOrderDetailController extends BaseController {
|
||||
/**
|
||||
* 修改订单明细
|
||||
*/
|
||||
@SaCheckPermission("klp:orderDetail:edit")
|
||||
@Log(title = "订单明细", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -96,7 +91,6 @@ public class WmsOrderDetailController extends BaseController {
|
||||
*
|
||||
* @param detailIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("klp:orderDetail:remove")
|
||||
@Log(title = "订单明细", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{detailIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
@@ -40,7 +40,6 @@ public class WmsProductBomController extends BaseController {
|
||||
/**
|
||||
* 查询产品BOM(产品-原材料清单)列表
|
||||
*/
|
||||
@SaCheckPermission("klp:productBom:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsProductBomVo> list(WmsProductBomBo bo, PageQuery pageQuery) {
|
||||
return iWmsProductBomService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +48,6 @@ public class WmsProductBomController extends BaseController {
|
||||
/**
|
||||
* 导出产品BOM(产品-原材料清单)列表
|
||||
*/
|
||||
@SaCheckPermission("klp:productBom:export")
|
||||
@Log(title = "产品BOM(产品-原材料清单)", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsProductBomBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +60,6 @@ public class WmsProductBomController extends BaseController {
|
||||
*
|
||||
* @param bomId 主键
|
||||
*/
|
||||
@SaCheckPermission("klp:productBom:query")
|
||||
@GetMapping("/{bomId}")
|
||||
public R<WmsProductBomVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long bomId) {
|
||||
@@ -72,7 +69,6 @@ public class WmsProductBomController extends BaseController {
|
||||
/**
|
||||
* 新增产品BOM(产品-原材料清单)
|
||||
*/
|
||||
@SaCheckPermission("klp:productBom:add")
|
||||
@Log(title = "产品BOM(产品-原材料清单)", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -83,7 +79,6 @@ public class WmsProductBomController extends BaseController {
|
||||
/**
|
||||
* 修改产品BOM(产品-原材料清单)
|
||||
*/
|
||||
@SaCheckPermission("klp:productBom:edit")
|
||||
@Log(title = "产品BOM(产品-原材料清单)", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -96,7 +91,6 @@ public class WmsProductBomController extends BaseController {
|
||||
*
|
||||
* @param bomIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("klp:productBom:remove")
|
||||
@Log(title = "产品BOM(产品-原材料清单)", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{bomIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
@@ -40,7 +40,6 @@ public class WmsProductController extends BaseController {
|
||||
/**
|
||||
* 查询产品列表
|
||||
*/
|
||||
@SaCheckPermission("klp:product:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsProductVo> list(WmsProductBo bo, PageQuery pageQuery) {
|
||||
return iWmsProductService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +48,6 @@ public class WmsProductController extends BaseController {
|
||||
/**
|
||||
* 导出产品列表
|
||||
*/
|
||||
@SaCheckPermission("klp:product:export")
|
||||
@Log(title = "产品", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsProductBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +60,6 @@ public class WmsProductController extends BaseController {
|
||||
*
|
||||
* @param productId 主键
|
||||
*/
|
||||
@SaCheckPermission("klp:product:query")
|
||||
@GetMapping("/{productId}")
|
||||
public R<WmsProductVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long productId) {
|
||||
@@ -72,7 +69,6 @@ public class WmsProductController extends BaseController {
|
||||
/**
|
||||
* 新增产品
|
||||
*/
|
||||
@SaCheckPermission("klp:product:add")
|
||||
@Log(title = "产品", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -83,7 +79,6 @@ public class WmsProductController extends BaseController {
|
||||
/**
|
||||
* 修改产品
|
||||
*/
|
||||
@SaCheckPermission("klp:product:edit")
|
||||
@Log(title = "产品", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -96,7 +91,6 @@ public class WmsProductController extends BaseController {
|
||||
*
|
||||
* @param productIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("klp:product:remove")
|
||||
@Log(title = "产品", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{productIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
@@ -40,7 +40,6 @@ public class WmsProductionLineController extends BaseController {
|
||||
/**
|
||||
* 查询产线列表
|
||||
*/
|
||||
@SaCheckPermission("klp:productionLine:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsProductionLineVo> list(WmsProductionLineBo bo, PageQuery pageQuery) {
|
||||
return iWmsProductionLineService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +48,6 @@ public class WmsProductionLineController extends BaseController {
|
||||
/**
|
||||
* 导出产线列表
|
||||
*/
|
||||
@SaCheckPermission("klp:productionLine:export")
|
||||
@Log(title = "产线", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsProductionLineBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +60,6 @@ public class WmsProductionLineController extends BaseController {
|
||||
*
|
||||
* @param lineId 主键
|
||||
*/
|
||||
@SaCheckPermission("klp:productionLine:query")
|
||||
@GetMapping("/{lineId}")
|
||||
public R<WmsProductionLineVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long lineId) {
|
||||
@@ -72,7 +69,6 @@ public class WmsProductionLineController extends BaseController {
|
||||
/**
|
||||
* 新增产线
|
||||
*/
|
||||
@SaCheckPermission("klp:productionLine:add")
|
||||
@Log(title = "产线", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -83,7 +79,6 @@ public class WmsProductionLineController extends BaseController {
|
||||
/**
|
||||
* 修改产线
|
||||
*/
|
||||
@SaCheckPermission("klp:productionLine:edit")
|
||||
@Log(title = "产线", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -96,7 +91,6 @@ public class WmsProductionLineController extends BaseController {
|
||||
*
|
||||
* @param lineIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("klp:productionLine:remove")
|
||||
@Log(title = "产线", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{lineIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
@@ -40,7 +40,6 @@ public class WmsPurchasePlanController extends BaseController {
|
||||
/**
|
||||
* 查询采购计划主列表
|
||||
*/
|
||||
@SaCheckPermission("klp:purchasePlan:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsPurchasePlanVo> list(WmsPurchasePlanBo bo, PageQuery pageQuery) {
|
||||
return iWmsPurchasePlanService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +48,6 @@ public class WmsPurchasePlanController extends BaseController {
|
||||
/**
|
||||
* 导出采购计划主列表
|
||||
*/
|
||||
@SaCheckPermission("klp:purchasePlan:export")
|
||||
@Log(title = "采购计划主", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsPurchasePlanBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +60,6 @@ public class WmsPurchasePlanController extends BaseController {
|
||||
*
|
||||
* @param planId 主键
|
||||
*/
|
||||
@SaCheckPermission("klp:purchasePlan:query")
|
||||
@GetMapping("/{planId}")
|
||||
public R<WmsPurchasePlanVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long planId) {
|
||||
@@ -72,7 +69,6 @@ public class WmsPurchasePlanController extends BaseController {
|
||||
/**
|
||||
* 新增采购计划主
|
||||
*/
|
||||
@SaCheckPermission("klp:purchasePlan:add")
|
||||
@Log(title = "采购计划主", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -83,7 +79,6 @@ public class WmsPurchasePlanController extends BaseController {
|
||||
/**
|
||||
* 修改采购计划主
|
||||
*/
|
||||
@SaCheckPermission("klp:purchasePlan:edit")
|
||||
@Log(title = "采购计划主", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -96,7 +91,6 @@ public class WmsPurchasePlanController extends BaseController {
|
||||
*
|
||||
* @param planIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("klp:purchasePlan:remove")
|
||||
@Log(title = "采购计划主", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{planIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
@@ -40,7 +40,6 @@ public class WmsPurchasePlanDetailController extends BaseController {
|
||||
/**
|
||||
* 查询采购计划明细列表
|
||||
*/
|
||||
@SaCheckPermission("klp:purchasePlanDetail:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsPurchasePlanDetailVo> list(WmsPurchasePlanDetailBo bo, PageQuery pageQuery) {
|
||||
return iWmsPurchasePlanDetailService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +48,6 @@ public class WmsPurchasePlanDetailController extends BaseController {
|
||||
/**
|
||||
* 导出采购计划明细列表
|
||||
*/
|
||||
@SaCheckPermission("klp:purchasePlanDetail:export")
|
||||
@Log(title = "采购计划明细", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsPurchasePlanDetailBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +60,6 @@ public class WmsPurchasePlanDetailController extends BaseController {
|
||||
*
|
||||
* @param detailId 主键
|
||||
*/
|
||||
@SaCheckPermission("klp:purchasePlanDetail:query")
|
||||
@GetMapping("/{detailId}")
|
||||
public R<WmsPurchasePlanDetailVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long detailId) {
|
||||
@@ -72,7 +69,6 @@ public class WmsPurchasePlanDetailController extends BaseController {
|
||||
/**
|
||||
* 新增采购计划明细
|
||||
*/
|
||||
@SaCheckPermission("klp:purchasePlanDetail:add")
|
||||
@Log(title = "采购计划明细", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -83,7 +79,6 @@ public class WmsPurchasePlanDetailController extends BaseController {
|
||||
/**
|
||||
* 修改采购计划明细
|
||||
*/
|
||||
@SaCheckPermission("klp:purchasePlanDetail:edit")
|
||||
@Log(title = "采购计划明细", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -96,7 +91,6 @@ public class WmsPurchasePlanDetailController extends BaseController {
|
||||
*
|
||||
* @param detailIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("klp:purchasePlanDetail:remove")
|
||||
@Log(title = "采购计划明细", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{detailIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
@@ -40,7 +40,6 @@ public class WmsRawMaterialController extends BaseController {
|
||||
/**
|
||||
* 查询原材料列表
|
||||
*/
|
||||
@SaCheckPermission("klp:rawMaterial:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsRawMaterialVo> list(WmsRawMaterialBo bo, PageQuery pageQuery) {
|
||||
return iWmsRawMaterialService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +48,6 @@ public class WmsRawMaterialController extends BaseController {
|
||||
/**
|
||||
* 导出原材料列表
|
||||
*/
|
||||
@SaCheckPermission("klp:rawMaterial:export")
|
||||
@Log(title = "原材料", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsRawMaterialBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +60,6 @@ public class WmsRawMaterialController extends BaseController {
|
||||
*
|
||||
* @param rawMaterialId 主键
|
||||
*/
|
||||
@SaCheckPermission("klp:rawMaterial:query")
|
||||
@GetMapping("/{rawMaterialId}")
|
||||
public R<WmsRawMaterialVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long rawMaterialId) {
|
||||
|
||||
@@ -103,4 +103,14 @@ public class WmsStockIoController extends BaseController {
|
||||
@PathVariable Long[] stockIoIds) {
|
||||
return toAjax(iWmsStockIoService.deleteWithValidByIds(Arrays.asList(stockIoIds), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 审核出入库/移库单
|
||||
*/
|
||||
@SaCheckPermission("klp:stockIo:audit")
|
||||
@Log(title = "出入库单主", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/audit/{stockIoId}")
|
||||
public R<Void> audit(@NotNull(message = "主键不能为空") @PathVariable Long stockIoId) {
|
||||
return toAjax(iWmsStockIoService.auditStockIo(stockIoId));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,5 +62,9 @@ public class WmsStockIoDetail extends BaseEntity {
|
||||
*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
/**
|
||||
* 源库位ID(移库时使用)
|
||||
*/
|
||||
private Long fromWarehouseId;
|
||||
|
||||
}
|
||||
|
||||
@@ -72,5 +72,10 @@ public class WmsStockIoDetailBo extends BaseEntity {
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 源库位ID(移库时使用)
|
||||
*/
|
||||
private Long fromWarehouseId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -75,5 +75,10 @@ public class WmsStockIoDetailVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 源库位ID(移库时使用)
|
||||
*/
|
||||
private Long fromWarehouseId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -46,4 +46,9 @@ public interface IWmsStockIoService {
|
||||
* 校验并批量删除出入库单主信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 审核出入库/移库单,变更库存,含库存校验
|
||||
*/
|
||||
Boolean auditStockIo(Long stockIoId);
|
||||
}
|
||||
|
||||
@@ -14,6 +14,12 @@ import com.klp.domain.vo.WmsStockIoVo;
|
||||
import com.klp.domain.WmsStockIo;
|
||||
import com.klp.mapper.WmsStockIoMapper;
|
||||
import com.klp.service.IWmsStockIoService;
|
||||
import com.klp.domain.WmsStockIoDetail;
|
||||
import com.klp.domain.WmsStock;
|
||||
import com.klp.mapper.WmsStockIoDetailMapper;
|
||||
import com.klp.mapper.WmsStockMapper;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -30,6 +36,8 @@ import java.util.Collection;
|
||||
public class WmsStockIoServiceImpl implements IWmsStockIoService {
|
||||
|
||||
private final WmsStockIoMapper baseMapper;
|
||||
private final WmsStockIoDetailMapper stockIoDetailMapper;
|
||||
private final WmsStockMapper stockMapper;
|
||||
|
||||
/**
|
||||
* 查询出入库单主
|
||||
@@ -109,4 +117,81 @@ public class WmsStockIoServiceImpl implements IWmsStockIoService {
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 审核出入库/移库单,变更库存,含库存校验
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean auditStockIo(Long stockIoId) {
|
||||
WmsStockIo stockIo = baseMapper.selectById(stockIoId);
|
||||
if (stockIo == null || stockIo.getStatus() == null || stockIo.getStatus() != 1) {
|
||||
// 只允许审核“已提交”状态的单据
|
||||
throw new RuntimeException("单据不存在或状态不允许审核");
|
||||
}
|
||||
List<WmsStockIoDetail> details = stockIoDetailMapper.selectList(
|
||||
Wrappers.<WmsStockIoDetail>lambdaQuery().eq(WmsStockIoDetail::getStockIoId, stockIoId)
|
||||
);
|
||||
if (details == null || details.isEmpty()) {
|
||||
throw new RuntimeException("单据明细不能为空");
|
||||
}
|
||||
for (WmsStockIoDetail detail : details) {
|
||||
String ioType = stockIo.getIoType();
|
||||
if ("in".equals(ioType)) {
|
||||
// 入库:目标库位库存增加
|
||||
changeStock(detail.getWarehouseId(), detail.getItemType(), detail.getItemId(), detail.getBatchNo(), detail.getQuantity(), true, detail.getUnit());
|
||||
} else if ("out".equals(ioType)) {
|
||||
// 出库:目标库位库存减少
|
||||
changeStock(detail.getWarehouseId(), detail.getItemType(), detail.getItemId(), detail.getBatchNo(), detail.getQuantity(), false, detail.getUnit());
|
||||
} else if ("transfer".equals(ioType)) {
|
||||
// 移库:fromWarehouseId减少,warehouseId增加
|
||||
if (detail.getFromWarehouseId() == null) {
|
||||
throw new RuntimeException("移库明细缺少源库位ID");
|
||||
}
|
||||
// 先减少源库位
|
||||
changeStock(detail.getFromWarehouseId(), detail.getItemType(), detail.getItemId(), detail.getBatchNo(), detail.getQuantity(), false, detail.getUnit());
|
||||
// 再增加目标库位
|
||||
changeStock(detail.getWarehouseId(), detail.getItemType(), detail.getItemId(), detail.getBatchNo(), detail.getQuantity(), true, detail.getUnit());
|
||||
} else {
|
||||
throw new RuntimeException("未知的出入库类型");
|
||||
}
|
||||
}
|
||||
// 更新单据状态为已审核(2)
|
||||
stockIo.setStatus(2);
|
||||
baseMapper.updateById(stockIo);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 库存增减,isAdd=true为增加,false为减少,减少时校验库存是否足够
|
||||
*/
|
||||
private void changeStock(Long warehouseId, String itemType, Long itemId, String batchNo, BigDecimal quantity, boolean isAdd, String unit) {
|
||||
WmsStock stock = stockMapper.selectOne(Wrappers.<WmsStock>lambdaQuery()
|
||||
.eq(WmsStock::getWarehouseId, warehouseId)
|
||||
.eq(WmsStock::getItemType, itemType)
|
||||
.eq(WmsStock::getItemId, itemId)
|
||||
.eq(WmsStock::getBatchNo, batchNo)
|
||||
.last("limit 1"));
|
||||
if (stock == null) {
|
||||
if (!isAdd) {
|
||||
throw new RuntimeException("库存不足,无法出库/移库");
|
||||
}
|
||||
// 新增库存记录
|
||||
stock = new WmsStock();
|
||||
stock.setWarehouseId(warehouseId);
|
||||
stock.setItemType(itemType);
|
||||
stock.setItemId(itemId);
|
||||
stock.setBatchNo(batchNo);
|
||||
stock.setQuantity(quantity);
|
||||
stock.setUnit(unit);
|
||||
stockMapper.insert(stock);
|
||||
} else {
|
||||
BigDecimal newQty = isAdd ? stock.getQuantity().add(quantity) : stock.getQuantity().subtract(quantity);
|
||||
if (newQty.compareTo(BigDecimal.ZERO) < 0) {
|
||||
throw new RuntimeException("库存不足,无法出库/移库");
|
||||
}
|
||||
stock.setQuantity(newQty);
|
||||
stockMapper.updateById(stock);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="fromWarehouseId" column="from_warehouse_id"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user