仓库看板 报工

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -361,7 +361,6 @@ public class FbsWorkingStatisticsController {
 
 		 entity.setPkWorkshopDispatchList(list.get(0).getId());
 		 entity.setId(list2.get(0).getId());
-		 fbsWorkingStatisticsService.updateById(entity);
          ///////////遇到多人的订单判断是否只有一个属于上岗的情况
          QueryWrapper<FbsWorkingStatistics> fbsWorkingStatisticsQueryWrapper=new QueryWrapper<>();
          fbsWorkingStatisticsQueryWrapper.lambda().eq(FbsWorkingStatistics::getDelFlag,"0");
@@ -373,6 +372,7 @@ public class FbsWorkingStatisticsController {
              fbsWorkshopDispatchListService.updateState("2",entity.getPkWorkshopDispatchList());
          }
 
+		 fbsWorkingStatisticsService.updateById(entity);
 
 		 QueryWrapper<FbsWorkingStatistics> queryWrapper = new QueryWrapper<>();
 		 queryWrapper.eq("pk_Workshop_Dispatch_List", entity.getPkWorkshopDispatchList()).eq("del_flag", 0);
@@ -908,10 +908,10 @@ public class FbsWorkingStatisticsController {
 		QueryWrapper<FbsWorkingStatistics> queryWrapper = QueryGenerator.initQueryWrapper(fbsWorkingStatistics, req.getParameterMap());
 		queryWrapper.lambda().eq(FbsWorkingStatistics::getDelFlag,"0");
 		if(StringUtils.isNotBlank(start)&&StringUtils.isNotBlank(end)&&!start.equals("null")&&!end.equals("null")){
-			queryWrapper.ge("DATE_FORMAT(final_time,'%Y-%m-%d')",start);
-			queryWrapper.le("DATE_FORMAT(final_time,'%Y-%m-%d')",end);
+			queryWrapper.ge("DATE_FORMAT(first_time,'%Y-%m-%d')",start);
+			queryWrapper.le("DATE_FORMAT(first_time,'%Y-%m-%d')",end);
 		}else {
-			queryWrapper.apply("DATE_FORMAT( final_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )");
+			queryWrapper.apply("DATE_FORMAT( first_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )");
 		}
 		if(StringUtils.isNotBlank(orderNumber)){
 			queryWrapper.lambda().like(FbsWorkingStatistics::getOrderNumber,orderNumber);

src/main/java/org/jeecg/modules/fbsDispatchLists/mapper/xml/FbsDispatchListsMapper.xml

@@ -11,6 +11,7 @@
         WHERE
             ps.cWhCode = '01'
             AND datediff( MONTH, d.dDate, getdate ( ) ) = 0
+            and ps.iQuantity>0
         GROUP BY
             ps.cItemName
 

src/main/java/org/jeecg/modules/fbsMomOrder/controller/FbsMomOrderdetailController.java

@@ -487,4 +487,46 @@ public class FbsMomOrderdetailController {
 		 return result;
 	 }
 
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 除关闭的生产订单数据包括子健总数数量
+	 * @Date 2021/4/14 14:53
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>>
+	 */
+	 @GetMapping(value = "/getOrderDetailList")
+	 public Result<List<FbsMomOrderdetail>> getOrderDetailList(){
+		 Result<List<FbsMomOrderdetail>> result=new Result<>();
+		 try {
+			 List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailService.getOrderDetailList();
+			 result.setResult(fbsMomOrderdetailList);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 除关闭的生产订单的子件数据包括数量等和库存数量
+	 * @Date 2021/4/14 14:53
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>>
+	 */
+	 @GetMapping(value = "/getMoallocateList")
+	 public Result<List<FbsMomOrderdetail>> getMoallocateList(){
+		 Result<List<FbsMomOrderdetail>> result=new Result<>();
+		 try {
+			 List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailService.getMoallocateList();
+			 result.setResult(fbsMomOrderdetailList);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
 }

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

@@ -188,4 +188,23 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
     */
     List<FbsMomOrderdetail> getMomMoallocateByMoCode(@Param("moCode")String moCode);
+
+
+    /**
+     * @Author chenchuang
+     * @Description //TODO 除关闭的生产订单数据包括子健总数数量
+     * @Date 2021/4/14 14:44
+     * @Param []
+     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+     */
+    List<FbsMomOrderdetail> getOrderDetailList();
+
+    /**
+     * @Author chenchuang
+     * @Description //TODO 除关闭的生产订单的子件数据包括数量等和库存数量
+     * @Date 2021/4/14 14:47
+     * @Param []
+     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+     */
+    List<FbsMomOrderdetail> getMoallocateList();
 }

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

@@ -433,7 +433,8 @@
         SELECT
             mo.MoCode,
             mod.QualifiedInQty,
-            mo.CreateTime
+            mo.CreateTime,
+            mod.invcode
         FROM
           mom_order mo
         LEFT JOIN mom_orderdetail MOD ON mo.MoId = MOD.MoId
@@ -450,4 +451,55 @@
         WHERE
             mo.MoCode = #{moCode}
     </select>
+
+
+    <select id="getMoallocateList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+            cs.materialPreparationTotal,
+            mm.Qty AS Qtys,
+            mm.IssQty AS IssQty,
+            mm.InvCode AS mInvCode,
+            mo.InvCode,
+            m.MoCode,
+            i.cinvname,
+            mi.cinvname mcinvname
+        FROM
+          mom_moallocate mm
+        LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
+        LEFT JOIN mom_order m ON mo.MoId= m.MoId
+        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+        LEFT JOIN Inventory mi ON mm.InvCode= mi.cInvCode
+        LEFT JOIN ( SELECT SUM ( iQuantity ) AS materialPreparationTotal, cInvCode FROM CurrentStock WHERE cWhCode IN ( '02', '10' ) GROUP BY cInvCode ) cs ON mm.InvCode= cs.cInvCode
+        WHERE
+            mo.RelsUser IS NOT NULL
+            AND mo.Status  <![CDATA[ <> ]]> 4
+            ORDER BY
+            m.MoCode,
+            mo.InvCode DESC
+    </select>
+
+    <select id="getOrderDetailList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT
+            SUM ( mm.Qty ) AS Qtys,
+            SUM ( mm.IssQty ) AS IssQty,
+            mo.InvCode,
+            m.MoCode,
+            i.cinvname
+        FROM
+          mom_moallocate mm
+        LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
+        LEFT JOIN mom_order m ON mo.MoId= m.MoId
+        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+        LEFT JOIN Inventory mi ON mm.InvCode= mi.cInvCode
+        WHERE
+            mo.RelsUser IS NOT NULL
+            AND mo.Status  <![CDATA[ <> ]]> 4
+            GROUP BY
+            m.MoCode,
+            mo.InvCode,
+            i.cinvname
+            ORDER BY
+            m.MoCode,
+            mo.InvCode DESC
+    </select>
 </mapper>

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

@@ -164,4 +164,23 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
     */
     List<FbsMomOrderdetail> getListByOrderSheetCurrentStock();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 除关闭的生产订单数据包括子健总数数量
+    * @Date 2021/4/14 14:44
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getOrderDetailList();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 除关闭的生产订单的子件数据包括数量等和库存数量
+    * @Date 2021/4/14 14:47
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getMoallocateList();
+
 }

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

@@ -296,6 +296,7 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
     }
 
 
+
     @Override
     public List<FbsMomOrderdetail> getApplyList() {
         return fbsMomOrderdetailMapper.getApplyList();
@@ -354,4 +355,16 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
         return fbsMomOrderdetailMapper.getApplyCompleteSum();
     }
 
+
+    @Override
+    public List<FbsMomOrderdetail> getOrderDetailList() {
+        return fbsMomOrderdetailMapper.getOrderDetailList();
+    }
+
+    @Override
+    public List<FbsMomOrderdetail> getMoallocateList() {
+        return fbsMomOrderdetailMapper.getMoallocateList();
+    }
+
+
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/job/FbsLatestCompletedQuantityUpdateJob.java

@@ -57,10 +57,14 @@ public class FbsLatestCompletedQuantityUpdateJob implements Job {
         List<FbsWorkshopDispatchList> fbsWorkshopDispatchListListToUpdate=new ArrayList<>();
         //派工订单
         for(FbsWorkshopDispatchList fbsWorkshopDispatchList:fbsWorkshopDispatchListList){
+
             String code=fbsWorkshopDispatchList.getProductionOrderNumberName();//派工中的订单号
+            String codeN=fbsWorkshopDispatchList.getProductId();
+            System.out.println(code);
             //循环rep订单
             for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailList){
                 String modeCode=fbsMomOrderdetail.getMocode();//rep中的订单号
+                String invcode=fbsMomOrderdetail.getInvcode();
                 //派工数量
                 BigDecimal numberOfTasks=new BigDecimal("0.0");
                 if(fbsWorkshopDispatchList.getNumberOfTasks()!=null){
@@ -78,7 +82,7 @@ public class FbsLatestCompletedQuantityUpdateJob implements Job {
                 }
 
                 //找到对应需要更新的订单
-                if(code.equals(modeCode)&&latestCompletedQuantity.doubleValue()!=qualifiedinqty.doubleValue()){
+                if(code.equals(modeCode)&&codeN.equals(invcode)&&latestCompletedQuantity.doubleValue()!=qualifiedinqty.doubleValue()){
                     Date date = new Date();//获取当前的日期
                     String str = df.format(date);//获取String类型的时间
                     //获取本次更新信息
@@ -107,27 +111,27 @@ public class FbsLatestCompletedQuantityUpdateJob implements Job {
                             //累计在完成工时上
                             fbsWorkshopDispatchList.setManHoursCompleted(manHoursCompleted.add(differHour)+"");
                         }
-                        //新增扫码记录
-                        FbsWorkingStatistics fbsWorkingStatistics=new FbsWorkingStatistics();
-                        fbsWorkingStatistics.setPkWorkshopDispatchList(fbsWorkshopDispatchList.getId());
-                        fbsWorkingStatistics.setPersonnelCode("更新");
-                        fbsWorkingStatistics.setPersonnelName("更新");
-                        fbsWorkingStatistics.setMaterielCode(fbsWorkshopDispatchList.getProductId());
-                        fbsWorkingStatistics.setPersonnelName(fbsWorkshopDispatchList.getProduct());
-                        fbsWorkingStatistics.setMaterielCode(fbsWorkshopDispatchList.getProductId());
-                        fbsWorkingStatistics.setMaterielName(fbsWorkshopDispatchList.getProduct());
-                        fbsWorkingStatistics.setStartDate(fbsWorkshopDispatchList.getPlannedStartTime());
-                        fbsWorkingStatistics.setEndDate(fbsWorkshopDispatchList.getPlannedEndTime());
-                        fbsWorkingStatistics.setFirstTime(new Date());
-                        fbsWorkingStatistics.setFinalTime(new Date());
-                        fbsWorkingStatistics.setFinalInfo("实时报工");
-                        fbsWorkingStatistics.setFinalState("3");
-                        fbsWorkingStatistics.setWorkingHours(differHour);
-                        fbsWorkingStatistics.setDelFlag("0");
-                        fbsWorkingStatistics.setOrderNumber(fbsWorkshopDispatchList.getProductionOrderNumberName());
-                        fbsWorkingStatistics.setQualifiedNumber(differNumber.doubleValue()+"");
-                        fbsWorkingStatistics.setState("1");
-                        iFbsWorkingStatisticsService.save(fbsWorkingStatistics);
+//                        //新增扫码记录
+//                        FbsWorkingStatistics fbsWorkingStatistics=new FbsWorkingStatistics();
+//                        fbsWorkingStatistics.setPkWorkshopDispatchList(fbsWorkshopDispatchList.getId());
+//                        fbsWorkingStatistics.setPersonnelCode("更新");
+//                        fbsWorkingStatistics.setPersonnelName("更新");
+//                        fbsWorkingStatistics.setMaterielCode(fbsWorkshopDispatchList.getProductId());
+//                        fbsWorkingStatistics.setPersonnelName(fbsWorkshopDispatchList.getProduct());
+//                        fbsWorkingStatistics.setMaterielCode(fbsWorkshopDispatchList.getProductId());
+//                        fbsWorkingStatistics.setMaterielName(fbsWorkshopDispatchList.getProduct());
+//                        fbsWorkingStatistics.setStartDate(fbsWorkshopDispatchList.getPlannedStartTime());
+//                        fbsWorkingStatistics.setEndDate(fbsWorkshopDispatchList.getPlannedEndTime());
+//                        fbsWorkingStatistics.setFirstTime(new Date());
+//                        fbsWorkingStatistics.setFinalTime(new Date());
+//                        fbsWorkingStatistics.setFinalInfo("实时报工");
+//                        fbsWorkingStatistics.setFinalState("3");
+//                        fbsWorkingStatistics.setWorkingHours(differHour);
+//                        fbsWorkingStatistics.setDelFlag("0");
+//                        fbsWorkingStatistics.setOrderNumber(fbsWorkshopDispatchList.getProductionOrderNumberName());
+//                        fbsWorkingStatistics.setQualifiedNumber(differNumber.doubleValue()+"");
+//                        fbsWorkingStatistics.setState("1");
+//                        iFbsWorkingStatisticsService.save(fbsWorkingStatistics);
                     }
                     ///////////////////////////////////////////////////////////////////派工数量比erp
                     if(qualifiedinqty.doubleValue()<latestCompletedQuantity.doubleValue()){
@@ -138,58 +142,58 @@ public class FbsLatestCompletedQuantityUpdateJob implements Job {
                             //在完成工时上减掉
                             fbsWorkshopDispatchList.setManHoursCompleted(manHoursCompleted.subtract(differHour)+"");
                         }
-                        LambdaQueryWrapper<FbsWorkingStatistics> fbsWorkingStatisticsLambdaQueryWrapper=new LambdaQueryWrapper<>();
-                        fbsWorkingStatisticsLambdaQueryWrapper.eq(FbsWorkingStatistics::getDelFlag,"0");
-                        fbsWorkingStatisticsLambdaQueryWrapper.eq(FbsWorkingStatistics::getPkWorkshopDispatchList,fbsWorkshopDispatchList.getId());
-                        fbsWorkingStatisticsLambdaQueryWrapper.orderByAsc(FbsWorkingStatistics::getFinalTime);
-                        List<FbsWorkingStatistics> fbsWorkingStatisticsList=iFbsWorkingStatisticsService.list(fbsWorkingStatisticsLambdaQueryWrapper);
-                        if(fbsWorkingStatisticsList!=null){
-                            BigDecimal differHourS=new BigDecimal("0.0");//相差时间
-                            differHourS=differHourS.add(differHour);
-                            BigDecimal differNumberS=new BigDecimal("0.0");//相差数量
-                            differNumberS=differNumberS.add(differNumber);
-                            for(FbsWorkingStatistics fbsWorkingStatistics:fbsWorkingStatisticsList){
-                                String statisticMemo="更新前：时间："+fbsWorkingStatistics.getWorkingHours()+"-数量："+fbsWorkingStatistics.getQualifiedNumber();
-                                //创建扫码修改对象
-                                FbsWorkingStatistics fbsWorkingStatisticsUpdate=new FbsWorkingStatistics();
-                                fbsWorkingStatisticsUpdate.setId(fbsWorkingStatistics.getId());
-                                //扫码的工时
-                                BigDecimal workingHours=new BigDecimal("0.0");
-                                if(fbsWorkingStatistics.getWorkingHours()!=null){
-                                    workingHours=fbsWorkingStatistics.getWorkingHours();
-                                }
-                                //扫码的数量
-                                BigDecimal qualifiedNumber=new BigDecimal("0.0");
-                                if(StringUtils.isNotBlank(fbsWorkingStatistics.getQualifiedNumber())){
-                                    qualifiedNumber=getDecimal(fbsWorkingStatistics.getQualifiedNumber());
-                                }
-                                //如果还有相差时间没减掉则继续扫码记录减工时
-                                if(differHourS.doubleValue()>0.0){
-                                    //如果相差时间比当前扫码记录时间还大 则直接扫码记录工时变0
-                                    if(differHourS.doubleValue()>workingHours.doubleValue()){
-                                        fbsWorkingStatisticsUpdate.setWorkingHours(new BigDecimal("0.0"));
-                                        differHourS.subtract(workingHours);//相差时间减去扫码记录时间
-                                    }else {//相差时间比扫码时间小 则扫码时间去除相差时间 时间更新完毕
-                                        fbsWorkingStatisticsUpdate.setWorkingHours(workingHours.subtract(differHourS));
-                                        differHourS=new BigDecimal("0.0");//相差时间清零
-                                    }
-                                }
-                                //如果还有相差数量没减掉则继续扫码记录减工时
-                                if(differNumberS.doubleValue()>0.0){
-                                    //如果相差数量比当前扫码记录数量还大 则直接扫码记录数量变0
-                                    if(differNumberS.doubleValue()>qualifiedNumber.doubleValue()){
-                                        fbsWorkingStatisticsUpdate.setQualifiedNumber("0");
-                                        differNumberS.subtract(qualifiedNumber);//相差时间减去扫码记录时间
-                                    }else {//相差数量比扫码数量小 则扫码数量去除相差数量 数量更新完毕
-                                        fbsWorkingStatisticsUpdate.setQualifiedNumber((qualifiedNumber.subtract(differNumberS).doubleValue())+"");
-                                        differNumberS=new BigDecimal("0.0");//相差数量清零
-                                    }
-                                }
-                                statisticMemo+="；更新后：时间："+fbsWorkingStatisticsUpdate.getWorkingHours()+"-数量："+fbsWorkingStatisticsUpdate.getQualifiedNumber()+"时间"+str;
-                                fbsWorkingStatisticsUpdate.setRefuseInfo(statisticMemo);
-                                iFbsWorkingStatisticsService.updateById(fbsWorkingStatisticsUpdate);
-                            }
-                        }
+//                        LambdaQueryWrapper<FbsWorkingStatistics> fbsWorkingStatisticsLambdaQueryWrapper=new LambdaQueryWrapper<>();
+//                        fbsWorkingStatisticsLambdaQueryWrapper.eq(FbsWorkingStatistics::getDelFlag,"0");
+//                        fbsWorkingStatisticsLambdaQueryWrapper.eq(FbsWorkingStatistics::getPkWorkshopDispatchList,fbsWorkshopDispatchList.getId());
+//                        fbsWorkingStatisticsLambdaQueryWrapper.orderByAsc(FbsWorkingStatistics::getFinalTime);
+//                        List<FbsWorkingStatistics> fbsWorkingStatisticsList=iFbsWorkingStatisticsService.list(fbsWorkingStatisticsLambdaQueryWrapper);
+//                        if(fbsWorkingStatisticsList!=null){
+//                            BigDecimal differHourS=new BigDecimal("0.0");//相差时间
+//                            differHourS=differHourS.add(differHour);
+//                            BigDecimal differNumberS=new BigDecimal("0.0");//相差数量
+//                            differNumberS=differNumberS.add(differNumber);
+//                            for(FbsWorkingStatistics fbsWorkingStatistics:fbsWorkingStatisticsList){
+//                                String statisticMemo="更新前：时间："+fbsWorkingStatistics.getWorkingHours()+"-数量："+fbsWorkingStatistics.getQualifiedNumber();
+//                                //创建扫码修改对象
+//                                FbsWorkingStatistics fbsWorkingStatisticsUpdate=new FbsWorkingStatistics();
+//                                fbsWorkingStatisticsUpdate.setId(fbsWorkingStatistics.getId());
+//                                //扫码的工时
+//                                BigDecimal workingHours=new BigDecimal("0.0");
+//                                if(fbsWorkingStatistics.getWorkingHours()!=null){
+//                                    workingHours=fbsWorkingStatistics.getWorkingHours();
+//                                }
+//                                //扫码的数量
+//                                BigDecimal qualifiedNumber=new BigDecimal("0.0");
+//                                if(StringUtils.isNotBlank(fbsWorkingStatistics.getQualifiedNumber())){
+//                                    qualifiedNumber=getDecimal(fbsWorkingStatistics.getQualifiedNumber());
+//                                }
+//                                //如果还有相差时间没减掉则继续扫码记录减工时
+//                                if(differHourS.doubleValue()>0.0){
+//                                    //如果相差时间比当前扫码记录时间还大 则直接扫码记录工时变0
+//                                    if(differHourS.doubleValue()>workingHours.doubleValue()){
+//                                        fbsWorkingStatisticsUpdate.setWorkingHours(new BigDecimal("0.0"));
+//                                        differHourS.subtract(workingHours);//相差时间减去扫码记录时间
+//                                    }else {//相差时间比扫码时间小 则扫码时间去除相差时间 时间更新完毕
+//                                        fbsWorkingStatisticsUpdate.setWorkingHours(workingHours.subtract(differHourS));
+//                                        differHourS=new BigDecimal("0.0");//相差时间清零
+//                                    }
+//                                }
+//                                //如果还有相差数量没减掉则继续扫码记录减工时
+//                                if(differNumberS.doubleValue()>0.0){
+//                                    //如果相差数量比当前扫码记录数量还大 则直接扫码记录数量变0
+//                                    if(differNumberS.doubleValue()>qualifiedNumber.doubleValue()){
+//                                        fbsWorkingStatisticsUpdate.setQualifiedNumber("0");
+//                                        differNumberS.subtract(qualifiedNumber);//相差时间减去扫码记录时间
+//                                    }else {//相差数量比扫码数量小 则扫码数量去除相差数量 数量更新完毕
+//                                        fbsWorkingStatisticsUpdate.setQualifiedNumber((qualifiedNumber.subtract(differNumberS).doubleValue())+"");
+//                                        differNumberS=new BigDecimal("0.0");//相差数量清零
+//                                    }
+//                                }
+//                                statisticMemo+="；更新后：时间："+fbsWorkingStatisticsUpdate.getWorkingHours()+"-数量："+fbsWorkingStatisticsUpdate.getQualifiedNumber()+"时间"+str;
+//                                fbsWorkingStatisticsUpdate.setRefuseInfo(statisticMemo);
+//                                iFbsWorkingStatisticsService.updateById(fbsWorkingStatisticsUpdate);
+//                            }
+//                        }
 
                     }
                     memo+=",更新后的完成时间："+fbsWorkshopDispatchList.getManHoursCompleted()+",更新时间："+str;

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

@@ -449,6 +449,7 @@
         WHERE
             del_flag = '0'
             AND number_of_tasks > latest_completed_quantity
+           <!-- ORDER by create_time DESC-->
     </select>
 
     <select id="getFirstFinalTime" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
@@ -511,7 +512,7 @@
             AND date <![CDATA[ >= ]]> DATE_SUB( CURDATE( ), INTERVAL 90 DAY )
            <!-- AND number_of_tasks <![CDATA[ <> ]]> latest_completed_quantity -->
         GROUP BY
-          production_order_number_name
+          production_order_number_name,product_id
     </select>
 
     <update id="updateBatchWorkShopDispatch" parameterType="java.util.List">