diff --git a/src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java b/src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java index 8adbff9..ff35f5b 100644 --- a/src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java +++ b/src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java @@ -95,8 +95,11 @@ public class MaterialSplitServiceImpl implements MaterialSplitService { materialSplitMapper.saveCRollInfo(inList.get(i)); //查询出打印的数据 Map printMap = materialSplitMapper.getSplitPrintMaterialRoll(inList.get(i)); + //添加打印的数据 + printList.add(printMap); } } + responseData.setObj(printList); responseData.setCode("200"); responseData.setSuccess(true); responseData.setMsg("操作成功!"); diff --git a/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml b/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml index b81e197..7d0d75f 100644 --- a/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml +++ b/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, pt.UMID umid, cri.RollDate rollDate, NULL expiredDate, cri.CreatedBy createdBy, pt.DefaultLocationID locationId + '' 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 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}