看板

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -509,7 +509,7 @@ public class FbsWorkingStatisticsController {
 				itemMap.put("CINVCODE",workshopDispatchList.getProductId());//成品存货编码
 				itemMap.put("IQUANTITY",1);//数量
 				itemMap.put("MOCODE",workshopDispatchList.getProductionOrderNumberName());//订单号
-				itemMap.put("MOROWMO",i);//行号
+				itemMap.put("MOROWMO",entity.getRowNumber());//行号
 				itemMap.put("CBATCH",batchCode);//批号
 				itemMap.put("cDefine27",allHors.doubleValue());//实际工时
 				Double number=Double.valueOf(entity.getQualifiedNumber());//数量

src/main/java/org/jeecg/modules/appInterface/mapper/xml/FbsWorkingStatisticsMapper.xml

@@ -38,8 +38,16 @@
         fbs_abnormal_working_hours
         WHERE
         del_flag = '0'
-        AND date_format(
-        date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} ) ) AS '其他（5S、会议、培训、研发）',
+        <if test="dateString=='%Y-%m-%d'">
+            AND date_format(
+            date, #{dateString} ) = DATE_FORMAT( date_sub(curdate(),interval 1 day),  #{dateString} )
+        </if>
+        <if test="dateString=='%Y-%m'">
+            AND date_format(
+            date, #{dateString} ) = DATE_FORMAT( now(),  #{dateString} )
+        </if>
+
+        ) AS '其他（5S、会议、培训、研发）',
         (
         SELECT
         IFNULL(sum( quality ),0) + IFNULL(sum( design ),0) + IFNULL(sum( rework ),0) + IFNULL(sum( materiel ),0) + IFNULL(sum( energy ),0) + IFNULL(sum( other ),0)+IFNULL(sum(equipment),0) + IFNULL(sum( plan ),0)
@@ -47,8 +55,15 @@
         fbs_abnormal_working_hours
         WHERE
         del_flag = '0'
-        AND date_format(
-        date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} ) ) as '异常',
+        <if test="dateString=='%Y-%m-%d'">
+            AND date_format(
+            date, #{dateString} ) = DATE_FORMAT( date_sub(curdate(),interval 1 day),  #{dateString} )
+        </if>
+        <if test="dateString=='%Y-%m'">
+            AND date_format(
+            date, #{dateString} ) = DATE_FORMAT( now(),  #{dateString} )
+        </if>
+        ) as '异常',
         (
         SELECT
         IFNULL(sum( mixed_ingredients ),0) + IFNULL(sum( warehousing ),0) + IFNULL(sum( pack ),0) + IFNULL(sum( warehouse_others ),0)
@@ -56,14 +71,28 @@
         fbs_abnormal_working_hours
         WHERE
         del_flag = '0'
-        AND date_format(
-        date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} ) ) as '仓库'
+        <if test="dateString=='%Y-%m-%d'">
+            AND date_format(
+            date, #{dateString} ) = DATE_FORMAT( date_sub(curdate(),interval 1 day),  #{dateString} )
+        </if>
+        <if test="dateString=='%Y-%m'">
+            AND date_format(
+            date, #{dateString} ) = DATE_FORMAT( now(),  #{dateString} )
+        </if>
+        ) as '仓库'
         FROM
         fbs_workshop_dispatch_list fwdl
         WHERE
         fwdl.del_flag = '0'
-        and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ >= ]]> DATE_FORMAT(fwdl.planned_start_time,#{dateString})
-        and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ <= ]]> DATE_FORMAT(fwdl.planned_end_time,#{dateString})
+        <if test="dateString=='%Y-%m-%d'">
+            and DATE_FORMAT(date_sub(curdate(),interval 1 day),#{dateString}) <![CDATA[ >= ]]> DATE_FORMAT(fwdl.planned_start_time,#{dateString})
+            and DATE_FORMAT(date_sub(curdate(),interval 1 day),#{dateString}) <![CDATA[ <= ]]> DATE_FORMAT(fwdl.planned_end_time,#{dateString})
+        </if>
+        <if test="dateString=='%Y-%m'">
+            and DATE_FORMAT(now(),#{dateString}) <![CDATA[ >= ]]> DATE_FORMAT(fwdl.planned_start_time,#{dateString})
+            and DATE_FORMAT(now(),#{dateString}) <![CDATA[ <= ]]> DATE_FORMAT(fwdl.planned_end_time,#{dateString})
+        </if>
+
     </select>
 
     <select id="getWorkingHours" resultType="org.jeecg.modules.appInterface.entity.FbsWorkingStatistics">

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

@@ -107,14 +107,14 @@
 
     <select id="getAbnormalHoursMonthReport" resultType="java.util.HashMap">
         SELECT
-            sum( quality ) AS '质量',
-            sum( design ) AS '设计',
-            sum( rework ) AS '返工',
-            sum( materiel ) AS '物料',
-            sum( energy ) AS '能源',
-            sum( other ) AS '其他',
-            sum( equipment ) AS '设备',
-            sum( plan ) AS '计划'
+            IFNULL(sum( quality ),0) AS '质量',
+            IFNULL(sum( design ),0) AS '设计',
+            IFNULL(sum( rework ),0) AS '返工',
+            IFNULL(sum( materiel ),0) AS '物料',
+            IFNULL(sum( energy ),0) AS '能源',
+            IFNULL(sum( other ),0) AS '其他',
+            IFNULL(sum( equipment ),0) AS '设备',
+            IFNULL(sum( plan ),0) AS '计划'
         FROM
             fbs_abnormal_working_hours
         WHERE
@@ -221,8 +221,8 @@
         WHERE
         fwdl.del_flag = '0'
         AND fwdl.man_hours_completed >0
-        AND fwdl.state='3',
-        AND fwdl.latest_completed_quantity=number_of_tasks
+        AND fwdl.state='3'
+        AND fwdl.latest_completed_quantity=fwdl.number_of_tasks
         and DATE_FORMAT(now( ),'%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(fwdl.planned_start_time,'%Y-%m-%d')
         and DATE_FORMAT(now( ),'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(fwdl.planned_end_time,'%Y-%m-%d')
         GROUP BY
@@ -264,8 +264,8 @@
             AND fws.final_state = '3'
         WHERE
             fwd.del_flag = '0'
-            and DATE_FORMAT(now( ),'%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(fwd.planned_start_time,'%Y-%m-%d')
-            and DATE_FORMAT(now( ),'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(fwd.planned_end_time,'%Y-%m-%d')
+            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 id="getAttendanceOfTheDay" resultType="java.util.HashMap">
@@ -285,7 +285,7 @@
           fbs_abnormal_working_hours
         WHERE
           del_flag = '0'
-          AND DATE_FORMAT( date, '%Y-%m-%d' ) = DATE_FORMAT( now( ), '%Y-%m-%d' )
+          AND DATE_FORMAT( date, '%Y-%m-%d' ) = DATE_FORMAT( date_sub(curdate(),interval 1 day), '%Y-%m-%d' )
     </select>
 
     <select id="getProductList" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
@@ -362,6 +362,7 @@
         WHERE
         del_flag = '0'
         AND latest_completed_quantity  <![CDATA[ <> ]]> number_of_tasks
+        ORDER BY name
        <!-- AND DATE_FORMAT( now( ), '%Y-%m-%d' ) <![CDATA[ >= ]]> DATE_FORMAT( planned_start_time, '%Y-%m-%d' )
         AND DATE_FORMAT( now( ), '%Y-%m-%d' ) <![CDATA[ <= ]]> DATE_FORMAT( planned_end_time, '%Y-%m-%d' )-->
     </select>