From 7147971423985ef55020800de76998aa1c69cd99 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 9 Nov 2021 16:45:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=B5=81=E8=BD=AC=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/controller/ReportDataController.java    | 3 +++
 common/src/main/resources/mapper/ReportDataMapper.xml     | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
index 2dc82d30..a88b02db 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
@@ -171,6 +171,9 @@ public class ReportDataController {
     @PostMapping("/doItemMove")
     public R doItemMove(@RequestBody List<String> list) {
         try{
+            if (list == null || list.size() < 1){
+                return R.ok("物料流转成功");
+            }
             String site = CommonMethods.getSite();
             reportDataMapper.doItemMove(site  , list);
             return R.ok("物料流转成功");
diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
index c1c43575..bbc10a4b 100644
--- a/common/src/main/resources/mapper/ReportDataMapper.xml
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -686,7 +686,7 @@
                  LEFT JOIN ITEM_T IT ON IT.ITEM_BO = SO.ITEM_BO
                  LEFT JOIN ITEM I ON I.HANDLE = SO.ITEM_BO
                  INNER JOIN TEMP ON TEMP.HANDLE = ZSD.HANDLE
-        WHERE ZSD.SITE = #{site}
+        WHERE ZSD.SITE = #{site} AND ZSD.DISPATCH_STATUS = 'COMPLETE'
         <if test="other2 != null and other2 != ''">
             AND  ZSD.OTHER_2 = #{other2}
         </if>
@@ -699,6 +699,12 @@
         <if test="workCenter != null and workCenter != ''">
             AND  ZSD.WORK_CENTER = #{workCenter}
         </if>
+        <if test="startFromDate != null and startFromDate != ''" >
+            AND TO_CHAR(ZSD.ACTUAL_COMPLETE_DATE,'YYYY-MM-DD') >=#{startFromDate}
+        </if>
+        <if test="startToDate != null and startToDate != ''" >
+            AND TO_CHAR(ZSD.ACTUAL_COMPLETE_DATE,'YYYY-MM-DD') &lt;= #{startToDate}
+        </if>
     </select>
 
     <update id="doItemMove">