【需求】出库明细查询接口完善

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storagemat/vo/StorageMatRespVO.java

@@ -1,13 +1,12 @@
 package com.chanko.yunxi.mes.module.biz.controller.admin.storagemat.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
-import java.util.*;
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 入/出库物料 Response VO")
 @Data
@@ -65,4 +64,12 @@ public class StorageMatRespVO {
     @Schema(description = "工序id")
     private Long procedureId;
 
+    private String projectSubCode;
+
+    private String materialType;
+
+    private String spec;
+
+    private String unit;
+
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storagemat/vo/StorageMatSaveReqVO.java

@@ -22,16 +22,13 @@ public class StorageMatSaveReqVO {
     @NotNull(message = "物料 Id,对应 base_material表中的 Id 列不能为空")
     private Long matId;
 
-    @Schema(description = "仓库 Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31860")
+    @Schema(description = "仓库 Id，对应 wms_wh 表中的Id", example = "31860")
-    @NotNull(message = "仓库 Id，对应 wms_wh 表中的Id不能为空")
     private Long whId;
 
-    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13060")
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", example = "13060")
-    @NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
     private Long rgId;
 
-    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25544")
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", example = "25544")
-    @NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
     private Long pnId;
 
     @Schema(description = "库存良品数量")

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/storagemat/StorageMatDO.java

@@ -75,4 +75,13 @@ public class StorageMatDO extends BaseDO {
     @TableField(exist = false)
     private String projectSubCode;
 
+    @TableField(exist = false)
+    private String materialType;
+
+    @TableField(exist = false)
+    private String spec;
+
+    @TableField(exist = false)
+    private String unit;
+
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storagemat/StorageMatMapper.java

@@ -39,10 +39,9 @@ public interface StorageMatMapper extends BaseMapperX<StorageMatDO> {
     }
 
     default List<StorageMatDO> selectMatByStorckID(Long stockId) {
-
         MPJLambdaWrapper<StorageMatDO> query = new MPJLambdaWrapper<>();
         query.selectAll(StorageMatDO.class)
-                .select("a.name as projectSubName", "a.code as projectSubCode")
+                .select("a.name as projectSubName", "a.code as projectSubCode", "a.material_type, a.spec, a.unit")
                 .leftJoin(MaterialDO.class, "a", MaterialDO::getId, StorageMatDO::getMatId)
                 .disableSubLogicDel()
                 .eq(stockId!= null && stockId!= 0,StorageMatDO::getStockId, stockId);