Merge remote-tracking branch 'origin/master'

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

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/BizDayworkItemController.java

@@ -388,8 +388,8 @@ public class BizDayworkItemController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('business:dayworkItem:list')")
     @GetMapping("/tonoverList")
     @Log(title = "查询周转记录", businessType = BusinessType.SELECT)
-    public TableDataInfo tonoverList(BizDayworkItem bizDayworkItem) {
-
+    public TableDataInfo tonoverList(BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
+//       setTenantId(bizDayworkItem);
         List<BizDayworkItem> list = bizDayworkItemService.getList(bizDayworkItem);
         //人员只能看到最近的一条报工记录中工序的报工
         List<BizDayworkItem> itemList = new ArrayList<>();

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

@@ -116,6 +116,7 @@ public class BizLotController extends BaseController {
 //                BizLotTechnologicalProcess wasteRecycling = bizLotTechnologicalProcessService.getOne(queryWrapper);
                 QueryWrapper<BizLotTechnologicalProcessDetail> wrapper = new QueryWrapper<>();
                 wrapper.eq("lot_technological_process_id",bizLot.getTechnologicalProcessId());
+                wrapper.eq("tenant_id",bizLot.getTenantId());
                 //去掉备料的序
                 wrapper.ne("process_id",0);
                 wrapper.ne("process_id",1);
@@ -130,6 +131,7 @@ public class BizLotController extends BaseController {
                 wrapper.eq("technological_process_id",bizLot.getTechnologicalProcessId());
                 wrapper.ne("process_id",0);
                 wrapper.ne("process_id",1);
+                wrapper.eq("tenant_id",bizLot.getTenantId());
                 wrapper.eq("is_conceal", 0);
                 wrapper.ne("tenant_id", 9);
                 wrapper.orderByAsc("process_step_number");

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

@@ -242,6 +242,7 @@ public class BizProcessInspecionController extends BaseController {
     @GetMapping("/outsourcedlist")
     @Log(title = "查询序检主列表", businessType = BusinessType.SELECT)
     public TableDataInfo outsourcedlist(BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizProcessInspecion);
         if (bizProcessInspecion.getStartTime() != null) {
             Date startTimeDate = bizProcessInspecion.getStartTime();
             // 使用 SimpleDateFormat 格式化 Date 对象为特定格式的字符串
@@ -2944,6 +2945,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 +2969,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 +3500,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/java/cn/ezhizao/project/business/product/controller/SortDayworkController.java

@@ -189,7 +189,8 @@ public class SortDayworkController extends BaseController {
     }
     @PostMapping("getInstructionList")
     @Log(title = "获取分选报工选项列表", businessType = BusinessType.SELECT)
-    public AjaxResult getInstructionList(@RequestBody BizDayworkItem bizDayworkItem) {
+    public AjaxResult getInstructionList(@RequestBody BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDayworkItem);
         BizLot bizLot = bizLotService.query().eq("id", bizDayworkItem.getLotId()).list().get(0);
         List<BizProductInspectionInstruction> list = bizProductInspectionInstructionService.query()
                 .eq("product_id", bizLot.getProductId())
@@ -246,7 +247,8 @@ public class SortDayworkController extends BaseController {
     @PostMapping("saveConsult")
     @Log(title = "保存分选报工咨询信息", businessType = BusinessType.SELECT)
     @Transactional
-    public AjaxResult saveConsult(@RequestBody BizDayworkItemConsult bizDayworkItemConsult) {
+    public AjaxResult saveConsult(@RequestBody BizDayworkItemConsult bizDayworkItemConsult) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDayworkItemConsult);
             List<BizDayworkItemConsult> needAdd = new ArrayList<>();
             bizDayworkItemConsult.getDepartments().forEach(item ->{
                 BizDayworkItemConsult consult = new BizDayworkItemConsult();
@@ -279,7 +281,8 @@ public class SortDayworkController extends BaseController {
 
     @PostMapping("update")
     @Log(title = "更新分选报工信息", businessType = BusinessType.SELECT)
-    public AjaxResult update(@RequestBody BizDayworkItem bizDayworkItem) {
+    public AjaxResult update(@RequestBody BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDayworkItem);
         BizDayworkItem item = bizDayworkItemService.getById(bizDayworkItem.getId());
         List<BizDayworkItemReject> rejectList = bizDayworkItem.getRejectList();
         BizDayworkItemReject delCondition = new BizDayworkItemReject();
@@ -293,6 +296,7 @@ public class SortDayworkController extends BaseController {
             l.setProductionPlanDetailId(item.getProductionPlanDetailId());
             l.setProductionPlanDetailSubDetailId(item.getProductionPlanDetailSubDetailId());
             l.setReason(l.getReason());
+            l.setTenantId(bizDayworkItem.getTenantId());
         });
         boolean result = rejectList.isEmpty() || bizDayworkItemRejectService.saveBatch(rejectList);
         item.setRejectNum(bizDayworkItem.getRejectNum());
@@ -309,6 +313,7 @@ public class SortDayworkController extends BaseController {
                     // 对象不为空，执行操作
                     if(storage.isEmpty()) {
                         //新增
+                        bizDayworkItem.getStorageInfo().setTenantId(bizDayworkItem.getTenantId());
                         bizStorageRetrievalService.save(bizDayworkItem.getStorageInfo());
                     }
                 });

src/main/java/cn/ezhizao/project/business/switchDept/controller/SwitchController.java

@@ -180,8 +180,9 @@ public class SwitchController extends BaseController {
 
     @GetMapping("/listAllDepts")
     @Log(title = "获取所有工段列表", businessType = BusinessType.SELECT)
-    public AjaxResult listAllDepts(SysDept sysDept) {
+    public AjaxResult listAllDepts(SysDept sysDept) throws NoSuchFieldException, IllegalAccessException {
         sysDept.setIsWorkSection(1);
+        setTenantId(sysDept);
         List<SysDept> depts = sysDeptService.selectDeptList(sysDept);
         return success(depts);
     }

src/main/java/cn/ezhizao/project/business/takeStockPeriod/controller/BizTakeStockPeriodController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.ezhizao.common.utils.poi.ExcelUtil;
@@ -41,6 +42,8 @@ public class BizTakeStockPeriodController extends BaseController
     private IBizTakeStockPeriodService bizTakeStockPeriodService;
     @Resource
     private IBizTaksStockLotService bizTaksStockLotService;
+    @Resource
+    private HttpServletRequest request;
 
     /**
      * 查询盘点时间列表
@@ -72,7 +75,8 @@ public class BizTakeStockPeriodController extends BaseController
     @Log(title = "判断是否在盘点状态", businessType = BusinessType.SELECT)
     public AjaxResult isTakeStock()
     {
-        BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status",1).one();
+        Long tenantId = Long.parseLong(request.getHeader("tenantId"));
+        BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status",1).eq("tenant_id",tenantId).one();
         if(bizTakeStockPeriod!=null && bizTakeStockPeriod.getStatus() == 1) {
             return success(true);
         }

src/main/java/cn/ezhizao/project/business/workshop/controller/BizWorkshopController.java

@@ -87,7 +87,9 @@ public class BizWorkshopController extends BaseController {
     @PostMapping("/getTreeData")
     @Log(title = "获取周转区树状结构", businessType = BusinessType.SELECT)
     public AjaxResult getTreeData () {
-        List<BizWorkshop> workshop = bizWorkshopService.list();
+        QueryWrapper<BizWorkshop> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("tenant_id", Long.parseLong(request.getHeader("tenantId")));
+        List<BizWorkshop> workshop = bizWorkshopService.list(queryWrapper);
         List<BizWorkshopTurnover> workshopTurnovers = iBizWorkshopTurnoverService.query().eq("status", 0).list();
         List<TreeSelectText> treeSelectTexts = workshop.stream().map(i -> {
             TreeSelectText item = new TreeSelectText(i);

src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -382,6 +382,7 @@ public class SysUserController extends BaseController {
 
     @GetMapping("/getUserByLikeUsername")
     public AjaxResult getUserByLikeUsername(String userName) {
-        return success(userService.getUserByLikeUserName(userName));
+        Long tenantId = getTenantId();
+        return success(userService.getUserByLikeUserName(userName,tenantId));
     }
 }

src/main/java/cn/ezhizao/project/system/domain/SysUser.java

@@ -107,6 +107,17 @@ public class SysUser extends BaseEntity {
      * 使用厂别
      */
     private Long usageCompanyId;
+    private Long tenantId;
+
+    @Override
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    @Override
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 
     /**
      * 合同厂别

src/main/java/cn/ezhizao/project/system/mapper/SysUserMapper.java

@@ -171,5 +171,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param userName
      * @return
      */
-    List<SysUser>  getUserByLikeUserName(String userName);
+    List<SysUser>  getUserByLikeUserName(String userName,Long tenantId);
 }

src/main/java/cn/ezhizao/project/system/service/ISysUserService.java

@@ -258,5 +258,5 @@ public interface ISysUserService
      * @param userName
      * @return
      */
-    List<SysUser>  getUserByLikeUserName(String userName);
+    List<SysUser>  getUserByLikeUserName(String userName,Long tenantId);
 }

src/main/java/cn/ezhizao/project/system/service/impl/SysUserServiceImpl.java

@@ -576,7 +576,7 @@ public class SysUserServiceImpl implements ISysUserService {
     }
 
     @Override
-    public List<SysUser> getUserByLikeUserName(String userName) {
-        return userMapper.getUserByLikeUserName(userName);
+    public List<SysUser> getUserByLikeUserName(String userName,Long tenantId) {
+        return userMapper.getUserByLikeUserName(userName,tenantId);
     }
 }

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

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

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

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -246,6 +246,7 @@
 		WHERE
 			del_flag = 0
 		  AND user_name LIKE CONCAT('', #{userName}, '%')
+		and tenant_id = #{tenantId}
 	</select>
 
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">