From 80205987e9b26b38c8d5e761e076b7c3c28bbb9b 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: Wed, 29 Nov 2023 13:31:49 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=BC=BA=E5=88=B6=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=BD=93=E5=A4=A9=E4=B9=9F=E5=8F=AF=E4=BB=A5=EF=BC=8C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=B3=A5=E6=96=99=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PdmBdWorkorderServiceImpl.java        | 10 +++++-----
 .../group/service/dao/SchBaseVehiclematerialgroup.java |  3 ++-
 .../dao/mapper/SchBaseVehiclematerialgroupMapper.xml   |  2 ++
 .../service/dto/SchBaseVehiclematerialgroupDto.java    |  2 ++
 .../service/dto/SchBaseVehiclematerialgroupQuery.java  |  1 +
 .../org/nl/wms/sch/point/service/dao/SchBasePoint.java |  3 ++-
 .../point/service/dao/mapper/SchBasePointMapper.xml    |  3 ++-
 lms/nladmin-ui/src/views/wms/sch/group/index.vue       |  3 +++
 lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue  |  4 +++-
 9 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
index f95f5d3..d709624 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
@@ -309,11 +309,11 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
         if (bdWorkorder == null) {
             throw new BadRequestException("未找到工单号[" + workorderCode + "]的记录!");
         }
-        if ((bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.ISSUED.getCode())
-                || bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.UNPRODUCED.getCode()))
-                && (ObjectUtil.isNotEmpty(entity.getProduce_date()) && entity.getProduce_date().equals(today))) {
-            throw new BadRequestException("工单号[" + workorderCode + "]未生产不能完成工!");
-        }
+//        if ((bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.ISSUED.getCode())
+//                || bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.UNPRODUCED.getCode()))
+//                && (ObjectUtil.isNotEmpty(entity.getProduce_date()) && entity.getProduce_date().equals(today))) {
+//            throw new BadRequestException("工单号[" + workorderCode + "]未生产不能完成工!");
+//        }
         if (bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.COMPLETE.getCode())) {
             throw new BadRequestException("工单号[" + workorderCode + "]已完工，不能重复完工!");
         }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
index 2439b79..85647b8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
@@ -162,5 +162,6 @@ public class SchBaseVehiclematerialgroup implements Serializable {
     private String region_name;
     @TableField(exist = false)
     private String group_bind_material_status_name;
-
+    @TableField(exist = false)
+    private String raw_material_code;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml
index 99d05b7..8a254ed 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml
@@ -7,6 +7,7 @@
             , ma.material_name
             , ma.material_code
             , ma.material_spec
+            , ma.raw_material_code
             , po.region_name
         FROM sch_base_vehiclematerialgroup vg
         LEFT JOIN md_base_material ma ON vg.material_id = ma.material_id
@@ -34,6 +35,7 @@
         , ma.material_name
         , ma.material_code
         , ma.material_spec
+        , ma.raw_material_code
         , po.region_name
         , sd.label AS group_bind_material_status_name
         FROM sch_base_vehiclematerialgroup vg
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java
index 0dc44a2..69088db 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java
@@ -128,4 +128,6 @@ public class SchBaseVehiclematerialgroupDto implements Serializable {
     private String out_kiln_time;
     /** 入窑时间 */
     private String into_kiln_time;
+    /** 泥料编码 */
+    private String raw_material_code;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java
index 576d285..bb43045 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java
@@ -16,4 +16,5 @@ public class SchBaseVehiclematerialgroupQuery implements Serializable {
     private String workshop_code;
     private String region_code;
     private String group_bind_material_status;
+    private String raw_material_code;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
index b38d35d..6fbe1c0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
@@ -156,5 +156,6 @@ public class SchBasePoint implements Serializable {
     private String material_spec;
     @TableField(exist = false)
     private String material_model;
-
+    @TableField(exist = false)
+    private String raw_material_code;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
index c5044d6..bbc41b6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
@@ -35,7 +35,8 @@
             IF(LENGTH(mm.material_code)>0,mm.material_code,'-') AS material_code,
             IF(LENGTH(mm.material_name)>0,mm.material_name,'-') AS material_name,
             IF(LENGTH(mm.material_spec)>0,mm.material_spec,'-') AS material_spec,
-            IF(LENGTH(mm.material_model)>0,mm.material_model,'-') AS material_model
+            IF(LENGTH(mm.material_model)>0,mm.material_model,'-') AS material_model,
+            IF(LENGTH(mm.raw_material_code)>0,mm.raw_material_code,'-') AS raw_material_code
         FROM
             `sch_base_point` p
         LEFT JOIN sch_base_vehiclematerialgroup vg ON vg.vehicle_code = p.vehicle_code
diff --git a/lms/nladmin-ui/src/views/wms/sch/group/index.vue b/lms/nladmin-ui/src/views/wms/sch/group/index.vue
index a0cce1c..313fbd5 100644
--- a/lms/nladmin-ui/src/views/wms/sch/group/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/group/index.vue
@@ -163,6 +163,9 @@
           <el-form-item label="物料规格">
             <el-input v-model="form.material_spec" disabled style="width: 240px;" />
           </el-form-item>
+          <el-form-item label=" 泥料编码">
+            <el-input v-model="form.raw_material_code" disabled style="width: 240px;" />
+          </el-form-item>
           <el-form-item label="组盘次数">
             <el-input v-model="form.group_number" style="width: 240px;" />
           </el-form-item>
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
index 2a26a17..4e5fec5 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
@@ -56,10 +56,12 @@
         <el-form-item label="物料名称">
           <el-input v-model="groups.material_name" style="width: 200px;"/>
         </el-form-item>
-
         <el-form-item label="物料规格">
           <el-input v-model="groups.material_spec" style="width: 200px;"/>
         </el-form-item>
+        <el-form-item label="泥料编码">
+          <el-input v-model="groups.raw_material_code" style="width: 200px;"/>
+        </el-form-item>
         <el-form-item label="物料批次">
           <el-input v-model="groups.pcsn" style="width: 200px;"/>
         </el-form-item>