@chenchaolong/plugin-trade-compliance-workbench 1.0.151 → 1.0.153

package/dist/lib/workbench.service.js

@@ -13,7 +13,7 @@ import { createHash, randomUUID } from 'node:crypto';
 import { BankAccountSettings, CatalogReviewBlock, CompanySanctionMatch, CompanySettings, ControlledCatalogBatch, ControlledCatalogImportIssue, ControlledGoodsRecord, Customer, CustomerContract, CustomerContractAnalysisRun, CustomerContractClause, CustomerContractClauseAnalysis, DerivedSalesOrderManualData, GeneratedSalesFile, HsCodeReferenceSnapshot, ImportTask, ManagedAsset, MonthlySafeExchangeRate, ProductComplianceMatch, ProfitRuleSettings, PurchaseOrder, PurchaseOrderLine, SanctionCatalogBatch, SanctionCatalogImportIssue, SanctionedCompanyAlias, SanctionedCompanyRecord, SettingsHistory, Supplier } from './entities/index.js';
 import { CATALOG_REVIEW_BATCH_LIMIT, CATALOG_REVIEW_LEASE_MS, CATALOG_TRANSLATION_REVIEW_LEASE_MS } from './constants.js';
 import { CatalogTypes, ClauseTypes, CustomerProfitRateStatuses, DomainError, DomainErrorCodes, RefundValidationMethods, RiskLevels, SalesPaymentStatuses, SanctionHitStatuses, StalledCatalogImportDecisions } from './types.js';
-import { deriveSalesLine, assertReceivedAmount } from './domain/finance.js';
+import { deriveSalesLine, assertReceivedAmount, calculateSalesLineFromRate } from './domain/finance.js';
 import { assertYcNumberContractNo, parseCustomerContractNo, parsePurchaseContractNo } from './domain/contract-number.js';
 import { isProductNameMatch, normalizeExactName, normalizeForProductMatch, normalizeHsCode, normalizeSanctionSource } from './domain/normalization.js';
 import { importTaskTimedOut, nextSettingsRevision, normalizeOptionalDecimalInput } from './domain/workflow.js';
@@ -3461,11 +3461,9 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                     continue;
                 const manual = manualMap.get(derivedOrderKey(contract.id, purchase.id));
                 const effectiveRate = manual?.pricingProfitRateOverride ?? (customer.pricingProfitRateStatus === 'CONFIGURED' ? customer.defaultPricingProfitRate : null);
-                if (effectiveRate == null)
-                    continue;
-                const source = manual?.pricingProfitRateOverride != null ? 'ORDER_OVERRIDE' : 'CUSTOMER_DEFAULT';
+                const lineOverrides = linePricingOverrides(manual?.linePricingOverrides);
                 const derivedLines = (linesByPurchase.get(purchase.id) ?? []).map(line => {
-                    const pricing = deriveSalesLine({ purchaseUnitPriceCny: line.unitPriceTaxIncluded, quantity: line.quantity }, effectiveRate);
+                    const pricing = deriveSalesPricingLine(line, lineOverrides[line.id], effectiveRate);
                     return {
                         purchaseOrderLineId: line.id, productName: line.productName, englishName: line.englishName, productDescription: line.productDescription,
                         modelSpecification: line.modelSpecification, unit: line.unit, quantity: line.quantity, hsCode: line.hsCode,
@@ -3485,9 +3483,10 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                         })
                     };
                 });
-                const amount = derivedLines.reduce((sum, line) => sum.plus(line.salesLineAmountCny), new Decimal(0));
+                const pricedLines = derivedLines.filter(line => line.pricingStatus === 'PRICED' && line.salesLineAmountCny != null);
+                const amount = manual?.orderAmountCnyOverride != null ? new Decimal(manual.orderAmountCnyOverride) : pricedLines.reduce((sum, line) => sum.plus(line.salesLineAmountCny ?? 0), new Decimal(0));
                 const received = new Decimal(manual?.receivedAmountCny ?? 0);
-                results.push({ customerContractId: contract.id, purchaseOrderId: purchase.id, customerId: customer.id, salesOrderNo: parsePurchaseContractNo(purchase.contractNo).salesOrderNo, customerContractNo: contract.contractNo, purchaseContractNo: purchase.contractNo, orderDate: purchase.orderDate, currencyCode: 'CNY', pricingProfitRateSource: source, effectivePricingProfitRate: effectiveRate, orderAmountCny: amount.toFixed(0), receivedAmountCny: received.toFixed(2), unreceivedAmountCny: Decimal.max(amount.minus(received), 0).toFixed(2), lines: derivedLines });
+                results.push({ customerContractId: contract.id, purchaseOrderId: purchase.id, customerId: customer.id, salesOrderNo: parsePurchaseContractNo(purchase.contractNo).salesOrderNo, customerContractNo: contract.contractNo, purchaseContractNo: purchase.contractNo, orderDate: purchase.orderDate, currencyCode: 'CNY', pricingProfitRateSource: orderPricingSource(derivedLines, manual?.pricingProfitRateOverride, customer.pricingProfitRateStatus === 'CONFIGURED' ? customer.defaultPricingProfitRate : null), effectivePricingProfitRate: effectiveRate, pricingStatus: orderPricingStatus(derivedLines), missingPricingFields: orderMissingPricingFields(derivedLines), orderAmountCny: amount.toFixed(manual?.orderAmountCnyOverride != null ? 4 : 0), receivedAmountCny: received.toFixed(2), unreceivedAmountCny: Decimal.max(amount.minus(received), 0).toFixed(2), lines: derivedLines });
             }
         }
         return results.sort(compareDerivedSalesOrders);
@@ -3499,7 +3498,6 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             .leftJoin(DerivedSalesOrderManualData, 'manual', 'manual."customerContractId" = contract.id AND manual."purchaseOrderId" = purchase.id AND manual."tenantId" = contract."tenantId" AND manual."organizationId" = contract."organizationId" AND manual."deletedAt" IS NULL')
             .leftJoin(Supplier, 'supplier', 'supplier.id = purchase."supplierId" AND supplier."tenantId" = purchase."tenantId" AND supplier."organizationId" = purchase."organizationId" AND supplier."deletedAt" IS NULL')
             .where('contract."tenantId" = :tenantId AND contract."organizationId" = :organizationId AND contract."deletedAt" IS NULL', activeScope(scope))
-            .andWhere("(manual.\"pricingProfitRateOverride\" IS NOT NULL OR (customer.\"pricingProfitRateStatus\" = 'CONFIGURED' AND customer.\"defaultPricingProfitRate\" IS NOT NULL))")
             .select('contract.id', 'customerContractId').addSelect('purchase.id', 'purchaseOrderId');
         if (customerId)
             qb.andWhere('customer.id = :customerId', { customerId });
@@ -3517,8 +3515,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             qb.andWhere('purchase."orderDate" >= :orderDateFrom', { orderDateFrom: date.from });
         if (hasQueryValue(date.to))
             qb.andWhere('purchase."orderDate" <= :orderDateTo', { orderDateTo: date.to });
-        const effectiveRate = 'COALESCE(manual."pricingProfitRateOverride", customer."defaultPricingProfitRate")';
-        const amount = `(SELECT COALESCE(SUM(ROUND(ROUND(sales_line."unitPriceTaxIncluded" * (1 + ${effectiveRate}), 0) * sales_line.quantity, 0)), 0) FROM plugin_trade_compliance_purchase_order_line sales_line WHERE sales_line."purchaseOrderId" = purchase.id AND sales_line."tenantId" = purchase."tenantId" AND sales_line."organizationId" = purchase."organizationId" AND sales_line."deletedAt" IS NULL)`;
+        const amount = derivedSalesOrderAmountSql('sales_line', 'manual."linePricingOverrides"', 'COALESCE(manual."pricingProfitRateOverride", customer."defaultPricingProfitRate")');
         const received = 'COALESCE(manual."receivedAmountCny", 0)';
         if (parameters.paymentStatus === 'UNPAID')
             qb.andWhere(`${received} <= 0`);
@@ -3548,7 +3545,8 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         return { items: items, total, page, pageSize };
     }
     async saveCustomerProfitRate(scope, customerId, rate) {
-        if (new Decimal(rate).isNegative())
+        const normalizedRate = normalizeOptionalDecimalInput(rate);
+        if (normalizedRate != null && new Decimal(normalizedRate).isNegative())
             throw new DomainError(DomainErrorCodes.INVALID_INPUT, '客户默认利润率不能小于 0');
         return this.dataSource.transaction(async (manager) => {
             const customerRepo = manager.getRepository(Customer);
@@ -3563,13 +3561,13 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             const contractIds = contracts.map(contract => contract.id);
             const manuals = contractIds.length && purchaseIds.length ? await manager.getRepository(DerivedSalesOrderManualData).find({ where: { ...activeScope(scope), customerContractId: In(contractIds), purchaseOrderId: In(purchaseIds), deletedAt: IsNull() }, order: { customerContractId: 'ASC', purchaseOrderId: 'ASC' }, lock: { mode: 'pessimistic_write' } }) : [];
             const linesByPurchase = groupBy(lines, line => line.purchaseOrderId);
-            for (const manual of manuals.filter(item => item.pricingProfitRateOverride == null)) {
-                const orderAmount = derivedOrderAmount(linesByPurchase.get(manual.purchaseOrderId) ?? [], rate);
+            for (const manual of manuals.filter(item => item.pricingProfitRateOverride == null && manual.orderAmountCnyOverride == null && normalizedRate != null)) {
+                const orderAmount = deriveOrderPricingAmount(linesByPurchase.get(manual.purchaseOrderId) ?? [], manual.linePricingOverrides, normalizedRate);
                 assertReceivedAmount(orderAmount, manual.receivedAmountCny);
             }
-            customer.defaultPricingProfitRate = rate;
+            customer.defaultPricingProfitRate = normalizedRate;
             customer.updatedById = scope.userId ?? null;
-            customer.pricingProfitRateStatus = 'CONFIGURED';
+            customer.pricingProfitRateStatus = normalizedRate == null ? 'MISSING' : 'CONFIGURED';
             return customerRepo.save(customer);
         });
     }
@@ -3599,19 +3597,28 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             const where = { ...activeScope(scope), customerContractId, purchaseOrderId, deletedAt: IsNull() };
             let row = await repo.findOne({ where, lock: { mode: 'pessimistic_write' } });
             if (!row) {
-                await repo.createQueryBuilder().insert().into(DerivedSalesOrderManualData).values({ ...auditScope(scope), customerContractId, purchaseOrderId, pricingProfitRateOverride: null, receivedAmountCny: '0' }).orIgnore().execute();
+                await repo.createQueryBuilder().insert().into(DerivedSalesOrderManualData).values({ ...auditScope(scope), customerContractId, purchaseOrderId, pricingProfitRateOverride: null, orderAmountCnyOverride: null, linePricingOverrides: null, receivedAmountCny: '0' }).orIgnore().execute();
                 row = await required(repo.findOne({ where, lock: { mode: 'pessimistic_write' } }), '销售订单人工维护数据创建失败');
             }
             const override = input.pricingProfitRateOverride === undefined ? row.pricingProfitRateOverride : normalizeOptionalDecimalInput(input.pricingProfitRateOverride);
             if (override != null && new Decimal(override).isNegative())
                 throw new DomainError(DomainErrorCodes.INVALID_INPUT, '订单利润率不能小于 0');
+            const orderAmountCnyOverride = input.orderAmountCnyOverride === undefined ? row.orderAmountCnyOverride : normalizeOptionalDecimalInput(input.orderAmountCnyOverride);
+            if (orderAmountCnyOverride != null && new Decimal(orderAmountCnyOverride).isNegative())
+                throw new DomainError(DomainErrorCodes.INVALID_INPUT, '销售订单总额不能小于 0');
+            const nextLineOverrides = input.linePricingOverrides === undefined
+                ? row.linePricingOverrides
+                : normalizeLinePricingOverrides({ ...linePricingOverrides(row.linePricingOverrides), ...linePricingOverrides(input.linePricingOverrides) });
             const effectiveRate = override ?? (customer.pricingProfitRateStatus === 'CONFIGURED' ? customer.defaultPricingProfitRate : null);
-            if (effectiveRate == null)
-                throw new DomainError(DomainErrorCodes.CUSTOMER_PROFIT_RATE_REQUIRED, '客户默认利润率未维护');
             const received = input.receivedAmountCny ?? row.receivedAmountCny;
-            assertReceivedAmount(derivedOrderAmount(lines, effectiveRate), received);
+            const finalAmount = orderAmountCnyOverride ?? deriveOrderPricingAmount(lines, nextLineOverrides, effectiveRate);
+            assertReceivedAmount(finalAmount, received);
             if (input.pricingProfitRateOverride !== undefined)
                 row.pricingProfitRateOverride = override;
+            if (input.orderAmountCnyOverride !== undefined)
+                row.orderAmountCnyOverride = orderAmountCnyOverride;
+            if (input.linePricingOverrides !== undefined)
+                row.linePricingOverrides = nextLineOverrides;
             if (input.receivedAmountCny !== undefined)
                 row.receivedAmountCny = input.receivedAmountCny;
             row.updatedById = scope.userId ?? null;
@@ -4292,7 +4299,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             const received = new Decimal(order.receivedAmountCny);
             const total = new Decimal(order.orderAmountCny);
             const paymentStatus = received.lte(0) ? 'UNPAID' : received.gte(total) ? 'PAID' : 'PARTIAL';
-            return { ...order, customerName: customerNames.get(order.customerId) ?? '', supplierName: supplierNames.get(purchaseSuppliers.get(order.purchaseOrderId) ?? '') ?? '', pricingProfitRateStatus: 'CONFIGURED', paymentStatus, lines: order.lines.map(line => ({ ...line, complianceCategories: [...new Set(line.complianceMatches.map(match => match.catalogType))] })) };
+            return { ...order, customerName: customerNames.get(order.customerId) ?? '', supplierName: supplierNames.get(purchaseSuppliers.get(order.purchaseOrderId) ?? '') ?? '', pricingProfitRateStatus: order.pricingStatus === 'UNPRICED' ? 'MISSING' : 'CONFIGURED', paymentStatus, lines: order.lines.map(line => ({ ...line, complianceCategories: [...new Set(line.complianceMatches.map(match => match.catalogType))] })) };
         });
     }
     async purchaseOrderDtos(scope, orders) {
@@ -4797,6 +4804,100 @@ function groupBy(rows, keyOf) { const grouped = new Map(); for (const row of row
 } return grouped; }
 function compareDerivedSalesOrders(left, right) { return left.salesOrderNo.localeCompare(right.salesOrderNo) || left.purchaseOrderId.localeCompare(right.purchaseOrderId) || left.customerContractId.localeCompare(right.customerContractId); }
 function derivedOrderAmount(lines, rate) { return lines.reduce((total, line) => total.plus(deriveSalesLine({ purchaseUnitPriceCny: line.unitPriceTaxIncluded, quantity: line.quantity }, rate).salesLineAmountCny), new Decimal(0)).toFixed(0); }
+function derivedSalesOrderAmountSql(lineAlias, overridesExpression, effectiveRateExpression) {
+    const override = `${overridesExpression} -> ${lineAlias}.id::text`;
+    const lineRate = `COALESCE(NULLIF(BTRIM(${override}->>'pricingProfitRate'), '')::numeric, ${effectiveRateExpression})`;
+    const lineAmount = `COALESCE(NULLIF(BTRIM(${override}->>'salesLineAmountCny'), '')::numeric, NULLIF(BTRIM(${override}->>'salesUnitPriceCny'), '')::numeric * ${lineAlias}.quantity, CASE WHEN COALESCE(${override}->>'pricingMethod', 'TAX_INCLUDED_MARKUP') = 'TAX_INCLUDED_MARKUP' AND ${lineAlias}."unitPriceTaxIncluded" IS NOT NULL AND ${lineRate} IS NOT NULL THEN ROUND(ROUND(${lineAlias}."unitPriceTaxIncluded" * (1 + ${lineRate}), 0) * ${lineAlias}.quantity, 0) ELSE NULL END, 0)`;
+    return `COALESCE(manual."orderAmountCnyOverride", (SELECT COALESCE(SUM(${lineAmount}), 0) FROM plugin_trade_compliance_purchase_order_line ${lineAlias} WHERE ${lineAlias}."purchaseOrderId" = purchase.id AND ${lineAlias}."tenantId" = purchase."tenantId" AND ${lineAlias}."organizationId" = purchase."organizationId" AND ${lineAlias}."deletedAt" IS NULL))`;
+}
+function linePricingOverrides(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return {};
+    const entries = Object.entries(value).filter((entry) => Boolean(entry[1]) && typeof entry[1] === 'object' && !Array.isArray(entry[1]));
+    return Object.fromEntries(entries);
+}
+function normalizeLinePricingOverrides(value) {
+    const overrides = linePricingOverrides(value);
+    const normalized = {};
+    for (const [lineId, override] of Object.entries(overrides)) {
+        const next = {};
+        for (const key of ['salesLineAmountCny', 'salesUnitPriceCny', 'pricingProfitRate']) {
+            const raw = override[key];
+            if (raw != null && typeof raw !== 'string')
+                throw new DomainError(DomainErrorCodes.INVALID_INPUT, `${key}无效`);
+            const value = normalizeOptionalDecimalInput(raw);
+            if (value != null) {
+                if (new Decimal(value).isNegative())
+                    throw new DomainError(DomainErrorCodes.INVALID_INPUT, `${key}不能小于 0`);
+                next[key] = value;
+            }
+        }
+        if (override.pricingMethod != null)
+            next.pricingMethod = pricingMethod(override.pricingMethod);
+        if (Object.keys(next).length)
+            normalized[lineId] = next;
+    }
+    return Object.keys(normalized).length ? normalized : null;
+}
+function optionalPricingText(value) { return value == null || value === '' ? null : String(value); }
+function pricingMethod(value) { return value === 'TAX_EXCLUDED_MARKUP' ? 'TAX_EXCLUDED_MARKUP' : 'TAX_INCLUDED_MARKUP'; }
+function deriveSalesPricingLine(line, override, orderRate) {
+    const quantity = optionalPricingText(line.quantity);
+    const manualAmount = optionalPricingText(override?.salesLineAmountCny);
+    if (manualAmount != null) {
+        const amount = new Decimal(manualAmount);
+        const unit = quantity && !new Decimal(quantity).isZero() ? amount.div(quantity).toDecimalPlaces(4, Decimal.ROUND_HALF_UP).toFixed(4) : null;
+        return { salesUnitPriceCny: unit, salesLineAmountCny: amount.toFixed(4), pricingProfitRate: null, pricingMethod: null, pricingSource: 'MANUAL_AMOUNT', pricingStatus: amount.isNegative() ? 'INVALID' : 'PRICED', missingPricingFields: [] };
+    }
+    const manualUnit = optionalPricingText(override?.salesUnitPriceCny);
+    if (manualUnit != null) {
+        const unit = new Decimal(manualUnit);
+        const amount = quantity == null ? null : unit.mul(quantity).toDecimalPlaces(4, Decimal.ROUND_HALF_UP);
+        return { salesUnitPriceCny: unit.toFixed(4), salesLineAmountCny: amount == null ? null : amount.toFixed(4), pricingProfitRate: null, pricingMethod: null, pricingSource: 'MANUAL_UNIT_PRICE', pricingStatus: unit.isNegative() || amount == null || amount.isNegative() ? 'INVALID' : 'PRICED', missingPricingFields: amount == null ? ['quantity'] : [] };
+    }
+    const lineRate = optionalPricingText(override?.pricingProfitRate);
+    const rate = lineRate ?? orderRate;
+    const method = pricingMethod(override?.pricingMethod);
+    if (rate == null)
+        return { salesUnitPriceCny: null, salesLineAmountCny: null, pricingProfitRate: null, pricingMethod: method, pricingSource: 'UNPRICED', pricingStatus: 'UNPRICED', missingPricingFields: ['salesAmountOrPricingInputs'] };
+    const calculated = calculateSalesLineFromRate({
+        quantity,
+        purchaseUnitPriceTaxIncluded: optionalPricingText(line.unitPriceTaxIncluded),
+        purchaseUnitPriceTaxExcluded: optionalPricingText(line.unitPriceTaxExcludedCny ?? line.unitPriceTaxExcluded),
+        pricingProfitRate: rate,
+        pricingMethod: method
+    });
+    if ('invalid' in calculated)
+        return { salesUnitPriceCny: null, salesLineAmountCny: null, pricingProfitRate: rate, pricingMethod: method, pricingSource: lineRate != null ? 'LINE_RATE' : orderRate ? 'ORDER_OVERRIDE' : 'UNPRICED', pricingStatus: 'INVALID', missingPricingFields: [] };
+    if (!('salesLineAmountCny' in calculated))
+        return { salesUnitPriceCny: null, salesLineAmountCny: null, pricingProfitRate: rate, pricingMethod: method, pricingSource: 'UNPRICED', pricingStatus: 'UNPRICED', missingPricingFields: calculated.missingFields };
+    return { salesUnitPriceCny: calculated.salesUnitPriceCny, salesLineAmountCny: calculated.salesLineAmountCny, pricingProfitRate: rate, pricingMethod: method, pricingSource: lineRate != null ? 'LINE_RATE' : orderRate ? 'ORDER_OVERRIDE' : 'UNPRICED', pricingStatus: 'PRICED', missingPricingFields: [] };
+}
+function orderPricingStatus(lines) {
+    if (lines.some(line => line.pricingStatus === 'INVALID'))
+        return 'INVALID';
+    const priced = lines.filter(line => line.pricingStatus === 'PRICED').length;
+    return priced === lines.length && lines.length > 0 ? 'COMPLETE' : priced > 0 ? 'PARTIAL' : 'UNPRICED';
+}
+function orderPricingSource(lines, orderRate, customerRate) {
+    const sources = new Set(lines.map(line => line.pricingSource).filter(source => source !== 'UNPRICED'));
+    if (sources.size === 0)
+        return 'NONE';
+    if (sources.size > 1)
+        return 'MIXED';
+    const [source] = [...sources];
+    if (source === 'LINE_RATE')
+        return 'LINE_OVERRIDE';
+    if (source === 'MANUAL_AMOUNT' || source === 'MANUAL_UNIT_PRICE')
+        return 'MANUAL_AMOUNT';
+    return orderRate != null ? 'ORDER_OVERRIDE' : customerRate != null ? 'CUSTOMER_DEFAULT' : 'NONE';
+}
+function orderMissingPricingFields(lines) { return [...new Set(lines.flatMap(line => line.missingPricingFields))]; }
+function deriveOrderPricingAmount(lines, overrides, effectiveRate) {
+    const overrideMap = linePricingOverrides(overrides);
+    const priced = lines.map(line => deriveSalesPricingLine(line, overrideMap[line.id], effectiveRate)).filter(line => line.pricingStatus === 'PRICED' && line.salesLineAmountCny != null);
+    return priced.reduce((sum, line) => sum.plus(line.salesLineAmountCny ?? 0), new Decimal(0)).toFixed(4);
+}
 function assertOptionalEnum(value, allowed, label) { if (hasQueryValue(value) && !allowed.includes(value))
     throw new DomainError(DomainErrorCodes.INVALID_INPUT, `${label}无效`); }
 function fuzzyValue(value, filter) { return !hasQueryValue(filter) || String(value ?? '').toLocaleLowerCase().includes(String(filter).trim().toLocaleLowerCase()); }
@@ -4806,8 +4907,10 @@ function salesMetrics(rows) {
     const currentYearRows = rows.filter(row => String(row.orderDate ?? '').slice(0, 4) === currentYear);
     const productAmounts = new Map();
     for (const row of rows)
-        for (const line of row.lines)
-            productAmounts.set(line.productName, (productAmounts.get(line.productName) ?? new Decimal(0)).plus(line.salesLineAmountCny));
+        for (const line of row.lines) {
+            if (line.salesLineAmountCny != null)
+                productAmounts.set(line.productName, (productAmounts.get(line.productName) ?? new Decimal(0)).plus(line.salesLineAmountCny));
+        }
     return {
         orderCount: rows.length,
         salesAmountCny: sum(rows, 'orderAmountCny'),