From bf79d1f77f48774675b6ff8c82931e01c3a2986e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?=
 <9463626+zhou-junjiezjj@user.noreply.gitee.com>
Date: Fri, 12 Jan 2024 20:39:37 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E7=89=A9=E6=96=99=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/service/dao/MdBaseMaterial.java  |  7 ++++
 .../src/views/wms/basedata/material/index.vue | 39 ++++++++++++-------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java
index f48123a..7517f8e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java
@@ -24,9 +24,16 @@ public class MdBaseMaterial implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "material_id", type = IdType.NONE)
+
     @ApiModelProperty(value = "物料标识")
     private String material_id;
 
+    @ApiModelProperty(value = "订单编号")
+    private String order_number;
+
+    @ApiModelProperty(value = "产品编码")
+    private String product_code;
+
     @ApiModelProperty(value = "成品物料编码")
     private String material_code;
 
diff --git a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
index 7f8c93a..cc78a98 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -64,19 +64,26 @@
           size="mini"
           label-width="125px"
           label-suffix=":">
-          <el-form-item label="原料编码" prop="raw_material_code">
+          
+          <el-form-item label="订单编号" prop="order_number">
+            <el-input v-model="form.order_number" style="width: 240px;" />
+          </el-form-item>
+          <el-form-item label="产品编码" prop="product_code">
+            <el-input v-model="form.product_code" style="width: 240px;" />
+          </el-form-item>
+          <el-form-item label="物料名称" prop="material_code">
             <el-input v-model="form.raw_material_code" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="物料名称 " prop="material_name">
+          <el-form-item label="产品牌号 " prop="material_name">
             <el-input v-model="form.material_name" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="物料规格" prop="material_spec">
+          <el-form-item label="产品部位" prop="material_spec">
             <el-input v-model="form.material_spec" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="物料型号" prop="material_model">
             <el-input v-model="form.material_model" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="A长边">
+          <!-- <el-form-item label="A长边">
             <el-input-number
               v-model.number="form.a_long_side"
               :min="0"
@@ -161,13 +168,13 @@
             <el-tooltip class="item" effect="dark" content="例如：3*6*6" placement="top">
               <el-input v-model="form.pack_method" style="width: 240px;" />
             </el-tooltip>
-          </el-form-item>
-          <el-form-item label="是否特殊" prop="is_needmove">
+          </el-form-item> -->
+          <!-- <el-form-item label="是否特殊" prop="is_needmove">
             <el-radio-group v-model="form.is_special" style="width: 240px">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="备注">
             <el-input v-model="form.remark" type="textarea" style="width: 240px;" />
           </el-form-item>
@@ -180,14 +187,16 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="raw_material_code" label="泥料编码" :min-width="flexWidth('raw_material_code',crud.data,'物料编码')" />
-        <el-table-column prop="half_material_code" label="半成品编码" :min-width="flexWidth('half_material_code',crud.data,'半成品编码')" />
-        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-        <el-table-column prop="material_name" label="物料名称 " :min-width="flexWidth('material_name',crud.data,'物料名称 ')" />
-        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
+        <!-- <el-table-column prop="raw_material_code" label="泥料编码" :min-width="flexWidth('raw_material_code',crud.data,'物料编码')" />
+        <el-table-column prop="half_material_code" label="半成品编码" :min-width="flexWidth('half_material_code',crud.data,'半成品编码')" /> -->
+        <el-table-column prop="order_number" label="订单编号" :min-width="flexWidth('order_number',crud.data,'订单编号')" />
+        <el-table-column prop="product_code" label="产品编码" :min-width="flexWidth('product_code',crud.data,'产品编码')" />
+        <el-table-column prop="material_code" label="物料名称" :min-width="flexWidth('material_code',crud.data,'物料名称')" />
+        <el-table-column prop="material_name" label="产品牌号 " :min-width="flexWidth('material_name',crud.data,'产品牌号 ')" />
+        <el-table-column prop="material_spec" label="产品部位" :min-width="flexWidth('material_spec',crud.data,'产品部位')" />
         <el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'物料分类标识')" />
-        <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
-        <el-table-column prop="cooling_time" label="冷却时间(分钟)" :min-width="flexWidth('cooling_time',crud.data,'静置时间(分钟)')" />
+        <!-- <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
+        <el-table-column prop="cooling_time" label="冷却时间(分钟)" :min-width="flexWidth('cooling_time',crud.data,'静置时间(分钟)')" /> -->
 <!--        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">
@@ -231,7 +240,9 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 
 const defaultForm = {
+  order_number: null,
   material_id: null,
+  product_code: null,
   material_code: null,
   half_material_code: null,
   raw_material_code: null,