From 87fefebf23fe9e1cb6b22a2f8056b52123efbab9 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 12 Jun 2024 16:59:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jianteng/modules/Schedule/entity/SfdcCancel.java | 2 ++
 src/main/resources/mapper/schedule/ScheduleMapper.xml    | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/jianteng/modules/Schedule/entity/SfdcCancel.java b/src/main/java/com/jianteng/modules/Schedule/entity/SfdcCancel.java
index 4c51119..1549612 100644
--- a/src/main/java/com/jianteng/modules/Schedule/entity/SfdcCancel.java
+++ b/src/main/java/com/jianteng/modules/Schedule/entity/SfdcCancel.java
@@ -47,4 +47,6 @@ public class SfdcCancel {
     private Double approveWeight;
     private Double moldQty;
     private BigDecimal wasteWeight;
+    private String lineName;
+    private String planTime;
 }
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 315dcbe..13a487f 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -243,7 +243,9 @@
      <select id="getSfdcList" resultType="com.jianteng.modules.Schedule.entity.SfdcCancel">
             select a.site,a.OrderNo,a.ItemNo ,a.SeqNo,a.WorkCenterNo,a.ReportDate,a.OperatorID,a.ReportQty,a.ApproveQty,a.ReportedManfTime,a.StatisticDate,
         a.AssJobSeqNo,a.Scheduled_ResourceId  ResourceID,b.S_ShiftNo ShiftNo,b.partNo,dbo.Get_ItemDesc(a.site,a.OrderNo,a.ItemNo) operation_desc,c.OperatorName,b.S_ShiftNo ShiftDesc,e.ResourceDesc,Reverseflag
-        ,dbo.Get_Part_Spec(a.site,b.partNo) partSpec,dbo.Get_PartDesc(a.site,b.partNo) PartDesc
+        ,dbo.Get_Part_Spec(a.site,b.partNo) partSpec,dbo.Get_PartDesc(a.site,b.partNo) PartDesc,dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(a.site,a.WorkCenterNo)) lineName
+        ,Round(b.TimeRequired*a.ApproveQty/b.QtyRequired,3) as planTime
+
         from sfdc a LEFT JOIN SOScheduledRouting b on a.Site=b.Site and a.AssJobSeqNo=b.SeqNo
         left join Operator c on a.site=c.site and a.OperatorID=c.OperatorID
         left join WorkCenterResource e on a.Site=e.Site and a.Scheduled_ResourceId =e.ResourceID and a.WorkCenterNo=e.WorkCenterNo
@@ -252,6 +254,9 @@
             and a.AssJobSeqNo is not null
              <if test="orderNo != null and orderNo != ''">
                 and a.OrderNo like #{orderNo}
+            </if>
+             <if test="lineName != null and lineName != ''">
+                and dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(a.site,a.WorkCenterNo))  like #{lineName}
             </if>
              <if test="workCenterNo != null and workCenterNo != ''">
                 and a.WorkCenterNo like #{workCenterNo}
@@ -454,7 +459,7 @@ Freezeflag,QtyTmp,ManufactureDate,ExpiredDate,QtytoIssue,DemandPartnerType,Deman
     Select InspectionType_DB,DefectCode,InspectionType,DefectDesc,Active,Site,GroupInfo from InspectionDefectCode
     Where Site=#{site}
     and InspectionType_DB='PQ'
-    and (GroupInfo='*' or GroupInfo=#{workCenterNo})
+    and (GroupInfo='*' or GroupInfo like '%' + #{workCenterNo}+'%')
     </select>
 
     <select id="saveSFDCDefectHist" >