Merge remote-tracking branch 'origin/dev' into dev

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

@@ -40,6 +40,9 @@ public class StorageMatSaveReqVO {
     @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/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: []
   }

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

@@ -706,7 +706,7 @@ onMounted(async () => {
       item.cid = matCount
       item.matId = matVos.list.find((record) => record.id === item.matId)?.id
       //item.matCode = matVos.list.find( (record) => record.id === item.matId)?.id
-      item.matName = matVos.list.find((record) => record.id === item.matId)?.name
+      item.matCode = matVos.list.find((record) => record.id === item.matId)?.code
       item.matSpec = matVos.list.find((record) => record.id === item.matId)?.spec
       item.matType = matVos.list.find((record) => record.id === item.matId)?.materialType
       item.matUnit = matVos.list.find((record) => record.id === item.matId)?.unit