12.25

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

@@ -387,7 +387,7 @@ public class BizDayworkItemController extends BaseController {
             List<Long> dayworkIds = dayworkList.stream().map(BizDaywork::getId).collect(Collectors.toList());
             //正常批次的工序集合
             List<Long> normalTechnologicalProcessIds = dayworkList.stream().filter(item -> item.getIsWasteRecycling() == 0 && item.getIsAmend() == 0).map(BizDaywork::getTechnologicalProcessId).collect(Collectors.toList());
-            List<BizTechnologicalProcessDetail> normalDetailList = bizTechnologicalProcessDetailService.query().in("technological_process_id", normalTechnologicalProcessIds.isEmpty() ? Collections.singletonList(0L) : normalTechnologicalProcessIds).orderByAsc("process_step_number").list();
+            List<BizTechnologicalProcessDetail> normalDetailList = bizTechnologicalProcessDetailService.query().ne("tenant_id",9).in("technological_process_id", normalTechnologicalProcessIds.isEmpty() ? Collections.singletonList(0L) : normalTechnologicalProcessIds).orderByAsc("process_step_number").list();
            //不正常批次的工序集合
             List<Long> abNormalTechnologicalProcessIds = dayworkList.stream().filter(item -> item.getIsWasteRecycling() == 1 || item.getIsAmend() == 1).map(BizDaywork::getTechnologicalProcessId).collect(Collectors.toList());
             List<BizLotTechnologicalProcessDetail> abNormalDetailList = bizLotTechnologicalProcessDetailService.query().in("lot_technological_process_id", abNormalTechnologicalProcessIds.isEmpty() ? Collections.singletonList(0L) : abNormalTechnologicalProcessIds).orderByAsc("process_step_number").list();
@@ -466,7 +466,7 @@ public class BizDayworkItemController extends BaseController {
             List<Long> dayworkIds = dayworkList.stream().map(BizDaywork::getId).collect(Collectors.toList());
             //正常批次的工序集合
             List<Long> normalTechnologicalProcessIds = dayworkList.stream().filter(item -> item.getIsWasteRecycling() == 0 && item.getIsAmend() == 0).map(BizDaywork::getTechnologicalProcessId).collect(Collectors.toList());
-            List<BizTechnologicalProcessDetail> normalDetailList = bizTechnologicalProcessDetailService.query().in("technological_process_id", normalTechnologicalProcessIds.isEmpty() ? Collections.singletonList(0L) : normalTechnologicalProcessIds).orderByAsc("process_step_number").list();
+            List<BizTechnologicalProcessDetail> normalDetailList = bizTechnologicalProcessDetailService.query().ne("tenant_id",9).in("technological_process_id", normalTechnologicalProcessIds.isEmpty() ? Collections.singletonList(0L) : normalTechnologicalProcessIds).orderByAsc("process_step_number").list();
             //不正常批次的工序集合
             List<Long> abNormalTechnologicalProcessIds = dayworkList.stream().filter(item -> item.getIsWasteRecycling() == 1 || item.getIsAmend() == 1).map(BizDaywork::getTechnologicalProcessId).collect(Collectors.toList());
             List<BizLotTechnologicalProcessDetail> abNormalDetailList = bizLotTechnologicalProcessDetailService.query().in("lot_technological_process_id", abNormalTechnologicalProcessIds.isEmpty() ? Collections.singletonList(0L) : abNormalTechnologicalProcessIds).orderByAsc("process_step_number").list();

src/main/java/cn/ezhizao/project/business/product/domain/BizQuickDayworkNextInfo.java

@@ -85,4 +85,6 @@ public class BizQuickDayworkNextInfo extends BaseEntity
     @TableField(exist = false)
     private Long workshopId;
     private Integer isSortPackaging;
+    @TableField(exist = false)
+    private String carrierName;
 }