guoyujia 7 сар өмнө
parent
commit
35ccc0e9ce

+ 6 - 1
src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/controller/BizDayworkAuxiliaryItemController.java

@@ -321,7 +321,12 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
         if(!bizDayworkAuxiliaryItem.getRejectList().isEmpty()) {
             Long dayworkItemId = bizDayworkAuxiliaryItem.getRejectList().stream().map(BizDayworkAuxiliaryItemReject::getDayworkItemId).distinct().findFirst().orElse(0L);
             List<BizDayworkAuxiliaryItemReject> dayworkRejectList = bizDayworkAuxiliaryItemRejectService.query().eq("daywork_item_id", dayworkItemId).list();
-            rejectTotalNum = dayworkRejectList.stream().mapToInt(t -> t.getRejectNum() == null ? 0 : t.getRejectNum()).sum() + rejectNum;
+            if(bizDayworkAuxiliaryItem.getId() !=null){
+                rejectTotalNum = dayworkRejectList.stream().mapToInt(t -> t.getRejectNum() == null ? 0 : t.getRejectNum()).sum();
+            }else{
+                rejectTotalNum = dayworkRejectList.stream().mapToInt(t -> t.getRejectNum() == null ? 0 : t.getRejectNum()).sum() + rejectNum;
+            }
+
             //当前序工序编号
             String processStepNumber = bizDayworkItems.stream().filter(v->v.getId().equals(dayworkItemId)).findFirst().orElse(new BizDayworkItem()).getProcessStepNumber();
             //当前序除了周转的报工