Merge remote-tracking branch 'origin/master'

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

@@ -657,6 +657,7 @@ public class BizDayworkController extends BaseController {
         if (!abNormalTechnologicalProcessIds.isEmpty()) {
             List<BizTechnologicalProcessDetail> normalTechnologicalProcessList = bizTechnologicalProcessDetailService.query()
                     .in("technological_process_id", abNormalTechnologicalProcessIds)
+                    .ne("tenant_id", 9)
                     .eq("deleted", 0)
                     .list();
             return success(normalTechnologicalProcessList);
@@ -842,7 +843,7 @@ public class BizDayworkController extends BaseController {
                         bizDayworkItem.setTechnologicalProcessDetailId(lotTechnologicalProcessDetail.getId());
 
                     } else {
-                        BizTechnologicalProcessDetail technologicalProcessDetail = bizTechnologicalProcessDetailService.query().eq("process_id", bizDaywork.getProcessId()).eq("technological_process_id", bizDaywork.getTechnologicalProcessId()).orderByAsc("process_step_number").last("limit 1").one();
+                        BizTechnologicalProcessDetail technologicalProcessDetail = bizTechnologicalProcessDetailService.query().eq("process_id", bizDaywork.getProcessId()).eq("technological_process_id", bizDaywork.getTechnologicalProcessId()).ne("tenant_id", 9).orderByAsc("process_step_number").last("limit 1").one();
                         bizDayworkItem.setTechnologicalProcessDetailId(technologicalProcessDetail.getId());
                     }
 
@@ -1213,7 +1214,7 @@ public class BizDayworkController extends BaseController {
             normalLotList = normalDayworkList.stream().map(BizDaywork::getLotId).collect(Collectors.toList());
             if (!normalDayworkList.isEmpty()) {
                 List<Long> technologicalProcessIds = normalDayworkList.stream().map(BizDaywork::getTechnologicalProcessId).collect(Collectors.toList());
-                technologicalProcessDetailList = bizTechnologicalProcessDetailService.query().in("technological_process_id", technologicalProcessIds).list();
+                technologicalProcessDetailList = bizTechnologicalProcessDetailService.query().in("technological_process_id", technologicalProcessIds).ne("tenant_id", 9).list();
             }
             //不正常批次
             List<BizDaywork> abNormalDayworkList = dayworkList.stream().filter(abnd -> abnd.getIsWasteRecycling() == 1 || abnd.getIsAmend() == 1).collect(Collectors.toList());

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

@@ -96,6 +96,7 @@ public class BizLotController extends BaseController {
                 wrapper.eq("technological_process_id",bizLot.getTechnologicalProcessId());
                 wrapper.ne("process_id",0);
                 wrapper.ne("process_id",1);
+                wrapper.ne("tenant_id", 9);
                 wrapper.orderByAsc("process_step_number");
                 return success(bizTechnologicalProcessDetailService.list(wrapper));
             }

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

@@ -182,7 +182,7 @@ public class SortDayworkController extends BaseController {
             returnCarrier = item.getProcessStepNumber().equals(bizLotTechnologicalProcessDetails.stream().filter(v -> !v.getTenantId().equals(9L)).max(Comparator.comparing(BizLotTechnologicalProcessDetail::getProcessStepNumber)).orElse(new BizLotTechnologicalProcessDetail()).getProcessStepNumber());
 //                    item.getProcessStepNumber().equals(bizLotTechnologicalProcessDetails.stream().max(Comparator.comparing(BizLotTechnologicalProcessDetail::getProcessStepNumber)));
         } else {
-            List<BizTechnologicalProcessDetail> bizTechnologicalProcessDetails = bizTechnologicalProcessDetailService.query().eq("technological_process_id", item.getTechnologicalProcessId()).list();
+            List<BizTechnologicalProcessDetail> bizTechnologicalProcessDetails = bizTechnologicalProcessDetailService.query().ne("tenant_id", 9).eq("technological_process_id", item.getTechnologicalProcessId()).list();
 //            returnCarrier = bizTechnologicalProcessDetails.stream().max(Comparator.comparing(BizTechnologicalProcessDetail::getProcessStepNumber)).orElse(new BizTechnologicalProcessDetail()).getProcessStepNumber().equals(item.getProcessStepNumber());
             returnCarrier = item.getProcessStepNumber().equals(bizTechnologicalProcessDetails.stream().filter(v -> !v.getTenantId().equals(9L)).max(Comparator.comparing(BizTechnologicalProcessDetail::getProcessStepNumber)).orElse(new BizTechnologicalProcessDetail()).getProcessStepNumber());
         }