From 94e8168f5528d604de1fa1dc7b074de473ef76a8 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 19 Apr 2022 12:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E4=BB=93=E5=BA=93=202022?=
 =?UTF-8?q?=E5=B9=B44=E6=9C=8819=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gaotao/modules/finishedProduct/vo/CRollinfoVo.java    | 2 ++
 src/main/resources/mapper/finishedProduct/CRollinfoDao.xml    | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/com/gaotao/modules/finishedProduct/vo/CRollinfoVo.java b/src/main/java/com/gaotao/modules/finishedProduct/vo/CRollinfoVo.java
index b0b8705..89427bc 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/vo/CRollinfoVo.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/vo/CRollinfoVo.java
@@ -22,6 +22,8 @@ public class CRollinfoVo extends CRollinfoEntity {
 
     private Integer overdueDays;
 
+    private String suppliername;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date startDate;
diff --git a/src/main/resources/mapper/finishedProduct/CRollinfoDao.xml b/src/main/resources/mapper/finishedProduct/CRollinfoDao.xml
index 2e8b14d..a9649bb 100644
--- a/src/main/resources/mapper/finishedProduct/CRollinfoDao.xml
+++ b/src/main/resources/mapper/finishedProduct/CRollinfoDao.xml
@@ -93,9 +93,11 @@
         p.PartDescription,
         p.ExpireDateControlFlag,
         ExpiredDate,
+        sp.SupplierName,
         datediff( DAY, r.RollDate, GETDATE( ) ) as toexpiredays
         FROM
         C_RollInfo AS r
+        LEFT JOIN Supplier AS sp on r.SupplierID = sp.SupplierID
         LEFT JOIN Part AS p ON ( r.PartNo = p.PartNo AND r.Site = p.Site )
         <where>
             Status_DB = 'I'
@@ -166,8 +168,10 @@
         p.ExpireDateControlFlag as expireDateControlFlag,
         r.ExpiredDate,
         p.toexpiredays,
+        sp.SupplierName,
         ( CASE WHEN ExpiredDate IS NULL THEN - 9999 ELSE datediff( DAY, ExpiredDate, GETDATE( ) ) END ) overdue_days
         FROM C_RollInfo AS r
+        LEFT JOIN Supplier AS sp on r.SupplierID = sp.SupplierID
         LEFT JOIN Part AS p ON ( r.PartNo = p.PartNo AND r.Site = p.Site )
         <where>
             Status_DB = 'I' AND p.ExpireDateControlFlag = 'Y'