From 606905210576b980f67e02232135f89778532e62 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Tue, 31 Aug 2021 11:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E5=87=86=E5=A4=87=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/model/ProdReadyTask.java    | 24 ++++++++++++++++++-
 .../resources/mapper/ProdReadyTaskMapper.xml  |  2 +-
 2 files changed, 24 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 35d33a22..f622a1e7 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
@@ -191,7 +191,29 @@ public class ProdReadyTask extends Model<ProdReadyTask> {
    @TableField(exist = false)
    private String texture;
 
-   public String getMatSpec() {
+    @TableField(exist = false)
+    private String prodHours;
+
+    @TableField(exist = false)
+    private String qty;
+
+    public String getQty() {
+        return qty;
+    }
+
+    public void setQty(String qty) {
+        this.qty = qty;
+    }
+
+    public String getProdHours() {
+        return prodHours;
+    }
+
+    public void setProdHours(String prodHours) {
+        this.prodHours = prodHours;
+    }
+
+    public String getMatSpec() {
       return matSpec;
    }
 
diff --git a/common/src/main/resources/mapper/ProdReadyTaskMapper.xml b/common/src/main/resources/mapper/ProdReadyTaskMapper.xml
index b2dea01b..0cd501cd 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 c3.value TEXTURE,c4.value MAT_SPEC,zsd.BLANKING_SIZE,PREZSD.EMPLOYEE_DESCRIPTION,CASE WHEN TO_NUMBER(zsd.DISPATCH_SEQ)=1 THEN NULL
+        SELECT zsd.PROD_HOURS,S.QTY,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