Merge remote-tracking branch 'origin/master'

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

@@ -327,6 +327,7 @@ public class BizProcessInspecionController extends BaseController {
         processInspecion.setCarrierId(processInspecion.getLot().getCarrierId());
         processInspecion.setCarrierCode(processInspecion.getLot().getCarrierCode());
         processInspecion.setDayworkId(daywork.getId());
+        processInspecion.setIsOutsourcedInspection(1);
         processInspecion.setProductionPlanId(daywork.getProductionPlanId());
         processInspecion.setDayworkItemId(dayworkItem.getId());
         processInspecion.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
@@ -658,6 +659,7 @@ public class BizProcessInspecionController extends BaseController {
         processInspecion.setDayworkItemId(dayworkItem.getId());
         processInspecion.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
         processInspecion.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
+        processInspecion.setIsOutsourcedInspection(1);
         processInspecion.setProductDescription(processInspecion.getLot().getProductDescription());
         processInspecion.setLotId(processInspecion.getLot().getId());
         processInspecion.setLotCode(processInspecion.getLot().getLotCode());

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

@@ -7,6 +7,8 @@ import cn.ezhizao.framework.security.service.SysLoginService;
 import cn.ezhizao.framework.security.service.SysPermissionService;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.project.business.takeStockPeriod.domain.BizTakeStockPeriod;
+import cn.ezhizao.project.business.takeStockPeriod.service.IBizTakeStockPeriodService;
 import cn.ezhizao.project.system.domain.SysMenu;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.service.ISysMenuService;
@@ -37,6 +39,8 @@ public class SysLoginController extends BaseController
 
     @Resource
     private SysPermissionService permissionService;
+    @Resource
+    private IBizTakeStockPeriodService bizTakeStockPeriodService;
 
     /**
      * 登录方法
@@ -60,6 +64,9 @@ public class SysLoginController extends BaseController
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
         user.setPermissions(permissions);
+        //当前是否处于盘点状态
+        List<BizTakeStockPeriod> takeStockList = bizTakeStockPeriodService.query().eq("status", 1).list();
+        user.setTakeStock(takeStockList.size() > 0 ? true : false);
         return AjaxResult.success(user);
     }
     /**

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

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import cn.ezhizao.common.xss.Xss;
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
@@ -368,4 +369,14 @@ public class SysUser extends BaseEntity {
     public void setPermissions(Set<String> permissions) {
         this.permissions = permissions;
     }
+    @TableField(exist = false)
+    private Boolean isTakeStock;
+
+    public Boolean getTakeStock() {
+        return isTakeStock;
+    }
+
+    public void setTakeStock(Boolean takeStock) {
+        isTakeStock = takeStock;
+    }
 }

src/main/resources/mybatis/business/technologicalProcessDetailDrawing/BizTechnologicalProcessDetailDrawingMapper.xml

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getList" parameterType="BizTechnologicalProcessDetailDrawing" resultMap="BizTechnologicalProcessDetailDrawingResult">
         SELECT * FROM biz_technological_process_detail_drawing
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            deleted = 0
+            deleted = 0 and abandoned = 0 and status = 2
             <if test="url != null  and url != ''"> AND url = #{url}</if>
             <if test="productId != null">and product_id = #{productId} </if>
             <if test="productVersion != null and productVersion !=''">AND product_version = #{productVersion}</if>