卷标签打印

src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml

@@ -339,7 +339,7 @@
         (CASE WHEN dbo.Get_ReferenceInfo_SupplierID(cri.Site, cri.PartNo, cri.CustomerID, cri.FGPartNo) = '' THEN cri.SupplierID ELSE dbo.Get_ReferenceInfo_SupplierID(cri.Site,cri.PartNo,cri.CustomerID,cri.FGPartNo) END) supplierId,
         dbo.Get_SupplierDesc(cri.Site, (CASE WHEN dbo.Get_ReferenceInfo_SupplierID(cri.Site, cri.PartNo, cri.CustomerID, cri.FGPartNo) = '' THEN cri.SupplierID ELSE dbo.Get_ReferenceInfo_SupplierID(cri.Site, cri.PartNo, cri.CustomerID, cri.FGPartNo) END)) supplierDesc,
         (CASE WHEN dbo.Get_ReferenceInfo_PartDesc(cri.Site, cri.PartNo, cri.CustomerID, cri.FGPartNo) = '' THEN pt.PartDescription ELSE dbo.Get_ReferenceInfo_PartDesc(cri.Site,cri.PartNo,cri.CustomerID,cri.FGPartNo) END) partDesc,
-        '' spec, cri.RollQty rollQty, ISNULL(pt.UMID, '') umid, CONVERT(VARCHAR(19), cri.RollDate, 120) rollDate, CONVERT(VARCHAR(10), cri.ExpiredDate, 120) expiredDate, cri.CreatedBy createdBy, pt.DefaultLocationID locationId
+        '' spec, cri.RollQty rollQty, ISNULL(pt.UMID, '') umid, CONVERT(VARCHAR(10), cri.RollDate, 120) rollDate, ISNULL(CONVERT(VARCHAR(10), cri.ExpiredDate, 120), null ) expiredDate, cri.CreatedBy createdBy, pt.DefaultLocationID locationId
         FROM C_RollInfo cri
         LEFT JOIN Part pt ON cri.Site = pt.Site AND cri.PartNo = pt.PartNo
         WHERE cri.Site = #{site} AND cri.RollNo = #{rollNo}