后台 看板问题修改

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fbsAbnormalWorkingHours.controller;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -40,7 +41,9 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 import com.alibaba.fastjson.JSON;
 
- /**
+import static org.jeecg.common.util.oConvertUtils.isEmpty;
+
+/**
  * @Title: Controller
  * @Description: 生产异常信息统计单
  * @author： jeecg-boot
@@ -426,20 +429,28 @@ public class FbsAbnormalWorkingHoursController {
 		 //查询当月中的产品的异常数量
 		 List<FbsAbnormalWorkingHours> fbsAbnormalWorkingHoursList=fbsAbnormalWorkingHoursService.getRejectsNumber(dateString);
 		 //U8完工数量
-		 List<FbsMomOrderdetail> fbsMomOrderdetailList=iFbsMomOrderdetailService.getQualifiedInQty();
+//		 List<FbsMomOrderdetail> fbsMomOrderdetailList=iFbsMomOrderdetailService.getQualifiedInQty();
 		 List<Map<String,Object>> mapList=new ArrayList<>();
-		 if(fbsAbnormalWorkingHoursList!=null&&fbsMomOrderdetailList!=null){
+		 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("sum1",Double.valueOf(String.valueOf(fbsMomOrderdetail.getQualifiedinqty())).intValue()-Integer.parseInt(fbsAbnormalWorkingHours.getRejectsNumberTotal()));
-						map.put("sum2",fbsMomOrderdetail.getQualifiedinqty());
-					}
+				BigDecimal rejectsNumberTotal=new BigDecimal("0.0");
+				if(StringUtils.isNotBlank(fbsAbnormalWorkingHours.getRejectsNumberTotal())&&isNumber(fbsAbnormalWorkingHours.getRejectsNumberTotal())){
+					rejectsNumberTotal=getDecimal(Double.valueOf(fbsAbnormalWorkingHours.getRejectsNumberTotal()));
 				}
+				map.put("sum1",fbsAbnormalWorkingHours.getPlannedQuantity().subtract(rejectsNumberTotal));
+				map.put("sum2",fbsAbnormalWorkingHours.getPlannedQuantity().doubleValue());
+//		 		for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailList){
+//		 			//找到对应产品的数量
+//		 			if(fbsAbnormalWorkingHours.getProduct().equals(fbsMomOrderdetail.getCinvname())){
+//						map.put("sum1",Double.valueOf(String.valueOf(fbsMomOrderdetail.getQualifiedinqty())).intValue()-Integer.parseInt(fbsAbnormalWorkingHours.getRejectsNumberTotal()));
+//						map.put("sum2",fbsMomOrderdetail.getQualifiedinqty());
+//					}
+//				}
 				mapList.add(map);
 			}
 		 }
@@ -448,6 +459,24 @@ public class FbsAbnormalWorkingHoursController {
 		 return result;
 	 }
 
+	public BigDecimal getDecimal(Double d){
+		BigDecimal decimal= new BigDecimal(d);
+		return decimal;
+	}
+
+	private boolean isNumber(String str){
+		if(isEmpty(str)){
+			return false;
+		}
+		String reg = "\\d+(\\.\\d+)?";
+		return str.matches(reg);
+
+	}
+
+	public static String formatDouble5(double d) {
+		return String.format("%.2f", d);
+	}
+
 	 /**
 	 * @Author chenchuang
 	 * @Description //TODO 产线看板：当日良率

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsAbnormalWorkingHours.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -185,7 +186,9 @@ public class FbsAbnormalWorkingHours implements Serializable {
 	//不良品总数
 	@TableField(exist = false)
 	private String rejectsNumberTotal;
-
+	//计划数量
+	@TableField(exist = false)
+	private BigDecimal plannedQuantity;
 	//月份
 	@TableField(exist = false)
 	private String months;

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsAbnormalWorkingHours.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -85,7 +86,10 @@ public class FbsAbnormalWorkingHoursDescribe implements Serializable {
 	private String workshopDispatchListId;
 	@Excel(name = "不良品数量", width = 15)
 	private String rejectsNumber;
-
+	@Excel(name = "类别（产品、物料）", width = 15)
+	private String type;
+	@Excel(name = "计划数量", width = 15)
+	private BigDecimal plannedQuantity;
 	//异常分类总数
 	@TableField(exist = false)
 	private String total;
@@ -95,4 +99,6 @@ public class FbsAbnormalWorkingHoursDescribe implements Serializable {
 	//结束时间
 	@TableField(exist = false)
 	private String end;
+
+
 }

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

@@ -11,6 +11,7 @@
         WHERE
             fawhd.del_flag = '0'
             AND fawhd.del_flag = '0'
+            AND type='物料'
             AND date_format( fawh.date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )
         GROUP BY
             fawhd.type_name

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

@@ -28,7 +28,8 @@
             fawh.product -->
         SELECT
           fawhd.product,
-          sum( fawhd.rejects_number ) rejectsNumberTotal
+          sum( fawhd.rejects_number ) rejectsNumberTotal,
+          fawhd.planned_quantity plannedQuantity
         FROM
           fbs_abnormal_working_hours_describe fawhd
           LEFT JOIN fbs_abnormal_working_hours fawh ON fawhd.abnormal_working_hours_id = fawh.id
@@ -36,9 +37,10 @@
             fawhd.del_flag = '0'
             AND fawhd.del_flag = '0'
             AND fawhd.product IS NOT NULL
+            AND fawhd.type='产品'
             AND date_format( fawh.date, #{dateString} ) = DATE_FORMAT( now( ), #{dateString} )
         GROUP BY
-            fawhd.product
+            fawhd.product,fawhd.planned_quantity
     </select>
 
     <select id="getRejectsNumberSameDay" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours">

src/main/java/org/jeecg/modules/fbsBasedate/entity/FbsPersonnel.java

@@ -73,4 +73,8 @@ public class FbsPersonnel implements Serializable {
 	/**岗位*/
 	@Excel(name = "岗位", width = 15)
 	private String post;
+	/**员工技能*/
+	@Excel(name = "员工技能", width = 15)
+	private String staffSkills;
+
 }

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

@@ -59,7 +59,7 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
     * @Param []
     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
     */
-    List<FbsMomOrderdetail> getMonthListStatre();
+    List<FbsMomOrderdetail> getMonthListStatre(@Param("fbsMomOrderdetail")FbsMomOrderdetail fbsMomOrderdetail);
 
     /**
     * @Author chenchuang

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

@@ -94,11 +94,15 @@
         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-->
         mo.Status <![CDATA[ <>]]> 4
+        <if test="fbsMomOrderdetail.mocode!=null and fbsMomOrderdetail.mocode!=''">
+            AND m.MoCode=#{fbsMomOrderdetail.mocode}
+        </if>
         ORDER BY
         m.createtime DESC
     </select>

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

@@ -50,7 +50,7 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     List<FbsMomOrderdetail> getMonthList();
 
 
-    List<FbsMomOrderdetail> getMonthListStatre();
+    List<FbsMomOrderdetail> getMonthListStatre(FbsMomOrderdetail fbsMomOrderdetail);
 
     /**
     * @Author chenchuang

src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderdetailServiceImpl.java

@@ -55,8 +55,8 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
     }
 
     @Override
-    public List<FbsMomOrderdetail> getMonthListStatre() {
-        return fbsMomOrderdetailMapper.getMonthListStatre();
+    public List<FbsMomOrderdetail> getMonthListStatre(FbsMomOrderdetail fbsMomOrderdetail) {
+        return fbsMomOrderdetailMapper.getMonthListStatre(fbsMomOrderdetail);
     }
 
     @Override

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

@@ -352,7 +352,8 @@ public class FbsWorkshopDispatchListController {
 //		 	 fbsMomOrderQueryWrapper.lambda().orderByDesc(FbsMomOrder::getCreatetime);
 //			 List<FbsMomOrder> fbsMomOrderList=iFbsMomOrderService.list(fbsMomOrderQueryWrapper);
 //			 result.setResult(fbsMomOrderList);
-			 List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatre();
+			 FbsMomOrderdetail fbsMomOrderdetail=new FbsMomOrderdetail();
+			 List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatre(fbsMomOrderdetail);
 			 //剩余数量为0的remove
 			 getFbsMomOrderdetailList(fbsMomOrderdetailList);
 			 result.setResult(fbsMomOrderdetailList);
@@ -410,10 +411,12 @@ public class FbsWorkshopDispatchListController {
 	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>>
 	 */
 	 @GetMapping(value = "/getSumDispatchReport")
-	 public Result<List<FbsWorkshopDispatchList>> getSumDispatchReport(){
+	 public Result<List<FbsWorkshopDispatchList>> getSumDispatchReport(FbsWorkshopDispatchList fbsWorkshopDispatchList){
 		 Result<List<FbsWorkshopDispatchList>> result=new Result<>();
 		 try {
-			 List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatre();
+			 FbsMomOrderdetail fbsMomOrderdetail=new FbsMomOrderdetail();
+			 fbsMomOrderdetail.setMocode(fbsWorkshopDispatchList.getProductionOrderNumberName());
+			 List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatre(fbsMomOrderdetail);
 			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.getSumDispatch(fbsMomOrderdetailList);
 			 result.setResult(fbsWorkshopDispatchListList);
 			 result.success("操作成功");