diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsMainData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsMainData.java index 62efe41..8e99369 100644 --- a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsMainData.java +++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsMainData.java @@ -19,5 +19,5 @@ public class LogisticsMainData { /** * 发货数量 */ - private Double shippedQty; + private Double cShipQty; } diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java index 323b4db..03187b0 100644 --- a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java +++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java @@ -20,4 +20,8 @@ public class LogisticsPoData { private Double shippedQty; private String flexId; + + private String sku; + + private String orderRef1; } diff --git a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml index c7bd842..a9ed5ea 100644 --- a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml +++ b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml @@ -30,6 +30,7 @@ AND d.site = #{query.site} AND d.request_no LIKE '%' + #{query.requestNo} + '%' + AND d.order_ref1 = #{query.orderRef1} ORDER BY d.request_no DESC, d.item_no ASC diff --git a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml index a7b81c7..7c09909 100644 --- a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml +++ b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml @@ -9,7 +9,7 @@ h.supplier_no AS supplierNo, ISNULL(s.supplier_name, '') AS supplierName, COUNT(DISTINCT d.order_no) AS poCount, - ISNULL(SUM(d.shipped_qty), 0) AS shippedQty + ISNULL(SUM(d.c_ship_qty), 0) AS shippedQty FROM PODetail d INNER JOIN POHeader h ON d.order_no = h.order_no @@ -42,8 +42,9 @@ d.part_no AS partNo, h.order_date AS orderDate, d.qty, - d.shipped_qty AS shippedQty, + d.c_ship_qty AS shippedQty, d.c_flexid AS flexId, + d.order_ref1 AS orderRef1, p.sku FROM PODetail d LEFT JOIN POHeader h