✨ feat(item-receipt): 添加采购入库单相关字段和功能

新增采购入库单编码和采购订单号字段，优化相关服务和控制器以支持批量获取入库单信息，提升数据处理能力。

✨ feat(item-receipt): 添加采购入库单相关字段和功能
新增采购入库单编码和采购订单号字段，优化相关服务和控制器以支持批量获取入库单信息，提升数据处理能力。
YunaiV
1 parent 98e11135
Showing 7 changed files with 49 additions and 5 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/MesProWorkOrderItemRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptLineController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/line/MesWmItemReceiptLineRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
@@ -122,6 +122,8 @@ public class MesProWorkOrderBomController {
         Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(leafItems.keySet());
         Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
                 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        Map<Long, MesMdItemTypeDO> itemTypeMap = itemTypeService.getItemTypeMap(
+                convertSet(itemMap.values(), MesMdItemDO::getItemTypeId));
         List<MesProWorkOrderItemRespVO> result = new ArrayList<>(leafItems.size());
         for (Map.Entry<Long, BigDecimal> entry : leafItems.entrySet()) {
             MesMdItemDO item = itemMap.get(entry.getKey());
@@ -133,6 +135,8 @@ public class MesProWorkOrderBomController {
                     .setItemCode(item.getCode()).setItemName(item.getName()).setItemSpec(item.getSpecification());
             MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
                     unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
+            MapUtils.findAndThen(itemTypeMap, item.getItemTypeId(),
+                    itemType -> vo.setItemOrProduct(itemType.getItemOrProduct()));
             result.add(vo);
         }
         return success(result);
@@ -27,4 +27,7 @@ public class MesProWorkOrderItemRespVO {
     @Schema(description = "需求数量", example = "1000.00")
     private BigDecimal quantity;
  
+    @Schema(description = "物料/产品标识", example = "ITEM")
+    private String itemOrProduct;
+
 }
@@ -10,10 +10,12 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line.MesWm
 import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line.MesWmItemReceiptLineSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptLineDO;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
 import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptLineService;
+import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -38,12 +40,12 @@ public class MesWmItemReceiptLineController {
  
     @Resource
     private MesWmItemReceiptLineService itemReceiptLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
+    @Resource
+    private MesWmItemReceiptService itemReceiptService;
  
     @PostMapping("/create")
     @Operation(summary = "创建采购入库单行")
@@ -101,6 +103,8 @@ public class MesWmItemReceiptLineController {
                 convertSet(list, MesWmItemReceiptLineDO::getItemId));
         Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
                 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        Map<Long, MesWmItemReceiptDO> receiptMap = itemReceiptService.getItemReceiptMap(
+                convertSet(list, MesWmItemReceiptLineDO::getReceiptId));
         // 2. 构建结果
         return BeanUtils.toBean(list, MesWmItemReceiptLineRespVO.class, vo -> {
             MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
@@ -108,6 +112,8 @@ public class MesWmItemReceiptLineController {
                 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
                         unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
             });
+            MapUtils.findAndThen(receiptMap, vo.getReceiptId(), receipt ->
+                    vo.setReceiptCode(receipt.getCode()).setPurchaseOrderCode(receipt.getPurchaseOrderCode()));
         });
     }
  
@@ -16,6 +16,12 @@ public class MesWmItemReceiptLineRespVO {
     @Schema(description = "入库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long receiptId;
  
+    @Schema(description = "入库单编码", example = "IR2026020001")
+    private String receiptCode;
+
+    @Schema(description = "采购订单号", example = "PO20260201")
+    private String purchaseOrderCode;
+
     @Schema(description = "到货通知单行编号", example = "1")
     private Long arrivalNoticeLineId;
  
@@ -191,8 +191,6 @@ public class MesProRouteProcessServiceImpl implements MesProRouteProcessService 
         // 1. 根据产品查找关联的工艺路线产品记录
         MesProRouteProductDO routeProduct = routeProductService.getRouteProductByItemId(productId);
         if (routeProduct == null) {
-            // TODO @芋艿：会不会存在配置了多个的情况？？？
-            // TODO @AI：会有这个情况么？
             return Collections.emptyList();
         }
         // 2. 返回该工艺路线的工序列表
@@ -5,8 +5,11 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemR
 import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO;
 import jakarta.validation.Valid;
-
+import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
  
 /**
  * MES 采购入库单 Service 接口
@@ -103,4 +106,22 @@ public interface MesWmItemReceiptService {
      */
     List<MesWmItemReceiptDO> getItemReceiptListByVendorId(Long vendorId);
  
+    /**
+     * 批量获得采购入库单列表
+     *
+     * @param ids 编号数组
+     * @return 入库单列表
+     */
+    List<MesWmItemReceiptDO> getItemReceiptList(Collection<Long> ids);
+
+    /**
+     * 批量获得采购入库单 Map
+     *
+     * @param ids 编号数组
+     * @return 入库单 Map
+     */
+    default Map<Long, MesWmItemReceiptDO> getItemReceiptMap(Collection<Long> ids) {
+        return convertMap(getItemReceiptList(ids), MesWmItemReceiptDO::getId);
+    }
+
 }
@@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
  
 import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.List;
  
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -271,4 +272,9 @@ public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
         return itemReceiptMapper.selectListByVendorId(vendorId);
     }
  
+    @Override
+    public List<MesWmItemReceiptDO> getItemReceiptList(Collection<Long> ids) {
+        return itemReceiptMapper.selectByIds(ids);
+    }
+
 }