产线看板 品质

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

@@ -579,4 +579,29 @@ public class FbsWorkingStatisticsController {
 //		 System.out.println(suffix);
 //	 }
 
+	 /**
+	  * @Author chenchuang
+	  * @Description //TODO 制造看板/产线看板： 月/日工时分布情况
+	  * @Date 2020/10/28 13:20
+	  * @Param []
+	  * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
+	  */
+	 @GetMapping(value = "/getByMaterial")
+	 public Result<Map<String,Object>> getByMaterial(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=fbsWorkingStatisticsService.getByMaterial(dateString);
+			 result.setResult(map);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
  }

src/main/java/org/jeecg/modules/appInterface/entity/FbsWorkingStatistics.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 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;
@@ -105,4 +106,8 @@ public class FbsWorkingStatistics implements Serializable {
 	/**0保存，1提交 */
 	@Excel(name = "0保存，1提交", width = 15)
 	private String state;
+
+	//产品名称
+	@TableField(exist = false)
+	private String product;
 }

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

@@ -13,5 +13,12 @@ import org.jeecg.modules.appInterface.entity.FbsWorkingStatistics;
  * @version： V1.0
  */
 public interface FbsWorkingStatisticsMapper extends BaseMapper<FbsWorkingStatistics> {
-
+    /**
+    * @Author chenchuang
+    * @Description //TODO 制造看板： 月工时分布情况
+    * @Date 2020/10/28 13:08
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.appInterface.entity.FbsWorkingStatistics>
+    */
+   List<FbsWorkingStatistics> getByMaterial(@Param("dateString")String dateString);
 }

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

@@ -1,5 +1,19 @@
 <?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.appInterface.mapper.FbsWorkingStatisticsMapper">
-
+    <select id="getByMaterial" resultType="org.jeecg.modules.appInterface.entity.FbsWorkingStatistics">
+        SELECT
+            sum( fws.working_hours ) as workingHours,
+            fwdl.product
+        FROM
+            fbs_working_statistics fws
+            LEFT JOIN fbs_workshop_dispatch_list fwdl ON fws.pk_workshop_dispatch_list = fwdl.id
+        WHERE
+            fws.del_flag = '0'
+            AND fwdl.del_flag = '0'
+            AND fws.final_state IN ( '2', '3' )
+            AND date_format( fws.final_time, #{dateString} ) = DATE_FORMAT( now( ), #{dateString} )
+        GROUP BY
+            fwdl.product
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/appInterface/service/IFbsWorkingStatisticsService.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.appInterface.service;
 import org.jeecg.modules.appInterface.entity.FbsWorkingStatistics;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 工时统计接口
  * @author： jeecg-boot
@@ -9,5 +12,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @version： V1.0
  */
 public interface IFbsWorkingStatisticsService extends IService<FbsWorkingStatistics> {
-
+    /**
+    * @Author chenchuang
+    * @Description //TODO 制造看板： 月工时分布情况
+    * @Date 2020/10/28 13:09
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.appInterface.entity.FbsWorkingStatistics>
+    */
+    Map<String,Object> getByMaterial(String dateString);
 }

src/main/java/org/jeecg/modules/appInterface/service/impl/FbsWorkingStatisticsServiceImpl.java

@@ -8,6 +8,11 @@ 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;
+
 /**
  * @Description: 工时统计接口
  * @author： jeecg-boot
@@ -18,4 +23,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 //@DS("multi-datasource1")
 public class FbsWorkingStatisticsServiceImpl extends ServiceImpl<FbsWorkingStatisticsMapper, FbsWorkingStatistics> implements IFbsWorkingStatisticsService {
 
+    @Resource
+    FbsWorkingStatisticsMapper fbsWorkingStatisticsMapper;
+
+    @Override
+    public Map<String,Object> getByMaterial(String dateString) {
+        List<FbsWorkingStatistics> fbsWorkingStatisticsList=fbsWorkingStatisticsMapper.getByMaterial(dateString);
+        Map<String,Object> map=new HashMap<>();
+        if(fbsWorkingStatisticsList!=null){
+            for(FbsWorkingStatistics fbsWorkingStatistics:fbsWorkingStatisticsList){
+                map.put(fbsWorkingStatistics.getProduct(),fbsWorkingStatistics.getWorkingHours());
+            }
+        }
+        return map;
+    }
 }

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

@@ -236,4 +236,25 @@ public class FbsAbnormalWorkingHoursDescribeController {
       return Result.ok("文件导入失败！");
   }
 
+  /**
+  * @Author chenchuang
+  * @Description //TODO 制造看板：月制程质量异常
+  * @Date 2020/10/28 15:37
+  * @Param []
+  * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
+  */
+  @GetMapping(value = "/getMonthExceptionByCategory")
+	public Result<Map<String,Object>> getMonthExceptionByCategory(){
+		Result<Map<String,Object>> result=new Result<>();
+		try {
+			Map<String,Object> map=fbsAbnormalWorkingHoursDescribeService.getMonthExceptionByCategory();
+			result.setResult(map);
+			result.success("操作成功");
+		} catch (Exception e) {
+			e.printStackTrace();
+			result.error500("操作失败："+e.getMessage());
+		}
+		return result;
+	}
+
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/entity/FbsAbnormalWorkingHoursDescribe.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.fbsAbnormalWorkingHours.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;
@@ -70,4 +71,13 @@ public class FbsAbnormalWorkingHoursDescribe implements Serializable {
 	/**排序*/
 	@Excel(name = "排序", width = 15)
 	private Integer sort;
+
+	//类型id
+	private String typeId;
+	//类型名称
+	private String typeName;
+
+	//异常分类总数
+	@TableField(exist = false)
+	private String total;
 }

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

@@ -13,5 +13,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version： V1.0
  */
 public interface FbsAbnormalWorkingHoursDescribeMapper extends BaseMapper<FbsAbnormalWorkingHoursDescribe> {
-
+    /**
+    * @Author chenchuang
+    * @Description //TODO 制造看板：月制程质量异常
+    * @Date 2020/10/28 15:33
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe>
+    */
+  List<FbsAbnormalWorkingHoursDescribe>  getMonthExceptionByCategory();
 }

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

@@ -1,5 +1,18 @@
 <?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.FbsAbnormalWorkingHoursDescribeMapper">
-
+    <select id="getMonthExceptionByCategory" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe">
+        SELECT
+            count( fawh.id ) AS total,
+            fawhd.type_name
+        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 date_format( fawh.date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )
+        GROUP BY
+            fawhd.type_name
+    </select>
 </mapper>

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

@@ -3,6 +3,8 @@ package org.jeecg.modules.fbsAbnormalWorkingHours.service;
 import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHoursDescribe;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * @Description: 异常工时描述
  * @author： jeecg-boot
@@ -10,5 +12,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @version： V1.0
  */
 public interface IFbsAbnormalWorkingHoursDescribeService extends IService<FbsAbnormalWorkingHoursDescribe> {
-
+    /**
+    * @Author chenchuang
+    * @Description //TODO 制造看板：月制程质量异常
+    * @Date 2020/10/28 15:29
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+    Map<String,Object> getMonthExceptionByCategory();
 }

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

@@ -7,6 +7,11 @@ 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;
+
 /**
  * @Description: 异常工时描述
  * @author： jeecg-boot
@@ -16,4 +21,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class FbsAbnormalWorkingHoursDescribeServiceImpl extends ServiceImpl<FbsAbnormalWorkingHoursDescribeMapper, FbsAbnormalWorkingHoursDescribe> implements IFbsAbnormalWorkingHoursDescribeService {
 
+    @Resource
+    FbsAbnormalWorkingHoursDescribeMapper fbsAbnormalWorkingHoursDescribeMapper;
+
+    @Override
+    public Map<String, Object> getMonthExceptionByCategory() {
+        Map<String,Object> map=new HashMap<>();
+        List<FbsAbnormalWorkingHoursDescribe> fbsAbnormalWorkingHoursDescribeMapperList=fbsAbnormalWorkingHoursDescribeMapper.getMonthExceptionByCategory();
+        if(fbsAbnormalWorkingHoursDescribeMapperList!=null){
+            for(FbsAbnormalWorkingHoursDescribe fbsAbnormalWorkingHoursDescribe:fbsAbnormalWorkingHoursDescribeMapperList){
+                map.put(fbsAbnormalWorkingHoursDescribe.getTypeName(),fbsAbnormalWorkingHoursDescribe.getTotal());
+            }
+        }
+        return map;
+    }
 }

src/main/java/org/jeecg/modules/fbsInventory/entity/FbsInventory.java

@@ -809,4 +809,8 @@ public class FbsInventory implements Serializable {
 	/**cretaildefreturnwh*/
 	@Excel(name = "cretaildefreturnwh", width = 15)
 	private String cretaildefreturnwh;
+
+	//项目名称
+	@TableField(exist = false)
+	private String CostItemName;
 }

src/main/java/org/jeecg/modules/fbsInventory/mapper/xml/FbsInventoryMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.fbsInventory.mapper.FbsInventoryMapper">
     <select id="getInventoryGetByOrderId" resultType="org.jeecg.modules.fbsInventory.entity.FbsInventory" >
         SELECT
-        i.cInvCode as cinvcode,i.cInvName as cinvname
+        i.cInvCode as cinvcode,i.cInvName as cinvname,m.CostItemName
         FROM
         mom_orderdetail m
         LEFT JOIN Inventory i ON m.InvCode = i.cInvCode

src/main/java/org/jeecg/modules/fbsMomOrder/controller/FbsMomOrderdetailController.java

@@ -276,4 +276,89 @@ public class FbsMomOrderdetailController {
 	  return result;
   }
 
+  /**
+  * @Author chenchuang
+  * @Description //TODO 制造看板：月生产计划
+  * @Date 2020/10/28 17:08
+  * @Param []
+  * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>>
+  */
+  @GetMapping(value = "/getMonthList")
+  public Result<List<FbsMomOrderdetail>> getMonthList(){
+	  Result<List<FbsMomOrderdetail>> result=new Result<>();
+	  try {
+		  List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailService.getMonthList();
+		  result.setResult(fbsMomOrderdetailList);
+		  result.success("操作成功");
+	  } catch (Exception e) {
+		  e.printStackTrace();
+		  result.error500("操作失败："+e.getMessage());
+	  }
+	  return result;
+  }
+
+  /**
+  * @Author chenchuang
+  * @Description //TODO 产线看板：日生产计划
+  * @Date 2020/10/28 17:20
+  * @Param []
+  * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>>
+  */
+	 @GetMapping(value = "/getDayList")
+	 public Result<List<FbsMomOrderdetail>> getDayList(){
+		 Result<List<FbsMomOrderdetail>> result=new Result<>();
+		 try {
+			 List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailService.getDayList();
+			 result.setResult(fbsMomOrderdetailList);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 仓库看板：工单备料/工单缺料
+	 * @Date 2020/10/28 21:55
+	 * @Param [type]
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>>
+	 */
+	 @GetMapping(value = "/getListByOrderSheet")
+	 public Result<List<FbsMomOrderdetail>> getListByOrderSheet(String type){
+		 Result<List<FbsMomOrderdetail>> result=new Result<>();
+		 try {
+			 List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailService.getListByOrderSheet(type);
+			 result.setResult(fbsMomOrderdetailList);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 仓库看板：领料申请通知
+	 * @Date 2020/10/28 22:16
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>>
+	 */
+	 @GetMapping(value = "/getApplyList")
+	 public  Result<List<FbsMomOrderdetail>> getApplyList(){
+		 Result<List<FbsMomOrderdetail>> result=new Result<>();
+		 try {
+			 List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailService.getApplyList();
+			 result.setResult(fbsMomOrderdetailList);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
 }

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

@@ -392,5 +392,29 @@ public class FbsMomOrderdetail implements Serializable {
 	@Excel(name = "factorycode", width = 15)
 	private String factorycode;
 
+	//产品名称
+	@TableField(exist = false)
 	private String cinvname;
+	//产品编码
+	@TableField(exist = false)
+	private String cinvcode;
+	//产品规格
+	@TableField(exist = false)
+	private String cinvstd;
+	//生产订单号
+	@TableField(exist = false)
+	private String mocode;
+	//总数量
+	@TableField(exist = false)
+	private Integer total;
+	//总料数
+	@TableField(exist = false)
+	private Integer materialPreparationTotal;
+	//备料数量
+	@TableField(exist = false)
+	private Integer materialPreparationNumber;
+
+	//未完成数量
+	@TableField(exist = false)
+	private Integer unfinishedQuantity;
 }

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

@@ -35,10 +35,55 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
 
     /**
     * @Author chenchuang
-    * @Description //TODO 周成品入库数量
+    * @Description //TODO 制造看板：周成品入库数量
     * @Date 2020/10/21 21:42
     * @Param []
     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
     */
     List<FbsMomOrderdetail> getQualifiedInQtyWeek();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 制造看板：月生产计划
+    * @Date 2020/10/28 17:04
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getMonthList();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 产线看板：日生产计划
+    * @Date 2020/10/28 17:19
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getDayList();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询库存数量
+    * @Date 2020/10/28 21:16
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getListByOrderSheetCurrentStock();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询订单子件数量
+    * @Date 2020/10/28 21:17
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getListByOrderSheetMomMoallocate();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO  仓库看板：领料申请通知
+    * @Date 2020/10/28 22:14
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getApplyList();
 }

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

@@ -18,14 +18,107 @@
 
     <select id="getQualifiedInQtyWeek" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
         SELECT
+            top 10
             i.cInvName,
             sum( QualifiedInQty ) as QualifiedInQty
         FROM
             mom_orderdetail mo
             LEFT JOIN Inventory i ON mo.InvCode = i.cInvCode
+            left join mom_morder mm on mo.modid=mm.modid
         WHERE
-            datediff( WEEK, RelsDate, getdate ( ) ) = 0
+            datediff( WEEK, mm.DueDate, getdate ( ) ) = 0
         GROUP BY
             i.cInvName
     </select>
+
+    <select id="getMonthList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+            m.MoCode,
+            i.cInvCode,
+            i.cInvStd,
+            i.cInvName,
+            mo.Qty,
+            mo.QualifiedInQty
+        FROM
+            mom_orderdetail mo
+            LEFT JOIN mom_order m ON mo.MoId= m.MoId
+            LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+            left join mom_morder mm on mo.MoDId=mm.MoDId
+        WHERE
+            datediff(
+            MONTH,
+            mm.StartDate,
+            getdate()) =0
+    </select>
+
+    <select id="getDayList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+            m.MoCode,
+            i.cInvCode,
+            i.cInvStd,
+            i.cInvName,
+            mo.Qty,
+            mo.QualifiedInQty
+        FROM
+            mom_orderdetail mo
+        LEFT JOIN mom_order m ON mo.MoId= m.MoId
+        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+        left join mom_morder mm on mo.MoDId=mm.MoDId
+        WHERE
+            DateDiff(
+            dd,
+            mm.StartDate,
+            getdate()) =0
+    </select>
+
+    <select id="getListByOrderSheetCurrentStock" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT SUM
+            ( iQuantity ) as materialPreparationTotal,
+            cInvCode
+        FROM
+            CurrentStock
+        GROUP BY
+            cInvCode
+    </select>
+
+    <select id="getListByOrderSheetMomMoallocate" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+            SUM ( mm.Qty ) as materialPreparationNumber,
+            mo.InvCode,
+            m.MoCode,
+            i.cinvname,
+            i.cinvcode,
+            i.cinvstd
+        FROM
+            mom_moallocate mm
+            LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
+            left join mom_order m on mo.MoId=m.MoId
+            left join Inventory i on mo.InvCode=i.cInvCode
+        GROUP BY
+            mo.MoId,mo.InvCode,m.MoCode,i.cinvname,i.cinvcode,i.cinvstd
+    </select>
+
+    <select id="getApplyList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT SUM
+            ( mm.RequisitionQty ) - SUM ( RequisitionIssQty ) AS unfinishedQuantity,
+            mo.InvCode,
+            m.MoCode,
+            i.cinvname,
+            i.cinvcode,
+            i.cinvstd
+        FROM
+            mom_moallocate mm
+            LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
+            LEFT JOIN mom_order m ON mo.MoId= m.MoId
+            LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+        GROUP BY
+            mo.MoId,
+            mo.InvCode,
+            m.MoCode,
+            i.cinvname,
+            i.cinvcode,
+            i.cinvstd
+        HAVING
+            SUM ( mm.RequisitionQty )-sum(RequisitionIssQty)>0
+    </select>
 </mapper>

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

@@ -39,4 +39,40 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
     */
     Map<String,Object> getQualifiedInQtyWeek();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 制造看板：月生产计划
+    * @Date 2020/10/28 17:05
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getMonthList();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 产线看板：日生产计划
+    * @Date 2020/10/28 17:20
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getDayList();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO
+    * @Date 2020/10/28 21:18
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getListByOrderSheet(String type);
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 仓库看板：领料申请通知
+    * @Date 2020/10/28 22:15
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getApplyList();
 }

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.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -47,4 +48,57 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
         }
         return map;
     }
+
+    @Override
+    public List<FbsMomOrderdetail> getMonthList() {
+        return fbsMomOrderdetailMapper.getMonthList();
+    }
+
+    @Override
+    public List<FbsMomOrderdetail> getDayList() {
+        return fbsMomOrderdetailMapper.getDayList();
+    }
+
+    @Override
+    public List<FbsMomOrderdetail> getListByOrderSheet(String type) {
+
+        List<FbsMomOrderdetail> fbsMomOrderdetailListCurrentStock=fbsMomOrderdetailMapper.getListByOrderSheetCurrentStock();
+        List<FbsMomOrderdetail> fbsMomOrderdetailListMomMoallocate=fbsMomOrderdetailMapper.getListByOrderSheetMomMoallocate();
+        List<FbsMomOrderdetail> fbsMomOrderdetailList=new ArrayList<>();
+        if(fbsMomOrderdetailListCurrentStock!=null&&fbsMomOrderdetailListMomMoallocate!=null){
+            for(FbsMomOrderdetail momMoallocate:fbsMomOrderdetailListMomMoallocate){
+                for(FbsMomOrderdetail currentStock:fbsMomOrderdetailListCurrentStock){
+                    if(momMoallocate.getCinvcode().equals(currentStock.getCinvcode())){
+                        if(type.equals("1")){//备料
+                            getMaterialPreparation(currentStock,momMoallocate,fbsMomOrderdetailList);
+                        }else if(type.equals("2")){//缺料
+                            getLackOfMaterial(currentStock,momMoallocate,fbsMomOrderdetailList);
+                        }
+                    }
+                }
+            }
+        }
+        return fbsMomOrderdetailList;
+    }
+
+    @Override
+    public List<FbsMomOrderdetail> getApplyList() {
+        return fbsMomOrderdetailMapper.getApplyList();
+    }
+
+    //备料
+    public void getMaterialPreparation(FbsMomOrderdetail currentStock,FbsMomOrderdetail momMoallocate,List<FbsMomOrderdetail> fbsMomOrderdetailList){
+        if(currentStock.getMaterialPreparationTotal()-momMoallocate.getMaterialPreparationNumber()>0){
+            momMoallocate.setMaterialPreparationTotal(currentStock.getMaterialPreparationTotal());
+            fbsMomOrderdetailList.add(momMoallocate);
+        }
+    }
+
+    //缺料
+    public void getLackOfMaterial(FbsMomOrderdetail currentStock,FbsMomOrderdetail momMoallocate,List<FbsMomOrderdetail> fbsMomOrderdetailList){
+        if(currentStock.getMaterialPreparationTotal()-momMoallocate.getMaterialPreparationNumber()<0){
+            momMoallocate.setMaterialPreparationTotal(currentStock.getMaterialPreparationTotal());
+            fbsMomOrderdetailList.add(momMoallocate);
+        }
+    }
 }

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

@@ -407,4 +407,50 @@ public class FbsPuArrivalvouchController {
 		 return result;
 	 }
 
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 品质看板:未入库批数
+	 * @Date 2020/10/28 16:02
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.lang.Integer>
+	 */
+	 @GetMapping(value = "/getNotInSum")
+	 public Result<Integer> getNotInSum(){
+		 Result<Integer> result=new Result<>();
+		 try {
+			 Integer total=fbsPuArrivalvouchService.getNotInSum();
+			 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/28 16:05
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
+	 */
+	 @GetMapping(value = "/getCheckRateByBatchno")
+	 public Result<Map<String,Object>> getCheckRateByBatchno(){
+		 Result<Map<String,Object>> result=new Result<>();
+		 try {
+			 Map<String,Object> map=fbsPuArrivalvouchService.getCheckRateByBatchno();
+			 result.setResult(map);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+
+	 }
+
 }

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

@@ -74,4 +74,22 @@ public interface FbsPuArrivalvouchMapper extends BaseMapper<FbsPuArrivalvouch> {
     * @return java.lang.Integer
     */
     Integer getThisMonthArriveSum();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 品质看板:未入库批数
+    * @Date 2020/10/28 10:31
+    * @Param []
+    * @return java.lang.Integer
+    */
+    Integer getNotInSum();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 品质看板：当月供检验合格率
+    * @Date 2020/10/28 16:02
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch>
+    */
+    List<FbsPuArrivalvouch> getCheckRateByBatchno();
 }

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

@@ -1,116 +1,124 @@
 <?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.fbsPuArrivalvouch.mapper.FbsPuArrivalvouchMapper">
-
-    <select id="getWatingCheckList" resultType="java.util.HashMap">
-
-       <!-- SELECT b.cVenCode '供应商编码',c.cVenName '供应商名称',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
-                iQuantity - fInspectQuantity '待检数量',b.dDate '到货日期'-->
-        SELECT b.cVenCode '供应商编码',c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
-                a.iQuantity - a.fInspectQuantity arriveSum,CONVERT(varchar(30),b.dDate,23) arriveDate
-        FROM
-             PU_ArrivalVouchs a
-             left join PU_ArrivalVouch b on a.id = b.id
-             left join Vendor c on b.cVenCode = c.cVenCode
-             left join Inventory d on a.cInvCode = d.cInvCode
-          where  (a.iQuantity - a.fInspectQuantity) &gt; 0
-        order by b.dDate desc
-
+<mapper namespace="org.jeecg.modules.fbsMomOrder.mapper.FbsMomOrderdetailMapper">
+    <select id="getFbsMomOrderdetailSum" resultType="java.util.HashMap">
+        select sum(QualifiedInQty) as '已完成',sum(Qty)-sum(QualifiedInQty) as '未完成' from mom_orderdetail
     </select>
 
-      <select id="getCheckSum" resultType="int">
-
-          SELECT count(1)
+    <select id="getQualifiedInQty" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+        i.cInvName ,
+        sum(mo.QualifiedInQty) as qualifiedinqty
         FROM
-             PU_ArrivalVouchs a
-             left join PU_ArrivalVouch b on a.id = b.id
-             left join Vendor c on b.cVenCode = c.cVenCode
-             left join Inventory d on a.cInvCode = d.cInvCode
-          where  (a.iQuantity - a.fInspectQuantity) &lt;= 0
-
+        mom_orderdetail mo
+        LEFT JOIN Inventory i ON mo.InvCode = i.cInvCode
+        GROUP BY
+        i.cInvName
     </select>
 
-
-    <select id="getWatingInList" resultType="java.util.HashMap">
-
-       <!-- SELECT b.cVenCode '供应商编码',c.cVenName '供应商名称',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
-                fValidQuantity - fRealQuantity '已到货未入库数据',b.dportdate '到货日期'-->
-           SELECT b.cVenCode '供应商编码',c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
-                a.fValidQuantity - a.fValidInQuan arriveSum,CONVERT(varchar(30),b.dDate ,23) arriveDate
+    <select id="getQualifiedInQtyWeek" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+        top 10
+        i.cInvName,
+        sum( QualifiedInQty ) as QualifiedInQty
         FROM
-             PU_ArrivalVouchs a
-             left join PU_ArrivalVouch b on a.id = b.id
-             left join Vendor c on b.cVenCode = c.cVenCode
-             left join Inventory d on a.cInvCode = d.cInvCode
-          where  (a.fValidQuantity - a.fValidInQuan) &gt; 0
-        order by b.dportdate desc
-
+        mom_orderdetail mo
+        LEFT JOIN Inventory i ON mo.InvCode = i.cInvCode
+        left join mom_morder mm on mo.modid=mm.modid
+        WHERE
+        datediff( WEEK, mm.DueDate, getdate ( ) ) = 0
+        GROUP BY
+        i.cInvName
     </select>
 
-     <select id="getInSum" resultType="int">
-          SELECT count(1)
+    <select id="getMonthList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+        m.MoCode,
+        i.cInvCode,
+        i.cInvStd,
+        i.cInvName,
+        mo.Qty,
+        mo.QualifiedInQty
         FROM
-             PU_ArrivalVouchs a
-             left join PU_ArrivalVouch b on a.id = b.id
-             left join Vendor c on b.cVenCode = c.cVenCode
-             left join Inventory d on a.cInvCode = d.cInvCode
-          where  (a.fValidQuantity - a.fValidInQuan) &lt;= 0
+        mom_orderdetail mo
+        LEFT JOIN mom_order m ON mo.MoId= m.MoId
+        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+        left join mom_morder mm on mo.MoDId=mm.MoDId
+        WHERE
+        datediff(
+        MONTH,
+        mm.StartDate,
+        getdate()) =0
     </select>
 
-    <select id="getPassRateByVendor" resultType="org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch">
-        SELECT top 6
-            v.cVenName,round( CAST (( SUM ( pa.fValidQuantity ) * 1.0 / SUM ( pa.iQuantity )) AS FLOAT ), 0 ) * 100 AS passRate
+    <select id="getDayList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+        m.MoCode,
+        i.cInvCode,
+        i.cInvStd,
+        i.cInvName,
+        mo.Qty,
+        mo.QualifiedInQty
         FROM
-            PU_ArrivalVouchs pa
-            LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
-            LEFT JOIN Vendor v ON p.cVenCode= v.cVenCode
+        mom_orderdetail mo
+        LEFT JOIN mom_order m ON mo.MoId= m.MoId
+        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+        left join mom_morder mm on mo.MoDId=mm.MoDId
         WHERE
-            datediff(
-            MONTH,
-            p.dDate,
-            getdate()) = 0
-        GROUP BY
-            p.cVenCode,v.cVenName
+        DateDiff(
+        dd,
+        mm.StartDate,
+        getdate()) =0
     </select>
 
-    <select id="getTodayArriveSum" resultType="java.lang.Integer">
+    <select id="getListByOrderSheetCurrentStock" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
         SELECT SUM
-            ( pa.fValidInQuan )
+        ( iQuantity ) as materialPreparationTotal,
+        cInvCode
         FROM
-            PU_ArrivalVouchs pa
-            LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
-        WHERE
-            DateDiff(
-            dd,
-            p.dDate,
-            getdate()) =0
+        CurrentStock
+        GROUP BY
+        cInvCode
     </select>
 
-    <select id="getWillArriveSum" resultType="java.lang.Integer">
-        SELECT SUM
-        ( pa.fValidInQuan )
+    <select id="getListByOrderSheetMomMoallocate" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+        SUM ( mm.Qty ) as materialPreparationNumber,
+        mo.InvCode,
+        m.MoCode,
+        i.cinvname,
+        i.cinvcode,
+        i.cinvstd
         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())
+        mom_moallocate mm
+        LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
+        left join mom_order m on mo.MoId=m.MoId
+        left join Inventory i on mo.InvCode=i.cInvCode
+        GROUP BY
+        mo.MoId,mo.InvCode,m.MoCode,i.cinvname,i.cinvcode,i.cinvstd
     </select>
 
-    <select id="getThisMonthArriveSum" resultType="java.lang.Integer">
+    <select id="getApplyList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
         SELECT SUM
-            ( pa.fValidInQuan )
+        ( mm.RequisitionQty ) - SUM ( RequisitionIssQty ) AS unfinishedQuantity,
+        mo.InvCode,
+        m.MoCode,
+        i.cinvname,
+        i.cinvcode,
+        i.cinvstd
         FROM
-            PU_ArrivalVouchs pa
-            LEFT JOIN PU_ArrivalVouch p ON pa.ID= p.ID
-        WHERE
-            datediff(
-            MONTH,
-            p.dDate,
-            getdate()) =0
+        mom_moallocate mm
+        LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
+        LEFT JOIN mom_order m ON mo.MoId= m.MoId
+        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+        GROUP BY
+        mo.MoId,
+        mo.InvCode,
+        m.MoCode,
+        i.cinvname,
+        i.cinvcode,
+        i.cinvstd
+        HAVING
+        SUM ( mm.RequisitionQty )-sum(RequisitionIssQty)>0
     </select>
-
 </mapper>

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

@@ -57,4 +57,22 @@ public interface IFbsPuArrivalvouchService extends IService<FbsPuArrivalvouch> {
      * @return java.lang.Integer
      */
     Integer getThisMonthArriveSum();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 品质看板:未入库批数
+    * @Date 2020/10/28 16:00
+    * @Param []
+    * @return java.lang.Integer
+    */
+    Integer getNotInSum();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 品质看板：当月供检验合格率
+    * @Date 2020/10/28 16:03
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch>
+    */
+    Map<String,Object> getCheckRateByBatchno();
 }

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

@@ -71,4 +71,23 @@ public class FbsPuArrivalvouchServiceImpl extends ServiceImpl<FbsPuArrivalvouchM
         return fbsPuArrivalvouchMapper.getThisMonthArriveSum();
     }
 
+    @Override
+    public Integer getNotInSum() {
+        return fbsPuArrivalvouchMapper.getNotInSum();
+    }
+
+    @Override
+    public  Map<String,Object> getCheckRateByBatchno() {
+        //获取合格率数据
+        List<FbsPuArrivalvouch> fbsPuArrivalvouchList=fbsPuArrivalvouchMapper.getCheckRateByBatchno();
+        //封装map数据
+        Map<String,Object> map=new HashMap<>();
+        if(fbsPuArrivalvouchList!=null){
+            for(FbsPuArrivalvouch fbsPuArrivalvouch:fbsPuArrivalvouchList){
+                map.put(fbsPuArrivalvouch.getCVenName(),fbsPuArrivalvouch.getPassRate());
+            }
+        }
+        return map;
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fbsWorkshopDispatchList.controller;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -558,13 +559,17 @@ public class FbsWorkshopDispatchListController {
 		 try {
 			 //派工数据及完工信息
 			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.getProductList();
+			 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			 if(fbsWorkshopDispatchListList!=null){
                  List<String> stringList=new ArrayList<>();//存储库存产品id(code)
                  for(FbsWorkshopDispatchList dispatchList:fbsWorkshopDispatchListList){
-                     if(StringUtils.isNotBlank(dispatchList.getProductId())){
-                        stringList.add(dispatchList.getProductId());
-                    }
-                }
+                     	if(StringUtils.isNotBlank(dispatchList.getProductId())){
+                        	stringList.add(dispatchList.getProductId());
+                    	}
+                    	if(dispatchList.getEndDate()!=null){
+							dispatchList.setEndDate(sdf.parse(sdf.format(dispatchList.getEndDate())));
+						}
+                	}
                 if(stringList.size()>0){
                      //根据库存产品id查询U8库存产品获取规格
                     List<FbsInventory> fbsInventoryList=iFbsInventoryService.getListByIds(stringList);

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -122,6 +122,9 @@ public class FbsWorkshopDispatchList implements Serializable {
     @Excel(name = "状态", width = 15)
     private String state;
 
+    //项目名称
+    private String projectName;
+
     //合并行
 	@TableField(exist = false)
     private Integer mergeLines;