diff --git a/src/main/java/com/gaotao/modules/orderIssure/entity/IssueNotifyReportData.java b/src/main/java/com/gaotao/modules/orderIssure/entity/IssueNotifyReportData.java index 27c00c9..baa1d7d 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/entity/IssueNotifyReportData.java +++ b/src/main/java/com/gaotao/modules/orderIssure/entity/IssueNotifyReportData.java @@ -34,7 +34,16 @@ public class IssueNotifyReportData { private BigDecimal standardDosage; private BigDecimal qtyToIssue; private BigDecimal actualOutQty; - + private String outBatchNo; + + public String getOutBatchNo() { + return outBatchNo; + } + + public void setOutBatchNo(String outBatchNo) { + this.outBatchNo = outBatchNo; + } + public Integer getPage() { return page; } diff --git a/src/main/java/com/gaotao/modules/outboundNotification/entity/OutboundNotificationDetailEntity.java b/src/main/java/com/gaotao/modules/outboundNotification/entity/OutboundNotificationDetailEntity.java index 1080188..854604a 100644 --- a/src/main/java/com/gaotao/modules/outboundNotification/entity/OutboundNotificationDetailEntity.java +++ b/src/main/java/com/gaotao/modules/outboundNotification/entity/OutboundNotificationDetailEntity.java @@ -24,4 +24,7 @@ public class OutboundNotificationDetailEntity extends QueryPage { private String relatedOrderNo; private String relatedOrderLineNo; private String inspectionFlag; + private String orderref01; + private String orderref02; + private String orderref03; } diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index a599465..5511254 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -670,9 +670,11 @@ C.standard_dosage AS standardDosage, C.QtyToIssue AS qtyToIssue, ISNULL(C.actual_out_qty, 0) AS actualOutQty, - A.work_center_no AS workCenterNo + A.work_center_no AS workCenterNo, + so.out_batchNo as outBatchNo FROM SOIssueNotifyHeader A INNER JOIN SOIssueNotifyOrderList B ON A.Site = B.Site AND A.NotifyNo = B.NotifyNo + left join ShopOrder as so on B.site = so.site and B.SOOrderNo = so.OrderNo INNER JOIN SOIssueNotifyOrderMaterialList C ON B.Site = C.Site AND B.NotifyNo = C.NotifyNo AND B.ItemNo = C.ItemNo INNER JOIN Part P ON C.Site = P.Site AND C.ComponentPartNo = P.PartNo INNER JOIN UM U ON U.Site = P.Site AND U.UMID = P.UMID diff --git a/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml b/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml index 1e2b7d4..dcaa112 100644 --- a/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml +++ b/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml @@ -24,7 +24,8 @@ a.order_qty, a.related_order_no, a.related_order_line_no, - a.actual_out_qty as actualStockOutQty + a.actual_out_qty as actualStockOutQty, + a.orderref03 FROM outbound_notification_detail as a left join WareHouse as b on a.site = b.site and a.bu_no = b.bu_no and a.out_warehouse = b.WareHouseID left join um as c on a.site = c.site and a.unit = c.UMID