更改四车间看板计划完成数sql,饼图sql.

common/src/main/resources/mapper/BoardMapper.xml

@@ -155,7 +155,7 @@
         WHERE  ZSD.SITE = #{site} AND ZSD.DISPATCH_STATUS IN ('COMPLETE','CANCEL')
         AND TO_CHAR(ZSD.PLANNED_COMP_DATE + 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
         AND ZSD.SHOP_ORDER IN (
-        SELECT SHOP_ORDER FROM SHOP_ORDER SO WHERE TO_CHAR(SO.PLANNED_COMP_DATE + 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
+        SELECT SHOP_ORDER FROM Z_SFC_DISPATCH SO WHERE TO_CHAR(SO.PLANNED_COMP_DATE + 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
         AND TO_CHAR(SO.PLANNED_START_DATE+ 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
         )
         <if test="workCenter != null and workCenter != ''">
@@ -176,7 +176,8 @@
             WHERE  ZSD.DISPATCH_STATUS IN ('COMPLETE','CANCEL')
             AND TO_CHAR(ZSD.PLANNED_COMP_DATE + 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
             AND ZSD.SHOP_ORDER IN (
-            SELECT SHOP_ORDER FROM SHOP_ORDER SO WHERE TO_CHAR(SO.PLANNED_COMP_DATE + 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
+            SELECT SHOP_ORDER FROM Z_SFC_DISPATCH SO WHERE TO_CHAR(SO.PLANNED_COMP_DATE + 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
+            AND TO_CHAR(SO.PLANNED_START_DATE+ 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
             )
             <if test="workCenter != null and workCenter != ''">
                 AND ZSD.WORK_CENTER = #{workCenter}
@@ -387,7 +388,8 @@
               </otherwise>
           </choose>
         AND ZSD.SHOP_ORDER IN (
-        SELECT SHOP_ORDER FROM SHOP_ORDER SO WHERE TO_CHAR(SO.PLANNED_COMP_DATE + 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
+        SELECT SHOP_ORDER FROM Z_SFC_DISPATCH SO WHERE TO_CHAR(SO.PLANNED_COMP_DATE + 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
+        AND TO_CHAR(SO.PLANNED_START_DATE+ 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
         )
     </select>
     <!--焊接车间计划数、完成数-->
@@ -423,7 +425,9 @@
             </otherwise>
         </choose>
             AND ZSD.SHOP_ORDER IN (
-            SELECT SHOP_ORDER FROM SHOP_ORDER SO WHERE TO_CHAR(SO.PLANNED_COMP_DATE + 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM') )  ) B
+            SELECT SHOP_ORDER FROM Z_SFC_DISPATCH SO WHERE TO_CHAR(SO.PLANNED_COMP_DATE + 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
+            AND TO_CHAR(SO.PLANNED_START_DATE+ 8/24 , 'YYYY-MM') = TO_CHAR(SYSDATE,'YYYY-MM')
+            )  ) B
     </select>
 
     <!--综合看板-->