diff --git a/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelImportExportSummaryRow.java b/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelImportExportSummaryRow.java index a6d13282..e9c6bdb0 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelImportExportSummaryRow.java +++ b/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelImportExportSummaryRow.java @@ -42,6 +42,7 @@ public class EcssCoDelImportExportSummaryRow { private BigDecimal netWeight; + /** 毛重:装箱单毛重合计 + 栈板主数据 pallet_weight × 托盘头 pallet_qty */ private BigDecimal grossWeight; /** 体积:ecss_CoDelPalletHeader.volume 按发货单汇总 */ diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index f1c0aa16..c88c5faf 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -1936,7 +1936,7 @@ create_by,create_date,update_by,update_date CONVERT(INT, ROUND(ISNULL(box.sum_box_qty, 0), 0)) ) AS boxQty, COALESCE(d.net_weight, box.sum_net_weight) AS netWeight, - COALESCE(d.gross_weight, box.sum_gross_weight) AS grossWeight, + ISNULL(box.sum_gross_weight, 0) + ISNULL(palWgt.sum_pallet_weight, 0) AS grossWeight, CONVERT(DECIMAL(20, 6), ISNULL(palVol.sum_pallet_volume, 0)) AS totalVolume, det.total_qty AS totalQty, det.currency_code AS currencyCode, @@ -1980,6 +1980,20 @@ create_by,create_date,update_by,update_date FROM ecss_CoDelPalletHeader GROUP BY site, bu_no, delNo ) palVol ON palVol.site = a.site AND palVol.bu_no = a.bu_no AND palVol.delNo = a.delNo + LEFT JOIN ( + SELECT + h.site, + h.bu_no, + h.delNo, + SUM(ISNULL(p.pallet_weight, 0) * ISNULL(h.pallet_qty, 0)) AS sum_pallet_weight + FROM ecss_CoDelPalletHeader h + LEFT JOIN ( + SELECT Site, BuNo, pallet_no, MAX(pallet_weight) AS pallet_weight + FROM ecss_pallet + GROUP BY Site, BuNo, pallet_no + ) p ON h.pallet = p.pallet_no AND h.site = p.Site AND h.bu_no = p.BuNo + GROUP BY h.site, h.bu_no, h.delNo + ) palWgt ON palWgt.site = a.site AND palWgt.bu_no = a.bu_no AND palWgt.delNo = a.delNo AND a.bu_no = #{query.buNo}