diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatPageReqVO.java
index a206c427..90fc9b58 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatPageReqVO.java
+++ b/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;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatRespVO.java
index 4c5fe5ec..f3099b86 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatRespVO.java
+++ b/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;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatSaveReqVO.java
index 311d31b1..02dbe5be 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatSaveReqVO.java
+++ b/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;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
-import java.util.*;
-import java.math.BigDecimal;
-
-@Schema(description = "管理后台 - 入/出库物料新增/修改 Request VO")
-@Data
-public class StorageMatSaveReqVO {
-
- @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29383")
- private Long id;
-
- @Schema(description = "入/出库Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19477")
- @NotNull(message = "入/出库Id不能为空")
- private Long stockId;
-
- @Schema(description = "物料 Id,对应 base_material表中的 Id 列", requiredMode = Schema.RequiredMode.REQUIRED, example = "3400")
- @NotNull(message = "物料 Id,对应 base_material表中的 Id 列不能为空")
- private Long matId;
-
- @Schema(description = "仓库 Id,对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31860")
- @NotNull(message = "仓库 Id,对应 wms_wh 表中的Id不能为空")
- private Long whId;
-
- @Schema(description = "库区 Id,对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13060")
- @NotNull(message = "库区 Id,对应 wms_rg 表中的Id不能为空")
- private Long rgId;
-
- @Schema(description = "库区 Id,对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25544")
- @NotNull(message = "库区 Id,对应 wms_rg 表中的Id不能为空")
- private Long pnId;
-
- @Schema(description = "库存良品数量")
- private BigDecimal storageOkQty;
-
- @Schema(description = "批次号")
- private String lotNo;
-
- @Schema(description = "备注", example = "你猜")
- private String description;
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.controller.admin.storagemat.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+import java.math.BigDecimal;
+
+@Schema(description = "管理后台 - 入/出库物料新增/修改 Request VO")
+@Data
+public class StorageMatSaveReqVO {
+
+ @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29383")
+ private Long id;
+
+ @Schema(description = "入/出库Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19477")
+ @NotNull(message = "入/出库Id不能为空")
+ private Long stockId;
+
+ @Schema(description = "物料 Id,对应 base_material表中的 Id 列", requiredMode = Schema.RequiredMode.REQUIRED, example = "3400")
+ @NotNull(message = "物料 Id,对应 base_material表中的 Id 列不能为空")
+ private Long matId;
+
+ @Schema(description = "仓库 Id,对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31860")
+ @NotNull(message = "仓库 Id,对应 wms_wh 表中的Id不能为空")
+ private Long whId;
+
+ @Schema(description = "库区 Id,对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13060")
+ @NotNull(message = "库区 Id,对应 wms_rg 表中的Id不能为空")
+ private Long rgId;
+
+ @Schema(description = "库区 Id,对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25544")
+ @NotNull(message = "库区 Id,对应 wms_rg 表中的Id不能为空")
+ private Long pnId;
+
+ @Schema(description = "库存良品数量")
+ private BigDecimal storageOkQty;
+
+ @Schema(description = "批次号")
+ private String lotNo;
+
+ @Schema(description = "子项目编号")
+ private String projectNo;
+
+ @Schema(description = "备注", example = "你猜")
+ private String description;
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagemat/StorageMatDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagemat/StorageMatDO.java
index 051e0773..aff87301 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagemat/StorageMatDO.java
+++ b/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;
/**
* 备注
*/
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagemat/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagemat/index.ts
index 552e5b43..ebe2da7c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagemat/index.ts
+++ b/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
}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index 0fad0e71..e62dba2d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -162,6 +162,12 @@
+
+
+
+
+
+
@@ -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: []
}