refactor(mes): 重构产品 SIP/SOP/BOM 模块，统一字段命名与代码风格

1. SIP/SOP 的 orderNumber 字段全局重命名为 sort，涉及 DO、VO、Mapper、Service、ErrorCode 2. BOM Service 的 hasCycle 方法重命名为 hasBomCycle，语义更清晰 3. ErrorCode 常量 ORDER_NUMBER_DUPLICATE 重命名为 SORT_DUPLICATE

refactor(mes): 重构产品 SIP/SOP/BOM 模块，统一字段命名与代码风格
1. SIP/SOP 的 orderNumber 字段全局重命名为 sort，涉及 DO、VO、Mapper、Service、ErrorCode 2. BOM Service 的 hasCycle 方法重命名为 hasBomCycle，语义更清晰 3. ErrorCode 常量 ORDER_NUMBER_DUPLICATE 重命名为 SORT_DUPLICATE
YunaiV
1 parent 9231dae7
Showing 13 changed files with 32 additions and 33 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdProductBomController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/sip/MesMdProductSipRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/sip/MesMdProductSipSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/sop/MesMdProductSopRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/sop/MesMdProductSopSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/item/MesMdProductSipDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/md/item/MesMdProductSopDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdProductSipMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdProductSopMapper.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/md/item/MesMdProductBomServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdProductSipServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdProductSopServiceImpl.java
@@ -108,16 +108,16 @@ public class MesMdProductBomController {
         if (CollUtil.isEmpty(list)) {
             return Collections.emptyList();
         }
-        // 1. 批量获取 BOM 物料信息
+        // 1.1 批量获取 BOM 物料信息
         Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
                 convertSet(list, MesMdProductBomDO::getBomItemId));
-        // 2. 批量获取计量单位信息
+        // 1.2 批量获取计量单位信息
         Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
                 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
-        // 3. 批量获取物料分类信息（用于 itemOrProduct）
+        // 1.3 批量获取物料分类信息（用于 itemOrProduct）
         Map<Long, MesMdItemTypeDO> itemTypeMap = itemTypeService.getItemTypeMap(
                 convertSet(itemMap.values(), MesMdItemDO::getItemTypeId));
-        // 4. 拼接 VO
+        // 2. 拼接 VO
         return BeanUtils.toBean(list, MesMdProductBomRespVO.class, vo -> {
             MapUtils.findAndThen(itemMap, vo.getBomItemId(), item -> {
                 vo.setBomItemCode(item.getCode());
@@ -16,7 +16,7 @@ public class MesMdProductSipRespVO {
     private Long itemId;
     @Schema(description = "排列顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer orderNumber;
+    private Integer sort;
     @Schema(description = "工序ID", example = "100")
     private Long processId;
@@ -18,7 +18,7 @@ public class MesMdProductSipSaveReqVO {
     @Schema(description = "排列顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "排列顺序不能为空")
-    private Integer orderNumber;
+    private Integer sort;
     @Schema(description = "工序ID", example = "100")
     private Long processId;
@@ -16,7 +16,7 @@ public class MesMdProductSopRespVO {
     private Long itemId;
     @Schema(description = "排列顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer orderNumber;
+    private Integer sort;
     @Schema(description = "工序ID", example = "100")
     private Long processId;
@@ -18,7 +18,7 @@ public class MesMdProductSopSaveReqVO {
     @Schema(description = "排列顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "排列顺序不能为空")
-    private Integer orderNumber;
+    private Integer sort;
     @Schema(description = "工序ID", example = "100")
     private Long processId;
@@ -35,7 +35,7 @@ public class MesMdProductSipDO extends BaseDO {
     /**
      * 排列顺序
      */
-    private Integer orderNumber;
+    private Integer sort;
     /**
      * 工序编号
      */
@@ -35,7 +35,7 @@ public class MesMdProductSopDO extends BaseDO {
     /**
      * 排列顺序
      */
-    private Integer orderNumber;
+    private Integer sort;
     /**
      * 工序编号
      */
@@ -21,19 +21,19 @@ public interface MesMdProductSipMapper extends BaseMapperX&lt;MesMdProductSipDO&gt; {
         return selectPage(reqVO, new LambdaQueryWrapperX<MesMdProductSipDO>()
                 .eq(MesMdProductSipDO::getItemId, reqVO.getItemId())
                 .likeIfPresent(MesMdProductSipDO::getTitle, reqVO.getTitle())
-                .orderByAsc(MesMdProductSipDO::getOrderNumber));
+                .orderByAsc(MesMdProductSipDO::getSort));
     }
     default List<MesMdProductSipDO> selectByItemId(Long itemId) {
         return selectList(new LambdaQueryWrapperX<MesMdProductSipDO>()
                 .eq(MesMdProductSipDO::getItemId, itemId)
-                .orderByAsc(MesMdProductSipDO::getOrderNumber));
+                .orderByAsc(MesMdProductSipDO::getSort));
     }
-    default Long selectCountByItemIdAndOrderNumber(Long itemId, Integer orderNumber, Long excludeId) {
+    default Long selectCountByItemIdAndSort(Long itemId, Integer sort, Long excludeId) {
         return selectCount(new LambdaQueryWrapperX<MesMdProductSipDO>()
                 .eq(MesMdProductSipDO::getItemId, itemId)
-                .eq(MesMdProductSipDO::getOrderNumber, orderNumber)
+                .eq(MesMdProductSipDO::getSort, sort)
                 .neIfPresent(MesMdProductSipDO::getId, excludeId));
     }
@@ -21,19 +21,19 @@ public interface MesMdProductSopMapper extends BaseMapperX&lt;MesMdProductSopDO&gt; {
         return selectPage(reqVO, new LambdaQueryWrapperX<MesMdProductSopDO>()
                 .eq(MesMdProductSopDO::getItemId, reqVO.getItemId())
                 .likeIfPresent(MesMdProductSopDO::getTitle, reqVO.getTitle())
-                .orderByAsc(MesMdProductSopDO::getOrderNumber));
+                .orderByAsc(MesMdProductSopDO::getSort));
     }
     default List<MesMdProductSopDO> selectByItemId(Long itemId) {
         return selectList(new LambdaQueryWrapperX<MesMdProductSopDO>()
                 .eq(MesMdProductSopDO::getItemId, itemId)
-                .orderByAsc(MesMdProductSopDO::getOrderNumber));
+                .orderByAsc(MesMdProductSopDO::getSort));
     }
-    default Long selectCountByItemIdAndOrderNumber(Long itemId, Integer orderNumber, Long excludeId) {
+    default Long selectCountByItemIdAndSort(Long itemId, Integer sort, Long excludeId) {
         return selectCount(new LambdaQueryWrapperX<MesMdProductSopDO>()
                 .eq(MesMdProductSopDO::getItemId, itemId)
-                .eq(MesMdProductSopDO::getOrderNumber, orderNumber)
+                .eq(MesMdProductSopDO::getSort, sort)
                 .neIfPresent(MesMdProductSopDO::getId, excludeId));
     }
@@ -75,11 +75,11 @@ public interface ErrorCodeConstants {
     // ========== MES 基础数据-产品SOP（1-040-108-000） ==========
     ErrorCode MD_PRODUCT_SOP_NOT_EXISTS = new ErrorCode(1_040_108_000, "产品SOP不存在");
-    ErrorCode MD_PRODUCT_SOP_ORDER_NUMBER_DUPLICATE = new ErrorCode(1_040_108_001, "该展示序号已存在");
+    ErrorCode MD_PRODUCT_SOP_SORT_DUPLICATE = new ErrorCode(1_040_108_001, "该展示序号已存在");
     // ========== MES 基础数据-产品SIP（1-040-109-000） ==========
     ErrorCode MD_PRODUCT_SIP_NOT_EXISTS = new ErrorCode(1_040_109_000, "产品SIP不存在");
-    ErrorCode MD_PRODUCT_SIP_ORDER_NUMBER_DUPLICATE = new ErrorCode(1_040_109_001, "该展示序号已存在");
+    ErrorCode MD_PRODUCT_SIP_SORT_DUPLICATE = new ErrorCode(1_040_109_001, "该展示序号已存在");
     // ========== MES 日历排班-班次（1-040-200-000） ==========
     ErrorCode CAL_SHIFT_NOT_EXISTS = new ErrorCode(1_040_200_000, "班次不存在");
@@ -45,7 +45,7 @@ public class MesMdProductBomServiceImpl implements MesMdProductBomService {
             throw exception(MD_PRODUCT_BOM_SELF_REFERENCE);
         }
         // 1.4 校验不能形成闭环
-        if (hasCycle(createReqVO.getItemId(), createReqVO.getBomItemId())) {
+        if (hasBomCycle(createReqVO.getItemId(), createReqVO.getBomItemId())) {
             throw exception(MD_PRODUCT_BOM_CIRCULAR);
         }
@@ -93,7 +93,6 @@ public class MesMdProductBomServiceImpl implements MesMdProductBomService {
         }
     }
-    // TODO @AI：hasXXXCycle 这样？
     /**
      * 检测新增边 (itemId -> bomItemId) 后，BOM 图是否存在闭环
      *
@@ -101,7 +100,7 @@ public class MesMdProductBomServiceImpl implements MesMdProductBomService {
      * @param bomItemId BOM子物料编号
      * @return 是否存在闭环
      */
-    private boolean hasCycle(Long itemId, Long bomItemId) {
+    private boolean hasBomCycle(Long itemId, Long bomItemId) {
         // 1.1 获取所有已有的 BOM 记录
         List<MesMdProductBomDO> allBoms = productBomMapper.selectAll();
         // 1.2 构建邻接表：parent -> Set<child>
@@ -30,7 +30,7 @@ public class MesMdProductSipServiceImpl implements MesMdProductSipService {
     @Override
     public Long createProductSip(MesMdProductSipSaveReqVO createReqVO) {
         // 校验排列顺序的唯一性
-        validateOrderNumberUnique(createReqVO.getItemId(), createReqVO.getOrderNumber(), null);
+        validateSortUnique(createReqVO.getItemId(), createReqVO.getSort(), null);
         // 插入
         MesMdProductSipDO sip = BeanUtils.toBean(createReqVO, MesMdProductSipDO.class);
@@ -43,7 +43,7 @@ public class MesMdProductSipServiceImpl implements MesMdProductSipService {
         // 校验存在
         validateProductSipExists(updateReqVO.getId());
         // 校验排列顺序的唯一性
-        validateOrderNumberUnique(updateReqVO.getItemId(), updateReqVO.getOrderNumber(), updateReqVO.getId());
+        validateSortUnique(updateReqVO.getItemId(), updateReqVO.getSort(), updateReqVO.getId());
         // 更新
         MesMdProductSipDO updateObj = BeanUtils.toBean(updateReqVO, MesMdProductSipDO.class);
@@ -64,10 +64,10 @@ public class MesMdProductSipServiceImpl implements MesMdProductSipService {
         }
     }
-    private void validateOrderNumberUnique(Long itemId, Integer orderNumber, Long excludeId) {
-        Long count = productSipMapper.selectCountByItemIdAndOrderNumber(itemId, orderNumber, excludeId);
+    private void validateSortUnique(Long itemId, Integer sort, Long excludeId) {
+        Long count = productSipMapper.selectCountByItemIdAndSort(itemId, sort, excludeId);
         if (count > 0) {
-            throw exception(MD_PRODUCT_SIP_ORDER_NUMBER_DUPLICATE);
+            throw exception(MD_PRODUCT_SIP_SORT_DUPLICATE);
         }
     }
@@ -30,7 +30,7 @@ public class MesMdProductSopServiceImpl implements MesMdProductSopService {
     @Override
     public Long createProductSop(MesMdProductSopSaveReqVO createReqVO) {
         // 校验排列顺序的唯一性
-        validateOrderNumberUnique(createReqVO.getItemId(), createReqVO.getOrderNumber(), null);
+        validateSortUnique(createReqVO.getItemId(), createReqVO.getSort(), null);
         // 插入
         MesMdProductSopDO sop = BeanUtils.toBean(createReqVO, MesMdProductSopDO.class);
@@ -43,7 +43,7 @@ public class MesMdProductSopServiceImpl implements MesMdProductSopService {
         // 校验存在
         validateProductSopExists(updateReqVO.getId());
         // 校验排列顺序的唯一性
-        validateOrderNumberUnique(updateReqVO.getItemId(), updateReqVO.getOrderNumber(), updateReqVO.getId());
+        validateSortUnique(updateReqVO.getItemId(), updateReqVO.getSort(), updateReqVO.getId());
         // 更新
         MesMdProductSopDO updateObj = BeanUtils.toBean(updateReqVO, MesMdProductSopDO.class);
@@ -64,10 +64,10 @@ public class MesMdProductSopServiceImpl implements MesMdProductSopService {
         }
     }
-    private void validateOrderNumberUnique(Long itemId, Integer orderNumber, Long excludeId) {
-        Long count = productSopMapper.selectCountByItemIdAndOrderNumber(itemId, orderNumber, excludeId);
+    private void validateSortUnique(Long itemId, Integer sort, Long excludeId) {
+        Long count = productSopMapper.selectCountByItemIdAndSort(itemId, sort, excludeId);
         if (count > 0) {
-            throw exception(MD_PRODUCT_SOP_ORDER_NUMBER_DUPLICATE);
+            throw exception(MD_PRODUCT_SOP_SORT_DUPLICATE);
         }
     }