看板接口

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.fbsAbnormalWorkingHours.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -20,7 +18,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrder;
+import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
 import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderService;
+import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderdetailService;
 import org.jeecg.modules.fbsPerson.entity.FbsPerson;
 import org.jeecg.modules.fbsPerson.service.IFbsPersonService;
 import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
@@ -61,6 +61,9 @@ public class FbsAbnormalWorkingHoursController {
 	@Autowired
 	private IFbsWorkshopDispatchListService iFbsWorkshopDispatchListService;
 
+	@Autowired
+	private IFbsMomOrderdetailService iFbsMomOrderdetailService;
+
 	/**
 	  * 分页列表查询
 	 * @param fbsAbnormalWorkingHours
@@ -369,4 +372,52 @@ public class FbsAbnormalWorkingHoursController {
 		 return result;
 	 }
 
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 月制成质量异常
+	 * @Date 2020/10/21 15:36
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
+	 */
+     @GetMapping(value = "/getQualityType")
+	 public Result<Map<String,Object>> getQualityType(){
+         Result<Map<String,Object>> result=new Result<>();
+         try {
+             Map<String,Object> map=fbsAbnormalWorkingHoursService.getQualityType();
+             result.setResult(map);
+             result.success("操作成功");
+         } catch (Exception e) {
+             e.printStackTrace();
+             result.error500("操作失败："+e.getMessage());
+         }
+         return result;
+     }
+
+	 @GetMapping(value = "/getRejectsNumber")
+     public Result<List<Map<String,Object>>> getRejectsNumber(){
+		 Result<List<Map<String,Object>>> result=new Result<>();
+		 //查询当月中的产品的异常数量
+		 List<FbsAbnormalWorkingHours> fbsAbnormalWorkingHoursList=fbsAbnormalWorkingHoursService.getRejectsNumber();
+		 //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/entity/FbsAbnormalWorkingHours.java

@@ -167,4 +167,8 @@ public class FbsAbnormalWorkingHours implements Serializable {
 	private String typeId;
 	//类型名称
 	private String typeName;
+
+	//不良品总数
+	@TableField(exist = false)
+	private String rejectsNumberTotal;
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/FbsAbnormalWorkingHoursMapper.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.FbsAbnormalWorkingHours;
@@ -13,5 +14,21 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version： V1.0
  */
 public interface FbsAbnormalWorkingHoursMapper extends BaseMapper<FbsAbnormalWorkingHours> {
+    /**
+    * @Author chenchuang
+    * @Description //TODO 月制成质量异常
+    * @Date 2020/10/21 15:21
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+   List<FbsAbnormalWorkingHours> getQualityType();
 
+   /**
+   * @Author chenchuang
+   * @Description //TODO 查询当月中的产品的异常数量
+   * @Date 2020/10/21 17:42
+   * @Param []
+   * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
+   */
+   List<FbsAbnormalWorkingHours> getRejectsNumber();
 }

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

@@ -1,5 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.fbsAbnormalWorkingHours.mapper.FbsAbnormalWorkingHoursMapper">
+    <select id="getQualityType" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours">
+        SELECT
+            sum( quality ) AS quality,
+            type_name as typeName
+        FROM
+            fbs_abnormal_working_hours
+        WHERE
+            del_flag = '0' and type_name is not null
+        GROUP BY
+            type_name
+    </select>
 
+    <select id="getRejectsNumber" 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, '%m' ) = DATE_FORMAT( now( ), '%m' )
+        GROUP BY
+            fawh.product
+    </select>
 </mapper>

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 生产异常信息统计单
@@ -49,4 +50,22 @@ public interface IFbsAbnormalWorkingHoursService extends IService<FbsAbnormalWor
     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
     */
     List<FbsWorkshopDispatchList> getDispatchListByDate(String date);
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 月制成质量异常
+    * @Date 2020/10/21 15:22
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+    Map<String,Object> getQualityType();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询当月中的产品的异常数量
+    * @Date 2020/10/21 17:47
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
+    */
+    List<FbsAbnormalWorkingHours> getRejectsNumber();
 }

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

@@ -23,9 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @Description: 生产异常信息统计单
@@ -257,4 +255,22 @@ public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalW
         return fbsWorkshopDispatchListMapper.getDispatchListByDate(date);
     }
 
+    @Override
+    public Map<String, Object> getQualityType() {
+        Map<String, Object> map=new HashMap<>();
+        //查询出按异常类别分类的质量异常工时
+        List<FbsAbnormalWorkingHours> fbsAbnormalWorkingHoursList=fbsAbnormalWorkingHoursMapper.getQualityType();
+        if(fbsAbnormalWorkingHoursList!=null){
+            for(FbsAbnormalWorkingHours fbsAbnormalWorkingHours:fbsAbnormalWorkingHoursList){
+                map.put(fbsAbnormalWorkingHours.getTypeName(),fbsAbnormalWorkingHours.getQuality());
+            }
+        }
+        return map;
+    }
+
+    @Override
+    public List<FbsAbnormalWorkingHours> getRejectsNumber() {
+        return fbsAbnormalWorkingHoursMapper.getRejectsNumber();
+    }
+
 }

src/main/java/org/jeecg/modules/fbsMomOrder/entity/FbsMomOrder.java

@@ -126,4 +126,6 @@ public class FbsMomOrder implements Serializable {
 	/**csysbarcode*/
 	@Excel(name = "csysbarcode", width = 15)
 	private String csysbarcode;
+
+
 }

src/main/java/org/jeecg/modules/fbsMomOrder/entity/FbsMomOrderdetail.java

@@ -391,4 +391,6 @@ public class FbsMomOrderdetail implements Serializable {
 	/**factorycode*/
 	@Excel(name = "factorycode", width = 15)
 	private String factorycode;
+
+	private String cinvname;
 }

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/FbsMomOrderdetailMapper.java

@@ -22,4 +22,14 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
     * @return org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail
     */
     Map<String,Object> getFbsMomOrderdetailSum();
+
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询U8物料中的完工数量
+    * @Date 2020/10/21 17:40
+    * @Param [cInvName]
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getQualifiedInQty();
 }

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderdetailMapper.xml

@@ -4,4 +4,15 @@
     <select id="getFbsMomOrderdetailSum" resultType="java.util.HashMap">
         select sum(QualifiedInQty) as '已完成',sum(Qty)-sum(QualifiedInQty) as '未完成' from mom_orderdetail
     </select>
+
+    <select id="getQualifiedInQty" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+        i.cInvName ,
+        sum(mo.QualifiedInQty) as qualifiedinqty
+        FROM
+        mom_orderdetail mo
+        LEFT JOIN Inventory i ON mo.InvCode = i.cInvCode
+        GROUP BY
+        i.cInvName
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsMomOrder/service/IFbsMomOrderdetailService.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.fbsMomOrder.service;
 import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,4 +21,13 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     * @return org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail
     */
     Map<String,Object> getFbsMomOrderdetailSum();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询U8物料中的完工数量
+    * @Date 2020/10/21 17:41
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getQualifiedInQty();
 }

src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderdetailServiceImpl.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.List;
 import java.util.Map;
 
 /**
@@ -28,4 +29,9 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
     public Map<String,Object> getFbsMomOrderdetailSum() {
         return fbsMomOrderdetailMapper.getFbsMomOrderdetailSum();
     }
+
+    @Override
+    public List<FbsMomOrderdetail> getQualifiedInQty() {
+        return fbsMomOrderdetailMapper.getQualifiedInQty();
+    }
 }