✨ feat(mes): 添加仓库、库区和库位名称字段及相关校验

YunaiV
1 parent 5a16d833
Showing 8 changed files with 121 additions and 46 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueLineController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLineRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptLineController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/line/MesWmMiscReceiptLineRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/line/MesWmMiscReceiptLineSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/miscreceipt/MesWmMiscReceiptDetailDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/miscreceipt/MesWmMiscReceiptLineDO.java
@@ -11,9 +11,15 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.line.MesWmMi
 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.miscissue.MesWmMiscIssueLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
 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.miscissue.MesWmMiscIssueLineService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -45,6 +51,15 @@ public class MesWmMiscIssueLineController {
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
+    @Resource
+    private MesWmWarehouseService warehouseService;
+
+    @Resource
+    private MesWmWarehouseLocationService warehouseLocationService;
+
+    @Resource
+    private MesWmWarehouseAreaService warehouseAreaService;
+
     @PostMapping("/create")
     @Operation(summary = "创建杂项出库单行")
     @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:create')")
@@ -101,6 +116,13 @@ public class MesWmMiscIssueLineController {
                 convertSet(list, MesWmMiscIssueLineDO::getItemId));
         Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
                 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
+                convertSet(list, MesWmMiscIssueLineDO::getWarehouseId));
+        Map<Long, MesWmWarehouseLocationDO> locationMap = warehouseLocationService.getWarehouseLocationMap(
+                convertSet(list, MesWmMiscIssueLineDO::getLocationId));
+        Map<Long, MesWmWarehouseAreaDO> areaMap = warehouseAreaService.getWarehouseAreaMap(
+                convertSet(list, MesWmMiscIssueLineDO::getAreaId));
+
         // 2. 构建结果
         return BeanUtils.toBean(list, MesWmMiscIssueLineRespVO.class, vo -> {
             MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
@@ -108,6 +130,9 @@ public class MesWmMiscIssueLineController {
                 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
                         unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
             });
+            MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(), warehouse -> vo.setWarehouseName(warehouse.getName()));
+            MapUtils.findAndThen(locationMap, vo.getLocationId(), location -> vo.setLocationName(location.getName()));
+            MapUtils.findAndThen(areaMap, vo.getAreaId(), area -> vo.setAreaName(area.getName()));
         });
     }
@@ -35,7 +35,8 @@ public class MesWmMiscIssueSaveReqVO {
     @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")
     private String sourceDocType;
-    @Schema(description = "出库日期")
+    @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "出库日期不能为空")
     private LocalDateTime issueDate;
     @Schema(description = "备注", example = "备注")
@@ -52,6 +52,15 @@ public class MesWmMiscIssueLineRespVO {
     @Schema(description = "库位编号", example = "1")
     private Long areaId;
+    @Schema(description = "仓库名称", example = "原料仓")
+    private String warehouseName;
+
+    @Schema(description = "库区名称", example = "A区")
+    private String locationName;
+
+    @Schema(description = "库位名称", example = "1排1架")
+    private String areaName;
+
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -17,9 +17,24 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
+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.warehouse.MesWmWarehouseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
+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.warehouse.MesWmWarehouseService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
 /**
  * MES 杂项入库单行 Controller
@@ -33,6 +48,21 @@ public class MesWmMiscReceiptLineController {
     @Resource
     private MesWmMiscReceiptLineService miscReceiptLineService;
+    @Resource
+    private MesMdItemService itemService;
+
+    @Resource
+    private MesMdUnitMeasureService unitMeasureService;
+
+    @Resource
+    private MesWmWarehouseService warehouseService;
+
+    @Resource
+    private MesWmWarehouseLocationService warehouseLocationService;
+
+    @Resource
+    private MesWmWarehouseAreaService warehouseAreaService;
+
     @PostMapping("/create")
     @Operation(summary = "创建杂项入库单行")
     @PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:create')")
@@ -63,7 +93,10 @@ public class MesWmMiscReceiptLineController {
     @PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:query')")
     public CommonResult<MesWmMiscReceiptLineRespVO> getMiscReceiptLine(@RequestParam("id") Long id) {
         MesWmMiscReceiptLineDO line = miscReceiptLineService.getMiscReceiptLine(id);
-        return success(BeanUtils.toBean(line, MesWmMiscReceiptLineRespVO.class));
+        if (line == null) {
+            return success(null);
+        }
+        return success(buildRespVOList(Collections.singletonList(line)).get(0));
     }
     @GetMapping("/list-by-receipt-id")
@@ -72,7 +105,7 @@ public class MesWmMiscReceiptLineController {
     @PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:query')")
     public CommonResult<List<MesWmMiscReceiptLineRespVO>> getMiscReceiptLineListByReceiptId(@RequestParam("receiptId") Long receiptId) {
         List<MesWmMiscReceiptLineDO> list = miscReceiptLineService.getMiscReceiptLineListByReceiptId(receiptId);
-        return success(BeanUtils.toBean(list, MesWmMiscReceiptLineRespVO.class));
+        return success(buildRespVOList(list));
     }
     @GetMapping("/page")
@@ -80,7 +113,38 @@ public class MesWmMiscReceiptLineController {
     @PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:query')")
     public CommonResult<PageResult<MesWmMiscReceiptLineRespVO>> getMiscReceiptLinePage(@Valid MesWmMiscReceiptLinePageReqVO pageReqVO) {
         PageResult<MesWmMiscReceiptLineDO> pageResult = miscReceiptLineService.getMiscReceiptLinePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, MesWmMiscReceiptLineRespVO.class));
+        return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
+    }
+
+    // ==================== 拼接 VO ====================
+
+    private List<MesWmMiscReceiptLineRespVO> buildRespVOList(List<MesWmMiscReceiptLineDO> list) {
+        if (CollUtil.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        // 1. 获得关联数据
+        Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+                convertSet(list, MesWmMiscReceiptLineDO::getItemId));
+        Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
+                convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
+                convertSet(list, MesWmMiscReceiptLineDO::getWarehouseId));
+        Map<Long, MesWmWarehouseLocationDO> locationMap = warehouseLocationService.getWarehouseLocationMap(
+                convertSet(list, MesWmMiscReceiptLineDO::getLocationId));
+        Map<Long, MesWmWarehouseAreaDO> areaMap = warehouseAreaService.getWarehouseAreaMap(
+                convertSet(list, MesWmMiscReceiptLineDO::getAreaId));
+
+        // 2. 构建结果
+        return BeanUtils.toBean(list, MesWmMiscReceiptLineRespVO.class, vo -> {
+            MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
+                vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
+                MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
+                        unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
+            });
+            MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(), warehouse -> vo.setWarehouseName(warehouse.getName()));
+            MapUtils.findAndThen(locationMap, vo.getLocationId(), location -> vo.setLocationName(location.getName()));
+            MapUtils.findAndThen(areaMap, vo.getAreaId(), area -> vo.setAreaName(area.getName()));
+        });
     }
 }
@@ -34,14 +34,26 @@ public class MesWmMiscReceiptLineRespVO {
     @Schema(description = "库位编号", example = "1")
     private Long areaId;
-    @Schema(description = "生产日期")
-    private LocalDateTime productionDate;
+    @Schema(description = "物料编码", example = "M001")
+    private String itemCode;
-    @Schema(description = "有效期")
-    private LocalDateTime expireDate;
+    @Schema(description = "物料名称", example = "钢板")
+    private String itemName;
-    @Schema(description = "生产批号", example = "PROD20260301")
-    private String lotNumber;
+    @Schema(description = "规格型号", example = "10mm*100mm")
+    private String specification;
+
+    @Schema(description = "计量单位名称", example = "千克")
+    private String unitMeasureName;
+
+    @Schema(description = "仓库名称", example = "原料仓")
+    private String warehouseName;
+
+    @Schema(description = "库区名称", example = "A区")
+    private String locationName;
+
+    @Schema(description = "库位名称", example = "1排1架")
+    private String areaName;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -6,7 +6,6 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 @Schema(description = "管理后台 - MES 杂项入库单行新增/修改 Request VO")
 @Data
@@ -41,15 +40,6 @@ public class MesWmMiscReceiptLineSaveReqVO {
     @Schema(description = "库位编号", example = "1")
     private Long areaId;
-    @Schema(description = "生产日期")
-    private LocalDateTime productionDate;
-
-    @Schema(description = "有效期")
-    private LocalDateTime expireDate;
-
-    @Schema(description = "生产批号", example = "PROD20260301")
-    private String lotNumber;
-
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 /**
  * MES 杂项入库明细 DO
@@ -76,18 +75,6 @@ public class MesWmMiscReceiptDetailDO extends BaseDO {
      */
     private Long areaId;
     /**
-     * 生产日期
-     */
-    private LocalDateTime productionDate;
-    /**
-     * 有效期
-     */
-    private LocalDateTime expireDate;
-    /**
-     * 生产批号
-     */
-    private String lotNumber;
-    /**
      * 备注
      */
     private String remark;
@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 /**
  * MES 杂项入库单行 DO
@@ -72,18 +71,6 @@ public class MesWmMiscReceiptLineDO extends BaseDO {
      */
     private Long areaId;
     /**
-     * 生产日期（暂不使用）
-     */
-    private LocalDateTime productionDate;
-    /**
-     * 有效期（暂不使用）
-     */
-    private LocalDateTime expireDate;
-    /**
-     * 生产批号（暂不使用）
-     */
-    private String lotNumber;
-    /**
      * 备注
      */
     private String remark;