调整12

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -338,7 +338,7 @@
             fwd.del_flag = '0'
             and DATE_FORMAT(date_sub(curdate(),interval 1 day),'%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(fwd.planned_start_time,'%Y-%m-%d')
             and DATE_FORMAT(date_sub(curdate(),interval 1 day),'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(fwd.planned_end_time,'%Y-%m-%d')-->
-        SELECT
+        <!--SELECT
         sum( qualified_number ) '已完成',
         sum( number_of_tasks ) - sum( qualified_number ) '未完成'
         FROM
@@ -357,7 +357,15 @@
         GROUP BY
         fwd.production_order_number_name,
         fwd.product
-        ) f
+        ) f-->
+
+        SELECT
+        sum( latest_completed_quantity ) '已完成',
+        sum( number_of_tasks ) - sum( latest_completed_quantity ) '未完成'
+        FROM
+        fbs_workshop_dispatch_list
+        where
+        del_flag = '0'
     </select>
 
     <select id="getAttendanceOfTheDay" resultType="java.util.HashMap">