批量汇报未完成数计数不准bug

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesFengRenBatchReportService.java

@@ -163,7 +163,7 @@ public class MesFengRenBatchReportService implements IMesFengRenBatchReportServi
         MesPackageDataContext packageDataContext = (MesPackageDataContext) queryPackSpecQtyFengRenBatchReport(reqBean, stepResult, model.getPartNo());
 
         //计数
-        Double unCompleteQty = MathOperation.sub(workOrderDb.getQty(), workOrderDb.getReportedQty());
+        Double unCompleteQty = MathOperation.sub(workOrderDb.getQty(), reportedQty);
         if (MathOperation.compareTo(unCompleteQty, new Double(0)) < 0) unCompleteQty = new Double(0);
         if (MathOperation.compareTo(reportedQty, workOrderDb.getQty()) < 0) workOrderStatus = MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue();
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

@@ -1101,7 +1101,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
 
         //汇报数量与未完成数量的修改 先给入参对象赋值, 下面没有报错的情况下再赋给工单DB对象
         mesWorkOrder.setReportedQty(MathOperation.add(mesWorkOrder.getNum(), mesWorkOrderDb.getReportedQty()));
-        double unCompleteQty = MathOperation.sub(mesWorkOrderDb.getQty(), mesWorkOrderDb.getReportedQty());
+        double unCompleteQty = MathOperation.sub(mesWorkOrderDb.getQty(), mesWorkOrder.getReportedQty());
         mesWorkOrder.setUnCompleteQty(unCompleteQty > 0 ? unCompleteQty : 0);
 
         //更新工单状态