Commit b759c474b003a27571979157115d805d363140c6

Authored by YunaiV
1 parent 627bbba3

✨ feat(mes): 新增库位物料/批次混放规则校验

yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.detail.Mes @@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.detail.Mes
6 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDetailDO; 6 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDetailDO;
7 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO; 7 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
8 import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueDetailMapper; 8 import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueDetailMapper;
  9 +import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
9 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; 10 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
10 import jakarta.annotation.Resource; 11 import jakarta.annotation.Resource;
11 import org.springframework.context.annotation.Lazy; 12 import org.springframework.context.annotation.Lazy;
@@ -32,14 +33,15 @@ public class MesWmReturnIssueDetailServiceImpl implements MesWmReturnIssueDetail @@ -32,14 +33,15 @@ public class MesWmReturnIssueDetailServiceImpl implements MesWmReturnIssueDetail
32 @Resource 33 @Resource
33 @Lazy 34 @Lazy
34 private MesWmReturnIssueLineService issueLineService; 35 private MesWmReturnIssueLineService issueLineService;
35 -  
36 @Resource 36 @Resource
37 private MesWmWarehouseAreaService warehouseAreaService; 37 private MesWmWarehouseAreaService warehouseAreaService;
  38 + @Resource
  39 + @Lazy
  40 + private MesWmMaterialStockService materialStockService;
38 41
39 @Override 42 @Override
40 public Long createReturnIssueDetail(MesWmReturnIssueDetailSaveReqVO createReqVO) { 43 public Long createReturnIssueDetail(MesWmReturnIssueDetailSaveReqVO createReqVO) {
41 validateReturnIssueDetailSaveData(createReqVO); 44 validateReturnIssueDetailSaveData(createReqVO);
42 - // TODO @芋艿:【后续搞】不允许物资混放  
43 45
44 // 插入 46 // 插入
45 MesWmReturnIssueDetailDO detail = BeanUtils.toBean(createReqVO, MesWmReturnIssueDetailDO.class); 47 MesWmReturnIssueDetailDO detail = BeanUtils.toBean(createReqVO, MesWmReturnIssueDetailDO.class);
@@ -52,7 +54,6 @@ public class MesWmReturnIssueDetailServiceImpl implements MesWmReturnIssueDetail @@ -52,7 +54,6 @@ public class MesWmReturnIssueDetailServiceImpl implements MesWmReturnIssueDetail
52 // 校验存在 54 // 校验存在
53 validateReturnIssueDetailExists(updateReqVO.getId()); 55 validateReturnIssueDetailExists(updateReqVO.getId());
54 validateReturnIssueDetailSaveData(updateReqVO); 56 validateReturnIssueDetailSaveData(updateReqVO);
55 - // TODO @芋艿:【后续搞】不允许物资混放  
56 57
57 // 更新 58 // 更新
58 MesWmReturnIssueDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueDetailDO.class); 59 MesWmReturnIssueDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueDetailDO.class);
@@ -107,6 +108,8 @@ public class MesWmReturnIssueDetailServiceImpl implements MesWmReturnIssueDetail @@ -107,6 +108,8 @@ public class MesWmReturnIssueDetailServiceImpl implements MesWmReturnIssueDetail
107 // 校验仓库、库区、库位的关联关系 108 // 校验仓库、库区、库位的关联关系
108 warehouseAreaService.validateWarehouseAreaExists( 109 warehouseAreaService.validateWarehouseAreaExists(
109 reqVO.getWarehouseId(), reqVO.getLocationId(), reqVO.getAreaId()); 110 reqVO.getWarehouseId(), reqVO.getLocationId(), reqVO.getAreaId());
  111 + // 校验库位物料/批次混放规则
  112 + materialStockService.checkAreaMixingRule(reqVO.getAreaId(), reqVO.getItemId(), reqVO.getBatchId());
110 // 校验明细总数量不超过行数量(排除自身) 113 // 校验明细总数量不超过行数量(排除自身)
111 validateDetailQuantityNotExceed(reqVO.getLineId(), reqVO.getQuantity(), reqVO.getId(), line); 114 validateDetailQuantityNotExceed(reqVO.getLineId(), reqVO.getQuantity(), reqVO.getId(), line);
112 } 115 }