产线看板 品质

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

@@ -393,11 +393,24 @@ public class FbsAbnormalWorkingHoursController {
          return result;
      }
 
+     /**
+     * @Author chenchuang
+     * @Description //TODO 制造看板/产线看板：月/日 良率
+     * @Date 2020/10/27 13:06
+     * @Param [type]
+     * @return org.jeecg.common.api.vo.Result<java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>
+     */
 	 @GetMapping(value = "/getRejectsNumber")
-     public Result<List<Map<String,Object>>> getRejectsNumber(){
+     public Result<List<Map<String,Object>>> getRejectsNumber(String type){
 		 Result<List<Map<String,Object>>> result=new Result<>();
+
+		 String dateString="%Y-%m";//月
+		 if(type!=null&&type.equals("1")){
+		 	dateString="%Y-%m-%d";
+		 }
+
 		 //查询当月中的产品的异常数量
-		 List<FbsAbnormalWorkingHours> fbsAbnormalWorkingHoursList=fbsAbnormalWorkingHoursService.getRejectsNumber();
+		 List<FbsAbnormalWorkingHours> fbsAbnormalWorkingHoursList=fbsAbnormalWorkingHoursService.getRejectsNumber(dateString);
 		 //U8完工数量
 		 List<FbsMomOrderdetail> fbsMomOrderdetailList=iFbsMomOrderdetailService.getQualifiedInQty();
 		 List<Map<String,Object>> mapList=new ArrayList<>();
@@ -420,4 +433,37 @@ public class FbsAbnormalWorkingHoursController {
 		 return result;
 	 }
 
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 产线看板：当日良率
+	 * @Date 2020/10/27 11:32
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>
+	 */
+	 @GetMapping(value = "/getRejectsNumberSameDay")
+	 public Result<List<Map<String,Object>>> getRejectsNumberSameDay(){
+		 Result<List<Map<String,Object>>> result=new Result<>();
+		 //查询当月中的产品的异常数量
+		 List<FbsAbnormalWorkingHours> fbsAbnormalWorkingHoursList=fbsAbnormalWorkingHoursService.getRejectsNumberSameDay();
+		 //U8完工数量
+		 List<FbsMomOrderdetail> fbsMomOrderdetailList=iFbsMomOrderdetailService.getQualifiedInQty();
+		 List<Map<String,Object>> mapList=new ArrayList<>();
+		 if(fbsAbnormalWorkingHoursList!=null&&fbsMomOrderdetailList!=null){
+			 for(FbsAbnormalWorkingHours fbsAbnormalWorkingHours:fbsAbnormalWorkingHoursList){
+				 Map<String,Object> map=new HashMap<>();
+				 map.put("label",fbsAbnormalWorkingHours.getProduct());
+				 map.put("sum1",fbsAbnormalWorkingHours.getRejectsNumberTotal());
+				 for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailList){
+					 //找到对应产品的数量
+					 if(fbsAbnormalWorkingHours.getProduct().equals(fbsMomOrderdetail.getCinvname())){
+						 map.put("sum2",fbsMomOrderdetail.getQualifiedinqty());
+					 }
+				 }
+				 mapList.add(map);
+			 }
+		 }
+		 result.setResult(mapList);
+		 result.success("操作成功");
+		 return result;
+	 }
 }

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

@@ -30,5 +30,15 @@ public interface FbsAbnormalWorkingHoursMapper extends BaseMapper<FbsAbnormalWor
    * @Param []
    * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
    */
-   List<FbsAbnormalWorkingHours> getRejectsNumber();
+   List<FbsAbnormalWorkingHours> getRejectsNumber(@Param("dateString")String dateString);
+
+
+   /**
+   * @Author chenchuang
+   * @Description //TODO 查询当日中的产品的异常数量
+   * @Date 2020/10/27 11:03
+   * @Param []
+   * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
+   */
+    List<FbsAbnormalWorkingHours> getRejectsNumberSameDay();
 }

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

@@ -23,8 +23,23 @@
         WHERE
             fawh.del_flag = '0'
             AND fawh.product IS NOT NULL
-            AND date_format( fawh.date, '%m' ) = DATE_FORMAT( now( ), '%m' )
+            AND date_format( fawh.date, #{dateString} ) = DATE_FORMAT( now( ), #{dateString} )
         GROUP BY
             fawh.product
     </select>
+
+    <select id="getRejectsNumberSameDay" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours">
+        SELECT
+        fawh.product,
+        sum( fawh.rejects_number ) as rejectsNumberTotal
+        FROM
+        fbs_abnormal_working_hours fawh
+        LEFT JOIN fbs_workshop_dispatch_list fwdl ON fawh.workshop_dispatch_list_id = fwdl.id
+        WHERE
+        fawh.del_flag = '0'
+        AND fawh.product IS NOT NULL
+        AND date_format( fawh.date, '%Y-%m-%d' ) = DATE_FORMAT( now( ), '%Y-%m-%d' )
+        GROUP BY
+        fawh.product
+    </select>
 </mapper>

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

@@ -67,5 +67,14 @@ public interface IFbsAbnormalWorkingHoursService extends IService<FbsAbnormalWor
     * @Param []
     * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
     */
-    List<FbsAbnormalWorkingHours> getRejectsNumber();
+    List<FbsAbnormalWorkingHours> getRejectsNumber(String dateString);
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询当日中的产品的异常数量
+    * @Date 2020/10/27 11:03
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
+    */
+    List<FbsAbnormalWorkingHours> getRejectsNumberSameDay();
 }

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

@@ -269,8 +269,13 @@ public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalW
     }
 
     @Override
-    public List<FbsAbnormalWorkingHours> getRejectsNumber() {
-        return fbsAbnormalWorkingHoursMapper.getRejectsNumber();
+    public List<FbsAbnormalWorkingHours> getRejectsNumber(String dateString) {
+        return fbsAbnormalWorkingHoursMapper.getRejectsNumber(dateString);
+    }
+
+    @Override
+    public List<FbsAbnormalWorkingHours> getRejectsNumberSameDay() {
+        return fbsAbnormalWorkingHoursMapper.getRejectsNumberSameDay();
     }
 
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/controller/FbsPuArrivalvouchController.java

@@ -313,4 +313,98 @@ public class FbsPuArrivalvouchController {
       return Result.ok("文件导入失败！");
   }
 
+  /**
+  * @Author chenchuang
+  * @Description //TODO 品质看板：当月供应商合格率实时展示
+  * @Date 2020/10/27 14:50
+  * @Param []
+  * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
+  */
+  @GetMapping(value = "/getPassRateByVendor")
+  public Result<Map<String,Object>> getPassRateByVendor(){
+	  Result<Map<String,Object>> result=new Result<>();
+	  try {
+		  Map<String,Object> map=fbsPuArrivalvouchService.getPassRateByVendor();
+		  result.setResult(map);
+		  result.success("操作成功");
+	  } catch (Exception e) {
+		  e.printStackTrace();
+		  result.error500("操作失败："+e.getMessage());
+	  }
+	  return result;
+
+  }
+
+  /**
+  * @Author chenchuang
+  * @Description //TODO 品质看板：当天到货批数
+  * @Date 2020/10/27 16:06
+  * @Param []
+  * @return org.jeecg.common.api.vo.Result<java.lang.Integer>
+  */
+  @GetMapping(value = "/getTodayArriveSum")
+  public Result<Integer> getTodayArriveSum(){
+	  Result<Integer> result=new Result<>();
+	  try {
+		  Integer total=fbsPuArrivalvouchService.getTodayArriveSum();
+		  if(total==null){
+			  total=0;
+		  }
+		  result.setResult(total);
+		  result.success("操作成功");
+	  } catch (Exception e) {
+		  e.printStackTrace();
+		  result.error500("操作失败："+e.getMessage());
+	  }
+	  return result;
+  }
+
+	 /**
+	  * @Author chenchuang
+	  * @Description //TODO 品质看板:未来3天的到货总批数
+	  * @Date 2020/10/27 16:06
+	  * @Param []
+	  * @return org.jeecg.common.api.vo.Result<java.lang.Integer>
+	  */
+	 @GetMapping(value = "/getWillArriveSum")
+	 public Result<Integer> getWillArriveSum(){
+		 Result<Integer> result=new Result<>();
+		 try {
+			 Integer total=fbsPuArrivalvouchService.getWillArriveSum();
+			 if(total==null){
+				 total=0;
+			 }
+			 result.setResult(total);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
+	 /**
+	  * @Author chenchuang
+	  * @Description //TODO 品质看板:当月到货总批数
+	  * @Date 2020/10/27 16:06
+	  * @Param []
+	  * @return org.jeecg.common.api.vo.Result<java.lang.Integer>
+	  */
+	 @GetMapping(value = "/getThisMonthArriveSum")
+	 public Result<Integer> getThisMonthArriveSum(){
+		 Result<Integer> result=new Result<>();
+		 try {
+			 Integer total=fbsPuArrivalvouchService.getThisMonthArriveSum();
+			 if(total==null){
+				 total=0;
+			 }
+			 result.setResult(total);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/entity/FbsPuArrivalvouch.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.fbsPuArrivalvouch.entity;
 import java.io.Serializable;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -250,4 +251,13 @@ public class FbsPuArrivalvouch implements Serializable {
 	/**ccurrentauditor*/
 	@Excel(name = "ccurrentauditor", width = 15)
 	private String ccurrentauditor;
+
+	/** 合格率 */
+	@TableField(exist = false)
+	private String passRate;
+
+	/** 供应商名称 */
+	@TableField(exist = false)
+	private String cVenName;
+
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/FbsPuArrivalvouchMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.fbsPuArrivalvouch.mapper;
 import java.util.List;
 import java.util.Map;
 
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -38,4 +39,39 @@ public interface FbsPuArrivalvouchMapper extends BaseMapper<FbsPuArrivalvouch> {
      */
     int getInSum();
 
+    /**
+    * @Author chenchuang
+    * @Description //TODO 品质看板： 当月供应商合格率实时展示
+    * @Date 2020/10/27 14:41
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch>
+    */
+    List<FbsPuArrivalvouch> getPassRateByVendor();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 品质看板：当天到货批数
+    * @Date 2020/10/27 15:33
+    * @Param []
+    * @return java.lang.Integer
+    */
+    Integer getTodayArriveSum();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 品质看板:未来3天的到货总批数
+    * @Date 2020/10/27 15:34
+    * @Param []
+    * @return java.lang.Integer
+    */
+    Integer getWillArriveSum();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 品质看板:当月到货总批数
+    * @Date 2020/10/27 15:35
+    * @Param []
+    * @return java.lang.Integer
+    */
+    Integer getThisMonthArriveSum();
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsPuArrivalvouchMapper.xml

@@ -56,4 +56,61 @@
              left join Inventory d on a.cInvCode = d.cInvCode
           where  (a.fValidQuantity - a.fValidInQuan) <= 0
     </select>
+
+    <select id="getPassRateByVendor" resultType="org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch">
+        SELECT
+            v.cVenName,round( CAST (( SUM ( pa.fValidQuantity ) * 1.0 / SUM ( pa.iQuantity )) AS FLOAT ), 0 ) * 100 AS passRate
+        FROM
+            PU_ArrivalVouchs pa
+            LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
+            LEFT JOIN Vendor v ON p.cVenCode= v.cVenCode
+        WHERE
+            datediff(
+            MONTH,
+            p.dDate,
+            getdate()) = 0
+        GROUP BY
+            p.cVenCode,v.cVenName
+    </select>
+
+    <select id="getTodayArriveSum" resultType="java.lang.Integer">
+        SELECT SUM
+            ( pa.fValidInQuan )
+        FROM
+            PU_ArrivalVouchs pa
+            LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
+        WHERE
+            DateDiff(
+            dd,
+            p.dDate,
+            getdate()) =0
+    </select>
+
+    <select id="getWillArriveSum" resultType="java.lang.Integer">
+        SELECT SUM
+        ( pa.fValidInQuan )
+        FROM
+        PU_ArrivalVouchs pa
+        LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
+        WHERE
+        p.dDate <![CDATA[ >= ]]> getdate()
+        AND p.dDate <![CDATA[ <= ]]> dateadd(
+        DAY,
+        3,
+        getdate())
+    </select>
+
+    <select id="getThisMonthArriveSum" resultType="java.lang.Integer">
+        SELECT SUM
+            ( pa.fValidInQuan )
+        FROM
+            PU_ArrivalVouchs pa
+            LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
+        WHERE
+            datediff(
+            MONTH,
+            p.dDate,
+            getdate()) =0
+    </select>
+
 </mapper>

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/IFbsPuArrivalvouchService.java

@@ -20,4 +20,41 @@ public interface IFbsPuArrivalvouchService extends IService<FbsPuArrivalvouch> {
     List<Map<String,Object>> getWatingInList();
 
     int getInSum();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 当月供应商合格率实时展示
+    * @Date 2020/10/27 14:44
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch>
+    */
+    Map<String,Object> getPassRateByVendor();
+
+
+    /**
+     * @Author chenchuang
+     * @Description //TODO 品质看板：当天到货批数
+     * @Date 2020/10/27 15:33
+     * @Param []
+     * @return java.lang.Integer
+     */
+    Integer getTodayArriveSum();
+
+    /**
+     * @Author chenchuang
+     * @Description //TODO 品质看板:未来3天的到货总批数
+     * @Date 2020/10/27 15:34
+     * @Param []
+     * @return java.lang.Integer
+     */
+    Integer getWillArriveSum();
+
+    /**
+     * @Author chenchuang
+     * @Description //TODO 品质看板:当月到货总批数
+     * @Date 2020/10/27 15:35
+     * @Param []
+     * @return java.lang.Integer
+     */
+    Integer getThisMonthArriveSum();
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/impl/FbsPuArrivalvouchServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -41,4 +42,33 @@ public class FbsPuArrivalvouchServiceImpl extends ServiceImpl<FbsPuArrivalvouchM
         return fbsPuArrivalvouchMapper.getInSum();
     }
 
+    @Override
+    public Map<String,Object> getPassRateByVendor() {
+        //获取合格率数据
+        List<FbsPuArrivalvouch> fbsPuArrivalvouchList=fbsPuArrivalvouchMapper.getPassRateByVendor();
+        //封装map数据
+        Map<String,Object> map=new HashMap<>();
+        if(fbsPuArrivalvouchList!=null){
+            for(FbsPuArrivalvouch fbsPuArrivalvouch:fbsPuArrivalvouchList){
+                map.put(fbsPuArrivalvouch.getCVenName(),fbsPuArrivalvouch.getPassRate());
+            }
+        }
+        return map;
+    }
+
+    @Override
+    public Integer getTodayArriveSum() {
+        return fbsPuArrivalvouchMapper.getTodayArriveSum();
+    }
+
+    @Override
+    public Integer getWillArriveSum() {
+        return fbsPuArrivalvouchMapper.getWillArriveSum();
+    }
+
+    @Override
+    public Integer getThisMonthArriveSum() {
+        return fbsPuArrivalvouchMapper.getThisMonthArriveSum();
+    }
+
 }

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

@@ -366,16 +366,20 @@ public class FbsWorkshopDispatchListController {
 
 	 /**
 	 * @Author chenchuang
-	 * @Description //TODO 月工时分布情况
+	 * @Description //TODO 制造看板/产线看板： 月/日工时分布情况
 	 * @Date 2020/10/19 14:12
 	 * @Param []
 	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>>
 	 */
 	 @GetMapping(value = "/getProductHoursMonthReport")
-	 public Result<Map<String,Object>> getProductHoursMonthReport(){
+	 public Result<Map<String,Object>> getProductHoursMonthReport(String type){
 	 	Result<Map<String,Object>> result=new Result<>();
 		 try {
-			 Map<String,Object> map=fbsWorkshopDispatchListService.getProductHoursMonthReport();
+		 	String dateString="%Y-%m";//月
+		 	if(type!=null&&type.equals("1")){//日
+				dateString="%Y-%m-%d";
+			}
+			 Map<String,Object> map=fbsWorkshopDispatchListService.getProductHoursMonthReport(dateString);
 			 result.setResult(map);
 			 result.success("操作成功");
 		 } catch (Exception e) {
@@ -387,16 +391,41 @@ public class FbsWorkshopDispatchListController {
 
 	 /**
 	 * @Author chenchuang
-	 * @Description //TODO 月质量异常分类
+	 * @Description //TODO 制造看板/产线看板：月/日质量异常分类
 	 * @Date 2020/10/19 16:34
 	 * @Param []
 	 * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
 	 */
 	 @GetMapping(value = "/getAbnormalHoursMonthReport")
-	 public Result<Map<String,Object>> getAbnormalHoursMonthReport(){
+	 public Result<Map<String,Object>> getAbnormalHoursMonthReport(String type){
+		 Result<Map<String,Object>> result=new Result<>();
+		 try {
+		 	String dateString="%Y-%m";//月
+		 	if(type!=null&&type.equals("1")){
+		 		dateString="%Y-%m-%d";//日
+			}
+			 Map<String,Object> map=fbsWorkshopDispatchListService.getAbnormalHoursMonthReport(dateString);
+			 result.setResult(map);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 产线看板：当日质量异常分类
+	 * @Date 2020/10/27 11:35
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
+	 */
+	 @GetMapping(value = "/getAbnormalHoursMonthReportSameDay")
+	 public Result<Map<String,Object>> getAbnormalHoursMonthReportSameDay(){
 		 Result<Map<String,Object>> result=new Result<>();
 		 try {
-			 Map<String,Object> map=fbsWorkshopDispatchListService.getAbnormalHoursMonthReport();
+			 Map<String,Object> map=fbsWorkshopDispatchListService.getAbnormalHoursMonthReportSameDay();
 			 result.setResult(map);
 			 result.success("操作成功");
 		 } catch (Exception e) {

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

@@ -37,7 +37,7 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
     * @Param []
     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
     */
-    List<FbsWorkshopDispatchList> getProductHoursMonthReport();
+    List<FbsWorkshopDispatchList> getProductHoursMonthReport(@Param("dateString")String dateString);
 
     /**
     * @Author chenchuang
@@ -46,7 +46,16 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
     * @Param []
     * @return java.util.Map<java.lang.String,java.lang.Object>
     */
-    Map<String,Object> getAbnormalHoursMonthReport();
+    Map<String,Object> getAbnormalHoursMonthReport(@Param("dateString")String dateString);
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 产线看板：当日质量异常分类
+    * @Date 2020/10/27 11:33
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+    Map<String,Object> getAbnormalHoursMonthReportSameDay();
 
     /**
     * @Author chenchuang

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

@@ -67,7 +67,7 @@
             fbs_workshop_dispatch_list
         WHERE
             del_flag = '0'
-            AND date_format( date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )
+            AND date_format( date, #{dateString} ) = DATE_FORMAT( now( ), #{dateString} )
         GROUP BY
             product
     </select>
@@ -86,7 +86,24 @@
             fbs_abnormal_working_hours
         WHERE
             del_flag = '0'
-            AND date_format( date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )
+            AND date_format( date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} )
+    </select>
+
+    <select id="getAbnormalHoursMonthReportSameDay" 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 '计划'
+        FROM
+        fbs_abnormal_working_hours
+        WHERE
+        del_flag = '0'
+        AND date_format( date, '%Y-%m-%d' ) = DATE_FORMAT( now( ), '%Y-%m-%d' )
     </select>
 
     <select id="getAttendance" resultType="java.util.HashMap">

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

@@ -36,7 +36,7 @@ public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDis
     * @Param []
     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
     */
-    Map<String,Object> getProductHoursMonthReport();
+    Map<String,Object> getProductHoursMonthReport(String dateString);
 
     /**
     * @Author chenchuang
@@ -45,7 +45,7 @@ public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDis
     * @Param []
     * @return java.util.Map<java.lang.String,java.lang.Object>
     */
-    Map<String,Object> getAbnormalHoursMonthReport();
+    Map<String,Object> getAbnormalHoursMonthReport(String dateString);
 
     /**
     * @Author chenchuang
@@ -109,4 +109,13 @@ public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDis
     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
     */
     List<FbsWorkshopDispatchList> getProductList();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 产线看板：当日质量异常分类
+    * @Date 2020/10/27 11:34
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+    Map<String,Object> getAbnormalHoursMonthReportSameDay();
 }

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

@@ -278,23 +278,21 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
     }
 
     @Override
-    public Map<String,Object> getProductHoursMonthReport() {
+    public Map<String,Object> getProductHoursMonthReport(String dateString) {
         Map<String,Object> map=new HashMap<>();
-        List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListMapper.getProductHoursMonthReport();
+        List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListMapper.getProductHoursMonthReport(dateString);
         if(fbsWorkshopDispatchListList!=null){
-            for(FbsWorkshopDispatchList fbsWorkshopDispatchList:fbsWorkshopDispatchListMapper.getProductHoursMonthReport()){
+            for(FbsWorkshopDispatchList fbsWorkshopDispatchList:fbsWorkshopDispatchListList){
                 map.put(fbsWorkshopDispatchList.getProduct(),fbsWorkshopDispatchList.getProductTotal());
             }
         }
 
-        System.out.println(fbsWorkshopDispatchListMapper.getAbnormalHoursMonthReport());
-
         return map;
     }
 
     @Override
-    public Map<String, Object> getAbnormalHoursMonthReport() {
-        return fbsWorkshopDispatchListMapper.getAbnormalHoursMonthReport();
+    public Map<String, Object> getAbnormalHoursMonthReport(String dateString) {
+        return fbsWorkshopDispatchListMapper.getAbnormalHoursMonthReport(dateString);
     }
 
     @Override
@@ -370,5 +368,10 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         return fbsWorkshopDispatchListMapper.getProductList();
     }
 
+    @Override
+    public Map<String, Object> getAbnormalHoursMonthReportSameDay() {
+        return fbsWorkshopDispatchListMapper.getAbnormalHoursMonthReportSameDay();
+    }
+
 
 }