入库查询报表

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java

@@ -153,6 +153,22 @@ public class ReportController {
             return R.failed(e.getMessage());
         }
     }
+
+    /**
+     *
+     * 入库查询报表
+     * @param paramMap
+     * @return
+     */
+    @GetMapping("/importStoreQueryReports")
+    public R importStoreQueryReports(@RequestParam(required = false) Map paramMap){
+        try{
+            List<Map<String, Object>> result = reportService.importStoreQueryReports(paramMap);
+            return R.ok(result);
+        }catch (Exception e){
+            return R.failed(e.getMessage());
+        }
+    }
     /**
      * 原材料追溯报表
      * @param paramMap

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java

@@ -169,4 +169,11 @@ public interface ReportMapper {
     List<Map<String, String>> workshopDeliveryRateList(String workCenter);
 
     List<Map<String, String>> NCTop5RateList(String workCenter);
+
+    /**
+     * 入库查询报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> importStoreQueryReports(Map paramMap);
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java

@@ -181,4 +181,10 @@ public interface ReportService {
      */
     Map<String, Object> manufacturingPlanning(String workCenter);
 
+    /**
+     * 入库查询报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> importStoreQueryReports(Map paramMap);
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java

@@ -966,6 +966,19 @@ public class ReportServiceImpl implements ReportService {
         return result;
     }
 
+    /**
+     * 入库查询报表
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> importStoreQueryReports(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site", site);
+        paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        return reportMapper.importStoreQueryReports(paramMap);
+    }
+
     /**
      * 事业部质量看板数据接口
      * @param user

anomaly/src/main/resources/mapper/ReportMapper.xml

@@ -1172,7 +1172,7 @@
         zsd.SHOP_ORDER shopOrder,--订单编号
         zsd.SFC SFC,--SFC
         it.DESCRIPTION itemDescription,--物料描述
-        MAX(zsd.DISPATCH_QTY) shopOrderQTY,--订单数量
+        MIN(zsd.DISPATCH_QTY) shopOrderQTY,--订单数量
         MIN(CASE
         WHEN zsd.DISPATCH_STATUS = 'COMPLETE' OR zsd.DISPATCH_STATUS = 'CANCEL' THEN
         zsd.DISPATCH_QTY
@@ -1567,44 +1567,44 @@
             TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."unWorkHours7" / CF.VALUE) * 100, '99990.99') || '%' "weekRate7",
             TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."unWorkHours8" / CF.VALUE) * 100, '99990.99') || '%' "weekRate8"
                    FROM (WITH WEEK AS (
-            SELECT TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW')         WEEK0,
+            SELECT TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW')         WEEK0,
-            TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 1 WEEK1,
+            TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 1 WEEK1,
-            TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 2 WEEK2,
+            TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 2 WEEK2,
-            TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 3 WEEK3,
+            TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 3 WEEK3,
-            TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 4 WEEK4,
+            TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 4 WEEK4,
-            TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 5 WEEK5,
+            TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 5 WEEK5,
-            TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 6 WEEK6,
+            TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 6 WEEK6,
-            TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 7 WEEK7,
+            TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 7 WEEK7,
-            TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 8 WEEK8
+            TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 8 WEEK8
             FROM DUAL)
             SELECT O.OPERATION "operation",
             OT.DESCRIPTION "operationDescription",
             RT.DESCRIPTION,
             SUM(CASE
-            WHEN TO_DATE(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW')) > ZSD.PLANNED_COMP_DATE THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "tardinessWork",
+            WHEN TO_DATE(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW')) > (ZSD.PLANNED_COMP_DATE + 8/24) THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "tardinessWork",
             SUM(CASE
-            WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK0) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(WEEK.WEEK1)
+            WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(WEEK.WEEK0) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(WEEK.WEEK1)
             THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "unWorkHours1",
             SUM(CASE
-            WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK1) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(WEEK.WEEK2)
+            WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(WEEK.WEEK1) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(WEEK.WEEK2)
             THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "unWorkHours2",
             SUM(CASE
-            WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK2) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(WEEK.WEEK3)
+            WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(WEEK.WEEK2) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(WEEK.WEEK3)
             THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "unWorkHours3",
             SUM(CASE
-            WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK3) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(WEEK.WEEK4)
+            WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(WEEK.WEEK3) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(WEEK.WEEK4)
             THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "unWorkHours4",
             SUM(CASE
-            WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK4) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(WEEK.WEEK5)
+            WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(WEEK.WEEK4) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(WEEK.WEEK5)
             THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "unWorkHours5",
             SUM(CASE
-            WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK5) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(WEEK.WEEK6)
+            WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(WEEK.WEEK5) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(WEEK.WEEK6)
             THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "unWorkHours6",
             SUM(CASE
-            WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK6) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(WEEK.WEEK7)
+            WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(WEEK.WEEK6) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(WEEK.WEEK7)
             THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "unWorkHours7",
             SUM(CASE
-            WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK7) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(WEEK.WEEK8)
+            WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(WEEK.WEEK7) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(WEEK.WEEK8)
             THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "unWorkHours8",
             WCT.DESCRIPTION WORK_CENTER_DESCRIPTION,
             RT.DESCRIPTION RESOURCE_TYPE_DESCRIPTION
@@ -1655,59 +1655,59 @@
         TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours12" / CF.VALUE) * 100, '99990.99') || '%' "monthRate12"
         FROM (
         WITH MONTH AS (
-        SELECT ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 0 - #{month})   month0,
+        SELECT ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 0 - #{month})   month0,
-        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 1- #{month})  month1,
+        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 1- #{month})  month1,
-        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 2- #{month})  month2,
+        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 2- #{month})  month2,
-        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 3- #{month})  month3,
+        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 3- #{month})  month3,
-        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 4- #{month})  month4,
+        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 4- #{month})  month4,
-        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 5- #{month})  month5,
+        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 5- #{month})  month5,
-        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 6- #{month})  month6,
+        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 6- #{month})  month6,
-        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 7- #{month})  month7,
+        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 7- #{month})  month7,
-        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 8- #{month})  month8,
+        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 8- #{month})  month8,
-        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 9- #{month})  month9,
+        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 9- #{month})  month9,
-        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 10- #{month}) month10,
+        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 10- #{month}) month10,
-        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 11- #{month}) month11,
+        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 11- #{month}) month11,
-        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate - 8/24, 'yyyy-MM'), 'yyyy-MM'),  'yyyy'), 12- #{month}) month12
+        ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'),  'yyyy'), 12- #{month}) month12
         FROM DUAL)
         SELECT O.OPERATION "operation",
         OT.DESCRIPTION "operationDescription",
         SUM(CASE
-        WHEN TO_DATE(trunc(sysdate - 8/24,'month')) > ZSD.PLANNED_COMP_DATE THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "tardinessWork",
+        WHEN TO_DATE(trunc(sysdate,'month')) > (ZSD.PLANNED_COMP_DATE + 8/24) THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "tardinessWork",
         SUM(CASE
-        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(MONTH.month0) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(MONTH.month1)
+        WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(MONTH.month0) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(MONTH.month1)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "workHours1",
         SUM(CASE
-        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(MONTH.month1) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(MONTH.month2)
+        WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(MONTH.month1) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(MONTH.month2)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "workHours2",
         SUM(CASE
-        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(MONTH.month2) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(MONTH.month3)
+        WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(MONTH.month2) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(MONTH.month3)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "workHours3",
         SUM(CASE
-        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(MONTH.month3) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(MONTH.month4)
+        WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(MONTH.month3) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(MONTH.month4)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "workHours4",
         SUM(CASE
-        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(MONTH.month4) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(MONTH.month5)
+        WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(MONTH.month4) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(MONTH.month5)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "workHours5",
         SUM(CASE
-        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(MONTH.month5) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(MONTH.month6)
+        WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(MONTH.month5) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(MONTH.month6)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "workHours6",
         SUM(CASE
-        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(MONTH.month6) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(MONTH.month7)
+        WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(MONTH.month6) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(MONTH.month7)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "workHours7",
         SUM(CASE
-        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(MONTH.month7) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(MONTH.month8)
+        WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(MONTH.month7) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(MONTH.month8)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "workHours8",
         SUM(CASE
-        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(MONTH.month8) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(MONTH.month9)
+        WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(MONTH.month8) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(MONTH.month9)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "workHours9",
         SUM(CASE
-        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(MONTH.month9) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(MONTH.month10)
+        WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(MONTH.month9) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(MONTH.month10)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "workHours10",
         SUM(CASE
-        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(MONTH.month10) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(MONTH.month11)
+        WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(MONTH.month10) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(MONTH.month11)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "workHours11",
         SUM(CASE
-        WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(MONTH.month11) AND ZSD.PLANNED_COMP_DATE <= TO_DATE(MONTH.month12)
+        WHEN (ZSD.PLANNED_COMP_DATE + 8/24) >= TO_DATE(MONTH.month11) AND (ZSD.PLANNED_COMP_DATE + 8/24) < TO_DATE(MONTH.month12)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS ELSE 0 END) "workHours12",
         WCT.DESCRIPTION WORK_CENTER_DESCRIPTION,
         RT.DESCRIPTION RESOURCE_TYPE_DESCRIPTION
@@ -2103,5 +2103,37 @@
     GROUP BY WIP.DESCRIPTION
     ORDER BY "QTY" DESC
     </select>
+    <select id="importStoreQueryReports" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        SELECT SRI.SFC        SFC,
+               S.SHOP_ORDER   SHOP_ORDER,
+               cf2.VALUE      WORK_ORDER,
+               DECODE(INSTR(cf2.VALUE,'/',1,2),0,NULL,SUBSTR(cf2.VALUE,INSTR(cf2.VALUE,'/',1,2) + 1))      PARE_NAME,
+               it.DESCRIPTION ITEM_DESCRIPTION,
+               SRI.IN_QTY     PART_QTY,
+               SRI.IN_TIME    IN_STORE_DATE
+        FROM STORE_RECORD_IN SRI
+                 LEFT JOIN (SELECT ZSD.SHOP_ORDER, ZSD.SFC, ZSD.SITE
+                            FROM Z_SFC_DISPATCH ZSD
+                            GROUP BY ZSD.SHOP_ORDER, ZSD.SFC, ZSD.SITE) S on SRI.SFC = S.SFC
+                 LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = S.SHOP_ORDER AND so.SITE = s.SITE
+                 LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER'
+                 LEFT JOIN ITEM i On i.HANDLE = so.ITEM_BO AND I.SITE = SO.SITE
+                 LEFT JOIN ITEM_T it ON it.ITEM_BO = i.HANDLE
+       <where>
+            1=1
+        <if test="sfc != null and sfc != ''">
+            AND SRI.SFC like '%${sfc}%'
+        </if>
+        <if test="shopOrder != null and shopOrder != ''">
+            AND S.SHOP_ORDER like '%${shopOrder}%'
+        </if>
+        <if test="workOrder != null and workOrder != ''">
+               AND cf2.VALUE like '%${workOrder}%'
+        </if>
+           <if test="itemDescription != null and itemDescription != ''">
+               AND it.DESCRIPTION like '%${itemDescription}%'
+           </if>
+       </where>
+    </select>
 
 </mapper>