后台 看板问题修改

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursDescribeController.java

@@ -277,4 +277,19 @@ public class FbsAbnormalWorkingHoursDescribeController {
 		}
 		return result;
 	}
+
+
+	 @GetMapping(value = "/getMonthExceptionByCategoryTwo")
+	public Result<List<Map<String,Object>>> getMonthExceptionByCategoryTwo(){
+		Result<List<Map<String,Object>>> result=new Result<>();
+		try {
+
+			result.setResult(fbsAbnormalWorkingHoursDescribeService.getMonthExceptionByCategoryTwo());
+			result.success("操作成功");
+		} catch (Exception e) {
+			e.printStackTrace();
+			result.error500("操作失败："+e.getMessage());
+		}
+		return result;
+	}
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/FbsAbnormalWorkingHoursDescribeMapper.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsAbnormalWorkingHours.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe;
@@ -30,4 +31,13 @@ public interface FbsAbnormalWorkingHoursDescribeMapper extends BaseMapper<FbsAbn
   * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe>
   */
   List<FbsAbnormalWorkingHoursDescribe> getListAndMain(@Param("fbsAbnormalWorkingHoursDescribe") FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe);
+
+  /**
+  * @Author chenchuang
+  * @Description //TODO 月制程良率
+  * @Date 2020/12/8 16:22
+  * @Param []
+  * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+  */
+  List<Map<String,Object>>  getMonthExceptionByCategoryTwo();
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/xml/FbsAbnormalWorkingHoursDescribeMapper.xml

@@ -17,6 +17,25 @@
             fawhd.product
     </select>
 
+    <select id="getMonthExceptionByCategoryTwo" resultType="java.util.HashMap">
+        SELECT
+        fawhd.product label,
+        (fawhd.planned_quantity-sum( fawhd.rejects_number )) sum1,
+        fawhd.planned_quantity sum2
+        FROM
+        fbs_abnormal_working_hours_describe fawhd
+        LEFT JOIN fbs_abnormal_working_hours fawh ON fawhd.abnormal_working_hours_id = fawh.id
+        WHERE
+        fawhd.del_flag = '0'
+        AND fawhd.del_flag = '0'
+        AND fawhd.product IS NOT NULL
+        AND fawhd.type='物料'
+        AND fawhd.planned_quantity >0
+        AND date_format( fawh.date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )
+        GROUP BY
+        fawhd.product,fawhd.planned_quantity
+    </select>
+
     <select id="getListAndMain" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe">
         SELECT
             fawhd.*

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/IFbsAbnormalWorkingHoursDescribeService.java

@@ -30,4 +30,6 @@ public interface IFbsAbnormalWorkingHoursDescribeService extends IService<FbsAbn
     * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe>
     */
     List<FbsAbnormalWorkingHoursDescribe> getListAndMain(FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe);
+
+    List<Map<String,Object>>  getMonthExceptionByCategoryTwo();
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/impl/FbsAbnormalWorkingHoursDescribeServiceImpl.java

@@ -40,4 +40,9 @@ public class FbsAbnormalWorkingHoursDescribeServiceImpl extends ServiceImpl<FbsA
     public List<FbsAbnormalWorkingHoursDescribe> getListAndMain(FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe) {
         return fbsAbnormalWorkingHoursDescribeMapper.getListAndMain(fbsAbnormalWorkingHoursDescribe);
     }
+
+    @Override
+    public List<Map<String, Object>> getMonthExceptionByCategoryTwo() {
+        return fbsAbnormalWorkingHoursDescribeMapper.getMonthExceptionByCategoryTwo();
+    }
 }

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

@@ -84,13 +84,13 @@
         SELECT
         fwdl.production_order_number_name,
         fwdl.product_id,
-        CONVERT (sum(COALESCE(fws.qualified_number,0)), DECIMAL ( 15, 2 ) ) qualified_number,
+        CONVERT (sum(COALESCE(fws.qualified_number,0)), DECIMAL ( 15, 1 ) ) qualified_number,
         DATE_FORMAT(fws.final_time,'%Y-%m-%d') final_time,
-        CONVERT ( (fwdl.standard_working_hours_z*latest_completed_quantity) / sum(fws.working_hours), DECIMAL ( 15, 2 ) ) * 100 AS productionEfficiency,
-        CONVERT ( sum(fws.qualified_number) / fwdl.number_of_tasks, DECIMAL ( 15, 2 ) ) * 100 AS achievementRate,
+        CONVERT ( (fwdl.standard_working_hours_z*latest_completed_quantity) / sum(fws.working_hours), DECIMAL ( 15, 1 ) ) * 100 AS productionEfficiency,
+        CONVERT ( sum(fws.qualified_number) / fwdl.number_of_tasks, DECIMAL ( 15, 1 ) ) * 100 AS achievementRate,
         fwdl.number_of_tasks number_of_tasks,
-        CONVERT (sum(fws.working_hours), DECIMAL ( 15, 2 ) ) man_hours_completed,
-        fwdl.standard_working_hours standard_working_hours,
+        CONVERT (sum(fws.working_hours), DECIMAL ( 15, 1 ) ) man_hours_completed,
+        CONVERT (fwdl.standard_working_hours, DECIMAL ( 15, 1 )) standard_working_hours,
         fwdl.standard_working_hours_z
         FROM
         fbs_workshop_dispatch_list fwdl
@@ -98,6 +98,7 @@
         WHERE
         fwdl.del_flag = '0'
         AND fws.del_flag = '0'
+        <!--AND fwdl.latest_completed_quantity <![CDATA[ <> ]]> fwdl.number_of_tasks-->
         and fws.final_state in('2','3')
         <if test="startDate!=null">
             <![CDATA[   and DATE_FORMAT(fws.final_time, '%Y-%m-%d')>=  #{startDate}]]>

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/impl/FbsWorkshopDispatchListServiceImpl.java

@@ -397,7 +397,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
     }
 
     public static String formatDouble5(double d) {
-        return String.format("%.2f", d);
+        return String.format("%.1f", d);
     }
 
     @Override