0617

src/main/java/cn/ezhizao/project/business/process/domain/BizProcess.java

@@ -70,6 +70,7 @@ public class BizProcess extends BaseEntity
     private Long technologicalProcessDetailId;
     @TableField(exist = false)
     private String processStepNumber;
+    private Long tenantId;
 
     public BizProcess() {}
 

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

@@ -2944,6 +2944,7 @@ public class BizProcessInspecionController extends BaseController {
     @PostMapping("/saveFirstFactoryInspection")
     @Log(title = "普通员工新增出厂检", businessType = BusinessType.INSERT)
     public AjaxResult saveFirstFactoryInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
+       setTenantId(processInspecion);
         if (processInspecion.getFlag() != null && processInspecion.getFlag() && (processInspecion.getIsInspectionCarrierChanged() != null && processInspecion.getIsInspectionCarrierChanged().equals(1))) {
             throw new RuntimeException("检测载具已解绑，移交仪器室，请绑定载具");
         }
@@ -2967,6 +2968,7 @@ public class BizProcessInspecionController extends BaseController {
         processInspecion.setLotId(processInspecion.getLot().getId());
         processInspecion.setLotCode(processInspecion.getLot().getLotCode());
         processInspecion.setDeptId(daywork.getDeptId());
+        processInspecion.setTenantId(processInspecion.getTenantId());
         processInspecion.setProductId(processInspecion.getLot().getProductId());
         processInspecion.setTechnologicalProcessId(processInspecion.getLot().getTechnologicalProcessId());
         if (processInspecion.getId() == null) {
@@ -3497,12 +3499,14 @@ public class BizProcessInspecionController extends BaseController {
     @GetMapping("/checkHasInspection")
     @Log(title = "判断批次是否有检查", businessType = BusinessType.SELECT)
     public AjaxResult checkHasInspection( BizLot lot) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(lot);
         QueryWrapper<BizProcessInspecion> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("lot_id",lot.getId());
         if(lot.getProcessStepNumber()!= null){
             queryWrapper.eq("process_step_number",lot.getProcessStepNumber());
         }
         queryWrapper.eq("type",lot.getType());
+        queryWrapper.eq("tenant_id",lot.getTenantId());
         List<BizProcessInspecion> list = bizProcessInspecionService.list(queryWrapper);
         if(list.isEmpty()){
             return success(true);

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

@@ -440,7 +440,7 @@ public class BizQuickDayworkController extends BaseController {
 //        List<BizLotTechnologicalProcess> ltp = bizLotTechnologicalProcessService.query().eq("is_stop", 0).in("lot_id", bizDayworks.isEmpty() ? Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getLotId).collect(Collectors.toList())).list();
 //        List<BizLotTechnologicalProcessDetail> ltpd = bizLotTechnologicalProcessDetailService.query().in("lot_technological_process_id", ltp.isEmpty() ? Collections.singletonList(0L) : ltp.stream().map(BizLotTechnologicalProcess::getId).collect(Collectors.toList())).list();
        List<Long> lotTechnologicalProcessIds = bizDayworks.stream().filter(item ->item.getIsAmend() == 1 || item.getIsWasteRecycling() == 1).collect(Collectors.toList()).stream().map(BizDaywork::getTechnologicalProcessId).collect(Collectors.toList());
-        List<BizLotTechnologicalProcessDetail> ltpd = bizLotTechnologicalProcessDetailService.query().in("lot_technological_process_id", lotTechnologicalProcessIds.isEmpty() ? Collections.singletonList(0L) :  bizDayworks.stream().filter(item ->item.getIsAmend() == 1 || item.getIsWasteRecycling() == 1).collect(Collectors.toList()).stream().map(BizDaywork::getTechnologicalProcessId).collect(Collectors.toList())).list();
+        List<BizLotTechnologicalProcessDetail> ltpd = bizLotTechnologicalProcessDetailService.query().in("lot_technological_process_id", lotTechnologicalProcessIds.isEmpty() ? Collections.singletonList(0L) :  bizDayworks.stream().filter(item ->item.getIsAmend() == 1 || item.getIsWasteRecycling() == 1).collect(Collectors.toList()).stream().map(BizDaywork::getTechnologicalProcessId).collect(Collectors.toList())).eq("tenant_id",tenantId).list();
         for (BizDaywork bizDaywork : bizDayworks) {
             if (!bizDaywork.getDayworkItemList().isEmpty() && (bizDaywork.getDayworkItemList().get(0).getStatus().equals("4") || bizDaywork.getDayworkItemList().get(0).getStatus().equals("7") || bizDaywork.getDayworkItemList().get(0).getStatus().equals("5"))) {
                 turnoverItems.add(bizDaywork.getDayworkItemList().get(0));
@@ -497,7 +497,7 @@ public class BizQuickDayworkController extends BaseController {
                     }
 
                 } else {
-                    BizProcess process = l.getProcessSequence().stream().filter(v -> v.getTechnologicalProcessDetailId().equals(l.getTechnologicalProcessDetailId())).findFirst().orElse(new BizProcess());
+                    BizProcess process = l.getProcessSequence().stream().filter(v -> v.getTechnologicalProcessDetailId().equals(l.getTechnologicalProcessDetailId()) && v.getTenantId().equals(tenantId)).findFirst().orElse(new BizProcess());
                     if (l.getProcessSequence().stream().filter(v -> v.getProcessStepNumber().compareTo(l.getProcessStepNumber()) > 0).noneMatch(v -> processes.stream().anyMatch(e -> e.getProcessId().equals(v.getId())))) {
                         hasNoProcess.set(true);
                     } else {

src/main/resources/mybatis/business/product/BizDayworkItemMapper.xml

@@ -199,7 +199,8 @@
     <select id="getProcessSequenceItem" resultMap="BizProcessResult">
         SELECT t1.*,
         t2.id as technological_process_detail_id,
-        t2.process_step_number
+        t2.process_step_number,
+        t2.tenant_id as tenantId
         FROM biz_process t1
         JOIN biz_technological_process_detail t2 ON t1.id = t2.process_id
         WHERE t1.deleted = 0