From 104e1e812febcee9383d3b61e03219ff30495f47 Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Wed, 17 Jul 2024 15:22:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/scm/WorkOrderMapper.xml  |  3 +-
 .../jnpf-web/src/views/scm/workorder/form.vue | 39 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
index 6c85d560..51c544ae 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
@@ -72,9 +72,10 @@
             b.id,
             b.id AS productId,
             b.NAME AS NAME,
-            b.spec,
+            a.spec,
             b.bar_code AS barCode,
             a.is_input AS isInput,
+            a.code,
             CASE
                 b.inventory_type
                 WHEN 1 THEN
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue
index 006dd07d..fe8f20a3 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue
@@ -342,20 +342,23 @@
                   align="center" prop="cargoId" width="180px">
 
                   <template slot="header">
-  <span class="required-sign" v-if="judgeRequired('workorderproductList-cargoId')">*</span>货区名称
-</template>
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderproductList-cargoId')">*</span>货区名称
+                  </template>
 
                   <template slot-scope="scope">
-  <JnpfPopupSelect v-model="scope.row.cargoId"
-    @change="changeData('workorderproduct-cargoId', scope.$index)" :rowIndex="scope.$index"
-    :formData="dataForm" :templateJson="interfaceRes.workorderproductcargoId" placeholder="请选择"
-    hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-    relationField='cargo_name' :field="'cargoId' + scope.$index"
-    :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cargoId')"
-    interfaceId="530700536261903749" :pageSize="20"
-    :columnOptions="workorderproductcargoIdcolumnOptions" clearable :style='{ "width": "100%" }'>
-  </JnpfPopupSelect>
-</template>
+                    <JnpfPopupSelect v-model="scope.row.cargoId"
+                      @change="changeData('workorderproduct-cargoId', scope.$index)"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.workorderproductcargoId" placeholder="请选择" hasPage
+                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='cargo_name' :field="'cargoId' + scope.$index"
+                      :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cargoId')"
+                      interfaceId="530700536261903749" :pageSize="20"
+                      :columnOptions="workorderproductcargoIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
+                    </JnpfPopupSelect>
+                  </template>
                 </el-table-column>
 
                 <el-table-column label="成品批次号" v-if="judgeShow('workorderproduct-batchNumber')"
@@ -446,7 +449,7 @@
                   <el-table-column label="规格" prop="spec" width="200px" align="center">
 
                     <template slot="header">
-                      <span class="required-sign">*</span>规格
+                      <span class="required-sign"></span>规格
                     </template>
 
                     <template slot-scope="scope">
@@ -456,10 +459,10 @@
                     </template>
                   </el-table-column>
 
-                  <el-table-column label="编码" prop="spec" width="200px" align="center">
+                  <el-table-column label="编码" prop="code" width="200px" align="center">
 
 <template slot="header">
-  <span class="required-sign">*</span>编码
+  <span class="required-sign"></span>编码
 </template>
 
 <template slot-scope="scope">
@@ -655,7 +658,7 @@
                 <el-table-column label="规格" prop="spec" align="center">
 
                   <template slot="header">
-  <span class="required-sign">*</span>规格
+  <span class="required-sign"></span>规格
 </template>
 
                   <template slot-scope="scope">
@@ -666,10 +669,10 @@
 
                 </el-table-column>
 
-                <el-table-column label="编码" prop="spec" width="200px" align="center">
+                <el-table-column label="编码" prop="code" width="200px" align="center">
 
 <template slot="header">
-  <span class="required-sign">*</span>编码
+  <span class="required-sign"></span>编码
 </template>
 
 <template slot-scope="scope">