From 40ecab6485edc522790602fda5c96b6f5f32049d Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 30 Aug 2023 16:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97(=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/plan/domain/ProOrderWorkorder.java    | 16 ++++++++++++++--
 .../op/plan/mapper/ProOrderWorkorderMapper.java  |  7 +++++++
 .../impl/ProOrderWorkorderServiceImpl.java       |  2 ++
 .../mapper/plan/ProOrderWorkorderMapper.xml      |  5 +++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java
index 431bc7fd..e063429a 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java
@@ -23,7 +23,7 @@ public class ProOrderWorkorder extends TreeEntity {
     private String workorderId;
 
     /** 工单编码 */
-    @Excel(name = "子工单编码")
+    @Excel(name = "子工单编号")
     private String workorderCode;
 
     /** 工单名称 */
@@ -40,7 +40,7 @@ public class ProOrderWorkorder extends TreeEntity {
     private String productId;
 
     /** 产品编号 */
-    @Excel(name = "产品编号")
+    @Excel(name = "产品编码")
     private String productCode;
 
     /** 产品名称 */
@@ -66,6 +66,17 @@ public class ProOrderWorkorder extends TreeEntity {
     @Excel(name = "工艺编码")
     private String routeCode;
 
+    // 工艺名称
+    private String routeName;
+
+    public String getRouteName() {
+        return routeName;
+    }
+
+    public void setRouteName(String routeName) {
+        this.routeName = routeName;
+    }
+
     /** 产线编码 */
     @Excel(name = "产线")
     private String prodLineCode;
@@ -478,6 +489,7 @@ public class ProOrderWorkorder extends TreeEntity {
                 .append("materialName",getMaterialName())
                 .append("planTime",getPlanTime())
                 .append("bucketName",getBucketName())
+                .append("routeName",getRouteName())
                 .toString();
     }
 }
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
index ea61a50c..c05b709d 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
@@ -134,5 +134,12 @@ public interface ProOrderWorkorderMapper {
     List<ProOrderWorkorder> selectProOrderWorkerderByWorkerIds(String[] ids);
 
     public void updateWorkOrderCodeSap(ProOrderWorkorder oworkSap);
+
+    /**
+     * 通过工艺code查询工艺名称
+     * @param routeCode
+     * @return
+     */
+    String selectRouteNameByRouteCode(String routeCode);
 }
 
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index 05c19dee..c16c7987 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
@@ -78,6 +78,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         for (ProOrderWorkorder workorder : workorderList) {
             // 通过设备code查询出机型名称
             workorder.setProdLineCode(proOrderMapper.selectProdLineName(workorder.getProdLineCode()));
+            // 通过工艺编码code查询出机型名称
+            workorder.setRouteName(proOrderWorkorderMapper.selectRouteNameByRouteCode(workorder.getRouteCode()));
         }
         return workorderList;
     }
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index 03bfb2c7..2f52d1a4 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -314,6 +314,11 @@
             #{item.cumc}
         </foreach>
     </select>
+
+    <select id="selectRouteNameByRouteCode" resultType="java.lang.String">
+        select route_name from pro_route where route_code = #{routeCode}
+    </select>
+
     <insert id="createPrepareDetails">
         insert into mes_prepare_detail
         (