✨ feat(mes): 移除单位编号字段，优化工单 BOM 相关逻辑

YunaiV
1 parent a2832d99
Showing 5 changed files with 7 additions and 18 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderBomController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/bom/MesProWorkorderBomSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkorderBomDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderBomServiceImpl.java
@@ -113,7 +113,7 @@ public class MesProWorkOrderBomController {
  
         // 2. 逐层展开，得到叶子物料 itemId → quantity
         Map<Long, BigDecimal> leafItems = buildWorkOrderItems(bomList);
-        if (leafItems.isEmpty()) {
+        if (CollUtil.isEmpty(leafItems)) {
             return success(Collections.emptyList());
         }
  
@@ -147,7 +147,7 @@ public class MesProWorkOrderBomController {
         Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
                 convertSet(list, MesProWorkOrderBomDO::getItemId));
         Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
-                convertSet(list, MesProWorkOrderBomDO::getUnitMeasureId));
+                convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
         Map<Long, MesMdItemTypeDO> itemTypeMap = itemTypeService.getItemTypeMap(
                 convertSet(itemMap.values(), MesMdItemDO::getItemTypeId));
         // 2. 拼接 VO
@@ -157,9 +157,9 @@ public class MesProWorkOrderBomController {
                         .setItemSpec(item.getSpecification());
                 MapUtils.findAndThen(itemTypeMap, item.getItemTypeId(),
                         itemType -> vo.setItemOrProduct(itemType.getItemOrProduct()));
+                MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
+                        unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
             });
-            MapUtils.findAndThen(unitMeasureMap, vo.getUnitMeasureId(),
-                    unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
         });
     }
  
@@ -21,10 +21,6 @@ public class MesProWorkOrderBomSaveReqVO {
     @NotNull(message = "BOM 物料不能为空")
     private Long itemId;
  
-    @Schema(description = "单位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "300")
-    @NotNull(message = "单位不能为空")
-    private Long unitMeasureId;
-
     @Schema(description = "预计使用量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10.00")
     @NotNull(message = "预计使用量不能为空")
     private BigDecimal quantity;
@@ -32,4 +28,4 @@ public class MesProWorkOrderBomSaveReqVO {
     @Schema(description = "备注", example = "备注")
     private String remark;
  
-    }
+}
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder;
  
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -43,12 +42,6 @@ public class MesProWorkOrderBomDO extends BaseDO {
      */
     private Long itemId;
     /**
-     * 单位编号
-     *
-     * 关联 {@link MesMdUnitMeasureDO#getId()}
-     */
-    private Long unitMeasureId;
-    /**
      * 预计使用量
      */
     private BigDecimal quantity;
@@ -7,6 +7,7 @@ package cn.iocoder.yudao.module.mes.enums;
  */
 public interface DictTypeConstants {
  
+    String MES_MD_ITEM_OR_PRODUCT = "mes_md_item_or_product"; // MES 物料产品标识
     String MES_CLIENT_TYPE = "mes_client_type"; // MES 客户类型
     String MES_VENDOR_LEVEL = "mes_vendor_level"; // MES 供应商级别
     String MES_CAL_HOLIDAY_TYPE = "mes_cal_holiday_type"; // MES 假期类型
@@ -127,9 +127,8 @@ public class MesProWorkOrderBomServiceImpl implements MesProWorkOrderBomService 
         // 3. 构建工单 BOM 列表并批量插入
         List<MesProWorkOrderBomDO> bomList = new ArrayList<>(productBomList.size());
         for (MesMdProductBomDO productBom : productBomList) {
-            MesMdItemDO bomItem = itemMap.get(productBom.getBomItemId());
             bomList.add(new MesProWorkOrderBomDO().setWorkOrderId(workOrderId).setItemId(productBom.getBomItemId())
-                    .setQuantity(reqVO.getQuantity().multiply(productBom.getQuantity())).setUnitMeasureId(bomItem.getUnitMeasureId()));
+                    .setQuantity(reqVO.getQuantity().multiply(productBom.getQuantity())));
         }
         workOrderBomMapper.insertBatch(bomList);
     }