Browse Source

隐藏工序

wangxin 16 hours ago
parent
commit
c8bc2f2f24

+ 2 - 0
src/main/java/cn/ezhizao/project/business/controller/BizLotTechnologicalProcessController.java

@@ -407,6 +407,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
                     amendDetail.setProductId(amend.getProductId());
                     amendDetail.setProductCode(amend.getProductCode());
                     amendDetail.setProcessStepNumber(detail.getProcessStepNumber());
+                    amendDetail.setIsConceal(detail.getIsConceal());
                     amendDetail.setLotId(lot.getId());
                     amendDetail.setProcessId(detail.getProcessId());
                     amendDetail.setProcessKey(detail.getProcessKey());
@@ -502,6 +503,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
                 amendDetail.setTenantId(amend.getTenantId());
                 amendDetail.setTechnologyVersion(amend.getTechnologyVersion());
                 amendDetail.setProductId(amend.getProductId());
+                amendDetail.setIsConceal(detail.getIsConceal());
                 amendDetail.setProductCode(amend.getProductCode());
                 amendDetail.setProcessStepNumber(detail.getProcessStepNumber());
                 amendDetail.setProcessId(detail.getProcessId());

+ 3 - 0
src/main/java/cn/ezhizao/project/business/domain/BizLotTechnologicalProcessDetail.java

@@ -44,6 +44,9 @@ public class BizLotTechnologicalProcessDetail extends BaseEntity
     @ApiModelProperty(value = "产品编码")
     private String productCode;
 
+    //是否隐藏
+    private Integer isConceal;
+
     /** 工序排序*/
     @Excel(name = "工序排序")
     @ApiModelProperty(value = "工序排序 ")

+ 2 - 0
src/main/java/cn/ezhizao/project/business/domain/BizProcess.java

@@ -38,6 +38,8 @@ public class BizProcess extends BaseEntity {
     @ApiModelProperty(value = "工序键名")
     private String processKey;
 
+    //是否隐藏
+    private Integer isConceal;
 
     /**
      * NA正常,CL不用

+ 3 - 0
src/main/java/cn/ezhizao/project/business/domain/BizTechnologicalProcessDetail.java

@@ -86,6 +86,9 @@ public class BizTechnologicalProcessDetail extends BaseEntity
 
     private String processKey;
 
+    //是否隐藏
+    private Integer isConceal;
+
     //完成状态
     @TableField(exist = false)
     private String status;

+ 1 - 1
src/main/resources/mybatis/business/BizLotTechnologicalProcessDetailMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getProcessList" parameterType="BizLotTechnologicalProcessDetail" resultMap="BizTechnologicalAmendDetailResult">
         SELECT * FROM biz_lot_technological_process_detail
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            deleted = 0
+            deleted = 0 AND is_conceal = 0
             <if test="tenantId != null and tenantId != 0" > AND tenant_id = #{tenantId}</if>
             <if test="technologicalProcessId != null">AND lot_technological_process_id = #{technologicalProcessId}</if>
             <if test="processStepNumber != null  and processStepNumber!=''">AND process_step_number > #{processStepNumber}</if>