调整

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

@@ -159,6 +159,9 @@ public class FbsWorkingStatisticsServiceImpl extends ServiceImpl<FbsWorkingStati
                     fbsAbnormalWorkingHoursDescribe.setProductId(fbsWorkshopDispatchList.getProductId());
                     fbsAbnormalWorkingHoursDescribe.setProduct(fbsWorkshopDispatchList.getProduct());
                     fbsAbnormalWorkingHoursDescribe.setPlannedQuantity(fbsWorkshopDispatchList.getPlannedQuantity());
+                    fbsAbnormalWorkingHoursDescribe.setCostItemCode(fbsWorkshopDispatchList.getCostItemCode());
+                    fbsAbnormalWorkingHoursDescribe.setProjectName(fbsWorkshopDispatchList.getProjectName());
+                    fbsAbnormalWorkingHoursDescribe.setWorkCenter(fbsWorkshopDispatchList.getWorkCenter());
                     //获取最大排序
                     QueryWrapper<FbsAbnormalWorkingHoursDescribe> queryWrapper2=new QueryWrapper<>();
                     queryWrapper2.lambda().eq(FbsAbnormalWorkingHoursDescribe::getDelFlag,"0");

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

@@ -50,7 +50,7 @@
          AND fawhd.type='物料'
          AND fawhd.planned_quantity >0
          -->
-        AND date_format( fawh.date, '%Y-%m-%d' ) = DATE_FORMAT( now( ), '%Y-%m-%d' )
+        AND date_format( fawh.date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )
 
         <!--fawhd.product,fawhd.planned_quantity-->
     </select>

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

@@ -456,6 +456,9 @@ public class FbsMomOrderdetail implements Serializable {
 	@TableField(exist = false)
 	private String yearMonth;
 
+	@TableField(exist = false)
+	private String year;
+
 	//产品名称
 	@TableField(exist = false)
 	private String mocinvname;

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

@@ -8,6 +8,8 @@
         FROM
             mom_orderdetail
             modee LEFT JOIN mom_order mo ON modee.MoId = mo.MoId
+        LEFT JOIN fbs_technological_process ftp ON modee.InvCode = ftp.NAME
+            where ftp.del_flag = '0'
         <!--WHERE-->
             <!--substring( mo.MoCode, 3, 4 ) = substring( CONVERT ( VARCHAR ( 100 ), GETDATE ( ), 112 ), 3, 4 )-->
         <!--DATE_FORMAT(mo.CreateTime, '%Y%m' ) = DATE_FORMAT(CURDATE(), '%Y%m' )
@@ -41,7 +43,7 @@
         i.cInvName-->
         SELECT
             i.cInvName,
-            sum( iQuantity ) AS QualifiedInQty
+            iQuantity AS QualifiedInQty
         FROM
           rdrecords10 mo
         LEFT JOIN Inventory i ON mo.cInvCode = i.cInvCode
@@ -220,52 +222,67 @@
         left join mom_morder mm on mo.MoDId=mm.MoDId
         left join fbs_technological_process ftp on mo.InvCode=ftp.name
         WHERE
+            1=1
         <!--datediff(
         MONTH,
         mm.StartDate,
         getdate()) =0-->
         <!--substring(m.MoCode, 3, 4)=SUBSTRING ( CONVERT ( VARCHAR ( 100 ), GETDATE( ), 112 ), 3, 4 )-->
 
-        (
 
-            <if test="fbsMomOrderdetail.yearMonth!=null and fbsMomOrderdetail.yearMonth!=''">
-                <!--SUBSTRING ( CONVERT ( VARCHAR ( 100 ), mo.CloseTime, 112 ), 3, 4 )=#{fbsMomOrderdetail.yearMonth}
+
+            <if test="fbsMomOrderdetail.yearMonth!=null and fbsMomOrderdetail.yearMonth!='' and fbsMomOrderdetail.year!=null and fbsMomOrderdetail.year!=''">
+                and (
+            <!--SUBSTRING ( CONVERT ( VARCHAR ( 100 ), mo.CloseTime, 112 ), 3, 4 )=#{fbsMomOrderdetail.yearMonth}
                 or
                 substring(m.MoCode, 3, 4)=#{fbsMomOrderdetail.yearMonth} sql修改-->
+
                 SUBSTRING(DATE_FORMAT(mo.CloseTime,'%Y%m%d'),3,4)=#{fbsMomOrderdetail.yearMonth}
                 OR
                 substring(DATE_FORMAT(m.CreateTime,'%Y%m%d'),3,4)=#{fbsMomOrderdetail.yearMonth}
+                )
             </if>
-            <if test="fbsMomOrderdetail.yearMonth==null or fbsMomOrderdetail.yearMonth==''">
-                <!--datediff(
-                MONTH,
-                mo.CloseTime,
-                getdate()) =0 sql
-                OR
-                substring(m.MoCode, 3, 4)=SUBSTRING ( CONVERT ( VARCHAR ( 100 ), GETDATE( ), 112 ), 3, 4 )sql修改-->
-                DATE_FORMAT(mo.CloseTime,'%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m' )
+            <if test="fbsMomOrderdetail.year!=null and fbsMomOrderdetail.year!='' and (fbsMomOrderdetail.yearMonth==null or fbsMomOrderdetail.yearMonth=='')">
+                and (
+                <!--SUBSTRING ( CONVERT ( VARCHAR ( 100 ), mo.CloseTime, 112 ), 3, 4 )=#{fbsMomOrderdetail.yearMonth}
+                or
+                substring(m.MoCode, 3, 4)=#{fbsMomOrderdetail.yearMonth} sql修改-->
+                SUBSTRING(DATE_FORMAT(mo.CloseTime,'%Y%m%d'),3,2)=#{fbsMomOrderdetail.year}
                 OR
-                substring(DATE_FORMAT(m.CreateTime,'%Y%m%d'), 3, 4)=SUBSTRING(DATE_FORMAT(NOW(),'%Y%m%d'), 3, 4 )
-    </if>
-)
+                substring(DATE_FORMAT(m.CreateTime,'%Y%m%d'),3,2)=#{fbsMomOrderdetail.year}
+                )
+            </if>
+        <!--<if test="fbsMomOrderdetail.yearMonth==null or fbsMomOrderdetail.yearMonth=='' ">-->
+            <!--datediff(
+            MONTH,
+            mo.CloseTime,
+            getdate()) =0 sql
+            OR
+            substring(m.MoCode, 3, 4)=SUBSTRING ( CONVERT ( VARCHAR ( 100 ), GETDATE( ), 112 ), 3, 4 )sql修改-->
+        <!--DATE_FORMAT(mo.CloseTime,'%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m' )
+        OR
+        substring(DATE_FORMAT(m.CreateTime,'%Y%m%d'), 3, 4)=SUBSTRING(DATE_FORMAT(NOW(),'%Y%m%d'), 3, 4 )-->
+
+        <!--</if>-->
+
 AND mo.Status = 4 and ftp.del_flag='0'
 <if test="fbsMomOrderdetail.mocode!=null and fbsMomOrderdetail.mocode!=''">
-    AND m.MoCode=#{fbsMomOrderdetail.mocode}
+AND m.MoCode=#{fbsMomOrderdetail.mocode}
 </if>
 <if test="fbsMomOrderdetail.itemCode!=null and fbsMomOrderdetail.itemCode!=''">
-    AND mo.cost_item_code=#{fbsMomOrderdetail.itemCode}
+AND mo.cost_item_code=#{fbsMomOrderdetail.itemCode}
 </if>
 <if test="fbsMomOrderdetail.costitemname!=null and fbsMomOrderdetail.costitemname!=''">
-    AND mo.CostItemName LIKE "%" #{fbsMomOrderdetail.costitemname} "%"
+AND mo.CostItemName LIKE "%" #{fbsMomOrderdetail.costitemname} "%"
 </if>
 <if test="fbsMomOrderdetail.workCenter!=null and fbsMomOrderdetail.workCenter!=''">
-    AND ftp.memo LIKE  "%" #{fbsMomOrderdetail.workCenter} "%"
+AND ftp.memo LIKE  "%" #{fbsMomOrderdetail.workCenter} "%"
 </if>
 <if test="fbsMomOrderdetail.cinvcode!=null and fbsMomOrderdetail.cinvcode!=''">
-    AND i.cInvCode=#{fbsMomOrderdetail.cinvcode}
+AND i.cInvCode=#{fbsMomOrderdetail.cinvcode}
 </if>
 <if test="fbsMomOrderdetail.cinvname!=null and fbsMomOrderdetail.cinvname!=''">
-    AND i.cInvName=#{fbsMomOrderdetail.cinvname}
+AND i.cInvName=#{fbsMomOrderdetail.cinvname}
 </if>
 ORDER BY
 m.createtime DESC

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

@@ -94,7 +94,7 @@
         <!-- SELECT b.cVenCode '供应商编码',c.cVenName '供应商名称',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
                  fValidQuantity - fRealQuantity '已到货未入库数据',b.dportdate '到货日期'-->
         SELECT b.cVenCode cVenCode,c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
-        (a.fRealQuantity - a.fValidInQuan) arriveSum,
+        (a.fRealQuantity - a.fvalidQuantity) arriveSum,
        <!-- CONVERT(varchar(30),b.dDate ,112) arriveDate,-->
         DATE_FORMAT( dDate,'%Y%m%d') arriveDate,
         a.cItemName cItemName
@@ -105,9 +105,12 @@
         left join Inventory d on a.cInvCode = d.cInvCode
         where
         <!--(a.fValidQuantity - a.fValidInQuan) &gt; 0-->
-        (a.fRealQuantity - a.fValidInQuan) &gt; 0
-        and DATE_FORMAT( b.dDate, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+        <!--(a.fRealQuantity - a.fvalidQuantity) &gt; 0
+        and--> DATE_FORMAT( b.dDate, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
         and d.bPropertyCheck=1
+        GROUP BY
+        d.cinvcode,a.fRealQuantity
+        HAVING a.fRealQuantity-sum(a.fvalidQuantity)>0
         order by b.dDate desc
 
     </select>
@@ -233,12 +236,12 @@
             p.dDate,
             getdate()) =0 sql修改-->
             DATE_FORMAT( p.dDate, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
-            and pa.fRealQuantity = pa.fValidInQuan
+            and pa.fRealQuantity = pa.fvalidQuantity
             AND d.bPropertyCheck=1
     </select>
 
     <select id="getNotInSum" resultType="java.lang.Integer">
-        SELECT
+        select count(*) from(SELECT
         count(pa.Autoid)
         FROM
         PU_ArrivalVouchs pa
@@ -246,9 +249,13 @@
         left join Inventory d on pa.cInvCode = d.cInvCode
         WHERE
 
-        (pa.fRealQuantity - pa.fValidInQuan) &gt; 0
-        and DATE_FORMAT( p.dDate, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+        <!-- (pa.fRealQuantity - pa.fValidInQuan) &gt; 0
+        and -->
+            DATE_FORMAT( p.dDate, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
         AND d.bPropertyCheck=1
+        GROUP BY
+        d.cinvcode,pa.fRealQuantity
+        HAVING pa.fRealQuantity-sum(pa.fvalidQuantity)>0) a
         <!--(pa.iQuantity-pa.fRealQuantity)>0 -->
 	    <!--and
         datediff(

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

@@ -570,9 +570,15 @@ public class FbsWorkshopDispatchListController {
 			 List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatre(fbsMomOrderdetail);
 			 //已关闭当月数据
 			 //获取订单查询月份格式 202012 =》2012
+			 String year="";
 			 if(fbsWorkshopDispatchList.getYear()!=null&&!fbsWorkshopDispatchList.getYear().equals("")){
-				 String year=fbsWorkshopDispatchList.getYear();
-				 fbsMomOrderdetail.setYearMonth(year.substring(2)+fbsWorkshopDispatchList.getMonth());
+//				 String year=fbsWorkshopDispatchList.getYear();
+//				 fbsMomOrderdetail.setYearMonth(year.substring(2)+fbsWorkshopDispatchList.getMonth());
+				 year=fbsWorkshopDispatchList.getYear().substring(2);
+				 fbsMomOrderdetail.setYear(year);
+			 }
+			 if(fbsWorkshopDispatchList.getMonth()!=null&&!fbsWorkshopDispatchList.getMonth().equals("")){
+				 fbsMomOrderdetail.setYearMonth(year+fbsWorkshopDispatchList.getMonth());
 			 }
 			 List<FbsMomOrderdetail> fbsMomOrderdetailList2= iFbsMomOrderdetailService.getMonthListStatreReviewed(fbsMomOrderdetail);
 			 fbsMomOrderdetailList.addAll(fbsMomOrderdetailList2);

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

@@ -76,7 +76,7 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
     */
     List<FbsWorkshopDispatchList> getDispatchListByDate(@Param("date")String date);
 
-    List<FbsWorkshopDispatchList> getDispatchClose(@Param("startDate")String startDate,@Param("endDate")String endDate );
+    List<FbsWorkshopDispatchList> getDispatchClose(@Param("startDate")String startDate,@Param("endDate")String endDate ,@Param("list") List<String> list);
 
     /**
     * @Author chenchuang

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

@@ -104,11 +104,19 @@
         AND fws.del_flag = '0'
         <!--AND fwdl.latest_completed_quantity <![CDATA[ <> ]]> fwdl.number_of_tasks-->
         and fws.final_state in('2','3')
-        <if test="startDate!=null">
+
+        <!--<if test="startDate!=null">
             <![CDATA[   and DATE_FORMAT(fws.final_time, '%Y-%m-%d')>=  #{startDate}]]>
         </if>
         <if test="endDate!=null">
             <![CDATA[  and DATE_FORMAT(fws.final_time, '%Y-%m-%d') <= #{endDate} ]]>
+        </if>-->
+
+        <if test="list!=null and list.size()>0">
+            AND fwdl.production_order_number_name IN
+            <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
         GROUP BY
         fwdl.production_order_number_name,

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

@@ -71,51 +71,56 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
 
         Calendar cale = Calendar.getInstance();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-        String firstday, lastday;
-        if(fbsWorkshopDispatchListWhere.getYear()==null){
-            // 获取前月的第一天
-            cale = Calendar.getInstance();
-            cale.add(Calendar.MONTH, 0);
-            cale.set(Calendar.DAY_OF_MONTH, 1);
-            firstday = format.format(cale.getTime());
-            // 获取前月的最后一天
-            cale = Calendar.getInstance();
-            cale.add(Calendar.MONTH, 1);
-            cale.set(Calendar.DAY_OF_MONTH, 0);
-            lastday = format.format(cale.getTime());
-                //获取开始时间结束时间 当前日期前15天时间
-    //        String startTime = fmt.format(new Date().getTime()-14*24*60*60*1000);
-    //        String endTime = fmt.format(new Date());
-        }else{
-            Calendar cal = Calendar.getInstance();
-            //设置年份
-            cal.set(Calendar.YEAR,Integer.parseInt(fbsWorkshopDispatchListWhere.getYear()));
-            //设置月份
-            cal.set(Calendar.MONTH, Integer.parseInt(fbsWorkshopDispatchListWhere.getMonth())-1);
-            //获取某月最小天数
-            int firstDay = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
-            //设置日历中月份的最小天数
-            cal.set(Calendar.DAY_OF_MONTH, firstDay);
-            firstday=format.format(cal.getTime());
-            //设置日历中月份的最大天数
-            int lastDay = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
-            cal.set(Calendar.DAY_OF_MONTH, lastDay);
-            lastday=format.format(cal.getTime());
+//        String firstday, lastday;
+//        if(fbsWorkshopDispatchListWhere.getYear()==null){
+//            // 获取前月的第一天
+//            cale = Calendar.getInstance();
+//            cale.add(Calendar.MONTH, 0);
+//            cale.set(Calendar.DAY_OF_MONTH, 1);
+//            firstday = format.format(cale.getTime());
+//            // 获取前月的最后一天
+//            cale = Calendar.getInstance();
+//            cale.add(Calendar.MONTH, 1);
+//            cale.set(Calendar.DAY_OF_MONTH, 0);
+//            lastday = format.format(cale.getTime());
+//        }else{
+//            Calendar cal = Calendar.getInstance();
+//            //设置年份
+//            cal.set(Calendar.YEAR,Integer.parseInt(fbsWorkshopDispatchListWhere.getYear()));
+//            //设置月份
+//            cal.set(Calendar.MONTH, Integer.parseInt(fbsWorkshopDispatchListWhere.getMonth())-1);
+//            //获取某月最小天数
+//            int firstDay = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
+//            //设置日历中月份的最小天数
+//            cal.set(Calendar.DAY_OF_MONTH, firstDay);
+//            firstday=format.format(cal.getTime());
+//            //设置日历中月份的最大天数
+//            int lastDay = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
+//            cal.set(Calendar.DAY_OF_MONTH, lastDay);
+//            lastday=format.format(cal.getTime());
+//        }
+//        String startTime = firstday;
+//        String endTime = lastday;
+        List<String> codeList=new ArrayList<>();
+        for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailList){
+            codeList.add(fbsMomOrderdetail.getMocode());
         }
-        String startTime = firstday;
-        String endTime = lastday;
-        List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListMapper.getDispatchClose(startTime,endTime);
+        List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListMapper.getDispatchClose("startTime","endTime",codeList);
+
+//        List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListMapper.getDispatchClose(startTime,endTime,codeList);
         //两个时间之间的所有日期
-        List<Date> dateList=startDateAndEndDate(startTime,endTime);
+//        List<Date> dateList=startDateAndEndDate(startTime,endTime);
 
         //组装派工单报表数据
-        if(fbsWorkshopDispatchListListSum!=null&&fbsWorkshopDispatchListList!=null&&dateList!=null){
+
+        if(fbsWorkshopDispatchListListSum!=null&&fbsWorkshopDispatchListList!=null){
+//        if(fbsWorkshopDispatchListListSum!=null&&fbsWorkshopDispatchListList!=null&&dateList!=null){
             for(FbsWorkshopDispatchList dispatchListSum:fbsWorkshopDispatchListListSum){
                 Integer quantityCompletedTotal=0;
                 BigDecimal manHoursCompletedTotal=new BigDecimal(0.00);//累计总工时
                 List<FbsWorkshopDispatchList> dispatchListAdd=new ArrayList<>();//需要保存子集集合的派工单（日期分组派工单）
-                for(Date date:dateList){
-                    String dateString=fmt.format(date);//时间
+//                for(Date date:dateList){
+//                    String dateString=fmt.format(date);//时间
                     boolean isorder=false;
                     FbsWorkshopDispatchList fbsWorkshopDispatchList=new FbsWorkshopDispatchList();
                     BigDecimal number_of_tasks=new BigDecimal(0.00);//派工数量
@@ -132,7 +137,9 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
                         String pro=dispatchList.getProductId();//全部中的产品id
                         //找到对应当天的派工单则添加
 
-                        if(orderIdSum.equals(orderId)&&dateString.equals(dispatchDate)&&proSum.equals(pro)){
+//                        if(orderIdSum.equals(orderId)&&dateString.equals(dispatchDate)&&proSum.equals(pro)){
+
+                        if(orderIdSum.equals(orderId)&&proSum.equals(pro)){
                             if(dispatchList.getQualifiedNumber()!=null){
                                 quantityCompletedTotal+=dispatchList.getQualifiedNumber();//统计累计完成数量
                             }
@@ -162,9 +169,9 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
                     }
                     //没有则添加空的派工单
                     if(isorder==false){
-                        FbsWorkshopDispatchList fbsWorkshopDispatchList2=new FbsWorkshopDispatchList();
-                        fbsWorkshopDispatchList2.setFinalTime(date);
-                        dispatchListAdd.add(fbsWorkshopDispatchList2);
+//                        FbsWorkshopDispatchList fbsWorkshopDispatchList2=new FbsWorkshopDispatchList();
+//                        fbsWorkshopDispatchList2.setFinalTime(date);
+//                        dispatchListAdd.add(fbsWorkshopDispatchList2);
                     }else{
                         if(fbsWorkshopDispatchList.getQualifiedNumber()==null||fbsWorkshopDispatchList.getQualifiedNumber()==0){
                             fbsWorkshopDispatchList.setProductionEfficiency("0.0");
@@ -182,7 +189,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
                         dispatchListAdd.add(fbsWorkshopDispatchList);
 
                     }
-                }
+//                }
                 //订单完成数量
                 if(quantityCompletedTotal!=0){
                     dispatchListSum.setQuantityCompletedTotal(quantityCompletedTotal);
@@ -238,7 +245,8 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         mergeLines(fbsWorkshopDispatchListListSum);
         //获取统计信息
         if(fbsWorkshopDispatchListListSum!=null&&fbsWorkshopDispatchListListSum.size()>0){
-            getStatisticsTotal(fbsWorkshopDispatchListListSum,dateList);
+//            getStatisticsTotal(fbsWorkshopDispatchListListSum,dateList);
+            getStatisticsTotal(fbsWorkshopDispatchListListSum,null);
         }
         return fbsWorkshopDispatchListListSum;
     }
@@ -446,53 +454,53 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         List<FbsWorkshopDispatchList> fbsWorkshopDispatchListListTotal=new ArrayList<>();
         SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
         //循环时间段
-        for(Date date:dateList){
-            String dateN=fmt.format(date);
-            BigDecimal numberOfTasks=new BigDecimal("0.0");//当日计算数量
-            Integer qualifiedNumber=0;//当日完成数量;
-            BigDecimal standardWorkingHours=new BigDecimal(0.00);//当日标准工时;
-            BigDecimal manHoursCompleted=new BigDecimal(0.00);//当日标准工时;
-            //循环报表数据获取对应的时间数据
-            for(FbsWorkshopDispatchList workshopDispatchList:fbsWorkshopDispatchListList){
-                if(workshopDispatchList.getFbsWorkshopDispatchListList()!=null){
-                    for(FbsWorkshopDispatchList workshopDispatchListC:workshopDispatchList.getFbsWorkshopDispatchListList()){
-                        String endDate=fmt.format(workshopDispatchListC.getFinalTime());
-                        //找到对应时间的数据
-                        if(dateN.equals(endDate)){//累加
-                            if(workshopDispatchListC.getNumberOfTasks()!=null){
-                                numberOfTasks=numberOfTasks.add(workshopDispatchListC.getNumberOfTasks());
-                            }
-                            if(workshopDispatchListC.getQualifiedNumber()!=null){
-                                qualifiedNumber+=workshopDispatchListC.getQualifiedNumber();
-                            }
-                            if(isNumber(workshopDispatchListC.getStandardWorkingHours())){
-                                standardWorkingHours=standardWorkingHours.add(getDecimal(Double.valueOf(workshopDispatchListC.getStandardWorkingHours())));
-                            }
-                            if(isNumber(workshopDispatchListC.getManHoursCompleted())){
-                                manHoursCompleted=manHoursCompleted.add(getDecimal(Double.valueOf(workshopDispatchListC.getManHoursCompleted())));
-                            }
-                        }
-                    }
-                }
-            }
-            //存储
-            FbsWorkshopDispatchList fbsWorkshopDispatchList=new FbsWorkshopDispatchList();
-            fbsWorkshopDispatchList.setNumberOfTasks(numberOfTasks);
-            fbsWorkshopDispatchList.setQualifiedNumber(qualifiedNumber);
-            fbsWorkshopDispatchList.setStandardWorkingHours(formatDouble5(standardWorkingHours.doubleValue())+"");
-            fbsWorkshopDispatchList.setManHoursCompleted(formatDouble5(manHoursCompleted.doubleValue())+"");
-            Double achievement=0.0;
-            if(qualifiedNumber!=0||numberOfTasks.doubleValue()!=0){
-                achievement=qualifiedNumber.doubleValue()/numberOfTasks.doubleValue();
-            }
-            fbsWorkshopDispatchList.setAchievementRate(formatDouble5((achievement*100.0)));
-            Double production=0.0;
-            if(standardWorkingHours.doubleValue()>0&&manHoursCompleted.doubleValue()>0){
-                production=standardWorkingHours.divide(manHoursCompleted,2, RoundingMode.HALF_UP).multiply(getDecimal(100.0)).doubleValue();
-            }
-            fbsWorkshopDispatchList.setProductionEfficiency(production+"");
-            fbsWorkshopDispatchListListTotal.add(fbsWorkshopDispatchList);
-        }
+//        for(Date date:dateList){
+//            String dateN=fmt.format(date);
+//            BigDecimal numberOfTasks=new BigDecimal("0.0");//当日计算数量
+//            Integer qualifiedNumber=0;//当日完成数量;
+//            BigDecimal standardWorkingHours=new BigDecimal(0.00);//当日标准工时;
+//            BigDecimal manHoursCompleted=new BigDecimal(0.00);//当日标准工时;
+//            //循环报表数据获取对应的时间数据
+//            for(FbsWorkshopDispatchList workshopDispatchList:fbsWorkshopDispatchListList){
+//                if(workshopDispatchList.getFbsWorkshopDispatchListList()!=null){
+//                    for(FbsWorkshopDispatchList workshopDispatchListC:workshopDispatchList.getFbsWorkshopDispatchListList()){
+//                        String endDate=fmt.format(workshopDispatchListC.getFinalTime());
+//                        //找到对应时间的数据
+//                        if(dateN.equals(endDate)){//累加
+//                            if(workshopDispatchListC.getNumberOfTasks()!=null){
+//                                numberOfTasks=numberOfTasks.add(workshopDispatchListC.getNumberOfTasks());
+//                            }
+//                            if(workshopDispatchListC.getQualifiedNumber()!=null){
+//                                qualifiedNumber+=workshopDispatchListC.getQualifiedNumber();
+//                            }
+//                            if(isNumber(workshopDispatchListC.getStandardWorkingHours())){
+//                                standardWorkingHours=standardWorkingHours.add(getDecimal(Double.valueOf(workshopDispatchListC.getStandardWorkingHours())));
+//                            }
+//                            if(isNumber(workshopDispatchListC.getManHoursCompleted())){
+//                                manHoursCompleted=manHoursCompleted.add(getDecimal(Double.valueOf(workshopDispatchListC.getManHoursCompleted())));
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//            //存储
+//            FbsWorkshopDispatchList fbsWorkshopDispatchList=new FbsWorkshopDispatchList();
+//            fbsWorkshopDispatchList.setNumberOfTasks(numberOfTasks);
+//            fbsWorkshopDispatchList.setQualifiedNumber(qualifiedNumber);
+//            fbsWorkshopDispatchList.setStandardWorkingHours(formatDouble5(standardWorkingHours.doubleValue())+"");
+//            fbsWorkshopDispatchList.setManHoursCompleted(formatDouble5(manHoursCompleted.doubleValue())+"");
+//            Double achievement=0.0;
+//            if(qualifiedNumber!=0||numberOfTasks.doubleValue()!=0){
+//                achievement=qualifiedNumber.doubleValue()/numberOfTasks.doubleValue();
+//            }
+//            fbsWorkshopDispatchList.setAchievementRate(formatDouble5((achievement*100.0)));
+//            Double production=0.0;
+//            if(standardWorkingHours.doubleValue()>0&&manHoursCompleted.doubleValue()>0){
+//                production=standardWorkingHours.divide(manHoursCompleted,2, RoundingMode.HALF_UP).multiply(getDecimal(100.0)).doubleValue();
+//            }
+//            fbsWorkshopDispatchList.setProductionEfficiency(production+"");
+//            fbsWorkshopDispatchListListTotal.add(fbsWorkshopDispatchList);
+//        }
 
 
         //放到最后一行