From fcf3f36f7589facce7af1c0412efd5292869c847 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 23 Aug 2021 18:33:51 +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

---
 .../modules/production/service/impl/DailyPlanServiceImpl.java | 4 ++--
 src/main/resources/mapper/production/DailyPlanMapper.xml      | 2 +-
 .../resources/mapper/production/SOTaskOrderHeaderMapper.xml   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/letian/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/letian/modules/production/service/impl/DailyPlanServiceImpl.java
index efd78a0..569c216 100644
--- a/src/main/java/com/letian/modules/production/service/impl/DailyPlanServiceImpl.java
+++ b/src/main/java/com/letian/modules/production/service/impl/DailyPlanServiceImpl.java
@@ -208,8 +208,8 @@ public class DailyPlanServiceImpl implements DailyPlanService {
            // inData.setUpdateDate(new Date());
            // inData.setUpdateBy(user);
             CalendarDatetypeShiftData checkData = calendarDatetypeShiftMapper.findByShiftno(inData.getShiftno());
-            if (checkData != null) {
-                throw new RuntimeException("该班次编码已存在！");
+            if (checkData == null) {
+                throw new RuntimeException("该班次编码不存在！");
             }
            int index = calendarDatetypeShiftMapper.editShift(inData);
            if(index==0){
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index 0691a83..771720a 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -7,7 +7,7 @@
 
 
 <select id="getShopOrderData" resultType="com.letian.modules.production.entity.ShopOrderData" parameterType="com.letian.modules.production.entity.DailyPlanInData">
-     select  a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,
+     select top 10000  a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,
     P.PartDescription,P.Spec,ISNULL(so.scheduling_size,0) as scheduling_size
     FROM ShopOrder a
     LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
diff --git a/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml b/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
index dd90911..39fd5d5 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 ,cds.shiftdesc, SOT.QtyCirculation,SOT.Qtyfinished,SOT.CloseFlag FROM SOTaskOrderHeader SOT
+    SELECT top 10000 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 != ''">
@@ -75,7 +75,7 @@ PartNo,UserName,EnterDate,Qtyfinished,ShiftId FROM SOTaskOrderHeader
 </delete>
 
 <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,
+    SELECT top 10000 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,cds.shiftdesc ,QtyCirculation
     FROM  SOTaskOrderHeader SOT
     LEFT join  Part P on P.Site= SOT.Site and P.PartNo=SOT.PartNo