From 01634dd3a47d35df462100ca72549b835f991f4e 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: Sat, 13 Jan 2024 09:42:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=E7=89=A9=E6=96=99=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MdBaseMaterialServiceImpl.java       |  2 +-
 .../wms/ext/mes/service/dto/ResultForMes.java |  1 -
 .../dao/mapper/PdmBdWorkorderMapper.xml       |  4 +++-
 .../service/dao/vo/AcsWorkOrderVo.java        | 20 +++++++++++++++----
 .../src/views/wms/basedata/material/index.vue | 12 +++++------
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
index e8f0bf3..392fd8d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
@@ -70,7 +70,7 @@ public class MdBaseMaterialServiceImpl extends ServiceImpl<MdBaseMaterialMapper,
         String now = DateUtil.now();
 
         //特殊处理，半成品编码=成品编码=物料名称
-        entity.setMaterial_code(entity.getMaterial_name());
+//        entity.setMaterial_code(entity.getMaterial_name());
         entity.setHalf_material_code(entity.getMaterial_name());
 
         entity.setMaterial_id(IdUtil.getSnowflake(1, 1).nextIdStr());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/ResultForMes.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/ResultForMes.java
index 8205e6e..67a16b8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/ResultForMes.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/ResultForMes.java
@@ -1,7 +1,6 @@
 package org.nl.wms.ext.mes.service.dto;
 
 import cn.hutool.http.HttpStatus;
-import com.sun.org.apache.regexp.internal.RE;
 import lombok.Data;
 
 /**
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 19c6b61..9b1318a 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
@@ -41,9 +41,11 @@
             w.point_code AS device_code,
             w.plan_qty,
             IF(w.region_code = 'HN',m.raw_material_code,m.half_material_code) AS material_code,
-            m.material_spec AS product_code,
+            m.product_code AS product_code,
             m.material_spec AS brick_code,
             m.material_model AS formula,
+            m.order_number AS order_number,
+            m.material_code AS material_code,
             IF(LENGTH(m.a_long_side) > 0,m.a_long_side,0) AS a,
             IF(LENGTH(m.b_short_side) > 0,m.b_short_side,0) AS b,
             IF(LENGTH(m.h_height) > 0,m.h_height,0) AS h,
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java
index 30a1b18..4481279 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java
@@ -1,5 +1,6 @@
 package org.nl.wms.pdm.workorder.service.dao.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 /**
@@ -21,10 +22,10 @@ public class AcsWorkOrderVo {
      * 半成品物料编码 - 工单物料编码
      */
     private String material_code;
-    /**
-     * 产品代号 - 规格
-     */
-    private String product_code;
+//    /**
+//     * 产品代号 - 规格
+//     */
+//    private String product_code;
     /**
      * 配方 - 型号
      */
@@ -87,4 +88,15 @@ public class AcsWorkOrderVo {
      */
     private String detection_error;
 
+
+    private String order_number;
+
+
+    private String product_code;
+
+
+    private String material_model;
+
+
+
 }
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 cc78a98..72126e9 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -71,12 +71,12 @@
           <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_code">
+            <el-input v-model="form.material_code" style="width: 240px;" />
+          </el-form-item>
           <el-form-item label="产品部位" prop="material_spec">
             <el-input v-model="form.material_spec" style="width: 240px;" />
           </el-form-item>
@@ -191,8 +191,8 @@
         <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_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+        <el-table-column prop="material_code" label="产品牌号 " :min-width="flexWidth('material_code',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,'静置时间(分钟)')" />