From 045b995f5094be8d8a1969e845907a7436e7b684 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 23 Aug 2021 11:58:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E6=8E=92=E4=BA=A7?=
 =?UTF-8?q?=20=20=E6=97=A5=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../production/entity/SOTaskOrderHeaderData.java       | 10 ++++++++++
 .../mapper/production/SOTaskOrderHeaderMapper.xml      |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/letian/modules/production/entity/SOTaskOrderHeaderData.java b/src/main/java/com/letian/modules/production/entity/SOTaskOrderHeaderData.java
index 155eb43..3bf92b7 100644
--- a/src/main/java/com/letian/modules/production/entity/SOTaskOrderHeaderData.java
+++ b/src/main/java/com/letian/modules/production/entity/SOTaskOrderHeaderData.java
@@ -154,6 +154,8 @@ public class SOTaskOrderHeaderData {
     private String shiftNo;
     private String closeFlag;
 
+    private String shiftdesc;
+
     private double qtyCirculation;
 
     public String getOrderNo() {
@@ -421,5 +423,13 @@ public class SOTaskOrderHeaderData {
     public void setQtyCirculation(double qtyCirculation) {
         this.qtyCirculation = qtyCirculation;
     }
+
+    public String getShiftdesc() {
+        return shiftdesc;
+    }
+
+    public void setShiftdesc(String shiftdesc) {
+        this.shiftdesc = shiftdesc;
+    }
 }
 
diff --git a/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml b/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
index ca50461..dd90911 100644
--- a/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
+++ b/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
@@ -26,7 +26,7 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId FROM SOTaskOrderHeader
 </insert>
 
 <select id="getWorkPlanData" resultType="com.letian.modules.production.entity.SOTaskOrderHeaderData" parameterType="com.letian.modules.production.entity.DailyPlanInData">
-    SELECT SOT.OrderNo,SOT.OrderDate,SOT.OrderQty,SOT.UserName,SOT.EnterDate,SOT.OrderRef1,SOT.ShiftId , cds.shiftno as ShiftNo , SOT.QtyCirculation,SOT.Qtyfinished,SOT.CloseFlag FROM SOTaskOrderHeader SOT
+    SELECT SOT.OrderNo,SOT.OrderDate,SOT.OrderQty,SOT.UserName,SOT.EnterDate,SOT.OrderRef1,SOT.ShiftId , cds.shiftno as ShiftNo ,cds.shiftdesc, SOT.QtyCirculation,SOT.Qtyfinished,SOT.CloseFlag FROM SOTaskOrderHeader SOT
     LEFT join calendar_datetype_shift cds on cds.site=SOT.Site and SOT.shiftId=cds.id
     <where>
         <if test="site != null and site != ''">
@@ -76,7 +76,7 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId FROM SOTaskOrderHeader
 
 <select id="getDailyPlanData" parameterType="com.letian.modules.production.entity.DailyPlanInData" resultType="com.letian.modules.production.entity.SOTaskOrderHeaderData">
     SELECT SOT.OrderNo,SOT.Site,SOT.Status,SOT.OrderDate,SOT.OrderQty,SOT.OrderRefType,SOT.OrderRef1, CASE WHEN SOT.CloseFlag ='N' THEN '正常' ELSE '已流转' END as CloseFlag,
-SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT.ShiftId,P.PartDescription,cds.shiftno as shiftNo, QtyCirculation
+SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT.ShiftId,P.PartDescription,cds.shiftno as shiftNo,cds.shiftdesc ,QtyCirculation
     FROM  SOTaskOrderHeader SOT
     LEFT join  Part P on P.Site= SOT.Site and P.PartNo=SOT.PartNo
      LEFT join calendar_datetype_shift cds on cds.site=SOT.Site and SOT.shiftId=cds.id