生产准备增加条件

common/src/main/java/com/foreverwin/mesnac/common/model/ProdReadyTask.java

@@ -185,6 +185,28 @@ public class ProdReadyTask extends Model<ProdReadyTask> {
    @TableField(exist = false)
    private String blankingSize;
 
+   @TableField(exist = false)
+   private String matSpec;
+
+   @TableField(exist = false)
+   private String texture;
+
+   public String getMatSpec() {
+      return matSpec;
+   }
+
+   public void setMatSpec(String matSpec) {
+      this.matSpec = matSpec;
+   }
+
+   public String getTexture() {
+      return texture;
+   }
+
+   public void setTexture(String texture) {
+      this.texture = texture;
+   }
+
    public String getBlankingSize() {
       return blankingSize;
    }

common/src/main/resources/mapper/ProdReadyTaskMapper.xml

@@ -631,7 +631,7 @@
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
     <select id="getTaskList" resultMap="BaseResultMap">
-        SELECT zsd.BLANKING_SIZE,PREZSD.EMPLOYEE_DESCRIPTION,CASE WHEN TO_NUMBER(zsd.DISPATCH_SEQ)=1 THEN NULL
+        SELECT c3.value TEXTURE,c4.value MAT_SPEC,zsd.BLANKING_SIZE,PREZSD.EMPLOYEE_DESCRIPTION,CASE WHEN TO_NUMBER(zsd.DISPATCH_SEQ)=1 THEN NULL
         WHEN SS.STEP_SEQUENCE>TO_NUMBER(zsd.DISPATCH_SEQ)-1 THEN '完成'
         ELSE '未完成' END LAST_OPERATION_STATUS
         ,PREOT.DESCRIPTION LAST_OPERATION,zprt.*,zsd.DISPATCH_NO,zsd.RESOURCE_TYPE,RES.DESCRIPTION RESRCE_DESC,ITT.DESCRIPTION ITEM_DESC,OT.DESCRIPTION OPERATION_DESC
@@ -645,6 +645,8 @@
         LEFT JOIN OPERATION PREOP ON PREOP.OPERATION = zsd.PREPOSITION_OPERATION AND OP.SITE = zprt.SITE AND OP.CURRENT_REVISION = 'true'
         LEFT JOIN OPERATION_T PREOT ON PREOT.OPERATION_BO = PREOP.HANDLE AND OT.LOCALE =#{locale}
         LEFT JOIN ITEM_T ITT ON ITT.ITEM_BO = I.HANDLE AND ITT.LOCALE =#{locale}
+        LEFT JOIN CUSTOM_FIELDS C3 ON C3.HANDLE = I.HANDLE AND C3.ATTRIBUTE = 'TEXTTURE'
+        LEFT JOIN CUSTOM_FIELDS C4 ON C4.HANDLE = I.HANDLE AND C4.ATTRIBUTE = 'MAT_SPEC'
         JOIN RESRCE RES ON RES.RESRCE = zprt.RESRCE AND RES.SITE = zprt.SITE
         JOIN SFC S ON S.SFC=ZSD.SFC AND S.SITE=ZSD.SITE
         JOIN SFC_ROUTING SR ON SR.SFC_BO=S.HANDLE
@@ -665,6 +667,8 @@
         <if test="entity.shopOrder!=null and entity.shopOrder!='' "> AND ZPRT.SHOP_ORDER=#{entity.shopOrder}</if>
         <if test="entity.item!=null and entity.item!='' "> AND ZPRT.ITEM=#{entity.item}</if>
         <if test="entity.blankingSize!=null and entity.blankingSize!='' "> AND zsd.BLANKING_SIZE LIKE '%${entity.blankingSize}%'</if>
+        <if test="entity.matSpec!=null and entity.matSpec!='' "> AND C4.VALUE LIKE '%${entity.matSpec}%'</if>
+        <if test="entity.texture!=null and entity.texture!='' "> AND C3.VALUE LIKE '%${entity.texture}%'</if>
         <if test="entity.planStartDate!=null and entity.planStartDate!='' "> AND TO_CHAR(ZSD.PLANNED_START_DATE,'YYYY-MM-DD')=#{entity.planStartDate}</if>
          ORDER BY zprt.CREATED_DATE_TIME DESC
     </select>