后台 看板问题修改

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

@@ -61,6 +61,16 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
     */
     List<FbsMomOrderdetail> getMonthListStatre(@Param("fbsMomOrderdetail")FbsMomOrderdetail fbsMomOrderdetail);
 
+    /**
+    * @Author chenchuang
+    * @Description //TODO 已关闭当月数据
+    * @Date 2020/12/15 14:55
+    * @Param [fbsMomOrderdetail]
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getMonthListStatreReviewed(@Param("fbsMomOrderdetail")FbsMomOrderdetail fbsMomOrderdetail);
+
+
     /**
     * @Author chenchuang
     * @Description //TODO 根据月份查询

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

@@ -107,6 +107,38 @@
         m.createtime DESC
     </select>
 
+    <select id="getMonthListStatreReviewed" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+        m.MoId,
+        m.MoCode,
+        i.cInvCode,
+        i.cInvStd,
+        i.cInvName,
+        i.cInvDefine13,
+        mo.Qty,
+        mo.QualifiedInQty,
+        m.Define12,
+        mo.Status
+        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-->
+        substring(m.MoCode, 3, 4)=SUBSTRING ( CONVERT ( VARCHAR ( 100 ), GETDATE( ), 112 ), 3, 4 )
+        AND mo.Status = 4
+        <if test="fbsMomOrderdetail.mocode!=null and fbsMomOrderdetail.mocode!=''">
+            AND m.MoCode=#{fbsMomOrderdetail.mocode}
+        </if>
+
+        ORDER BY
+        m.createtime DESC
+    </select>
+
     <select id="getMonthListNotStatre" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
         SELECT
         m.MoId,

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

@@ -52,6 +52,7 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
 
 
     List<FbsMomOrderdetail> getMonthListStatre(FbsMomOrderdetail fbsMomOrderdetail);
+    List<FbsMomOrderdetail> getMonthListStatreReviewed(FbsMomOrderdetail fbsMomOrderdetail);
 
     List<FbsMomOrderdetail> getMonthListNotStatre(String month);
 

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

@@ -59,6 +59,11 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
         return fbsMomOrderdetailMapper.getMonthListStatre(fbsMomOrderdetail);
     }
 
+    @Override
+    public List<FbsMomOrderdetail> getMonthListStatreReviewed(FbsMomOrderdetail fbsMomOrderdetail) {
+        return fbsMomOrderdetailMapper.getMonthListStatreReviewed(fbsMomOrderdetail);
+    }
+
     @Override
     public List<FbsMomOrderdetail> getMonthListNotStatre(String month) {
 

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

@@ -452,7 +452,12 @@ public class FbsWorkshopDispatchListController {
 				 fbsWorkshopDispatchList.setProductionOrderNumberName(null);
 			 }
 			 fbsMomOrderdetail.setMocode(fbsWorkshopDispatchList.getProductionOrderNumberName());
+			 //未审核数据
 			 List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatre(fbsMomOrderdetail);
+			 //已审核当月数据
+			 List<FbsMomOrderdetail> fbsMomOrderdetailList2= iFbsMomOrderdetailService.getMonthListStatreReviewed(fbsMomOrderdetail);
+			 fbsMomOrderdetailList.addAll(fbsMomOrderdetailList2);
+
 			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.getSumDispatch(fbsMomOrderdetailList);
 			 result.setResult(fbsWorkshopDispatchListList);
 			 result.success("操作成功");

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

@@ -170,6 +170,10 @@ public class FbsWorkshopDispatchList implements Serializable {
 	@TableField(exist = false)
 	private Integer qualifiedNumber;
 
+	//状态
+	@TableField(exist = false)
+	private Integer status;
+
 	//完工时间
 	@TableField(exist = false)
 	@Excel(name = "日期", width = 20, format = "yyyy-MM-dd")

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

@@ -289,7 +289,7 @@
         WHERE
         fwdl.del_flag = '0'
         AND fws.del_flag = '0'
-        AND fwdl.standard_working_hours_z>0
+        <!--AND fwdl.standard_working_hours_z>0-->
         <if test="dateString =='%Y-%m-%d'">
             AND date_format( fws.final_time, '%Y-%m-%d' ) = DATE_FORMAT( date_sub(curdate(),interval 1 day),  '%Y-%m-%d' )
         </if>
@@ -299,12 +299,12 @@
         GROUP BY
         fwdl.production_order_number_name,
         fwdl.product
-        HAVING sum( COALESCE ( fws.qualified_number, 0 ) )>0
+        <!--HAVING sum( COALESCE ( fws.qualified_number, 0 ) )>0-->
         ) as w
     </select>
 
     <select id="getAchievementRate" resultType="java.util.HashMap">
-        SELECT
+       <!-- SELECT
             sum( fws.qualified_number ) AS '已完成',
             sum( fwd.number_of_tasks ) - sum( fws.qualified_number ) AS '未完成'
         FROM
@@ -315,7 +315,27 @@
         WHERE
             fwd.del_flag = '0'
             and DATE_FORMAT(date_sub(curdate(),interval 1 day),'%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(fwd.planned_start_time,'%Y-%m-%d')
-            and DATE_FORMAT(date_sub(curdate(),interval 1 day),'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(fwd.planned_end_time,'%Y-%m-%d')
+            and DATE_FORMAT(date_sub(curdate(),interval 1 day),'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(fwd.planned_end_time,'%Y-%m-%d')-->
+        SELECT
+        sum( qualified_number ) '已完成',
+        sum( number_of_tasks ) - sum( qualified_number ) '未完成'
+        FROM
+        (
+        SELECT
+        sum( fws.qualified_number ) AS qualified_number,
+        fwd.number_of_tasks AS number_of_tasks
+        FROM
+        fbs_workshop_dispatch_list fwd
+        LEFT JOIN fbs_working_statistics fws ON fwd.id = fws.pk_workshop_dispatch_list
+        AND fws.del_flag = '0'
+        AND fws.final_state IN ( '2', '3' )
+        WHERE
+        fwd.del_flag = '0'
+        AND date_format( fws.final_time, '%Y-%m-%d' ) = DATE_FORMAT( date_sub( curdate( ), INTERVAL 1 DAY ), '%Y-%m-%d' )
+        GROUP BY
+        fwd.production_order_number_name,
+        fwd.product
+        ) f
     </select>
 
     <select id="getAttendanceOfTheDay" resultType="java.util.HashMap">

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

@@ -149,8 +149,9 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
                             fbsWorkshopDispatchList.setProductionEfficiency("0.0");
                         }
                         if(i>1){
-                            //一天存同个订单分多个派工单的情况
-                            if(qualified_number.doubleValue()>0.0){
+                            //一天存同个订单分多个派工单的情况 qualified_number.doubleValue()>0.0&&fbsWorkshopDispatchList.getStandardWorkingHoursZ()!=null&&Double.valueOf(fbsWorkshopDispatchList.getStandardWorkingHoursZ())>0.0&&
+                            if(man_hours_completed.doubleValue()>0.0){
+
                                 fbsWorkshopDispatchList.setProductionEfficiency(getDecimal(Double.valueOf(fbsWorkshopDispatchList.getStandardWorkingHoursZ())).multiply(qualified_number).divide(man_hours_completed,1,BigDecimal.ROUND_HALF_UP).multiply(getDecimal(100.0)).doubleValue()+"");
                                 fbsWorkshopDispatchList.setAchievementRate(qualified_number.divide(number_of_tasks,1,BigDecimal.ROUND_HALF_UP).multiply(getDecimal(100.0)).doubleValue()+"");
                             }
@@ -223,6 +224,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
             }
             String working=formatDouble5((workingHoursTotal.multiply(getDecimal(Double.valueOf(fbsMomOrderdetail.getQty()+"")))).doubleValue());
             fbsWorkshopDispatchList.setStandardWorkingHoursTotal(working);
+            fbsWorkshopDispatchList.setStatus(fbsMomOrderdetail.getStatus());
             fbsWorkshopDispatchListListSum.add(fbsWorkshopDispatchList);
         }
     }
@@ -355,11 +357,11 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
             fbsWorkshopDispatchList.setQualifiedNumber(qualifiedNumber);
             fbsWorkshopDispatchList.setStandardWorkingHours(formatDouble5(standardWorkingHours.doubleValue())+"");
             fbsWorkshopDispatchList.setManHoursCompleted(formatDouble5(manHoursCompleted.doubleValue())+"");
-            String achievement="0";
+            Double achievement=0.0;
             if(qualifiedNumber!=0||numberOfTasks.doubleValue()!=0){
-                achievement=formatDouble5((double)qualifiedNumber/numberOfTasks.doubleValue());
+                achievement=qualifiedNumber.doubleValue()/numberOfTasks.doubleValue();
             }
-            fbsWorkshopDispatchList.setAchievementRate((Double.parseDouble(achievement)*100)+"");
+            fbsWorkshopDispatchList.setAchievementRate(formatDouble5((achievement*100.0)));
             Double production=0.0;
             if(standardWorkingHours.doubleValue()>0){
                 production=standardWorkingHours.divide(manHoursCompleted,2, RoundingMode.HALF_UP).multiply(getDecimal(100.0)).doubleValue();