diff --git a/src/main/java/com/xujie/modules/supplier/data/PriceSheetReportPriceVo.java b/src/main/java/com/xujie/modules/supplier/data/PriceSheetReportPriceVo.java index c04669c..5745822 100644 --- a/src/main/java/com/xujie/modules/supplier/data/PriceSheetReportPriceVo.java +++ b/src/main/java/com/xujie/modules/supplier/data/PriceSheetReportPriceVo.java @@ -46,4 +46,6 @@ public class PriceSheetReportPriceVo { private String fscClaim; private String awareDpp; private String coo; + /** 供应商+SKU 例外优先,空值回退到供应商默认生产 Lead Time。 */ + private Integer leadTime; } diff --git a/src/main/java/com/xujie/modules/supplier/service/impl/PriceSheetReportServiceImpl.java b/src/main/java/com/xujie/modules/supplier/service/impl/PriceSheetReportServiceImpl.java index b911d61..9c01352 100644 --- a/src/main/java/com/xujie/modules/supplier/service/impl/PriceSheetReportServiceImpl.java +++ b/src/main/java/com/xujie/modules/supplier/service/impl/PriceSheetReportServiceImpl.java @@ -43,7 +43,7 @@ public class PriceSheetReportServiceImpl implements IPriceSheetReportService { "Tier_QTY_5", "Tier_QTY_6", "Tier_QTY_7", "Tier_QTY_8", "Price_Tier_1", "Price_Tier_2", "Price_Tier_3", "Price_Tier_4", "Price_Tier_5", "Price_Tier_6", "Price_Tier_7", "Price_Tier_8", - "FSC", "FSC claim", "AWARE\nDPP", "COO" + "FSC", "FSC claim", "AWARE\nDPP", "COO", "LeadTime" }; private static final String[] HANDLING_HEADERS = {"", "COMMENTS", "HANDLING CHARGE"}; private static final String[] PAYMENT_HEADERS = { @@ -270,7 +270,9 @@ public class PriceSheetReportServiceImpl implements IPriceSheetReportService { setText(row, column++, value.getFscClaim()); // Lead free Pellet 已删除,FSC claim 后直接写 AWARE DPP、COO setText(row, column++, value.getAwareDpp()); - setText(row, column, value.getCoo()); + setText(row, column++, value.getCoo()); + setNumber(row, column, value.getLeadTime() == null ? null + : BigDecimal.valueOf(value.getLeadTime()), quantityStyle); } setPriceSheetWidths(sheet); } diff --git a/src/main/resources/mapper/supplier/PriceSheetReportMapper.xml b/src/main/resources/mapper/supplier/PriceSheetReportMapper.xml index 6310441..861728a 100644 --- a/src/main/resources/mapper/supplier/PriceSheetReportMapper.xml +++ b/src/main/resources/mapper/supplier/PriceSheetReportMapper.xml @@ -61,7 +61,8 @@ fsc.propertyValue AS fsc, fsc_claim.propertyValue AS fscClaim, aware_dpp.propertyValue AS awareDpp, - coo.propertyValue AS coo + coo.propertyValue AS coo, + COALESCE(sku_lead.production_lead_time, s.production_lead_time) AS leadTime FROM SupplierforPart sp INNER JOIN part p ON p.site = sp.site @@ -69,6 +70,10 @@ LEFT JOIN srm_supplier s ON s.site = sp.site AND s.supplier_no = sp.supplier_no + LEFT JOIN SupplierforSku sku_lead + ON sku_lead.supplier_no = sp.supplier_no + AND sku_lead.sku = p.sku + AND NULLIF(LTRIM(RTRIM(p.sku)), '') IS NOT NULL LEFT JOIN ( SELECT