From 49f5c15d3d6a4d819ace09d5e4f9598937e1c91b Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 30 Aug 2023 20:07:17 +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=E4=BF=AE=E6=94=B9BUG=E8=A7=A3=E5=86=B3=E5=88=9D?=
 =?UTF-8?q?=E7=89=88)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/plan/domain/ProOrderWorkorder.java | 14 +++++++++++++-
 .../service/impl/ProOrderWorkorderServiceImpl.java |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

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 e063429af..ee920fb02 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
@@ -78,9 +78,20 @@ public class ProOrderWorkorder extends TreeEntity {
     }
 
     /** 产线编码 */
-    @Excel(name = "产线")
+    @Excel(name = "线体")
     private String prodLineCode;
 
+    // TODO 暂时存放线体编码
+    private String prodLineName;
+
+    public String getProdLineName() {
+        return prodLineName;
+    }
+
+    public void setProdLineName(String prodLineName) {
+        this.prodLineName = prodLineName;
+    }
+
     /** 工单生产日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "工单生产日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -490,6 +501,7 @@ public class ProOrderWorkorder extends TreeEntity {
                 .append("planTime",getPlanTime())
                 .append("bucketName",getBucketName())
                 .append("routeName",getRouteName())
+                .append("prodLineName",getProdLineName())
                 .toString();
     }
 }
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 c16c79879..dba9b84a8 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
@@ -76,6 +76,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
     public List<ProOrderWorkorder> selectProOrderWorkorderList(ProOrderWorkorder proOrderWorkorder) {
         List<ProOrderWorkorder> workorderList = proOrderWorkorderMapper.selectProOrderWorkorderList(proOrderWorkorder);
         for (ProOrderWorkorder workorder : workorderList) {
+            // TODO 暂存线体code
+            workorder.setProdLineName(workorder.getProdLineCode());
             // 通过设备code查询出机型名称
             workorder.setProdLineCode(proOrderMapper.selectProdLineName(workorder.getProdLineCode()));
             // 通过工艺编码code查询出机型名称
@@ -597,6 +599,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
     private void formatProOrderWorkorder(ProOrderWorkorder proOrderWorkorder) {
         // 通过班次id查询班次名称
         String shiftDesc = proOrderMapper.selectShiftNameById(proOrderWorkorder.getShiftId());
+        // TODO 暂时存放线体code
+        proOrderWorkorder.setProdLineName(proOrderWorkorder.getProdLineCode());
         // 通过设备code查询出机型名称
         String prodLineName = proOrderMapper.selectProdLineName(proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(proOrderWorkorder.getWorkorderId()).getProdLineCode());
         // 通过工单id查询批次号