0610

src/main/java/cn/ezhizao/project/business/controller/BizBeforeCheckoutVerifyController.java

@@ -72,6 +72,8 @@ public class BizBeforeCheckoutVerifyController extends BaseController {
     private String templatePath;
     @Resource
     private ISysConfigService configService;
+    @Resource
+    HttpServletRequest request;
 
     /**
      * 查询报工列表
@@ -79,11 +81,7 @@ public class BizBeforeCheckoutVerifyController extends BaseController {
     @GetMapping("/list")
     @Log(title = "查询报工列表", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
-        startPage();
-        String config = configService.selectConfigByKey("switch_data_source");
-        if ("true".equals(config)) {
             setTenantId(bizProcessInspecion);
-        }
         //查询当前生产子计划的批次报工列表
         List<BizProcessInspecion> list = bizProcessInspecionService.getVerifyList(bizProcessInspecion);
         List<BizDaywork> dayworks = bizDayworkService.query().in("id", list.isEmpty() ? Collections.singletonList(0L) : list.stream().map(BizProcessInspecion::getDayworkId).collect(Collectors.toList())).list();
@@ -103,7 +101,7 @@ public class BizBeforeCheckoutVerifyController extends BaseController {
     public AjaxResult reject(HttpServletRequest request, @RequestBody List<Long> ids) {
         // 判断是否已经结算 已经结算的不能改成不通过
         // 判断该结算是否为按炉结算，按炉结算需要整个发出单审核通过/取消通过。
-        List<BizProcessInspecion> inspections = bizProcessInspecionService.query().in("id", ids).list();
+        List<BizProcessInspecion> inspections = bizProcessInspecionService.query().in("id", ids).eq("tenant_id", getTenantId()).list();
         String authorization = request.getHeader("Authorization");
         inspections.forEach(l -> l.setAuditStatus(2));
         // 判断是否已经结算，如果已经结算则不能进行取消，未结算则删除该结算单。
@@ -117,7 +115,7 @@ public class BizBeforeCheckoutVerifyController extends BaseController {
     @Log(title = "外协结算前审核通过", businessType = BusinessType.UPDATE)
     public AjaxResult confirm(HttpServletRequest request, @RequestBody List<Long> ids) {
         // 判断是否已经结算
-        List<BizProcessInspecion> inspections = bizProcessInspecionService.query().in("id", ids).list();
+        List<BizProcessInspecion> inspections = bizProcessInspecionService.query().in("id", ids).eq("tenant_id", getTenantId()).list();
         String authorization = request.getHeader("Authorization");
         inspections.forEach(l -> l.setAuditStatus(1));
         addBalanceCheckout(inspections, authorization);
@@ -422,6 +420,7 @@ public class BizBeforeCheckoutVerifyController extends BaseController {
                 BigDecimal taxAmount = planAmount.subtract(otherCost).add(fillDifferencePrice).subtract(freightAmount).subtract(materialLossAmount);
                 l.setAcutalAmount(taxAmount.divide(BigDecimal.ONE.add(l.getTaxRate().divide(BigDecimal.valueOf(100), 6, RoundingMode.HALF_UP)), 4, RoundingMode.HALF_UP));
                 l.setTaxAmount(taxAmount.setScale(4, RoundingMode.HALF_UP));
+                l.setTenantId(Long.parseLong(request.getHeader("tenantId")));
             });
             bizOutsourceBalanceAccountService.saveBatch(addList);
         } else {

src/main/java/cn/ezhizao/project/business/controller/BizCertificateController.java

@@ -162,7 +162,7 @@ public class BizCertificateController extends BaseController {
     @GetMapping("getBatchCertificateList")
     @Log(title = "获取打印合格证列表", businessType = BusinessType.SELECT)
     public TableDataInfo getBatchCertificateList(BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
-//        setTenantId(bizDaywork);
+        setTenantId(bizDaywork);
         startPage();
         List<BizDaywork> list = bizDayworkService.getCertificateList(bizDaywork);
         if(list.isEmpty()){

src/main/java/cn/ezhizao/project/business/controller/BizDayworkAuxiliaryItemController.java

@@ -181,7 +181,6 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
 
         startPage();
         setTenantId(bizDaywork);
-
         //查询当前生产子计划的批次报工列表
         List<BizDaywork> dayworkList = bizDayworkService.getListForAuxiliary(bizDaywork);
         for (BizDaywork daywork : dayworkList) {

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

@@ -122,7 +122,8 @@ public class BizDayworkController extends BaseController {
      */
     @GetMapping("/list")
     @Log(title = "查询报工列表", businessType = BusinessType.SELECT)
-    public TableDataInfo list(BizDaywork bizDaywork) {
+    public TableDataInfo list(BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDaywork);
         List<BizDayworkItem> allDayworkItemList = bizDayworkItemService.selectTurnoverList(bizDaywork);
         if(!allDayworkItemList.isEmpty()){
             bizDaywork.setDayworkIds(allDayworkItemList.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList()));
@@ -217,7 +218,8 @@ public class BizDayworkController extends BaseController {
 
     @GetMapping("/lotList")
     @Log(title = "查询批次列表", businessType = BusinessType.SELECT)
-    public TableDataInfo lotList(BizLot bizLot) {
+    public TableDataInfo lotList(BizLot bizLot) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizLot);
         // 获取批次信息列表
         startPage();
         List<BizLot> lotList = bizLotService.getList(bizLot);
@@ -254,6 +256,7 @@ public class BizDayworkController extends BaseController {
     @GetMapping("/listForOutsource")
     @Log(title = "查询外协列表", businessType = BusinessType.SELECT)
     public TableDataInfo listForOutsource(BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDaywork);
         // 已经在页面中存在的daywork id
         List<Long> existingDayworkIds = bizDaywork.getExistingDayworkIds();
         BizDayworkItem dayworkItem = new BizDayworkItem();
@@ -393,7 +396,6 @@ public class BizDayworkController extends BaseController {
     @GetMapping("/processesForOutsource")
     @Log(title = "查询外协工序", businessType = BusinessType.SELECT)
     public TableDataInfo listProcessesForOutsource(BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
-        String config = configService.selectConfigByKey("switch_data_source");
         //查找当前生产子计划的批次报工信息，找到最后一条包报工信息
         BizDaywork daywork = bizDayworkService.query().eq("lot_id", bizDaywork.getLotId()).eq("deleted", 0).one();
         BizDayworkItem dayworkItem = new BizDayworkItem();
@@ -410,10 +412,8 @@ public class BizDayworkController extends BaseController {
             return getDataTable(processList);
         }
         dayworkItem.setKeyword(bizDaywork.getKeyword());
-        if ("true".equals(config)) {
-            setTenantId(dayworkItem);
-        }
-
+//            setTenantId(dayworkItem);
+        dayworkItem.setTenantId(0L);
         //根据当前工序查找之后的工序列表
         //是否单批单改或废品回用
 //        startPage();
@@ -485,7 +485,8 @@ public class BizDayworkController extends BaseController {
 
     @GetMapping("/getLotPosition")
     @Log(title = "查询批次位置", businessType = BusinessType.SELECT)
-    public TableDataInfo getLotPosition(BizDaywork bizDaywork) {
+    public TableDataInfo getLotPosition(BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDaywork);
         startPage();
         List<BizDaywork> list = bizDayworkService.getLotPosition(bizDaywork);
         list.stream().forEach(item -> {
@@ -921,6 +922,7 @@ public class BizDayworkController extends BaseController {
 //            bizDaywork.setEndTime(newEndTime);
 //        }
         startPage();
+        setTenantId(bizDaywork);
         List<BizDaywork> list = bizDayworkService.getDayworkList(bizDaywork);
         return getDataTable(list);
     }

src/main/java/cn/ezhizao/project/business/controller/BizDayworkItemConsultController.java

@@ -47,6 +47,7 @@ public class BizDayworkItemConsultController extends BaseController {
     public TableDataInfo list(BizDayworkItemConsult data) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
         // 分页
         startPage();
+        setTenantId(data);
         if (getUserId() != 1 && data.getConsultDepartment().equals(0)) {
             data.setTechnicianId(getUserId());
         }

src/main/java/cn/ezhizao/project/business/controller/BizDayworkItemExamineController.java

@@ -57,6 +57,7 @@ public class BizDayworkItemExamineController extends BaseController {
     @GetMapping("/list")
     @Log(title = "查询分选包装审核申请列表", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizDayworkItemExamine bizDayworkItemExamine) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDayworkItemExamine);
         startPage();
         if (bizDayworkItemExamine.getStartTime() != null) {
             bizDayworkItemExamine.setStartTime(bizDayworkItemExamine.getStartTime() + " 00:00:00");

src/main/java/cn/ezhizao/project/business/controller/BizInspectionInstructionController.java

@@ -125,6 +125,7 @@ public class BizInspectionInstructionController extends BaseController {
     public TableDataInfo list(BizInspectionInstruction data) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
         // 分页
         startPage();
+        setTenantId(data);
         List<BizInspectionInstruction> list = iBizInspectionInstructionService.getList(data);
         return getDataTable(list);
     }

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

@@ -111,6 +111,7 @@ public class BizLotController extends BaseController {
     @GetMapping("/getLotList")
     @Log(title = "查询所有批次", businessType = BusinessType.SELECT)
     public TableDataInfo getLotList(BizLot bizLot) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizLot);
 //        String tenantId = request.getHeader("tenantId");
 //        bizLot.setTenantId(Long.valueOf(tenantId));
         if (bizLot.getStartTime() != null) {

src/main/java/cn/ezhizao/project/business/controller/BizOutsourcedOrderController.java

@@ -1025,7 +1025,7 @@ public class BizOutsourcedOrderController extends BaseController {
     @PostMapping("/submitDetailsOnFirst")
     @Transactional
     public AjaxResult submitDetailsOnFirst(@RequestBody BizOutsourcedOrder bizOutsourcedOrder) throws NoSuchFieldException, IllegalAccessException {
-        bizOutsourcedOrder.setTenantId(getTenantId());
+        setTenantId(bizOutsourcedOrder);
         //若有id，则说将之前的明细删除不生成新的单号
 //        List<BizOutsourcedOrderDetail> insertDetail = new ArrayList<>();
 //        List<BizOutsourcedOrderDetail> updateDetail = new ArrayList<>();
@@ -1148,6 +1148,7 @@ public class BizOutsourcedOrderController extends BaseController {
             l.setDeliveryMethod(bizOutsourcedOrder.getDeliveryMethod());
             l.setPackagingMethod(bizOutsourcedOrder.getPackagingMethod());
             l.setSettlementType(bizOutsourcedOrder.getSettlementType());
+            l.setTenantId(bizOutsourcedOrder.getTenantId());
             BizDaywork daywork = new BizDaywork();
             BizLot lot = lots.stream().filter(e -> e.getId().equals(l.getLotId())).findFirst().orElse(null);
             daywork.setProductionPlanDetailId(l.getProductionPlanDetailId());
@@ -1163,7 +1164,7 @@ public class BizOutsourcedOrderController extends BaseController {
             daywork.setIsAmend(lot != null ? lot.getIsAmend() : null);
             daywork.setIsWasteRecycling(lot != null ? lot.getIsWasteRecycling() : null);
             daywork.setId(snowflakeIdWorker.nextId());
-            daywork.setTenantId(getTenantId());
+            daywork.setTenantId(bizOutsourcedOrder.getTenantId());
             daywork.setStatus(1);
             dayworks.add(daywork);
             BizOutsourcedRecords record = new BizOutsourcedRecords();
@@ -1205,6 +1206,7 @@ public class BizOutsourcedOrderController extends BaseController {
                 v.setPackagingMethod(l.getPackagingMethod());
                 v.setProductNum(l.getProductNum());
                 v.setTenantId(l.getTenantId());
+                v.setTenantId(bizOutsourcedOrder.getTenantId());
                 detailProcesses.add(v);
                 BizDayworkItem item = new BizDayworkItem();
                 item.setDayworkId(l.getDayworkId());
@@ -1223,7 +1225,7 @@ public class BizOutsourcedOrderController extends BaseController {
                 item.setTechnologicalProcessDetailId(v.getTechnologicalProcessDetailId());
                 item.setIsWx(1);
                 item.setNickName(bizOutsourcedOrder.getSupplierName());
-                item.setTenantId(getTenantId());
+                item.setTenantId(bizOutsourcedOrder.getTenantId());
                 items.add(item);
             });
 

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

@@ -127,6 +127,7 @@ public class BizProcessInspecionController extends BaseController
     public TableDataInfo listInfo(BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException
     {
         startPage();
+        setTenantId(bizProcessInspecion);
         List<BizProcessInspecion> list = bizProcessInspecionService.getInfo(bizProcessInspecion);
         return getDataTable(list);
     }

src/main/java/cn/ezhizao/project/business/controller/BizProductionPlanDetailSubDetailController.java

@@ -154,6 +154,7 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
     @Log(title = "查询工段长负责工段", businessType = BusinessType.SELECT)
     public AjaxResult getDeptList() throws NoSuchFieldException, IllegalAccessException {
         Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        long tenantId = Long.parseLong(request.getHeader("tenantId"));
         //这个人绑定的权限
         SysUserRole userRole = new SysUserRole();
         userRole.setUserId(userId);
@@ -163,6 +164,7 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
         if (userId != 1) {
             QueryWrapper<SysDeptUser> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("user_id", userId);
+            queryWrapper.eq("tenant_id",tenantId);
             queryWrapper.eq("deleted", 0);
             if (roles.size() > 0) {
                 List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());

src/main/java/cn/ezhizao/project/business/controller/BizReturnReceiptController.java

@@ -92,10 +92,7 @@ public class BizReturnReceiptController extends BaseController
     @Log(title = "查询外协单列表", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizReturnReceipt bizReturnReceipt) throws NoSuchFieldException, IllegalAccessException
     {
-        String config = configService.selectConfigByKey("switch_data_source");
-        if ("true".equals(config)) {
             setTenantId(bizReturnReceipt);
-        }
         if(bizReturnReceipt.getStartTime()!=null) {
             bizReturnReceipt.setStartTime(bizReturnReceipt.getStartTime()+ " 00:00:00");
         }
@@ -596,6 +593,7 @@ public class BizReturnReceiptController extends BaseController
             bizReturnReceiptDetail.setSupplierName(bizReturnReceipt.getSupplierName());
             bizReturnReceiptDetail.setFormDate(bizReturnReceipt.getFormDate());
             bizReturnReceiptDetail.setIsAudit(1);
+            bizReturnReceiptDetail.setTenantId(bizReturnReceipt.getTenantId());
             bizReturnReceiptDetail.setIsApproved(processCodes.stream().noneMatch(e -> bizReturnReceiptDetail.getProcessCode().equals(e)) ? 1 : 0);
             for(BizDayworkItem item: dayworkItem) {
                 for(BizOutsourcedOrderDetailProcess info: bizOutsourcedOrderDetailProcess) {
@@ -651,6 +649,7 @@ public class BizReturnReceiptController extends BaseController
     }
 
     private void addProcessInspection(List<BizReturnReceiptDetail> detailInfo, List<String> codes) {
+        long tenantId = Long.parseLong(request.getHeader("tenantId"));
         // detailInfo 是收回单明细 codes 是需要质检的所有工序明细
         // 对detailInfo 分组 同一发出单明细的分为一组
         Map<Long, List<BizReturnReceiptDetail>> groups = detailInfo.stream().collect(Collectors.groupingBy(BizReturnReceiptDetail::getOutsourceDetailId));
@@ -687,7 +686,7 @@ public class BizReturnReceiptController extends BaseController
                     bizProcessInspecion.setCarrierId(lastProcess.getCarriers().isEmpty() ? 0L : lastProcess.getCarriers().get(0).getId());
                     bizProcessInspecion.setCarrierCode(lastProcess.getCarriers().isEmpty() ? "" : lastProcess.getCarriers().get(0).getCode());
                     bizProcessInspecion.setDayworkItemId(lastProcess.getDayworkItemId());
-                    bizProcessInspecion.setTenantId(getTenantId());
+                    bizProcessInspecion.setTenantId(tenantId);
 //                    bizProcessInspecion.setUserId(getLoginUser().getUserId());
 //                    bizProcessInspecion.setUserName(getLoginUser().getUser().getUserName());
                     bizProcessInspecion.setReviewerId(getLoginUser().getUserId());

src/main/java/cn/ezhizao/project/business/controller/BizReturnTurnoverController.java

@@ -96,10 +96,7 @@ public class BizReturnTurnoverController extends BaseController {
     @GetMapping("/getFinishedReturnList")
     @Log(title = "获取外协收回周转列表", businessType = BusinessType.SELECT)
     public TableDataInfo getFinishedReturnList(BizOutsourcedOrderDetail bizOutsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException {
-        String config = configService.selectConfigByKey("switch_data_source");
-        if ("true".equals(config)) {
             setTenantId(bizOutsourcedOrderDetail);
-        }
         if (bizOutsourcedOrderDetail.getStartTime() != null) {
             bizOutsourcedOrderDetail.setStartTime(bizOutsourcedOrderDetail.getStartTime() + " 00:00:00");
         }
@@ -293,6 +290,7 @@ public class BizReturnTurnoverController extends BaseController {
         BizDaywork daywork = bizDayworkService.query().eq("id", bizReturnReceiptDetail.getDayworkId()).list().get(0);
         daywork.setProcessStepNumber(bizReturnReceiptDetail.getProcessStepNumber());
         BizDaywork info = new BizDaywork();
+        setTenantId(daywork);
         if (daywork.getIsWasteRecycling() == 1 || daywork.getIsAmend() == 1) {
             departments = bizReturnReceiptDetailService.getTurnoverAbDeptList(daywork);
         } else {
@@ -334,6 +332,7 @@ public class BizReturnTurnoverController extends BaseController {
     @Transactional
     @PutMapping
     public AjaxResult edit(@RequestBody BizOutsourcedOrderDetail outsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(outsourcedOrderDetail);
         //判断盘点
         BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status", 1).one();
         if (bizTakeStockPeriod != null && bizTakeStockPeriod.getStatus() == 1) {
@@ -434,6 +433,7 @@ public class BizReturnTurnoverController extends BaseController {
                 examine.setProcessId(currentDayworkItem.getProcessId());
                 examine.setProcessAlias(currentDayworkItem.getProcessAlias());
                 examine.setStatus(0);
+                examine.setTenantId(outsourcedOrderDetail.getTenantId());
                 bizDayworkItemExamineService.save(examine);
             }
 //           //箱子判断完，修改收回单明细的箱号和周转工段
@@ -471,6 +471,7 @@ public class BizReturnTurnoverController extends BaseController {
             newBizDayworkItem.setIsWx(1);
             newBizDayworkItem.setStatus("4");
             newBizDayworkItem.setNickName("外协");
+            newBizDayworkItem.setTenantId(outsourcedOrderDetail.getTenantId());
             newBizDayworkItem.setStartTime(new Date());
             if (newBizDayworkItem.getDeptId().equals(114L)) {
                 newBizDayworkItem.setTurnoverType("3");
@@ -481,7 +482,6 @@ public class BizReturnTurnoverController extends BaseController {
             newBizDayworkItem.setTurnoverArea("外协周转区");
             newBizDayworkItem.setFromDeptId(lastDayworkItem.getDeptId());
             newBizDayworkItem.setFromDeptName(lastDayworkItem.getDeptName());
-            newBizDayworkItem.setTenantId(SecurityUtils.getLoginUser().getTenantId());
             bizDayworkItemService.save(newBizDayworkItem);
             //修改daywork主表数据
 

src/main/java/cn/ezhizao/project/business/controller/BizSpecialDayworkController.java

@@ -128,7 +128,7 @@ public class BizSpecialDayworkController extends BaseController {
     @Log(title = "特殊报工列表查询", businessType = BusinessType.SELECT)
     @PreAuthorize("@ss.hasPermi('business:specialDaywork:list')")
     @GetMapping("/list")
-    public TableDataInfo list(BizDayworkItem bizDayworkItem) {
+    public TableDataInfo list(BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
         /**
          * 查询特殊报工信息，先查询所有是特殊报工(is_special=1)的明细(daywork_item)的数据查出来，查询时跟据创建时间正序排列
          */
@@ -139,6 +139,7 @@ public class BizSpecialDayworkController extends BaseController {
         if (bizDayworkItem.getSpecialEndTime() != null) {
             bizDayworkItem.setSpecialEndTime(bizDayworkItem.getSpecialEndTime() + " 23:59:59");
         }
+        setTenantId(bizDayworkItem);
         //查询出所有特殊报工的报工信息
         List<BizDayworkItem> dayworkItemList = bizDayworkItemService.getSpecialList(bizDayworkItem);
 
@@ -539,6 +540,7 @@ public class BizSpecialDayworkController extends BaseController {
                     bizItem.setNickName(user.getNickName());
                     bizItem.setWorkingHours(0L);
                     bizItem.setDeptId(lastItem.getDeptId());
+                    bizItem.setTenantId(Long.parseLong(request.getHeader("tenantId")));
                     bizItem.setIsSpecial(lastItem.getIsSpecial());
                     bizItem.setSpecialIsFirst(lastItem.getSpecialIsFirst());
                     bizItem.setTenantId(lastItem.getTenantId());
@@ -608,6 +610,7 @@ public class BizSpecialDayworkController extends BaseController {
                 examine.setDayworkId(item.getDayworkId());
                 examine.setDayworkItemId(item.getId());
                 examine.setDeptId(sysDept.getDeptId());
+                examine.setTenantId(Long.parseLong(request.getHeader("tenantId")));
                 examine.setProductionPlanDetailId(item.getProductionPlanDetailId());
                 examine.setProductDescription(productionPlanDetailList.stream().filter(v->v.getId().equals(examine.getProductionPlanDetailId())).collect(Collectors.toList()).get(0).getProductDescription());
                 examine.setLotId(item.getLotId());
@@ -623,8 +626,6 @@ public class BizSpecialDayworkController extends BaseController {
             bizDayworkItemExamineService.saveBatch(addExamineList);
         }
         bizDayworkService.saveOrUpdateBatch(dayworkList);
-
-
         // 自动派活
         if (sysDept.getAutoAllocation() == 1) {
             // 查资源组
@@ -821,10 +822,11 @@ public class BizSpecialDayworkController extends BaseController {
                     bizItem.setUserName(user.getUserName());
                     bizItem.setNickName(user.getNickName());
                     bizItem.setWorkingHours(0L);
+                    bizItem.setTenantId(Long.parseLong(request.getHeader("tenantId")));
                     bizItem.setDeptId(lastItem.getDeptId());
                     bizItem.setIsSpecial(lastItem.getIsSpecial());
                     bizItem.setSpecialIsFirst(lastItem.getSpecialIsFirst());
-                    bizItem.setTenantId(lastItem.getTenantId());
+//                    bizItem.setTenantId(lastItem.getTenantId());
                     bizItem.setProductionPlanDetailId(lastItem.getProductionPlanDetailId());
                     bizItem.setProductionPlanId(lastItem.getProductionPlanId());
                     bizItem.setProductionPlanDetailSubDetailId(lastItem.getProductionPlanDetailSubDetailId());
@@ -895,6 +897,7 @@ public class BizSpecialDayworkController extends BaseController {
                 examine.setProductionPlanDetailId(item.getProductionPlanDetailId());
                 examine.setProductDescription(productionPlanDetailList.stream().filter(v->v.getId().equals(examine.getProductionPlanDetailId())).collect(Collectors.toList()).get(0).getProductDescription());
                 examine.setLotId(item.getLotId());
+                examine.setTenantId(Long.parseLong(request.getHeader("tenantId")));
                 examine.setLotCode(bizDayworkList.stream().filter(v->v.getId().equals(examine.getDayworkId())).collect(Collectors.toList()).get(0).getLotCode());
                 examine.setProductId(productionPlanDetailList.stream().filter(v->v.getId().equals(examine.getProductionPlanDetailId())).collect(Collectors.toList()).get(0).getProductId());
                 examine.setTechnologicalProcessId(item.getTechnologicalProcessId());
@@ -996,6 +999,7 @@ public class BizSpecialDayworkController extends BaseController {
             //保存daywork信息
             bizDaywork.setStartTime(new Date());
             bizDaywork.setHasSpecial(1);
+            bizDaywork.setTenantId(Long.parseLong(request.getHeader("tenantId")));
             bizDayworkService.saveOrUpdate(bizDaywork);
             long oneMillisecond = 1000;
 
@@ -1004,6 +1008,7 @@ public class BizSpecialDayworkController extends BaseController {
                 itemList.get(i).setDayworkId(bizDaywork.getId());
                 itemList.get(i).setTechnologicalProcessDetailId(bizDaywork.getTechnologicalProcessDetailId());
                 itemList.get(i).setIsSpecial(1);
+                itemList.get(i).setTenantId(Long.parseLong(request.getHeader("tenantId")));
                 itemList.get(i).setSpecialIsFirst(1);
                 itemList.get(i).setProcessStepNumber(bizDaywork.getProcessStepNumber());
                 itemList.get(i).setProcessId(bizDaywork.getProcessId());
@@ -1045,6 +1050,7 @@ public class BizSpecialDayworkController extends BaseController {
                         reject.setDayworkId(item.getDayworkId());
                         reject.setProductionPlanDetailId(item.getProductionPlanDetailId());
                         reject.setProcessId(item.getProcessId());
+                        reject.setTenantId(Long.parseLong(request.getHeader("tenantId")));
                         saveReject.add(reject);
                     }
                 }
@@ -1093,6 +1099,7 @@ public class BizSpecialDayworkController extends BaseController {
                 itemList.get(i).setDayworkId(daywork.getId());
                 itemList.get(i).setTechnologicalProcessDetailId(bizDaywork.getTechnologicalProcessDetailId());
                 itemList.get(i).setIsSpecial(1);
+                itemList.get(i).setTenantId(Long.parseLong(request.getHeader("tenantId")));
                 itemList.get(i).setTechnologicalProcessId(bizDaywork.getTechnologicalProcessId());
                 itemList.get(i).setProcessStepNumber(bizDaywork.getProcessStepNumber());
                 itemList.get(i).setProcessId(bizDaywork.getProcessId());
@@ -1128,6 +1135,7 @@ public class BizSpecialDayworkController extends BaseController {
                         reject.setDayworkId(item.getDayworkId());
                         reject.setProductionPlanDetailId(item.getProductionPlanDetailId());
                         reject.setProcessId(item.getProcessId());
+                        reject.setTenantId(Long.parseLong(request.getHeader("tenantId")));
                         saveReject.add(reject);
                     }
                 }
@@ -1152,6 +1160,7 @@ public class BizSpecialDayworkController extends BaseController {
             daywork.setNickName(bizDaywork.getNickName());
             daywork.setStartTime(new Date());
             daywork.setHasSpecial(1);
+            daywork.setTenantId(Long.parseLong(request.getHeader("tenantId")));
             daywork.setProcessQualifiedNum(bizDaywork.getProcessQualifiedNum());
             daywork.setTemporaryProcessQualifiedNum(bizDaywork.getProcessQualifiedNum());
             bizDayworkService.saveOrUpdate(daywork);

src/main/java/cn/ezhizao/project/business/controller/BizStorageRetrievalController.java

@@ -62,6 +62,7 @@ public class BizStorageRetrievalController extends BaseController
     @Log(title = "查询零存零取列表", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizStorageRetrieval bizStorageRetrieval) throws NoSuchFieldException, IllegalAccessException
     {
+        setTenantId(bizStorageRetrieval);
         startPage();
         if(bizStorageRetrieval.getStartStorageTime()!=null) {
             bizStorageRetrieval.setStartStorageTime(bizStorageRetrieval.getStartStorageTime()+ " 00:00:00");

src/main/resources/mybatis/business/BizDayworkItemConsultMapper.xml

@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="technicianId != null and flag == 'false' ">AND (t1.technician_id = #{technicianId} OR t1.technician_id=0 )</if>
             <if test="consultDepartment != null and consultDepartment != '-1'  ">AND t1.consult_department = #{consultDepartment}</if>
             <if test="status != null">AND t1.status = #{status}</if>
+            <if test="tenantId != null and tenantId != 0 ">AND t1.tenant_id = #{tenantId}</if>
             <if test="productDescription != null and productDescription != ''">AND t1.product_description LIKE CONCAT('%',
                 #{productDescription}, '%')
             </if>

src/main/resources/mybatis/business/BizDayworkItemExamineMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND (t1.lot_code LIKE CONCAT('%', #{keywords}, '%')
                 OR t2.production_plan_no LIKE CONCAT('%', #{keywords}, '%'))
             </if>
+            <if test="tenantId != null and tenantId != 0"> AND t1.tenant_id = #{tenantId} </if>
             <if test="productDescription != null">
                 AND t1.product_description LIKE CONCAT('%', #{productDescription}, '%')
             </if>

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

@@ -74,6 +74,7 @@
             <if test="specialEndTime != null "> AND
                 dw.start_time &lt;= #{specialEndTime}</if>
             <if test="lotCode != null and  lotCode != ''">AND   dw.lot_code LIKE CONCAT('%', #{lotCode}, '%') </if>
+            <if test="tenantId !=null"> AND dw.tenant_id = #{tenantId}</if>
             <if test="productionPlanNo != null and  productionPlanNo != ''">AND p.production_plan_no  LIKE CONCAT('%', #{productionPlanNo}, '%') </if>
             <if test="productDescription != null and  productDescription != ''">AND p.product_description  LIKE CONCAT('%', #{productDescription}, '%') </if>
         </trim>

src/main/resources/mybatis/business/BizDayworkMapper.xml

@@ -670,13 +670,15 @@
         (select
         lot_code from biz_lot
         where from_id = id) as
-        fromName,t1.is_waste_recycling,t1.is_superaddition,t3.is_waste,t1.is_amend,t1.production_plan_detail_id,t2.company_alias,t2.production_plan_no,t2.product_description ,t2.line_number,t1.create_time,t4.dept_name,t4.dept_id,(select lot_code from biz_lot where t3.from_id =biz_lot.id ) as fromCode  from biz_daywork t1
+        fromName,t1.is_waste_recycling,t1.is_superaddition,t3.is_waste,t1.is_amend,t1.production_plan_detail_id,t2.company_alias,t2.production_plan_no,t2.product_description ,t2.line_number,t1.create_time,t4.dept_name,t4.dept_id,(select lot_code from biz_lot where t3.from_id =biz_lot.id ) as fromCode
+        from biz_daywork t1
         left join biz_production_plan_detail t2 on t1.production_plan_detail_id = t2.id
         left join biz_lot t3 on t1.lot_id = t3.id
         left join sys_dept t4 on t1.dept_id = t4.dept_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 and t2.deleted = 0 and t3.deleted = 0 and t1.status &lt; 2
             <if test="deptId != null  and deptId != 0">AND t1.dept_id = #{deptId}</if>
+            <if test="tenantId != null  and tenantId != 0">AND t1.tenant_id = #{tenantId}</if>
             <if test="productDescription != null  and productDescription != ''">AND t2.product_description like
                 concat('%', #{productDescription}, '%')
             </if>
@@ -846,6 +848,7 @@
             AND t4.del_flag = 0
             AND t5.deleted = 0
             <if test="deptId != null ">AND t1.dept_id = #{deptId}</if>
+            <if test="tenantId != null  and tenantId != 0">AND t1.tenant_id = #{tenantId}</if>
             <if test="workshopId != null ">AND t5.id = #{workshopId}</if>
             <if test="productDescription != null and productDescription != ''">
                 AND t2.product_description like concat('%',#{productDescription},'%')
@@ -976,6 +979,7 @@
                 AND t3.product_id IN (SELECT product_id FROM biz_supplier_product WHERE supplier_id=#{supplierId} AND
                 deleted=0)
             </if>
+            <if test="tenantId != null  and tenantId != 0">AND t2.tenant_id = #{tenantId}</if>
 
             ORDER BY t1.process_step_number ASC
         </trim>

src/main/resources/mybatis/business/BizInspectionInstructionMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="categoryId != null and categoryId != '0'"> AND category_id = #{categoryId}</if>
             <if test="standard != null and standard != ''"> AND standard LIKE CONCAT('%', #{standard}, '%')</if>
             <if test="keyword != null and keyword != ''"> AND standard LIKE CONCAT('%', #{keyword}, '%')</if>
-
+            <if test="tenantId != null and tenantId != 0"> AND tenant_id = #{tenantId}</if>
         </trim>
 
     </select>

src/main/resources/mybatis/business/BizLotMapper.xml

@@ -112,6 +112,7 @@
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
             <if test="id != null">AND t1.id = #{id}</if>
+            <if test="tenantId != null and tenantId != 0">AND t1.tenant_id = #{tenantId}</if>
             <if test="lotCode != null  and lotCode != ''">AND t1.lot_code = #{lotCode}</if>
             <if test="isWaste != null ">AND t1.is_waste = #{isWaste}</if>
             <if test="isFallback != null ">AND t1.is_fallback = #{isFallback}</if>
@@ -196,6 +197,7 @@
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 and t2.deleted = 0 and t3.deleted = 0
             <if test="deptId != null  and deptId != 0">AND t3.dept_id = #{deptId}</if>
+            <if test="tenantId != null and tenantId != 0">AND t1.tenant_id = #{tenantId}</if>
             <if test="productDescription != null  and productDescription != ''">AND t2.product_description like
                 concat('%', #{productDescription}, '%')
             </if>
@@ -252,9 +254,6 @@
 <!--            (select processId from biz_daywork_item where lot_id = t1.id order by-->
 <!--                create_time desc limit 1) = #{processId}-->
 <!--            </if>-->
-
-
-
         </trim>
         order by t1.lot_code asc
     </select>

src/main/resources/mybatis/business/BizNoCurrentRejectMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
             <if test="companyAlias != null  and companyAlias != ''"> AND company_alias = #{companyAlias}</if>
+            <if test="tenantId != null and tenantId != 0 "> AND tenant_id = #{tenantId}</if>
             <if test="lotCode != null  and lotCode != ''"> AND lot_code like concat('%', #{lotCode}, '%')</if>
             <if test="deptName != null  and deptName != ''"> AND dept_name like concat('%', #{deptName}, '%')</if>
             <if test="technologicalProcessName != null  and technologicalProcessName != ''"> AND technological_process_name like concat('%', #{technologicalProcessName}, '%')</if>

src/main/resources/mybatis/business/BizOutsourceBalanceAccountMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
             <if test="supplierName != null  and supplierName != ''"> AND supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
             <if test="supplierCode != null  and supplierCode != ''"> AND supplier_code = #{supplierCode}</if>
             <if test="settlementType != null  and settlementType != ''"> AND settlement_type = #{settlementType}</if>
             <if test="lotCode != null  and lotCode != ''"> AND lot_code = #{lotCode}</if>

src/main/resources/mybatis/business/BizOutsourcedOrderDetailMapper.xml

@@ -106,7 +106,7 @@ and deleted = 0 and daywork_id = t1.daywork_id and process_inspection_id = 0) as
             t1.deleted = 0 and t3.deleted = 0 and t3.is_audit = 1
             <!-- 且未完成最后一道序 -->
 <!--            and t4.status &lt; 2-->
-            <if test="tenantId != null "> AND t1.tenant_id = #{tenantId}</if>
+            <if test="tenantId != null and tenantId != 0 "> AND t1.tenant_id = #{tenantId}</if>
             <if test="returnFormCode != null  and returnFormCode != ''"> AND t3.form_code like concat('%', #{returnFormCode}, '%')</if>
             <if test="productDescription != null "> AND t1.product_description like concat('%', #{productDescription}, '%')</if>
             <if test="supplierName != null  and supplierName != ''"> AND t1.supplier_name like concat('%', #{supplierName}, '%')</if>
@@ -222,7 +222,7 @@ and deleted = 0 and daywork_id = t1.daywork_id and process_inspection_id = 0) as
             <if test="originalCarrier != null "> AND t1.original_carrier LIKE CONCAT('%', #{originalCarrier}, '%')</if>
             <if test="newCarrier != null "> AND t1.new_carrier_name LIKE CONCAT('%', #{newCarrier}, '%')</if>
             <if test="supplierId != null "> AND t1.supplier_id = #{supplierId}</if>
-            <if test="tenantId != null"> AND t1.tenant_id = #{tenantId}</if>
+            <if test="tenantId != null and tenantId != 0 "> AND t1.tenant_id = #{tenantId}</if>
         </trim>
     </select>
     <select id="getListForAllReceipt" parameterType="BizOutsourcedOrderDetail" resultMap="BizOutsourcedOrderDetailResult">

src/main/resources/mybatis/business/BizOutsourcedOrderMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 and t1.is_inner_outsource = 1 and t2.del_flag = 0
             <if test="formCode != null  and formCode != ''"> AND t1.form_code like concat('%',#{formCode},'%')</if>
+            <if test="tenantId != null and tenantId != 0"> AND t1.tenant_id = #{tenantId}</if>
             <if test="formDate != null "> AND t1.form_date = #{formDate}</if>
             <if test="supplierName != null  and supplierName != ''"> AND t1.supplier_name like concat('%', #{supplierName}, '%')</if>
             <if test="outsourceDeptName != null  and outsourceDeptName != ''"> AND t2.dept_name like concat('%', #{outsourceDeptName}, '%')</if>

src/main/resources/mybatis/business/BizProcessInspecionMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t.deleted = 0 and t.recheck_date is null and t.status = 1 and t.is_outsourced_inspection = 1 and rrd.deleted = 0 and oo.deleted = 0
             and not exists (select 1 from biz_outsourced_order oo left join biz_outsourced_order_detail od on od.master_id = oo.id left join biz_process_inspecion pi on pi.outsource_order_detail_id = od.id  where oo.id = t.outsource_order_id and oo.settlement_type = 2 and pi.recheck_date is null and (pi.id is null or pi.status != 1) and pi.deleted = 0 and od.deleted = 0)
             <if test="lotCode != null  and lotCode != ''">AND t.lot_code like concat ('%',#{lotCode},'%')</if>
-            <if test="tenantId != null"> AND t.tenant_id = #{tenantId} </if>
+            <if test="tenantId != null and tenant != 0"> AND t.tenant_id = #{tenantId} </if>
             <if test="userId != null  ">AND t.user_id = #{userId}</if>
             <if test="status != null ">AND t.status = #{status}</if>
             <if test="startTime != null"> AND DATE(t.start_time) &gt;= #{startTime}</if>
@@ -130,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="processAlias != null  and processAlias != ''">AND t4.process_alias like concat('%',#{processAlias},'%')</if>
             <if test="startTime != null ">AND t1.create_time &gt;= #{startTime}</if>
             <if test="endTime != null ">AND t1.create_time &lt;= #{endTime}</if>
+            <if test="tenantId != null and tenantId != 0">AND t1.tenant_id = #{tenantId}</if>
         </trim>
         ORDER BY
         FIELD(t1.status, 0, 2, 1),

src/main/resources/mybatis/business/BizReturnReceiptDetailMapper.xml

@@ -53,7 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UNION
         SELECT dept_id as value, dept_name as label,is_sort_packaging
         FROM sys_dept
-        WHERE dept_code = '170000';
+        WHERE dept_code = '170000'
+        <if test="tenantId != null and tenantId != 0"> AND tenant_id = #{tenantId}</if>
 <!--        AND d.tenant_id = #{tenantId}-->
     </select>
     <select id="getTurnoverAbDeptList" resultType="cn.ezhizao.project.system.domain.SysDept">
@@ -67,7 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UNION
         SELECT dept_id as value, dept_name as label,is_sort_packaging
         FROM sys_dept
-        WHERE dept_code = '170000';
+        WHERE dept_code = '170000'
+        <if test="tenantId != null and tenantId != 0"> AND tenant_id = #{tenantId}</if>
 <!--        AND d.tenant_id = #{tenantId}-->
     </select>
 

src/main/resources/mybatis/business/BizReturnReceiptMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null ">AND form_date &lt;= #{endTime}</if>
             <if test="supplierName != null  and supplierName != ''"> AND supplier_name like concat('%', #{supplierName}, '%')</if>
             <if test="status != null "> AND status = #{status}</if>
-            <if test="tenantId != null "> AND tenant_id = #{tenantId}</if>
+            <if test="tenantId != null and tenantId != 0 "> AND tenant_id = #{tenantId}</if>
         </trim>
         order by create_time desc
     </select>

src/main/resources/mybatis/business/BizStorageCodeMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="code != null  and code != ''"> AND code like concat('%',#{code},'%')</if>
             <if test="serialNumber != null "> AND serial_number = #{serialNumber}</if>
             <if test="isPrint != null "> AND is_print = #{isPrint}</if>
-            <if test="tenantId != null "> AND tenant_id = #{tenantId}</if>
+            <if test="tenantId != null and tenantId != 0 "> AND tenant_id = #{tenantId}</if>
         </trim>
         order by year, serial_number
     </select>

src/main/resources/mybatis/business/BizStorageRetrievalMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
             <if test="productDescription != null  and productDescription != ''"> AND t1.product_description like concat('%',#{productDescription},'%')</if>
+            <if test="tenantId != null  and tenantId != 0"> AND t1.tenant_id = #{tenantId}</if>
             <if test="drawingNumber != null  and drawingNumber != ''"> AND t1.drawing_number like concat('%',#{drawingNumber},'%')</if>
             <if test="lotCode != null  and lotCode != ''"> AND t1.lot_code like concat('%',#{lotCode},'%') </if>
             <if test="technologyVersion != null  and technologyVersion != ''"> AND t1.technology_version = #{technologyVersion}</if>

src/main/resources/mybatis/business/BizTechnologicalProcessDetailMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT * FROM biz_technological_process_detail
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0 and tenant_id != 9
-            <if test="tenantId != null" > AND tenant_id = #{tenantId}</if>
+            <if test="tenantId != null and tenantId != 0" > AND tenant_id = #{tenantId}</if>
             <if test="technologicalProcessId!= null"> AND technological_process_id = #{technologicalProcessId}</if>
             <if test="processStepNumber != null and processStepNumber!=''">AND process_step_number > #{processStepNumber}</if>
             <if test="keyword != null  and keyword != ''">AND (process_key LIKE concat('%', #{keyword}, '%')or

src/main/resources/mybatis/business/BizTurnoverMapper.xml

@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             deleted = 0
             <if test="code != null  and code != ''"> AND code = #{code}</if>
             <if test="status != null "> AND status = #{status}</if>
-            <if test="tenantId != null "> AND tenant_id = #{tenantId}</if>
+            <if test="tenantId != null and tenantId != 0 "> AND tenant_id = #{tenantId}</if>
         </trim>
     </select>
     <select id="getTurnoverByDeptId" resultMap="BizTurnoverResult">