产线看板

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -449,7 +449,7 @@ public class FbsWorkshopDispatchListController {
 
 	 /**
 	 * @Author chenchuang
-	 * @Description //TODO
+	 * @Description //TODO  制造看板生产效率
 	 * @Date 2020/10/22 14:09
 	 * @Param []
 	 * @return org.jeecg.common.api.vo.Result<java.lang.String>
@@ -471,4 +471,25 @@ public class FbsWorkshopDispatchListController {
 		 }
 		 return result;
 	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 产线看板：当日达成率
+	 * @Date 2020/10/22 15:38
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
+	 */
+	 @GetMapping(value = "/getAchievementRate")
+	 public Result<Map<String,Object>> getAchievementRate(){
+		 Result<Map<String,Object>> result=new Result<>();
+		 try {
+			 Map<String,Object> map=fbsWorkshopDispatchListService.getAchievementRate();
+			 result.setResult(map);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
 }

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

@@ -85,4 +85,13 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
     * @return java.lang.String
     */
     String getProductionEfficiency();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 当日达成率
+    * @Date 2020/10/22 15:27
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+    Map<String,Object> getAchievementRate();
 }

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

@@ -131,6 +131,7 @@
             fwdl.product
     </select>
 
+    <!--   需要加入当日时间判断   -->
     <select id="getProductionEfficiency" resultType="java.lang.String">
         SELECT CONVERT
             ( count( fws.pk_workshop_dispatch_list ) / count( fwdl.id ), DECIMAL ( 15, 2 ) ) * 100
@@ -139,6 +140,22 @@
             LEFT JOIN ( SELECT pk_workshop_dispatch_list FROM fbs_working_statistics WHERE del_flag = '0' GROUP BY pk_workshop_dispatch_list ) fws ON fwdl.id = fws.pk_workshop_dispatch_list
         WHERE
             fwdl.del_flag = '0'
+
+    </select>
+
+    <select id="getAchievementRate" resultType="java.util.HashMap">
+        SELECT
+            sum( fws.qualified_number ) AS '已完成',
+            sum( fwd.number_of_tasks ) - sum( fws.qualified_number ) AS '未完成'
+        FROM
+            fbs_workshop_dispatch_list fwd
+            LEFT JOIN fbs_working_statistics fws ON fwd.id = fws.pk_workshop_dispatch_list
+            AND fws.del_flag = '0'
+            AND fws.final_state = '3'
+        WHERE
+            fwd.del_flag = '0'
+
+          <!--   需要加入单日时间判断 派工单根据计划时间 现场单根据完工时间  -->
     </select>
     
 </mapper>

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/IFbsWorkshopDispatchListService.java

@@ -82,4 +82,13 @@ public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDis
     * @return java.lang.String
     */
     String getProductionEfficiency();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 当日达成率
+    * @Date 2020/10/22 15:28
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+    Map<String,Object> getAchievementRate();
 }

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

@@ -354,5 +354,10 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         return fbsWorkshopDispatchListMapper.getProductionEfficiency();
     }
 
+    @Override
+    public Map<String, Object> getAchievementRate() {
+        return fbsWorkshopDispatchListMapper.getAchievementRate();
+    }
+
 
 }