物料流转报表调整

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("物料流转成功");

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">