Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e769eb9c1d |
+3
-2
@@ -865,10 +865,11 @@ public class InquiryQuoteTemplateServiceImpl extends ServiceImpl<InquiryQuoteTem
|
|||||||
if (rows.isEmpty()) {
|
if (rows.isEmpty()) {
|
||||||
rows = QuoteTemplateExcelSupport.parseFeeRows(q.get("fee_rows"));
|
rows = QuoteTemplateExcelSupport.parseFeeRows(q.get("fee_rows"));
|
||||||
}
|
}
|
||||||
// 空运:已落库 quote 常只有一条 fee_lines,完整明细在 airOptions.departureCharges
|
// 空运:已落库 quote 常只有一条 fee_lines,完整明细在 airOptions.departureCharges。
|
||||||
|
// 行数相同也优先 departureCharges(fee_lines 常把单价误当金额,缺单位)。
|
||||||
JSONArray fromAir = QuoteTemplateExcelSupport.parseAirDepartureChargeRows(
|
JSONArray fromAir = QuoteTemplateExcelSupport.parseAirDepartureChargeRows(
|
||||||
q.get("airOptions"), q.get("air_options"), chargeable, currency);
|
q.get("airOptions"), q.get("air_options"), chargeable, currency);
|
||||||
if (!fromAir.isEmpty() && (rows.isEmpty() || rows.size() < fromAir.size())) {
|
if (!fromAir.isEmpty()) {
|
||||||
rows = fromAir;
|
rows = fromAir;
|
||||||
}
|
}
|
||||||
if (rows.isEmpty()) {
|
if (rows.isEmpty()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user