From 084636b0412c23e660bebbe297ac5fb07cd23c49 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Thu, 26 May 2022 08:55:21 +0800
Subject: [PATCH] =?UTF-8?q?2022-05-26=20=E6=96=B0=E5=A2=9E=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5=20=E5=92=8C=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/schedule/data/ScheduleData.java    | 18 ++++++++++++++++++
 .../mapper/schedule/ScheduleMapper.xml         |  1 +
 2 files changed, 19 insertions(+)

diff --git a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
index cdc02ea..c88d907 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
@@ -78,6 +78,8 @@ public class ScheduleData extends BaseShopOrderData {
     private String laterShipFlag;//晚于发货时间
     private String earlierItemFlag;//早于上工序
     private String finishPreItemFlag;//早于上工序的标记
+    private String preResourceInfo;//前道机台信息
+    private Float preQtyFinished;//前道工序完成的
 
     public ScheduleData() {
     }
@@ -465,4 +467,20 @@ public class ScheduleData extends BaseShopOrderData {
     public void setFinishPreItemFlag(String finishPreItemFlag) {
         this.finishPreItemFlag = finishPreItemFlag;
     }
+
+    public String getPreResourceInfo() {
+        return preResourceInfo;
+    }
+
+    public void setPreResourceInfo(String preResourceInfo) {
+        this.preResourceInfo = preResourceInfo;
+    }
+
+    public Float getPreQtyFinished() {
+        return preQtyFinished;
+    }
+
+    public void setPreQtyFinished(Float preQtyFinished) {
+        this.preQtyFinished = preQtyFinished;
+    }
 }
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 28d44dd..4a55d04 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -178,6 +178,7 @@
         E.S_ScheduledSeqNo scheduledSeqNo, T.S_ShiftNo shiftNo, D.MachSetupTime machSetupTime, D.MachRunFactor machRunFactor,
         D.FactorUnit factorUnit, D.Efficiency efficiency,D.NextItemNo nextItemNo, dbo.Get_SOOpsDescription(T.Site,T.OrderNo,D.NextItemNo) nextItemDesc,
         D.PreItemNo preItemNo,dbo.Get_SOOpsDescription(T.Site,T.OrderNo,D.PreItemNo) preItemDesc, SO.NeedDate needDate, T.ParkFlag parkFlag,
+        dbo.Get_SOOpsPreResourceInfo(T.Site, T.OrderNo, T.ItemNo) preResourceInfo, dbo.Get_SOOpsPreQtyFinished(T.Site, T.OrderNo, T.ItemNo) preQtyFinished,
         P.ConfigurationTemplateID customerName, P.Remark custPartNo, t.S_WorkCenterNo workCenterNo, dbo.Get_WorkCenterDesc(T.Site, T.S_WorkCenterNo) workCenterDesc,
         T.QtyRequired_Original qtyRequiredOriginal, SO.orderType,
         T.ClosedBy closedBy, T.ClosedDate closedDate, SO.CostRollUpFlag costRollUpFlag, SO.RepairSOFlag repairSOFlag, SO.ManualFlag manualFlag