Merge remote-tracking branch 'origin/master'

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

@@ -235,7 +235,8 @@ public class BizDayworkController extends BaseController {
 
     @GetMapping("/listDayworkLot")
     @Log(title = "查询报工批次", businessType = BusinessType.SELECT)
-    public TableDataInfo listDayworkLot(BizDaywork bizDaywork) {
+    public TableDataInfo listDayworkLot(BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDaywork);
         startPage();
         List<BizDaywork> dayworkList = bizDayworkService.getListFromNoCurrent(bizDaywork);
         if (dayworkList.size() == 0) {

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

@@ -62,7 +62,7 @@ public class BizInspectionStandardsController extends BaseController
     @Log(title = "获取检查标准列表", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizInspectionStandards bizInspectionStandards) throws NoSuchFieldException, IllegalAccessException
     {
-
+        setTenantId(bizInspectionStandards);
         startPage();
         List<BizInspectionStandards> list = bizInspectionStandardsService.getList(bizInspectionStandards);
         for (BizInspectionStandards item:list){
@@ -116,7 +116,8 @@ public class BizInspectionStandardsController extends BaseController
     public void saveCheck(String code, BizInspectionStandards bizInspectionStandards){
         if (bizInspectionStandards.getId() !=null){
             //这里的删除是为了不同权限操作时只保留一个
-            List<BizInspectionStandardsCheck> standardsId = bizInspectionStandardsCheckService.query().eq("inspection_code", code).eq("standards_id", bizInspectionStandards.getId()).list();
+            List<BizInspectionStandardsCheck> standardsId = bizInspectionStandardsCheckService.query().eq("inspection_code", code).eq("standards_id", bizInspectionStandards.getId())
+                    .eq("tenant_id",bizInspectionStandards.getTenantId()).list();
             List<Long>ids = new ArrayList<>();
             for(BizInspectionStandardsCheck item:standardsId){
                 ids.add(item.getId());
@@ -126,6 +127,7 @@ public class BizInspectionStandardsController extends BaseController
         List<BizCheckCategory> list = bizCheckCategoryService.query().eq("code", code).list();
         BizInspectionStandardsCheck item = new BizInspectionStandardsCheck();
         item.setStandardsId(bizInspectionStandards.getId());
+        item.setTenantId(bizInspectionStandards.getTenantId());
         item.setProcessCode(bizInspectionStandards.getProcessCode());
         item.setProductId(bizInspectionStandards.getProductId());
         item.setProductVersion(bizInspectionStandards.getProductVersion());
@@ -138,7 +140,8 @@ public class BizInspectionStandardsController extends BaseController
         bizInspectionStandardsCheckService.save(item);
     }
     public void removeCheck(String code , BizInspectionStandards bizInspectionStandards){
-        List<BizInspectionStandardsCheck> standardsId = bizInspectionStandardsCheckService.query().eq("inspection_code", code).eq("standards_id", bizInspectionStandards.getId()).list();
+        List<BizInspectionStandardsCheck> standardsId = bizInspectionStandardsCheckService.query().eq("inspection_code", code).eq("standards_id", bizInspectionStandards.getId())
+                .eq("tenant_id",bizInspectionStandards.getTenantId()).list();
         if (!standardsId.isEmpty()){
             List<Long>ids = new ArrayList<>();
             for(BizInspectionStandardsCheck item:standardsId){
@@ -155,6 +158,7 @@ public class BizInspectionStandardsController extends BaseController
     @Transactional
     public AjaxResult add(@RequestBody BizInspectionStandards bizInspectionStandards) throws NoSuchFieldException, IllegalAccessException
     {
+        setTenantId(bizInspectionStandards);
         bizInspectionStandardsService.saveOrUpdate(bizInspectionStandards);
 
         //判断根据当前人员的权限所能操作的列

src/main/java/cn/ezhizao/project/business/domain/BizOutsourcedOrderDetail.java

@@ -196,7 +196,6 @@ public class BizOutsourcedOrderDetail extends BaseEntity
     @ApiModelProperty(value = "序号")
     private Integer lineNumber;
     /** 计划单明细id */
-    @ApiModelProperty(value = "${comment}")
     private Long productionPlanDetailId;
 
     @ApiModelProperty("炉号信息")

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

@@ -464,6 +464,7 @@
                 AND (t4.product_description LIKE CONCAT('%', #{keyword}, '%') OR t1.lot_code LIKE CONCAT('%',
                 #{keyword}, '%'))
             </if>
+            <if test="tenantId != null and tenantId != 0">AND t1.tenant_id = #{tenantId}</if>
         </trim>
         ORDER BY t1.create_time DESC
     </select>

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

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productVersion != null  and productVersion != ''"> AND product_version = #{productVersion}</if>
             <if test="processCode != null  and processCode != ''"> AND process_code = #{processCode}</if>
             <if test="productId != null "> AND product_id = #{productId}</if>
-
+            <if test="tenantId != null and tenantId != 0 "> AND tenant_id = #{tenantId}</if>
             <if test="standard != null  and standard != ''"> AND standard = #{standard}</if>
         </trim>
         ORDER BY create_time DESC

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

@@ -68,7 +68,7 @@ and deleted = 0 and daywork_id = t1.daywork_id and process_inspection_id = 0) as
         t1.product_id,
         t1.production_dept_id,
         t1.packaging_method AS packagingMethod,
-        t4.production_plan_detail_id,
+        t4.production_plan_detail_id as productionPlanDetailId,
         t4.technological_process_id,
         t4.dept_id
 <!--        (select id from biz_daywork_item where daywork_id = t1.daywork_id and deleted = 0 order by process_step_number desc limit 1)