From 2110d24a99834fee20b8259b2428915f77a61076 Mon Sep 17 00:00:00 2001
From: Niky <1393756821@qq.com>
Date: Fri, 12 Jan 2024 21:49:09 +0800
Subject: [PATCH] =?UTF-8?q?div:=E5=8E=8B=E5=88=B6=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workorder/service/dao/PdmBdWorkorder.java | 10 +++
 .../dao/mapper/PdmBdWorkorderMapper.xml       |  4 +-
 .../wms/pdm/workerorder/pressedOrder.vue      | 65 ++++++++++++-------
 .../views/wms/sch/group/MaterialDialog.vue    | 14 ++--
 4 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java
index 33411fe..d3a1f38 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java
@@ -174,4 +174,14 @@ public class PdmBdWorkorder implements Serializable {
     @TableField(exist = false)
     private String pack_method;
 
+    @TableField(exist = false)
+    private String order_number;
+
+    @TableField(exist = false)
+    private String product_code;
+
+
+    @TableField(exist = false)
+    private String material_model;
+
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
index e9b09cf..19c6b61 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
@@ -6,7 +6,9 @@
         ,ma.material_name
         ,ma.material_code
         ,ma.material_spec
-        ,ma.half_material_code
+        ,ma.order_number
+        ,ma.product_code
+        ,ma.material_model
         FROM pdm_bd_workorder wo
         LEFT JOIN md_base_material ma ON ma.material_id = wo.material_id
         <where>
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/pressedOrder.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/pressedOrder.vue
index 165304d..52fd411 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/pressedOrder.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/pressedOrder.vue
@@ -164,18 +164,27 @@
           <el-form-item label="物料名称" prop="material_name">
             <el-input v-model="form.material_name" style="width: 240px;" @focus="getMaterial(1)"/>
           </el-form-item>
-          <el-form-item label="物料编码">
+          <el-form-item label="订单编号">
+            <el-input v-model="form.order_number" style="width: 240px;" disabled />
+          </el-form-item>
+          <el-form-item label="产品编码">
+            <el-input v-model="form.product_code" style="width: 240px;" disabled />
+          </el-form-item>
+          <el-form-item label="产品牌号">
             <el-input v-model="form.material_code" style="width: 240px;" disabled/>
           </el-form-item>
-          <el-form-item label="物料规格">
+          <el-form-item label="产品部位">
             <el-input v-model="form.material_spec" style="width: 240px;" disabled/>
           </el-form-item>
-          <el-form-item label="半成品编码" prop="material_name">
-            <el-input v-model="form.half_material_code" style="width: 240px;" disabled/>
-          </el-form-item>
-          <el-form-item label="原料编码">
-            <el-input v-model="form.raw_material_code" style="width: 240px;" disabled/>
+          <el-form-item label="物料型号">
+            <el-input v-model="form.material_model" style="width: 240px;" disabled/>
           </el-form-item>
+<!--          <el-form-item label="半成品编码" prop="material_name">-->
+<!--            <el-input v-model="form.half_material_code" style="width: 240px;" disabled/>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="原料编码">-->
+<!--            <el-input v-model="form.raw_material_code" style="width: 240px;" disabled/>-->
+<!--          </el-form-item>-->
           <el-form-item label="新料比例" v-if="form.region_code === 'YZ'">
             <el-input-number
               v-model.number="form.material_ratio"
@@ -356,31 +365,34 @@
         />
         <el-table-column prop="point_code" label="设备编码" :min-width="flexWidth('point_code',crud.data,'设备编码')" />
         <el-table-column prop="point_name" label="设备名称" :min-width="flexWidth('point_name',crud.data,'设备名称')" />
-        <el-table-column
-          prop="material_code"
-          label="成品编码"
-          :min-width="flexWidth('material_name',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_name',crud.data,'物料名称')"-->
+<!--        />-->
+<!--        <el-table-column-->
+<!--          prop="half_material_code"-->
+<!--          label="半成品编码"-->
+<!--          :min-width="flexWidth('half_material_code',crud.data,'半成品编码')"-->
+<!--        />-->
         <el-table-column
           prop="raw_material_code"
-          label="泥料编码"
-          :min-width="flexWidth('raw_material_code',crud.data,'物料标识')"
+          label="物料名称"
+          :min-width="flexWidth('raw_material_code',crud.data,'物料名称')"
         />
         <el-table-column
           prop="material_name"
-          label="物料名称"
-          :min-width="flexWidth('material_name',crud.data,'物料标识')"
+          label="产品牌号"
+          :min-width="flexWidth('material_name',crud.data,'产品牌号')"
         />
         <el-table-column
           prop="material_spec"
-          label="物料规格"
-          :min-width="flexWidth('material_spec',crud.data,'物料标识')"
+          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="vehicle_type"
           label="载具类型"
@@ -641,8 +653,11 @@ export default {
         this.form.material_id = row.material_id
         this.form.material_spec = row.material_spec
         this.form.material_code = row.material_code
-        this.form.half_material_code = row.half_material_code
-        this.form.raw_material_code = row.raw_material_code
+        // this.form.half_material_code = row.half_material_code
+        // this.form.raw_material_code = row.raw_material_code
+        this.form.order_number = row.order_number
+        this.form.product_code = row.product_code
+        this.form.material_model = row.material_model
       } else {
         this.form.raw_material_name = row.material_name
         this.form.raw_material_id = row.material_id
diff --git a/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue b/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
index 58ae604..cea6a03 100644
--- a/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
@@ -23,7 +23,7 @@
           @keyup.enter.native="crud.toQuery"
         />
       </el-form-item>
-      <el-form-item label="物料规格">
+      <el-form-item label="产品部位">
         <el-input
           v-model="query.material_spec"
           clearable
@@ -67,11 +67,13 @@
           <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
         </template>
       </el-table-column>
-      <el-table-column prop="material_code" label="物料编码" width="160" />
-      <el-table-column prop="half_material_code" label="半成品编码" width="160" />
-      <el-table-column prop="raw_material_code" label="泥料编码" width="160" />
-      <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="物料规格" width="140" />
+      <el-table-column prop="order_number" label="订单编号" width="160"/>
+      <el-table-column prop="product_code" label="产品编码" width="160" />
+      <el-table-column prop="material_code" label="物料名称" width="160" />
+<!--      <el-table-column prop="half_material_code" label="半成品编码" width="160" />-->
+<!--      <el-table-column prop="raw_material_code" label="泥料编码" width="160" />-->
+      <el-table-column prop="material_name" label="产品牌号" width="180" show-overflow-tooltip />
+      <el-table-column prop="material_spec" label="产品部位" width="140" />
       <el-table-column prop="material_model" label="物料型号" width="140" />
       <el-table-column prop="pack_method" label="包装方式" width="140" />
       <el-table-column v-if="queryInfo === '库存顺序'" prop="total_material_qty" label="物料总数/块" width="140" />