From 9caa54104c12a441db2c2d049404d712537d20a2 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Sun, 25 Dec 2022 22:39:24 +0800
Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ViewKanbanCODelNotifyData.java     | 40 ++++++++++++++++++-
 .../resources/mapper/board/BoardMapper.xml    |  7 ++--
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/heai/modules/board/entity/ViewKanbanCODelNotifyData.java b/src/main/java/com/heai/modules/board/entity/ViewKanbanCODelNotifyData.java
index 49b34c4..6bcbe6b 100644
--- a/src/main/java/com/heai/modules/board/entity/ViewKanbanCODelNotifyData.java
+++ b/src/main/java/com/heai/modules/board/entity/ViewKanbanCODelNotifyData.java
@@ -47,7 +47,11 @@ public class ViewKanbanCODelNotifyData {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date planShipDate;
-
+    private String customerPONo;
+    private String delNotifyNo;
+    @DateTimeFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss", timezone = "GMT+8")
+    private Date enteredDate;
     /**
      *
      */
@@ -69,6 +73,40 @@ public class ViewKanbanCODelNotifyData {
     private String operationHk;
     private String remark;
     private String abbreviateName;
+    private String forwarderName;
+
+    public String getForwarderName() {
+        return forwarderName;
+    }
+
+    public void setForwarderName(String forwarderName) {
+        this.forwarderName = forwarderName;
+    }
+
+    public String getCustomerPONo() {
+        return customerPONo;
+    }
+
+    public void setCustomerPONo(String customerPONo) {
+        this.customerPONo = customerPONo;
+    }
+
+    public String getDelNotifyNo() {
+        return delNotifyNo;
+    }
+
+    public void setDelNotifyNo(String delNotifyNo) {
+        this.delNotifyNo = delNotifyNo;
+    }
+
+    public Date getEnteredDate() {
+        return enteredDate;
+    }
+
+    public void setEnteredDate(Date enteredDate) {
+        this.enteredDate = enteredDate;
+    }
+
     public String getPartSpec() {
         return partSpec;
     }
diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml
index f1e771b..c4aa962 100644
--- a/src/main/resources/mapper/board/BoardMapper.xml
+++ b/src/main/resources/mapper/board/BoardMapper.xml
@@ -3,8 +3,9 @@
 
 <mapper namespace="com.heai.modules.board.dao.BoardMapper">
     <select id="getWeekShipmentBoardData" resultType="com.heai.modules.board.entity.ViewKanbanCODelNotifyData">
-        select  PartSpec,NotifyQty,QtyPerBox,WeightperBag,BagsperBox,BoxType,WeightperBox,PlanShipDate,Site,FinishedFlag,Operation_SZ,remark,
-        Operation_HK,abbreviateName FROM view_KANBAN_CODelNotify
+<!--        select  PartSpec,NotifyQty,QtyPerBox,WeightperBag,BagsperBox,BoxType,WeightperBox,PlanShipDate,Site,FinishedFlag,Operation_SZ,remark,-->
+<!--        Operation_HK,abbreviateName FROM view_KANBAN_CODelNotify-->
+        select abbreviateName,CustomerPONo,DelNotifyNo,PlanShipDate,PartSpec,NotifyQty,forwarderName,EnteredDate,Remark from view_KANBAN_CODelNotify_new
         <where>
              <if test="startDate != null ">
                  AND PlanShipDate >=   #{startDate}
@@ -159,7 +160,7 @@
 						LEFT JOIN PartSubPropertiesValue p2 on p2.site=a.site and p2.PartNo=a.PartNo and p2.PropertiesItemNo='GROSS WEIGHT'
 						LEFT JOIN  ShopOrder SO1 on a.site=so1.site and a.OrderNo=SO1.OrderNo
 						LEFT JOIN  ShopOrder SO2  on a.site=so2.site and SO1.E_OriginalOrderNo=SO2.OrderNo
-						LEFT JOIN PartSubPropertiesValue p3 on p3.site=a.site and p3.PartNo=a.PartNo and p3.PropertiesItemNo='HARDNESS'
+						LEFT JOIN PartSubPropertiesValue p3 on p3.site=a.site and p3.PartNo=a.PartNo and p3.PropertiesItemNo='DUROA'
 						LEFT JOIN PartSubPropertiesValue p4 on p4.site=a.site and p4.PartNo=a.PartNo and p4.PropertiesItemNo='COLOR'
 						where a.ClosedFlag='N' and a.scheduleType='日计划派工单'
         order By a.S_ScheduledDate,a.seqNo