首页 派工单

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

@@ -184,7 +184,8 @@ public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalW
         LambdaQueryWrapper<FbsAbnormalWorkingHoursDescribe> fbsAbnormalWorkingHoursDescribeLambdaQueryWrapper=new LambdaQueryWrapper<>();
         fbsAbnormalWorkingHoursDescribeLambdaQueryWrapper.eq(FbsAbnormalWorkingHoursDescribe::getDelFlag,"0");
         if(hourIdList.size()<=0){
-            hourIdList=null;
+//            hourIdList=null;
+            hourIdList.add("0");
         }
         fbsAbnormalWorkingHoursDescribeLambdaQueryWrapper.in(FbsAbnormalWorkingHoursDescribe::getAbnormalWorkingHoursId,hourIdList);
         List<FbsAbnormalWorkingHoursDescribe> fbsAbnormalWorkingHoursDescribeList=iFbsAbnormalWorkingHoursDescribeService.list(fbsAbnormalWorkingHoursDescribeLambdaQueryWrapper);

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

@@ -51,6 +51,16 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
     */
     List<FbsMomOrderdetail> getMonthList();
 
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 未关闭的数据
+    * @Date 2020/11/25 11:54
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getMonthListStatre();
+
     /**
     * @Author chenchuang
     * @Description //TODO 制造看板：项目完工进度

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

@@ -76,6 +76,33 @@
             m.createtime DESC
     </select>
 
+
+    <select id="getMonthListStatre" 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
+        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-->
+        mo.Status <![CDATA[ <>]]> 4
+        ORDER BY
+        m.createtime DESC
+    </select>
+
     <select id="getMonthListGroupDefine12" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
         SELECT SUM
             ( i.cInvDefine13 ) cInvDefine13,

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

@@ -49,6 +49,9 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     */
     List<FbsMomOrderdetail> getMonthList();
 
+
+    List<FbsMomOrderdetail> getMonthListStatre();
+
     /**
     * @Author chenchuang
     * @Description //TODO 制造看板：项目完工进度

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

@@ -54,6 +54,11 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
         return fbsMomOrderdetailMapper.getMonthList();
     }
 
+    @Override
+    public List<FbsMomOrderdetail> getMonthListStatre() {
+        return fbsMomOrderdetailMapper.getMonthListStatre();
+    }
+
     @Override
     public List<FbsMomOrderdetail> getMonthListGroupDefine12() {
         return fbsMomOrderdetailMapper.getMonthListGroupDefine12();

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

@@ -375,7 +375,7 @@ public class FbsWorkshopDispatchListController {
 	 public Result<List<FbsWorkshopDispatchList>> getSumDispatchReport(){
 		 Result<List<FbsWorkshopDispatchList>> result=new Result<>();
 		 try {
-			 List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthList();
+			 List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatre();
 			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.getSumDispatch(fbsMomOrderdetailList);
 			 result.setResult(fbsWorkshopDispatchListList);
 			 result.success("操作成功");

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.fbsWorkshopDispatchList.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.models.auth.In;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
 import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderdetailService;
 import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
@@ -106,7 +107,9 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
                         //找到对应当天的派工单则添加
                         if(orderIdSum.equals(orderId)&&dateString.equals(dispatchDate)&&proSum.equals(pro)){
                             dispatchListAdd.add(dispatchList);
-                            quantityCompletedTotal+=dispatchList.getQualifiedNumber();//统计累计完成数量
+                            if(dispatchList.getQualifiedNumber()!=null){
+                                quantityCompletedTotal+=dispatchList.getQualifiedNumber();//统计累计完成数量
+                            }
                             manHoursCompletedTotal=manHoursCompletedTotal.add(getDecimal(Double.parseDouble(dispatchList.getManHoursCompleted())));//累计完成工时
                             isorder=true;
                         }
@@ -122,7 +125,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
                     dispatchListSum.setQuantityCompletedTotal(quantityCompletedTotal);
                 }
                 if(manHoursCompletedTotal.doubleValue()!=0){
-                    dispatchListSum.setManHoursCompletedTotal(manHoursCompletedTotal+"");
+                    dispatchListSum.setManHoursCompletedTotal(manHoursCompletedTotal.doubleValue()+"");
                 }
                 dispatchListSum.setFbsWorkshopDispatchListList(dispatchListAdd);
             }
@@ -145,7 +148,12 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
             fbsWorkshopDispatchList.setProductId(fbsMomOrderdetail.getCinvcode());
             fbsWorkshopDispatchList.setProduct(fbsMomOrderdetail.getCinvname());
             fbsWorkshopDispatchList.setNumberOfTasksTotal(Math.rint(Double.parseDouble(fbsMomOrderdetail.getQty()+""))+"");
-            fbsWorkshopDispatchList.setStandardWorkingHoursTotal(fbsMomOrderdetail.getCinvDefine13());
+            BigDecimal workingHoursTotal=new BigDecimal("0.0");
+            if(StringUtils.isNotBlank(fbsMomOrderdetail.getCinvDefine13())){
+                workingHoursTotal=getDecimal(Double.valueOf(fbsMomOrderdetail.getCinvDefine13()));
+            }
+            String working=formatDouble5((workingHoursTotal.multiply(getDecimal(Double.valueOf(fbsMomOrderdetail.getQty()+"")))).doubleValue());
+            fbsWorkshopDispatchList.setStandardWorkingHoursTotal(working);
             fbsWorkshopDispatchListListSum.add(fbsWorkshopDispatchList);
         }
     }