首页

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

@@ -152,6 +152,10 @@ public class FbsWorkshopDispatchList implements Serializable {
 	@TableField(exist = false)
     private String standardWorkingHoursTotal;
 
+	//实际标准工时合计
+	@TableField(exist = false)
+	private String standardWorkingHoursActualTotal;
+
 	@TableField(exist = false)
 	private List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList;
 

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

@@ -168,6 +168,15 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
                 if(manHoursCompletedTotal.doubleValue()!=0){
                     dispatchListSum.setManHoursCompletedTotal(formatDouble5(manHoursCompletedTotal.doubleValue()));
                 }
+                //计算标准工时
+                BigDecimal workingHoursTotal=new BigDecimal("0.0");
+                if(StringUtils.isNotBlank(dispatchListSum.getStandardWorkingHoursZ())){
+                    workingHoursTotal=getDecimal(Double.valueOf(dispatchListSum.getStandardWorkingHoursZ()));
+                }
+                if(dispatchListSum.getQuantityCompletedTotal()!=null){
+                    String working=formatDouble5((workingHoursTotal.multiply(getDecimal(dispatchListSum.getQuantityCompletedTotal().doubleValue()))).doubleValue());
+                    dispatchListSum.setStandardWorkingHoursActualTotal(working);
+                }
                 dispatchListSum.setFbsWorkshopDispatchListList(dispatchListAdd);
             }
         }
@@ -210,7 +219,6 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
 
     //获取erp中的订单数据
     public void getWorkshopDispatchListListSum(List<FbsWorkshopDispatchList> fbsWorkshopDispatchListListSum,List<FbsMomOrderdetail> fbsMomOrderdetailList){
-
         for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailList){
             FbsWorkshopDispatchList fbsWorkshopDispatchList=new FbsWorkshopDispatchList();
             fbsWorkshopDispatchList.setProjectName(fbsMomOrderdetail.getDefine12());
@@ -224,6 +232,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
             }
             String working=formatDouble5((workingHoursTotal.multiply(getDecimal(Double.valueOf(fbsMomOrderdetail.getQty()+"")))).doubleValue());
             fbsWorkshopDispatchList.setStandardWorkingHoursTotal(working);
+            fbsWorkshopDispatchList.setStandardWorkingHoursZ(fbsMomOrderdetail.getCinvDefine13());
             fbsWorkshopDispatchList.setStatus(fbsMomOrderdetail.getStatus());
             fbsWorkshopDispatchListListSum.add(fbsWorkshopDispatchList);
         }
@@ -300,6 +309,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
     public void getStatisticsTotal(List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList,List<Date> dateList){
         Integer numberOfTasksTotal=0;//月度计划
         BigDecimal standardWorkingHoursTotal=new BigDecimal(0.00);//标准工时
+        BigDecimal standardWorkingHoursActualTotal=new BigDecimal(0.00);//实际标准工时
         Integer quantityCompletedTotal=0;//累计完成数量
         BigDecimal manHoursCompletedTotal=new BigDecimal(0.00);//累计总工时
         //循环累加计算
@@ -310,6 +320,9 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
             if(isNumber(workshopDispatchList.getStandardWorkingHoursTotal())){
                 standardWorkingHoursTotal=standardWorkingHoursTotal.add(getDecimal(Double.valueOf(workshopDispatchList.getStandardWorkingHoursTotal())));
             }
+            if(isNumber(workshopDispatchList.getStandardWorkingHoursActualTotal())){
+                standardWorkingHoursActualTotal=standardWorkingHoursActualTotal.add(getDecimal(Double.valueOf(workshopDispatchList.getStandardWorkingHoursActualTotal())));
+            }
             if(workshopDispatchList.getQuantityCompletedTotal()!=null){
                 quantityCompletedTotal+=workshopDispatchList.getQuantityCompletedTotal();
             }
@@ -376,6 +389,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         fbsWorkshopDispatchList.setProjectName("统计");
         fbsWorkshopDispatchList.setNumberOfTasksTotal(numberOfTasksTotal+"");
         fbsWorkshopDispatchList.setStandardWorkingHoursTotal(formatDouble5(standardWorkingHoursTotal.doubleValue())+"");
+        fbsWorkshopDispatchList.setStandardWorkingHoursActualTotal(formatDouble5(standardWorkingHoursActualTotal.doubleValue())+"");
         fbsWorkshopDispatchList.setQuantityCompletedTotal(quantityCompletedTotal);
         fbsWorkshopDispatchList.setManHoursCompletedTotal(formatDouble5(manHoursCompletedTotal.doubleValue())+"");
         fbsWorkshopDispatchList.setFbsWorkshopDispatchListList(fbsWorkshopDispatchListListTotal);