From 8e67c8b43c14e31b16da5b7027354bccaa6730a3 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 31 May 2022 15:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/base/BaseMapper.xml |  2 +-
 .../mapper/base/ProductProcessRouteMapper.xml |  9 ++++-----
 .../MaterialSplitMapper.xml                   |  6 +++---
 .../shopOrder/ProductionReportMapper.xml      |  6 +++---
 .../shopOrder/ReportFormSearchMapper.xml      | 18 +++++++++---------
 .../mapper/shopOrder/ShopOrderMapper.xml      | 19 ++++++++++---------
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index 6336761..78cbe69 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -433,7 +433,7 @@
                 AND T.CreateDate >= #{query.date1}
             </if>
              <if test=" query.date2 != null ">
-                AND  #{query.date2} >=T.CreateDate
+                AND dateadd( DAY, 1,  #{query.date2} ) >T.CreateDate
             </if>
         </where>
 
diff --git a/src/main/resources/mapper/base/ProductProcessRouteMapper.xml b/src/main/resources/mapper/base/ProductProcessRouteMapper.xml
index dff5ca5..0c598e0 100644
--- a/src/main/resources/mapper/base/ProductProcessRouteMapper.xml
+++ b/src/main/resources/mapper/base/ProductProcessRouteMapper.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gaotao.modules.base.dao.ProductProcessRouteMapper">
 
@@ -53,13 +52,13 @@
                 AND T.PhaseInDate >= #{date1}
             </if>
              <if test=" date2 != null ">
-                AND  #{date2} >=T.PhaseInDate
+                AND  dateadd( DAY, 1,  #{date2} ) > T.PhaseInDate
             </if>
              <if test=" date3 != null ">
                 AND T.PhaseOutDate >= #{date3}
             </if>
              <if test=" date4 != null ">
-               AND  #{date4} >=T.PhaseOutDate
+               AND dateadd( DAY, 1,  #{date4} ) > T.PhaseOutDate
             </if>
         </where>
     </select>
@@ -121,13 +120,13 @@
                 AND T.PhaseInDate >= #{date1}
             </if>
              <if test=" date2 != null ">
-                AND  #{date2} >=T.PhaseInDate
+                AND  dateadd( DAY, 1,  #{date2} ) > RH.PhaseInDate
             </if>
              <if test=" date3 != null ">
                 AND T.PhaseOutDate >= #{date3}
             </if>
              <if test=" date4 != null ">
-               AND  #{date4} >=T.PhaseOutDate
+               AND  dateadd( DAY, 1,  #{date4} ) > RH.PhaseOutDate
             </if>
        </where>
     </select>
diff --git a/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml b/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml
index c55ab06..ec0107c 100644
--- a/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml
+++ b/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml
@@ -55,13 +55,13 @@
                 AND T.CreatedDate >= #{date1}
             </if>
              <if test=" date2 != null ">
-                AND  #{date2} >= T.CreatedDate
+                AND  dateadd( DAY, 1,  #{date2} )  > T.CreatedDate
             </if>
              <if test=" date3 != null ">
                 AND T.RollDate >= #{date3}
             </if>
              <if test=" date4 != null ">
-               AND  #{date4} >= T.RollDate
+               AND  dateadd( DAY, 1,  #{date4} )  > T.RollDate
             </if>
          </where>
     </select>
@@ -80,7 +80,7 @@
                 AND T.OrderDate >= #{date1}
             </if>
              <if test=" date2 != null ">
-                AND  #{date2} >= T.OrderDate
+                AND dateadd( DAY, 1,  #{date2}  )> T.OrderDate
             </if>
              <if test=" slittedFlag != null and slittedFlag != ''">
                 AND T.SlittedFlag like #{slittedFlag}
diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
index ce14d91..32b8e21 100644
--- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
@@ -142,7 +142,7 @@
                 AND T.ReportDate >= #{date1}
             </if>
              <if test=" date2 != null ">
-                AND  #{date2} >= T.ReportDate
+                AND dateadd( DAY, 1,  #{date2} ) > T.ReportDate
             </if>
         </where>
     </select>
@@ -178,7 +178,7 @@
                 AND T.CreatedDate >= #{date1}
             </if>
              <if test=" date2 != null ">
-                AND  #{date2} >= T.CreatedDate
+                AND dateadd( DAY, 1,  #{date2} )  >= T.CreatedDate
             </if>
         </where>
     </select>
@@ -209,7 +209,7 @@
                 AND T.NeedDate >= #{date1}
             </if>
              <if test=" date2 != null ">
-                AND  #{date2} >= T.NeedDate
+                AND  dateadd( DAY, 1,  #{date2} ) > T.NeedDate
             </if>
         </where>
              Order by
diff --git a/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml b/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml
index 785705c..0fd52f4 100644
--- a/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml
@@ -35,7 +35,7 @@
             AND ReportDate >= #{date1}
         </if>
          <if test=" date2 != null ">
-            AND  #{date2} >= ReportDate
+            AND  dateadd( DAY, 1,  #{date2} ) > ReportDate
         </if>
       </where>
     </select>
@@ -68,7 +68,7 @@
             AND closedate >= #{date1}
         </if>
          <if test=" date2 != null ">
-            AND  #{date2} >= closedate
+            AND  dateadd( DAY, 1,  #{date2} ) > closedate
         </if>
       </where>
 
@@ -105,7 +105,7 @@
             AND closedate >= #{date1}
         </if>
          <if test=" date2 != null ">
-            AND  #{date2} >= closedate
+            AND  dateadd( DAY, 1,  #{date2} ) > closedate
         </if>
       </where>
 
@@ -461,7 +461,7 @@ FROM
             AND T.closedate >= #{date1}
         </if>
          <if test=" date2 != null ">
-            AND  #{date2} >= T.closedate
+            AND   dateadd( DAY, 1,  #{date2} ) > T.closedate
         </if>
       </where>
 
@@ -517,7 +517,7 @@ GROUP BY
             AND T.closedate >= #{date1}
         </if>
          <if test=" date2 != null ">
-            AND  #{date2} >= T.closedate
+            AND  dateadd( DAY, 1,  #{date2} ) > T.closedate
         </if>
       </where>
 
@@ -545,7 +545,7 @@ GROUP BY
             AND t.ScheduleDate >= #{date1}
         </if>
          <if test=" date2 != null ">
-            AND  #{date2} >= t.ScheduleDate
+            AND  dateadd( DAY, 1,  #{date2} ) > t.ScheduleDate
         </if>
       </where>
 
@@ -576,7 +576,7 @@ GROUP BY
             AND t.ScheduleDate >= #{date1}
         </if>
          <if test=" date2 != null ">
-            AND  #{date2} >= t.ScheduleDate
+            AND  dateadd( DAY, 1,  #{date2} ) >  t.ScheduleDate
         </if>
       </where>
          Group by
@@ -643,7 +643,7 @@ GROUP BY
                 AND t.EnterDate >= #{date1}
             </if>
              <if test=" date2 != null ">
-                AND  #{date2} >= t.EnterDate
+                AND  dateadd( DAY, 1,  #{date2} ) >  t.EnterDate
             </if>
           </where>
           Order By t.EnterDate Desc
@@ -672,7 +672,7 @@ GROUP BY
                 AND T.CreatedDate >= #{date1}
             </if>
              <if test=" date2 != null ">
-                AND  #{date2} >= T.CreatedDate
+                AND  dateadd( DAY, 1,  #{date2} ) >  T.CreatedDate
             </if>
           </where>
     </select>
diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index 673e0f7..6b1903e 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -65,7 +65,7 @@
             AND EnterDate >= #{date1}
         </if>
          <if test=" date2 != null ">
-            AND  #{date2} >= EnterDate
+            AND  dateadd( DAY, 1,  #{date2} ) > EnterDate
         </if>
       </where>
     </select>
@@ -167,19 +167,19 @@
                 AND D.EnterDate >= #{date1}
             </if>
              <if test=" date2 != null ">
-                AND  #{date2} >= D.EnterDate
+                AND  dateadd( DAY, 1,  #{date2} ) > D.EnterDate
             </if>
               <if test=" date3 != null ">
                 AND T.PlanStartTime >= #{date3}
             </if>
              <if test=" date4 != null ">
-                AND  #{date4} >= T.PlanStartTime
+                AND  dateadd( DAY, 1,  #{date4} ) > T.PlanStartTime
             </if>
               <if test=" date5 != null ">
                 AND T.PlanFinishTime>= #{date5}
             </if>
              <if test=" date6 != null ">
-                AND  #{date6} >= T.PlanFinishTime
+                AND  dateadd( DAY, 1,  #{date6} ) > T.PlanFinishTime
             </if>
             ${sql}
           </where>
@@ -238,13 +238,13 @@
                 AND T.EnterDate >= #{date1}
             </if>
              <if test=" date2 != null ">
-                AND  #{date2} >= T.EnterDate
+                AND  dateadd( DAY, 1,  #{date2} ) > T.EnterDate
             </if>
               <if test=" date3 != null ">
                 AND T.PlanStartTime >= #{date3}
             </if>
              <if test=" date4 != null ">
-                AND  #{date4} >= T.PlanStartTime
+                AND dateadd( DAY, 1,  #{date4} ) > T.PlanStartTime
             </if>
 
           </where>
@@ -284,13 +284,13 @@
                 AND T.NeedDate >= #{date1}
             </if>
              <if test=" date2 != null ">
-                AND  #{date2} >= T.NeedDate
+                AND  dateadd( DAY, 1,  #{date2} )  > T.NeedDate
             </if>
               <if test=" date3 != null ">
                 AND T.PlanStartDate >= #{date3}
             </if>
              <if test=" date4 != null ">
-                AND  #{date4} >= T.PlanStartDate
+                AND  dateadd( DAY, 1,  #{date4} )  > T.PlanStartDate
             </if>
 
           </where>
@@ -312,6 +312,7 @@
        ,R.ActionNotes,W.WorkCenterType,dbo.Get_SORoutingAvailResource(R.Site,R.OrderNo,R.WorkCenterNo,R.ItemNo) as AvailResource
         from SORouting as R,WorkCenter as W Where R.Site=W.Site and R.WorkCenterNo=W.WorkCenterNo and R.Site=#{site}
         and R.OrderNo=#{orderNo}
+        order by R.ItemNo
     </select>
 
     <select id="getToolInShopOrder" resultType="com.gaotao.modules.shopOrder.entity.ToolInShopOrder">
@@ -323,7 +324,7 @@
         Where T.Site=P.Site and T.ToolID=P.ToolID
         and T.Site=#{site}
         and T.OrderNo=#{orderNo}
-        Order by T.ToolID
+        Order by ItemNo,T.ToolID
     </select>
 
         <select id="getProductMixInShopOrder" resultType="com.gaotao.modules.shopOrder.entity.ProductMixInShopOrder">