1.07

src/main/java/cn/ezhizao/project/business/outsource/domain/BizOutsourcedOrderDetailProcess.java

@@ -101,4 +101,5 @@ public class BizOutsourcedOrderDetailProcess extends BaseEntity
     private Integer qualifiedNum;
     private BigDecimal loss;
     private Integer productionNum;
+    private Integer status;
 }

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkController.java

@@ -1080,7 +1080,7 @@ public class BizDayworkController extends BaseController {
                     daywork.setHasFinishOutsource(false);
                     //如果干完了发往外协的序，则不显示申请周转按钮
                     BizOutsourcedOrderDetailProcess lastOutsourcedOrderDetailProcess = outsourcedDetailProcessList.stream().filter(v -> v.getDayworkId().equals(daywork.getId())).sorted(Comparator.comparing(BizOutsourcedOrderDetailProcess::getProcessStepNumber).reversed()).findFirst().orElse(null);
-                    if(daywork.getDayworkItemList().get(0).getProcessStepNumber().equals(lastOutsourcedOrderDetailProcess.getProcessStepNumber()) && daywork.getDayworkItemList().get(0).getStatus().equals("3")){
+                    if(daywork.getDayworkItemList().get(0).getProcessStepNumber().equals(lastOutsourcedOrderDetailProcess.getProcessStepNumber()) && daywork.getDayworkItemList().stream().filter(v -> v.getProcessStepNumber().equals(lastOutsourcedOrderDetailProcess.getProcessStepNumber())).anyMatch(l->l.getStatus().equals("3"))){
                         daywork.setHasFinishOutsource(true);
                     }
 
@@ -1594,7 +1594,7 @@ public class BizDayworkController extends BaseController {
                     daywork.setHasFinishOutsource(false);
                     //如果干完了发往外协的序，则不显示申请周转按钮
                     BizOutsourcedOrderDetailProcess lastOutsourcedOrderDetailProcess = outsourcedDetailProcessList.stream().filter(v -> v.getDayworkId().equals(daywork.getId())).sorted(Comparator.comparing(BizOutsourcedOrderDetailProcess::getProcessStepNumber).reversed()).findFirst().orElse(null);
-                    if(daywork.getDayworkItemList().get(0).getProcessStepNumber().equals(lastOutsourcedOrderDetailProcess.getProcessStepNumber()) && daywork.getDayworkItemList().get(0).getStatus().equals("3")){
+                    if(daywork.getDayworkItemList().get(0).getProcessStepNumber().equals(lastOutsourcedOrderDetailProcess.getProcessStepNumber()) && daywork.getDayworkItemList().stream().filter(v -> v.getProcessStepNumber().equals(lastOutsourcedOrderDetailProcess.getProcessStepNumber())).anyMatch(l->l.getStatus().equals("3"))){
                         daywork.setHasFinishOutsource(true);
                     }
 

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -912,6 +912,7 @@ public class BizDayworkItemController extends BaseController {
             outsourcedOrderDetailProcess.setQualifiedNum(sum);
             float percent = ((outsourcedOrderDetailProcess.getProductionNum() - outsourcedOrderDetailProcess.getQualifiedNum()) / (float) outsourcedOrderDetailProcess.getProductionNum()) * 100;
             outsourcedOrderDetailProcess.setLoss(BigDecimal.valueOf(percent));
+            outsourcedOrderDetailProcess.setStatus(1);
             bizOutsourcedOrderDetailProcessService.updateById(outsourcedOrderDetailProcess);
         }
         //如果没有合格数，则投产数量为总数量，上道序的合格数为下到序的投产数

src/main/java/cn/ezhizao/project/business/product/controller/SortDayworkController.java

@@ -421,6 +421,7 @@ public class SortDayworkController extends BaseController {
         outsourcedOrderDetailProcess.setQualifiedNum(bizDayworkItem.getQualifiedNum());
         float percent = ((outsourcedOrderDetailProcess.getProductionNum() - outsourcedOrderDetailProcess.getQualifiedNum()) / (float) outsourcedOrderDetailProcess.getProductionNum()) * 100;
         outsourcedOrderDetailProcess.setLoss(BigDecimal.valueOf(percent));
+        outsourcedOrderDetailProcess.setStatus(1);
         bizOutsourcedOrderDetailProcessService.updateById(outsourcedOrderDetailProcess);
         BizDayworkItemReject delCondition = new BizDayworkItemReject();
         delCondition.setDayworkItemId(item.getId());