diff --git a/src/main/java/com/gaotao/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java b/src/main/java/com/gaotao/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java index ec9f3fd..551b9e3 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java +++ b/src/main/java/com/gaotao/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java @@ -35,4 +35,6 @@ public class SOIssueNotifyOrderMaterialListData extends SOIssueNotifyOrderMateri private String seqNo; private String warehouseName; private String bu; + private String umId; + private String umName; } diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index 0ec6a74..cb72ebb 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -351,11 +351,14 @@ a.BOMItemNo as bOMItemNo, a.component_scrap, a.first_inspection_qty, - a.standard_dosage + a.standard_dosage, + d.UMID as umId, + um.UMName as umName from SOIssueNotifyOrderMaterialList a left join SOIssueNotifyOrderList b on a.site = b.site and a.NotifyNo = b.NotifyNo and a.ItemNo = b.ItemNo left join SOBOM c on c.site = A.site and b.SOOrderNo = c.OrderNo and c.ItemNo = A.BOMItemNo and c.ComponentPartNo = a.ComponentPartNo left join part d on d.site = a.site and d.PartNo = a.ComponentPartNo + left join um as um on d.site = um.site and d.UMID = um.UMID left join WareHouse w on a.site = w.site and a.warehouse_id = w.WareHouseID where a.NotifyNo = #{notifyNo} and a.site = #{site} order by b.needDate, a.ItemNo