From 8d16e06a80c89fc939ff1e75af415a967b2155af Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Tue, 5 Apr 2022 15:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E6=8A=A5=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gaotao/modules/schedule/data/ScheduleData.java   | 9 +++++++++
 src/main/resources/mapper/schedule/ScheduleMapper.xml    | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

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 f0e4745..30e64ee 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
@@ -73,6 +73,7 @@ public class ScheduleData extends BaseShopOrderData {
     private String repairSOFlag;//
     private String manualFlag;//
     private boolean checkedFlag;//是否选中
+    private String orderType;//订单类型
 
     public ScheduleData() {
     }
@@ -420,4 +421,12 @@ public class ScheduleData extends BaseShopOrderData {
     public void setCheckedFlag(boolean checkedFlag) {
         this.checkedFlag = checkedFlag;
     }
+
+    public String getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(String orderType) {
+        this.orderType = orderType;
+    }
 }
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 119b79a..23ea370 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -154,7 +154,7 @@
 
     <!--查询-待生产工单-->
     <select id="getProduceScheduleData" parameterType="SearchScheduleData" resultType="ScheduleData">
-        Select TOP 100 T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, D.OperationDesc itemDesc, D.PartNo partNo, P.PartDescription partDesc, P.Spec spec,
+        Select TOP 200 T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, D.OperationDesc itemDesc, D.PartNo partNo, P.PartDescription partDesc, P.Spec spec,
         T.SeqNo seqNo, T.QtyRequired qtyRequired, T.QtyReported qtyReported, T.QtyApprove qtyApprove, ROUND(T.TimeRequired, 3) timeRequired,
         T.TimeReported timeReported, T.PlanStartTime planStartTime, T.PlanFinishTime planFinishTime, T.BarcodeID barcodeId, T.Remark remark,
         T.Crewsize crewSize, T.ClosedFlag closedFlag, T.QtyScrapt qtyScrapt, T.OutWorkFlag outWorkFlag, T.S_ScheduledDate scheduledDate,
@@ -163,7 +163,7 @@
         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,
         P.ConfigurationTemplateID customerName, P.Remark custPartNo, t.S_WorkCenterNo workCenterNo, dbo.Get_WorkCenterDesc(T.Site, T.S_WorkCenterNo) workCenterDesc,
-        T.QtyRequired_Original qtyRequiredOriginal,
+        T.QtyRequired_Original qtyRequiredOriginal, SO.orderType,
         T.ClosedBy closedBy, T.ClosedDate closedDate, SO.CostRollUpFlag costRollUpFlag, SO.RepairSOFlag repairSOFlag, SO.ManualFlag manualFlag
         from SOScheduledRouting as T
         Left Join SOScheduledList as E on E.Site=T.Site and E.LinkedSeqNo=T.SeqNo,