From 8d4bd65347201559dc8978264d64945d76f7b883 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Fri, 20 Aug 2021 11:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E6=96=99=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreverwin/mesnac/common/model/ProdReadyTask.java | 11 +++++++++++
 .../src/main/resources/mapper/ProdReadyTaskMapper.xml |  3 ++-
 meapi/src/main/resources/mapper/SfcMapper.xml         |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/model/ProdReadyTask.java b/common/src/main/java/com/foreverwin/mesnac/common/model/ProdReadyTask.java
index fcc5ecdb..ff85888b 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/model/ProdReadyTask.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/model/ProdReadyTask.java
@@ -182,6 +182,17 @@ public class ProdReadyTask extends Model<ProdReadyTask> {
    @TableField(exist = false)
    private String workCenterDesc;
 
+   @TableField(exist = false)
+   private String blankingSize;
+
+   public String getBlankingSize() {
+      return blankingSize;
+   }
+
+   public void setBlankingSize(String blankingSize) {
+      this.blankingSize = blankingSize;
+   }
+
    public List<ProdReadyTaskDetail> getProdReadyTaskDetailList() {
       return prodReadyTaskDetailList;
    }
diff --git a/common/src/main/resources/mapper/ProdReadyTaskMapper.xml b/common/src/main/resources/mapper/ProdReadyTaskMapper.xml
index d49856b6..75144076 100644
--- a/common/src/main/resources/mapper/ProdReadyTaskMapper.xml
+++ b/common/src/main/resources/mapper/ProdReadyTaskMapper.xml
@@ -631,7 +631,7 @@
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
     <select id="getTaskList" resultMap="BaseResultMap">
-        SELECT PREZSD.EMPLOYEE_DESCRIPTION,CASE WHEN TO_NUMBER(zsd.DISPATCH_SEQ)=1 THEN NULL
+        SELECT 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
@@ -662,6 +662,7 @@
         <if test="entity.resourceType!=null and entity.resourceType!='' "> AND ZSD.RESOURCE_TYPE=#{entity.resourceType}</if>
         <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.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>
diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml
index b45ca5b5..44cd8950 100644
--- a/meapi/src/main/resources/mapper/SfcMapper.xml
+++ b/meapi/src/main/resources/mapper/SfcMapper.xml
@@ -639,7 +639,7 @@
         SELECT IW.DATE_STARTED
          FROM  SFC S
         INNER JOIN SFC_ROUTING SR ON  SR.SFC_BO = S.HANDLE
-        INNER JOIN SFC_ROUTER SRO ON SRO.SFC_ROUTING_BO = SR.HANDLE AND SRSRO.IN_USE = 'true'
+        INNER JOIN SFC_ROUTER SRO ON SRO.SFC_ROUTING_BO = SR.HANDLE AND SRO.IN_USE = 'true'
         INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = SRO.HANDLE
         INNER JOIN SFC_IN_WORK IW ON SS.HANDLE = IW.SFC_STEP_BO
         INNER JOIN STATUS ST ON ST.HANDLE = S.STATUS_BO AND ST.STATUS ='403'