入库单 增加子项目编号

入库单 增加子项目编号

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

@@ -37,6 +37,9 @@ public class StorageMatPageReqVO extends PageParam {
     @Schema(description = "批次号")
     private String lotNo;
 
+    @Schema(description = "子项目编号")
+    private String projectNo;
+
     @Schema(description = "备注", example = "你猜")
     private String description;
 

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

@@ -46,6 +46,10 @@ public class StorageMatRespVO {
     @ExcelProperty("批次号")
     private String lotNo;
 
+    @Schema(description = "子项目编号")
+    @ExcelProperty("子项目编号")
+    private String projectNo;
+
     @Schema(description = "备注", example = "你猜")
     @ExcelProperty("备注")
     private String description;

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

@@ -1,46 +1,49 @@
-package com.chanko.yunxi.mes.module.heli.controller.admin.storagemat.vo;
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagemat.vo;
-
+
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.*;
-import java.util.*;
+import java.util.*;
-import javax.validation.constraints.*;
+import javax.validation.constraints.*;
-import java.util.*;
+import java.util.*;
-import java.math.BigDecimal;
+import java.math.BigDecimal;
-
+
-@Schema(description = "管理后台 - 入/出库物料新增/修改 Request VO")
+@Schema(description = "管理后台 - 入/出库物料新增/修改 Request VO")
-@Data
+@Data
-public class StorageMatSaveReqVO {
+public class StorageMatSaveReqVO {
-
+
-    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29383")
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29383")
-    private Long id;
+    private Long id;
-
+
-    @Schema(description = "入/出库Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19477")
+    @Schema(description = "入/出库Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19477")
-    @NotNull(message = "入/出库Id不能为空")
+    @NotNull(message = "入/出库Id不能为空")
-    private Long stockId;
+    private Long stockId;
-
+
-    @Schema(description = "物料 Id,对应 base_material表中的 Id 列", requiredMode = Schema.RequiredMode.REQUIRED, example = "3400")
+    @Schema(description = "物料 Id,对应 base_material表中的 Id 列", requiredMode = Schema.RequiredMode.REQUIRED, example = "3400")
-    @NotNull(message = "物料 Id,对应 base_material表中的 Id 列不能为空")
+    @NotNull(message = "物料 Id,对应 base_material表中的 Id 列不能为空")
-    private Long matId;
+    private Long matId;
-
+
-    @Schema(description = "仓库 Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31860")
+    @Schema(description = "仓库 Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31860")
-    @NotNull(message = "仓库 Id，对应 wms_wh 表中的Id不能为空")
+    @NotNull(message = "仓库 Id，对应 wms_wh 表中的Id不能为空")
-    private Long whId;
+    private Long whId;
-
+
-    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13060")
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13060")
-    @NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
+    @NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
-    private Long rgId;
+    private Long rgId;
-
+
-    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25544")
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25544")
-    @NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
+    @NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
-    private Long pnId;
+    private Long pnId;
-
+
-    @Schema(description = "库存良品数量")
+    @Schema(description = "库存良品数量")
-    private BigDecimal storageOkQty;
+    private BigDecimal storageOkQty;
-
+
-    @Schema(description = "批次号")
+    @Schema(description = "批次号")
-    private String lotNo;
+    private String lotNo;
-
+
-    @Schema(description = "备注", example = "你猜")
+    @Schema(description = "子项目编号")
-    private String description;
+    private String projectNo;
-
+
-}
+    @Schema(description = "备注", example = "你猜")
+    private String description;
+
+}

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

@@ -56,6 +56,10 @@ public class StorageMatDO extends BaseDO {
      * 批次号
      */
     private String lotNo;
+    /**
+     * 子项目编号
+     */
+    private String projectNo;
     /**
      * 备注
      */

mes-ui/mes-ui-admin-vue3/src/api/heli/storagemat/index.ts

@@ -9,6 +9,7 @@ export interface StorageMatVO {
   pnId: number
   storageOkQty: number
   lotNo: string
+  projectNo: string
   description: string
 }
 

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue

@@ -162,6 +162,12 @@
                       <el-input v-model="scope.row.lotNo" />
                     </template>
                   </el-table-column>
+
+                  <el-table-column prop="projectNo" width="120" label="子项目编号">
+                    <template #default="scope">
+                      <el-input v-model="scope.row.projectNo" />
+                    </template>
+                  </el-table-column>
                   <el-table-column prop="description" width="150" label="备注">
                     <template #default="scope">
                       <el-input v-model="scope.row.description" />
@@ -499,6 +505,7 @@ const onAddItem = () => {
     pnlist: ref([]),
     storageOkQty: '',
     lotNo: '',
+    projectNo: '',
     description: '',
     productBomItemValueDOList: []
   }
@@ -528,6 +535,7 @@ const handlefuke = (index, item) => {
     pnlist: item.pnlist,
     storageOkQty: item.storageOkQty,
     lotNo: item.lotNo,
+    projectNo: '',
     description: item.description,
     productBomItemValueDOList: []
   }