✨ feat(workorder): 添加工单状态字段并更新相关逻辑

在 MesProWorkOrderPageReqVO 中新增工单状态字段，并在相关的 Mapper 和 Service 中更新查询逻辑以支持该字段。同时，新增批次编号字段到 MesWmMaterialStockPageReqVO，并更新相关逻辑以确保数据一致性。

✨ feat(workorder): 添加工单状态字段并更新相关逻辑
在 MesProWorkOrderPageReqVO 中新增工单状态字段，并在相关的 Mapper 和 Service 中更新查询逻辑以支持该字段。同时，新增批次编号字段到 MesWmMaterialStockPageReqVO，并更新相关逻辑以确保数据一致性。
YunaiV
1 parent 2a901c12
Showing 12 changed files with 75 additions and 46 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkOrderPageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonRecordServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptDetailServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageLineServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java
@@ -35,6 +35,9 @@ public class MesProWorkOrderPageReqVO extends PageParam {
     @Schema(description = "客户编号", example = "300")
     private Long clientId;
+    @Schema(description = "工单状态", example = "1")
+    private Integer status;
+
     @Schema(description = "需求日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] requestDate;
@@ -21,6 +21,9 @@ public class MesWmMaterialStockPageReqVO extends PageParam {
     @Schema(description = "批次号", example = "B20260101")
     private String batchCode;
+    @Schema(description = "批次编号", example = "1")
+    private Long batchId;
+
     @Schema(description = "仓库编号", example = "1")
     private Long warehouseId;
@@ -26,6 +26,7 @@ public interface MesProWorkOrderMapper extends BaseMapperX&lt;MesProWorkOrderDO&gt; {
                 .likeIfPresent(MesProWorkOrderDO::getOrderSourceCode, reqVO.getOrderSourceCode())
                 .eqIfPresent(MesProWorkOrderDO::getProductId, reqVO.getProductId())
                 .eqIfPresent(MesProWorkOrderDO::getClientId, reqVO.getClientId())
+                .eqIfPresent(MesProWorkOrderDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(MesProWorkOrderDO::getRequestDate, reqVO.getRequestDate())
                 .orderByDesc(MesProWorkOrderDO::getId));
     }
@@ -26,6 +26,7 @@ public interface MesWmMaterialStockMapper extends BaseMapperX&lt;MesWmMaterialStock
                 .inIfPresent(MesWmMaterialStockDO::getItemTypeId, itemTypeIds)
                 .inIfPresent(MesWmMaterialStockDO::getItemId, itemIds)
                 .likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode())
+                .eqIfPresent(MesWmMaterialStockDO::getBatchId, reqVO.getBatchId())
                 .eqIfPresent(MesWmMaterialStockDO::getWarehouseId, reqVO.getWarehouseId())
                 .eqIfPresent(MesWmMaterialStockDO::getLocationId, reqVO.getLocationId())
                 .eqIfPresent(MesWmMaterialStockDO::getAreaId, reqVO.getAreaId())
@@ -51,6 +51,8 @@ public interface ErrorCodeConstants {
     ErrorCode WM_BATCH_MOLD_REQUIRED = new ErrorCode(1_040_717_011, "批次配置要求模具不能为空");
     ErrorCode WM_BATCH_LOT_NUMBER_REQUIRED = new ErrorCode(1_040_717_012, "批次配置要求生产批号不能为空");
     ErrorCode WM_BATCH_QUALITY_STATUS_REQUIRED = new ErrorCode(1_040_717_013, "批次配置要求质量状态不能为空");
+    ErrorCode WM_BATCH_NOT_EXISTS = new ErrorCode(1_040_717_014, "批次不存在");
+    ErrorCode WM_BATCH_ITEM_MISMATCH = new ErrorCode(1_040_717_015, "批次不属于当前物料");
     // ========== MES 基础数据-客户（1-040-103-000） ==========
     ErrorCode MD_CLIENT_NOT_EXISTS = new ErrorCode(1_040_103_000, "客户不存在");
@@ -50,7 +50,7 @@ public class MesProAndonRecordServiceImpl implements MesProAndonRecordService {
         MesProAndonConfigDO config = andonConfigService.validateAndonConfigExists(createReqVO.getConfigId());
         workstationService.validateWorkstationExists(createReqVO.getWorkstationId());
         if (createReqVO.getWorkOrderId() != null) {
-            workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId());
+            workOrderService.validateWorkOrderConfirmed(createReqVO.getWorkOrderId());
         }
         if (createReqVO.getProcessId() != null) {
             processService.validateProcessExists(createReqVO.getProcessId());
@@ -69,10 +69,12 @@ public interface MesWmBatchService {
     List<MesWmBatchDO> getBackwardBatchList(String code);
     /**
-     * 获取批次列表
+     * 校验批次存在，并校验批次与物料的归属关系
      *
-     * @return 批次列表
+     * @param batchId 批次ID
+     * @param itemId  物料ID
+     * @return 批次记录
      */
-    List<MesWmBatchDO> getBatchList();
+    MesWmBatchDO validateBatchExists(Long batchId, Long itemId);
 }
@@ -237,8 +237,15 @@ public class MesWmBatchServiceImpl implements MesWmBatchService {
     }
     @Override
-    public List<MesWmBatchDO> getBatchList() {
-        return batchMapper.selectList();
+    public MesWmBatchDO validateBatchExists(Long batchId, Long itemId) {
+        MesWmBatchDO batch = batchMapper.selectById(batchId);
+        if (batch == null) {
+            throw exception(WM_BATCH_NOT_EXISTS);
+        }
+        if (ObjUtil.notEqual(batch.getItemId(), itemId)) {
+            throw exception(WM_BATCH_ITEM_MISMATCH);
+        }
+        return batch;
     }
 }
@@ -6,8 +6,6 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourcereceipt.MesWmOutso
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.outsourcereceipt.MesWmOutsourceReceiptDetailMapper;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
-import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
-import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -31,28 +29,12 @@ public class MesWmOutsourceReceiptDetailServiceImpl implements MesWmOutsourceRec
     private MesMdItemService itemService;
     @Resource
-    private MesWmWarehouseService warehouseService;
-
-    @Resource
-    private MesWmWarehouseLocationService locationService;
-
-    @Resource
     private MesWmWarehouseAreaService areaService;
     @Override
     public Long createOutsourceReceiptDetail(MesWmOutsourceReceiptDetailSaveReqVO createReqVO) {
-        // 校验物料存在
-        itemService.validateItemExists(createReqVO.getItemId());
-        // 校验仓库、库区、库位存在
-        if (createReqVO.getWarehouseId() != null) {
-            warehouseService.validateWarehouseExists(createReqVO.getWarehouseId());
-        }
-        if (createReqVO.getLocationId() != null) {
-            locationService.validateWarehouseLocationExists(createReqVO.getLocationId());
-        }
-        if (createReqVO.getAreaId() != null) {
-            areaService.validateWarehouseAreaExists(createReqVO.getAreaId());
-        }
+        // 校验数据
+        validateDetailSaveData(createReqVO);
         // 插入
         MesWmOutsourceReceiptDetailDO detail = BeanUtils.toBean(createReqVO, MesWmOutsourceReceiptDetailDO.class);
@@ -64,18 +46,8 @@ public class MesWmOutsourceReceiptDetailServiceImpl implements MesWmOutsourceRec
     public void updateOutsourceReceiptDetail(MesWmOutsourceReceiptDetailSaveReqVO updateReqVO) {
         // 校验存在
         validateOutsourceReceiptDetailExists(updateReqVO.getId());
-        // 校验物料存在
-        itemService.validateItemExists(updateReqVO.getItemId());
-        // 校验仓库、库区、库位存在
-        if (updateReqVO.getWarehouseId() != null) {
-            warehouseService.validateWarehouseExists(updateReqVO.getWarehouseId());
-        }
-        if (updateReqVO.getLocationId() != null) {
-            locationService.validateWarehouseLocationExists(updateReqVO.getLocationId());
-        }
-        if (updateReqVO.getAreaId() != null) {
-            areaService.validateWarehouseAreaExists(updateReqVO.getAreaId());
-        }
+        // 校验数据
+        validateDetailSaveData(updateReqVO);
         // 更新
         MesWmOutsourceReceiptDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmOutsourceReceiptDetailDO.class);
@@ -115,6 +87,16 @@ public class MesWmOutsourceReceiptDetailServiceImpl implements MesWmOutsourceRec
         detailMapper.deleteByLineId(lineId);
     }
+    /**
+     * 校验保存时的关联数据
+     */
+    private void validateDetailSaveData(MesWmOutsourceReceiptDetailSaveReqVO reqVO) {
+        // 校验物料存在
+        itemService.validateItemExists(reqVO.getItemId());
+        // 校验仓库、库区、库位的层级关系
+        areaService.validateWarehouseAreaExists(reqVO.getWarehouseId(), reqVO.getLocationId(), reqVO.getAreaId());
+    }
+
     private void validateOutsourceReceiptDetailExists(Long id) {
         if (detailMapper.selectById(id) == null) {
             throw exception(WM_OUTSOURCE_RECEIPT_DETAIL_NOT_EXISTS);
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.line.MesWmPac
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.packages.MesWmPackageLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.packages.MesWmPackageLineMapper;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -33,13 +34,13 @@ public class MesWmPackageLineServiceImpl implements MesWmPackageLineService {
     private MesWmPackageService packageService;
     @Resource
     private MesMdItemService itemService;
+    @Resource
+    private MesProWorkOrderService workOrderService;
     @Override
     public Long createPackageLine(MesWmPackageLineSaveReqVO createReqVO) {
-        // 校验装箱单状态为草稿
-        packageService.validatePackageStatusDraft(createReqVO.getPackageId());
-        // 校验产品物料存在
-        itemService.validateItemExists(createReqVO.getItemId());
+        // 校验数据
+        validateLineSaveData(createReqVO);
         // 插入
         MesWmPackageLineDO line = BeanUtils.toBean(createReqVO, MesWmPackageLineDO.class);
@@ -51,10 +52,9 @@ public class MesWmPackageLineServiceImpl implements MesWmPackageLineService {
     public void updatePackageLine(MesWmPackageLineSaveReqVO updateReqVO) {
         // 校验存在
         MesWmPackageLineDO line = validatePackageLineExists(updateReqVO.getId());
-        // 校验装箱单状态为草稿
-        packageService.validatePackageStatusDraft(line.getPackageId());
-        // 校验产品物料存在
-        itemService.validateItemExists(updateReqVO.getItemId());
+        // 校验数据
+        updateReqVO.setPackageId(line.getPackageId());
+        validateLineSaveData(updateReqVO);
         // 更新
         MesWmPackageLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmPackageLineDO.class);
@@ -93,6 +93,20 @@ public class MesWmPackageLineServiceImpl implements MesWmPackageLineService {
     // ========== 校验方法 ==========
+    /**
+     * 校验保存时的关联数据
+     */
+    private void validateLineSaveData(MesWmPackageLineSaveReqVO reqVO) {
+        // 校验装箱单状态为草稿
+        packageService.validatePackageStatusDraft(reqVO.getPackageId());
+        // 校验产品物料存在
+        itemService.validateItemExists(reqVO.getItemId());
+        // 校验工单已确认
+        if (reqVO.getWorkOrderId() != null) {
+            workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
+        }
+    }
+
     private MesWmPackageLineDO validatePackageLineExists(Long id) {
         MesWmPackageLineDO line = packageLineMapper.selectById(id);
         if (line == null) {
@@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales.MesWmReturnSalesLine
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -43,6 +44,8 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ
     @Resource
     private MesMdItemService itemService;
     @Resource
+    private MesWmBatchService batchService;
+    @Resource
     @Lazy
     private MesWmReturnSalesDetailService returnSalesDetailService;
@@ -153,6 +156,10 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ
         if (Boolean.TRUE.equals(item.getBatchFlag()) && batchId == null) {
             throw exception(MD_ITEM_BATCH_REQUIRED);
         }
+        // 校验批次存在且属于当前物料
+        if (batchId != null) {
+            batchService.validateBatchExists(batchId, itemId);
+        }
     }
     @Override
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.line.MesW
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnvendor.MesWmReturnVendorLineMapper;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -36,6 +37,8 @@ public class MesWmReturnVendorLineServiceImpl implements MesWmReturnVendorLineSe
     private MesWmReturnVendorDetailService returnVendorDetailService;
     @Resource
     private MesMdItemService itemService;
+    @Resource
+    private MesWmBatchService batchService;
     @Override
     public Long createReturnVendorLine(MesWmReturnVendorLineSaveReqVO createReqVO) {
@@ -108,6 +111,10 @@ public class MesWmReturnVendorLineServiceImpl implements MesWmReturnVendorLineSe
         returnVendorService.validateReturnVendorExistsAndPrepare(reqVO.getReturnId());
         // 校验物料存在
         itemService.validateItemExists(reqVO.getItemId());
+        // 校验批次存在且属于当前物料
+        if (reqVO.getBatchId() != null) {
+            batchService.validateBatchExists(reqVO.getBatchId(), reqVO.getItemId());
+        }
     }
 }