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 ) 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 ) Status_DB = 'I' AND p.ExpireDateControlFlag = 'Y'