@chenchaolong/plugin-trade-compliance-workbench 1.0.180 → 1.0.181

package/dist/lib/sales-file.service.js

@@ -8,7 +8,7 @@ import { fileURLToPath } from 'node:url';
 import ExcelJS from 'exceljs';
 import * as yauzl from 'yauzl';
 import { Decimal } from 'decimal.js';
-import { BankAccountSettings, CompanySettings, Customer, CustomerContract, CustomerContractClause, GeneratedSalesFile, MonthlySafeExchangeRate, ProfitRuleSettings, PurchaseOrder, PurchaseOrderLine } from './entities/index.js';
+import { BankAccountSettings, CompanySettings, Customer, CustomerContract, CustomerContractClause, GeneratedSalesFile, MonthlySafeExchangeRate, ProfitRuleSettings, PurchaseOrder, PurchaseOrderLine, SupplierPacking, SupplierPackingLine } from './entities/index.js';
 import { TradeComplianceWorkbenchService } from './workbench.service.js';
 import { TranslationProvider } from './adapters/translation.provider.js';
 import { TradeComplianceFileStorage } from './adapters/file-storage.js';
@@ -38,18 +38,19 @@ let SalesFileService = class SalesFileService {
     async preflight(scope, input) {
         try {
             const evaluated = await this.evaluate(scope, input);
-            return preflightResult(input, evaluated.compliance.complianceProfitRate.toString(), evaluated.exchangeCost?.toString() ?? null, evaluated.warnings);
+            const packing = await this.packingStatusForOrders(scope, evaluated.derived.purchaseOrderIds?.length ? evaluated.derived.purchaseOrderIds : [input.purchaseOrderId]);
+            return preflightResult(input, evaluated.compliance.complianceProfitRate.toString(), evaluated.exchangeCost?.toString() ?? null, evaluated.warnings, packing);
         }
         catch (error) {
             if (!(error instanceof DomainError))
                 throw error;
             const metrics = error instanceof SalesFileEvaluationError ? error : null;
-            return preflightResult(input, metrics?.complianceProfitRate ?? null, metrics?.exchangeCost ?? null, metrics?.warnings ?? [], error);
+            return preflightResult(input, metrics?.complianceProfitRate ?? null, metrics?.exchangeCost ?? null, metrics?.warnings ?? [], undefined, error);
         }
     }
     async generate(scope, input) {
         const evaluated = await this.evaluate(scope, input);
-        const { derived, customerContract, customer, purchaseOrder, purchaseLines, rule, compliance, exchangeCost, exchangeRate, bank, warnings } = evaluated;
+        const { derived, customerContract, customer, purchaseOrder, purchaseLines, rule, compliance, exchangeCost, exchangeRate, bank, warnings, orders, ordersKey } = evaluated;
         const generationWarnings = [...warnings];
         const company = await this.dataSource.getRepository(CompanySettings).findOne({ where: scoped(scope) });
         const clauses = await this.dataSource.getRepository(CustomerContractClause).find({ where: { ...scoped(scope), customerContractId: customerContract.id, deletedAt: IsNull() } });
@@ -60,6 +61,12 @@ let SalesFileService = class SalesFileService {
         const fileNumber = input.fileNumber?.trim() || derived.salesOrderNo;
         const remarks = input.remarks ?? '';
         const bankType = input.bankType ?? null;
+        const needsPacking = input.fileType === 'PL' || input.fileType === 'PI_CI_PL' || input.fileType === 'CUSTOMS_DECLARATION';
+        const purchaseIds = derived.purchaseOrderIds?.length ? derived.purchaseOrderIds : [purchaseOrder.id];
+        const packing = needsPacking ? await this.loadPackingData(scope, purchaseIds) : null;
+        if (packing && (input.fileType === 'PL' || input.fileType === 'PI_CI_PL'))
+            generationWarnings.push(...this.packingWarningsForPl(derived, packing));
+        const mergedOrderRefs = orders.length > 1 ? orders.map(order => ({ customerContractId: order.customerContractId, purchaseOrderId: order.purchaseOrderId, salesOrderNo: order.salesOrderNo })) : null;
         const newStorageFileIds = [];
         try {
             const files = await this.dataSource.transaction(async (manager) => {
@@ -73,22 +80,22 @@ let SalesFileService = class SalesFileService {
                         throw new DomainError(DomainErrorCodes.NOT_FOUND, '采购订单不存在');
                 }
                 const candidates = input.fileType === 'PI_CI_PL' ? await repo.find({ where: { ...scoped(scope), customerContractId: customerContract.id, purchaseOrderId: purchaseOrder.id, fileType: In(requestedTypes), deletedAt: IsNull() }, order: { generatedAt: 'DESC' }, lock: { mode: 'pessimistic_write' } }) : [];
-                const existing = candidates.filter(item => generationRequestMatches(item, { fileNumber, templateVersion, remarks, bankType, lineIds: derived.lines.map(line => line.purchaseOrderLineId) }));
+                const existing = candidates.filter(item => generationRequestMatches(item, { fileNumber, templateVersion, remarks, bankType, lineIds: derived.lines.map(line => line.purchaseOrderLineId), packingFingerprint: packing?.fingerprint ?? '', ordersKey }));
                 const existingByType = new Map(existing.map(item => [item.fileType, item]));
                 const missingTypes = requestedTypes.filter(fileType => !existingByType.has(fileType));
                 const created = [];
                 for (const fileType of missingTypes) {
-                    const request = { templateVersion, fileNumber, remarks, bankType };
-                    const snapshot = { version: 'v1', generatedAt: generatedAt.toISOString(), fileType, request, customer: { ...customer }, customerContract: { ...customerContract }, purchaseOrder: { ...purchaseOrder }, purchaseLines: purchaseLines.map(item => ({ ...item })), derived, company: company ? { ...company } : null, bank: bank ? { ...bank } : null, clauses: clauses.map(item => ({ ...item })), translated, compliance: { profitCny: compliance.profitCny.toString(), complianceProfitRate: compliance.complianceProfitRate.toString() }, exchangeRate: exchangeRate ? { ...exchangeRate } : null, exchangeCost: exchangeCost?.toString() ?? null, rule: { ...rule } };
+                    const request = { templateVersion, fileNumber, remarks, bankType, packingFingerprint: packing?.fingerprint ?? '', ordersKey };
+                    const snapshot = { version: 'v1', generatedAt: generatedAt.toISOString(), fileType, request, orders, customer: { ...customer }, customerContract: { ...customerContract }, purchaseOrder: { ...purchaseOrder }, purchaseLines: purchaseLines.map(item => ({ ...item })), derived, company: company ? { ...company } : null, bank: bank ? { ...bank } : null, clauses: clauses.map(item => ({ ...item })), translated, packing: packing ? { fingerprint: packing.fingerprint, byPurchaseLine: packing.byPurchaseLine } : null, compliance: { profitCny: compliance.profitCny.toString(), complianceProfitRate: compliance.complianceProfitRate.toString() }, exchangeRate: exchangeRate ? { ...exchangeRate } : null, exchangeCost: exchangeCost?.toString() ?? null, rule: { ...rule } };
                     const logo = await this.readCompanyLogo(scope, fileType, company?.logoFileId);
-                    const buffer = await this.fillWorkbook(fileType, { snapshot, customer, customerContract, purchaseOrder, purchaseLines, derived, company, bank, clauses, translated }, logo);
+                    const buffer = await this.fillWorkbook(fileType, { snapshot, customer, customerContract, purchaseOrder, purchaseLines, derived, company, bank, clauses, translated, packing }, logo);
                     await validateWorkbook(buffer);
-                    const documentNo = fileType === 'PI' || fileType === 'CI' ? salesDocumentNo(derived.salesOrderNo, fileType, translated.customerName || customer.name) : null;
+                    const documentNo = fileType === 'PI' || fileType === 'CI' ? salesDocumentNo(derived.salesOrderNo, fileType, customer.name) : null;
                     const fileName = `${fileNumber}-${salesFileNameTypeLabels[fileType]}-${beijingFileTimestamp(generatedAt)}.xlsx`;
                     const checksum = createHash('sha256').update(await templateBuffer(fileType)).digest('hex');
                     const storageFileId = await this.storage.save(buffer, fileName, 'generated');
                     newStorageFileIds.push(storageFileId);
-                    created.push(repo.create({ tenantId: scope.tenantId, organizationId: scope.organizationId, createdById: scope.userId ?? null, updatedById: scope.userId ?? null, deletedAt: null, deletedById: null, deleteOperation: null, customerContractId: customerContract.id, purchaseOrderId: purchaseOrder.id, salesOrderNoSnapshot: derived.salesOrderNo, fileType, documentNo, fileName, storageFileId, templateVersion, templateChecksum: checksum, generationSnapshotVersion: 'v1', generationSnapshot: snapshot, generationWarnings, pricingProfitRate: derived.effectivePricingProfitRate, complianceProfitRate: compliance.complianceProfitRate.toString(), exchangeCost: exchangeCost?.toString() ?? null, profitRuleSnapshot: { ...rule }, bankType: bank?.bankType ?? null, bankSnapshot: bank ? { ...bank } : null, generatedById: scope.userId ?? null, generatedAt, lastEditedById: null, lastEditedAt: null }));
+                    created.push(repo.create({ tenantId: scope.tenantId, organizationId: scope.organizationId, createdById: scope.userId ?? null, updatedById: scope.userId ?? null, deletedAt: null, deletedById: null, deleteOperation: null, customerContractId: customerContract.id, purchaseOrderId: purchaseOrder.id, salesOrderNoSnapshot: derived.salesOrderNo, fileType, documentNo, fileName, storageFileId, templateVersion, templateChecksum: checksum, generationSnapshotVersion: 'v1', generationSnapshot: snapshot, mergedOrderRefs, generationWarnings, pricingProfitRate: derived.effectivePricingProfitRate, complianceProfitRate: compliance.complianceProfitRate.toString(), exchangeCost: exchangeCost?.toString() ?? null, profitRuleSnapshot: { ...rule }, bankType: bank?.bankType ?? null, bankSnapshot: bank ? { ...bank } : null, generatedById: scope.userId ?? null, generatedAt, lastEditedById: null, lastEditedAt: null }));
                 }
                 const saved = created.length ? await repo.save(created) : [];
                 const savedByType = new Map(saved.map(item => [item.fileType, item]));
@@ -102,13 +109,39 @@ let SalesFileService = class SalesFileService {
         }
     }
     async evaluate(scope, input) {
-        const derived = (await this.workbench.listDerivedSalesOrders(scope)).find(item => item.customerContractId === input.customerContractId && item.purchaseOrderId === input.purchaseOrderId);
-        if (!derived)
-            throw new DomainError(DomainErrorCodes.NOT_FOUND, '未找到已关联且具备定价利润率的销售订单');
-        if (!derived.lines.length)
-            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '销售订单至少需要一条商品明细');
-        const customerContract = await this.required(CustomerContract, scope, input.customerContractId, '客户合同不存在');
-        const customer = await this.required(Customer, scope, customerContract.customerId, '客户不存在');
+        // 合并生成：orders 指定同客户的多个销售订单（合同+采购单）；缺省退化为单订单生成
+        const orderRefs = normalizeGenerationOrders(input);
+        const allDerived = await this.workbench.listDerivedSalesOrders(scope);
+        const orderEntries = orderRefs.map(ref => {
+            const derived = allDerived.find(item => item.customerContractId === ref.customerContractId && item.purchaseOrderId === ref.purchaseOrderId);
+            if (!derived)
+                throw new DomainError(DomainErrorCodes.NOT_FOUND, '未找到已关联且具备定价利润率的销售订单');
+            if (!derived.lines.length)
+                throw new DomainError(DomainErrorCodes.INVALID_INPUT, '销售订单至少需要一条商品明细');
+            return { ref, derived };
+        }).sort((a, b) => a.derived.salesOrderNo.localeCompare(b.derived.salesOrderNo));
+        const primary = orderEntries[0];
+        const contracts = await Promise.all(orderEntries.map(entry => this.required(CustomerContract, scope, entry.ref.customerContractId, '客户合同不存在')));
+        const customerContract = contracts[0];
+        const customers = await Promise.all(orderEntries.map(entry => this.required(Customer, scope, entry.derived.customerId, '客户不存在')));
+        const customer = customers[0];
+        if (customers.some(item => item.id !== customer.id))
+            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '合并生成的销售订单必须属于同一客户');
+        // 合并生成要求各订单付款条款一致（PI/CI 上只有一处付款条款栏，错不得）
+        if (orderEntries.length > 1) {
+            const clauseRows = await this.dataSource.getRepository(CustomerContractClause).find({ where: { ...scoped(scope), customerContractId: In(orderEntries.map(entry => entry.ref.customerContractId)), deletedAt: IsNull() } });
+            const termsByContract = new Map();
+            for (const clause of clauseRows) {
+                if (clause.clauseType !== 'PAYMENT_TERMS')
+                    continue;
+                const text = (clause.reviewedText || clause.sourceText || '').replace(/\s+/g, '').trim();
+                if (text && !termsByContract.has(clause.customerContractId))
+                    termsByContract.set(clause.customerContractId, text);
+            }
+            const terms = new Set(orderEntries.map(entry => entry.ref.customerContractId).map(id => termsByContract.get(id) ?? ''));
+            if (terms.size > 1)
+                throw new DomainError(DomainErrorCodes.INVALID_INPUT, '合并生成的销售订单付款条款不一致，请先统一各合同付款条款', { contracts: orderEntries.map(entry => ({ customerContractId: entry.ref.customerContractId, salesOrderNo: entry.derived.salesOrderNo, paymentTerms: termsByContract.get(entry.ref.customerContractId) ?? '' })) });
+        }
         // 信用额度硬拦截：客户未收款总额超出信用额度（剩余额度为负）时，禁止生成任何销售文件。
         if (customer.creditLimit != null) {
             const unreceivedByCustomer = await this.workbench.customerUnreceivedAmounts(scope, [customer.id]);
@@ -118,11 +151,12 @@ let SalesFileService = class SalesFileService {
                 throw new DomainError(DomainErrorCodes.CREDIT_LIMIT_EXCEEDED, `客户「${customer.name}」已超出信用额度，无法生成销售文件：信用额度 ${new Decimal(customer.creditLimit).toFixed(2)} CNY，未收款总额 ${unreceivedAmountCny} CNY，剩余 ${remainingCreditCny.toFixed(2)} CNY。请先回收货款或上调信用额度`, { customerId: customer.id, customerName: customer.name, creditLimit: customer.creditLimit, unreceivedAmountCny, remainingCreditCny: remainingCreditCny.toFixed(2) });
             }
         }
-        const purchaseOrder = await this.required(PurchaseOrder, scope, input.purchaseOrderId, '采购订单不存在');
-        const purchaseIds = derived.purchaseOrderIds?.length ? derived.purchaseOrderIds : [input.purchaseOrderId];
+        const purchaseOrderEntities = await Promise.all([...new Set(orderEntries.map(entry => entry.ref.purchaseOrderId))].map(id => this.required(PurchaseOrder, scope, id, '采购订单不存在')));
+        const purchaseOrder = purchaseOrderEntities.find(item => item.id === primary.ref.purchaseOrderId);
+        const purchaseIds = [...new Set(orderEntries.flatMap(entry => entry.derived.purchaseOrderIds?.length ? entry.derived.purchaseOrderIds : [entry.ref.purchaseOrderId]))];
         const sourcePurchaseLines = await this.dataSource.getRepository(PurchaseOrderLine).find({ where: { tenantId: scope.tenantId, organizationId: scope.organizationId, purchaseOrderId: In(purchaseIds), deletedAt: IsNull() }, order: { purchaseOrderId: 'ASC', lineNumber: 'ASC' } });
         const purchaseLinesById = new Map(sourcePurchaseLines.map(line => [line.id, line]));
-        const lineIds = derived.lines.map(line => line.purchaseOrderLineId);
+        const lineIds = orderEntries.flatMap(entry => entry.derived.lines.map(line => line.purchaseOrderLineId));
         if (sourcePurchaseLines.length !== lineIds.length || purchaseLinesById.size !== sourcePurchaseLines.length || new Set(lineIds).size !== lineIds.length || lineIds.some(id => !purchaseLinesById.has(id))) {
             throw new DomainError(DomainErrorCodes.INVALID_INPUT, '销售商品与采购商品明细不一致，请刷新后重试');
         }
@@ -142,7 +176,7 @@ let SalesFileService = class SalesFileService {
             const labels = missingFields.map(field => field === 'vatRate' ? '增值税率' : '退税率');
             throw new DomainError(DomainErrorCodes.SALES_LINE_TAX_DATA_REQUIRED, `销售商品缺少${labels.join('、')}`, { missingFields, lines: missingTaxLines.map(({ missingFields: _, ...line }) => line) });
         }
-        const derivedLines = new Map(derived.lines.map(line => [line.purchaseOrderLineId, line]));
+        const derivedLines = new Map(orderEntries.flatMap(entry => entry.derived.lines).map(line => [line.purchaseOrderLineId, line]));
         const unpricedLines = purchaseLines.map(line => {
             const derivedLine = derivedLines.get(line.id);
             const amount = derivedLine?.salesLineAmountCny;
@@ -164,8 +198,8 @@ let SalesFileService = class SalesFileService {
         let exchangeCost = null;
         let exchangeRate = null;
         if (refundable.length) {
-            // 一笔销售订单可能聚合多个采购单：换汇月份按聚合后的最早下单日期确定。
-            const orderDate = derived.orderDate ?? purchaseOrder.orderDate;
+            // 合并生成/多采购单聚合：换汇月份按批次内最早下单日期确定。
+            const orderDate = orderEntries.map(entry => entry.derived.orderDate ?? purchaseOrderDates.get(entry.ref.purchaseOrderId) ?? null).filter(Boolean).sort()[0] ?? null;
             if (!orderDate)
                 throw new SalesFileEvaluationError(DomainErrorCodes.EXCHANGE_RATE_REQUIRED, '采购订单下单日期为空，无法确定月度美元汇率', {}, compliance.complianceProfitRate.toString(), null, warnings);
             const date = new Date(`${orderDate}T00:00:00Z`);
@@ -197,7 +231,24 @@ let SalesFileService = class SalesFileService {
             if (missingFields.length)
                 throw new SalesFileEvaluationError(DomainErrorCodes.BANK_ACCOUNT_REQUIRED, '所选银行信息配置不完整', { bankType: bank.bankType, missingFields }, compliance.complianceProfitRate.toString(), exchangeCost?.toString() ?? null, warnings);
         }
-        return { derived, customerContract, customer, purchaseOrder, purchaseLines, rule, compliance, exchangeCost, exchangeRate, bank, warnings };
+        const purchaseOrderDates = new Map(purchaseOrderEntities.map(item => [item.id, item.orderDate]));
+        const earliestOrderDate = orderEntries.map(entry => entry.derived.orderDate ?? purchaseOrderDates.get(entry.ref.purchaseOrderId) ?? null).filter(Boolean).sort()[0] ?? null;
+        const orders = orderEntries.map(entry => ({
+            customerContractId: entry.ref.customerContractId,
+            purchaseOrderId: entry.ref.purchaseOrderId,
+            salesOrderNo: entry.derived.salesOrderNo,
+            contractNo: contracts.find(contract => contract.id === entry.ref.customerContractId)?.contractNo ?? entry.derived.customerContractNo,
+            orderAmountCny: entry.derived.orderAmountCny
+        }));
+        const ordersKey = orderEntries.length > 1 ? JSON.stringify(orders.map(order => [order.customerContractId, order.purchaseOrderId])) : '';
+        const derived = {
+            ...primary.derived,
+            purchaseOrderIds: purchaseIds,
+            orderDate: earliestOrderDate,
+            orderAmountCny: orders.reduce((sum, order) => sum + Number(order.orderAmountCny ?? 0), 0).toFixed(0),
+            lines: orderEntries.flatMap(entry => entry.derived.lines)
+        };
+        return { derived, customerContract, customer, purchaseOrder, purchaseLines, rule, compliance, exchangeCost, exchangeRate, bank, warnings, orders, ordersKey };
     }
     async download(scope, id) {
         const item = await this.required(GeneratedSalesFile, scope, id, '历史销售文件不存在');
@@ -248,7 +299,8 @@ let SalesFileService = class SalesFileService {
             return result ?? '';
         };
         return {
-            customerName: await translate('customer.name', customer.name), customerAddress: await translate('customer.address', customer.address),
+            // 海外公司名称原样写入，不做 AI 翻译（翻译结果不可控且客户名常已是外文）
+            customerName: customer.name, customerAddress: await translate('customer.address', customer.address),
             customerContact: await translate('customer.contactName', customer.contactName), customerCountry: await translate('customer.country', customer.country),
             paymentTerms: await translate('clause.PAYMENT_TERMS', clauseText(clauses, 'PAYMENT_TERMS')),
             lines: await Promise.all(lines.map(async (line) => ({ productName: line.englishName || await translate(`line.${line.id}.productName`, [line.productName, line.modelSpecification].filter(Boolean).join(' ')), description: await translate(`line.${line.id}.description`, line.productDescription), model: await translate(`line.${line.id}.model`, line.modelSpecification), unit: await translate(`line.${line.id}.unit`, line.unit) })))
@@ -268,6 +320,57 @@ let SalesFileService = class SalesFileService {
             throw new DomainError(DomainErrorCodes.NOT_FOUND, message);
         return item;
     }
+    /** 加载订单涉及采购合同的装箱数据并按采购行聚合；无装箱数据返回 null（相关列保持模板默认值）。 */
+    async loadPackingData(scope, purchaseIds) {
+        const packings = await this.dataSource.getRepository(SupplierPacking).find({ where: { ...scoped(scope), purchaseOrderId: In(purchaseIds), deletedAt: IsNull() } });
+        if (!packings.length)
+            return null;
+        const lines = await this.dataSource.getRepository(SupplierPackingLine).find({ where: { ...scoped(scope), packingId: In(packings.map(item => item.id)), deletedAt: IsNull() }, order: { lineIndex: 'ASC' } });
+        if (!lines.length)
+            return null;
+        const byPurchaseLine = {};
+        let totalCartons = 0;
+        let totalGrossKg = 0;
+        let totalVolumeCbm = 0;
+        for (const line of lines) {
+            const cartons = Number(line.cartons ?? 0);
+            totalCartons += cartons;
+            totalGrossKg += Number(line.totalGrossWeightKg ?? 0);
+            totalVolumeCbm += Number(line.totalVolumeCbm ?? 0);
+            if (!line.purchaseOrderLineId)
+                continue;
+            const aggregate = byPurchaseLine[line.purchaseOrderLineId] ??= { cartons: 0, dimensions: [], grossKg: 0, weightPerCtn: null, boxVolumeCbm: null, totalVolumeCbm: 0 };
+            aggregate.cartons += cartons;
+            if (line.dimensionCm && !aggregate.dimensions.includes(line.dimensionCm))
+                aggregate.dimensions.push(line.dimensionCm);
+            aggregate.grossKg += Number(line.totalGrossWeightKg ?? 0);
+            aggregate.weightPerCtn ??= Number(line.grossWeightPerCtnKg ?? 0) || null;
+            aggregate.boxVolumeCbm ??= Number(line.boxVolumeCbm ?? 0) || null;
+            aggregate.totalVolumeCbm += Number(line.totalVolumeCbm ?? 0);
+        }
+        const fingerprint = `v${Math.max(...packings.map(item => item.revision))}n${lines.length}b${Object.keys(byPurchaseLine).length}`;
+        return { fingerprint, byPurchaseLine, totals: { cartons: totalCartons, grossKg: Math.round(totalGrossKg * 100) / 100, volumeCbm: Math.round(totalVolumeCbm * 1_000_000) / 1_000_000 } };
+    }
+    /** 预检用装箱状态：按采购合同列出装箱数据版本、行数与绑定行数（未导入的合同 revision=0）。 */
+    async packingStatusForOrders(scope, purchaseIds) {
+        const purchaseOrders = purchaseIds.length ? await this.dataSource.getRepository(PurchaseOrder).find({ where: { ...scoped(scope), id: In(purchaseIds), deletedAt: IsNull() } }) : [];
+        const packings = purchaseIds.length ? await this.dataSource.getRepository(SupplierPacking).find({ where: { ...scoped(scope), purchaseOrderId: In(purchaseIds), deletedAt: IsNull() } }) : [];
+        const lines = packings.length ? await this.dataSource.getRepository(SupplierPackingLine).find({ where: { ...scoped(scope), packingId: In(packings.map(item => item.id)), deletedAt: IsNull() } }) : [];
+        const status = purchaseOrders.map(order => {
+            const packing = packings.find(item => item.purchaseOrderId === order.id);
+            const boundRowCount = lines.filter(line => line.packingId === packing?.id && Boolean(line.purchaseOrderLineId)).length;
+            return { purchaseOrderId: order.id, contractNo: order.contractNo, revision: packing?.revision ?? 0, rowCount: lines.filter(line => line.packingId === packing?.id).length, boundRowCount };
+        });
+        return status.sort((a, b) => a.revision - b.revision || a.contractNo.localeCompare(b.contractNo));
+    }
+    /** PL 专属告警：装箱数据存在时的行缺失与净重提示。 */
+    packingWarningsForPl(derived, packing) {
+        const warnings = derived.lines
+            .filter(line => !packing.byPurchaseLine[line.purchaseOrderLineId])
+            .map(line => ({ code: 'PACKING_LINE_MISSING', purchaseOrderLineId: line.purchaseOrderLineId, productName: line.productName, message: `商品“${line.productName}”未匹配到装箱数据，尺寸/重量相关列留空` }));
+        warnings.push({ code: 'PACKING_NET_WEIGHT_MISSING', message: '供应商装箱数据不含净重，单件净重/总净重列留空，Total Net weight 合计为空' });
+        return warnings;
+    }
 };
 SalesFileService = __decorate([
     Injectable(),
@@ -325,12 +428,32 @@ export function negativeProfitWarnings(complianceLines, derivedLines) {
 }
 function generationFileTypes(fileType) { return fileType === 'PI_CI_PL' ? ['PI', 'CI', 'PL'] : [fileType]; }
 function generationResult(item) { return { ...item, translationFailures: (item.generationWarnings ?? []).filter(isTranslationFailure) }; }
+function normalizeGenerationOrders(input) {
+    const refs = input.orders?.length ? input.orders : [{ customerContractId: input.customerContractId, purchaseOrderId: input.purchaseOrderId }];
+    const seen = new Set();
+    const result = [];
+    for (const ref of refs) {
+        const customerContractId = String(ref.customerContractId ?? '').trim();
+        const purchaseOrderId = String(ref.purchaseOrderId ?? '').trim();
+        if (!customerContractId || !purchaseOrderId)
+            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '合并生成的销售订单缺少客户合同或采购单标识');
+        const key = `${customerContractId}:${purchaseOrderId}`;
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        result.push({ customerContractId, purchaseOrderId });
+    }
+    return result;
+}
 function generationRequestMatches(item, expected) {
     const request = item.generationSnapshot?.request;
     const snapshotDerived = item.generationSnapshot?.derived;
     const snapshotLines = snapshotDerived?.lines;
     const lineOrderMatches = Array.isArray(snapshotLines) && snapshotLines.length === expected.lineIds.length && snapshotLines.every((line, index) => line?.purchaseOrderLineId === expected.lineIds[index]);
     const bankType = request && Object.prototype.hasOwnProperty.call(request, 'bankType') ? request.bankType : item.bankType ?? null;
+    // 装箱数据只影响 PL 与报关单：指纹变化仅使这两类失效重生成，PI/CI 不受供应商装箱单重导入影响
+    const packingMatches = item.fileType !== 'PL' && item.fileType !== 'CUSTOMS_DECLARATION' || (request?.packingFingerprint ?? '') === expected.packingFingerprint;
+    const ordersKeyMatches = (request?.ordersKey ?? '') === expected.ordersKey;
     return Boolean(request &&
         typeof request === 'object' &&
         !Array.isArray(request) &&
@@ -338,7 +461,9 @@ function generationRequestMatches(item, expected) {
         request.templateVersion === expected.templateVersion &&
         request.remarks === expected.remarks &&
         bankType === expected.bankType &&
-        lineOrderMatches);
+        lineOrderMatches &&
+        packingMatches &&
+        ordersKeyMatches);
 }
 class SalesFileEvaluationError extends DomainError {
     constructor(code, message, details, complianceProfitRate, exchangeCost, warnings) {
@@ -348,7 +473,7 @@ class SalesFileEvaluationError extends DomainError {
         this.warnings = warnings;
     }
 }
-function preflightResult(input, complianceProfitRate, exchangeCost, warnings, error) {
+function preflightResult(input, complianceProfitRate, exchangeCost, warnings, packing, error) {
     return {
         allowed: !error,
         fileType: input.fileType,
@@ -357,7 +482,8 @@ function preflightResult(input, complianceProfitRate, exchangeCost, warnings, er
         complianceProfitRate,
         exchangeCost,
         warnings,
-        blockingReasons: error ? [{ code: error.code, message: error.message, details: error.details }] : []
+        blockingReasons: error ? [{ code: error.code, message: error.message, details: error.details }] : [],
+        packing
     };
 }
 function beijingFileTimestamp(value) {
@@ -372,13 +498,15 @@ function fillInvoiceSheet(sheet, type, data) {
     set(sheet, 'B4', translated.customerName);
     set(sheet, 'F4', company?.companyNameEn, true);
     set(sheet, 'B5', translated.customerAddress);
-    set(sheet, 'F5', salesDocumentNo(derived.salesOrderNo, type, translated.customerName || customer.name));
+    set(sheet, 'F5', salesDocumentNo(derived.salesOrderNo, type, customer.name));
     set(sheet, 'B6', translated.customerContact);
     set(sheet, 'F6', dateValue(derived.orderDate ?? purchaseOrder.orderDate));
     set(sheet, 'B7', customer.phone ?? '');
     set(sheet, 'F7', customerContract.contractNo);
     set(sheet, 'F8', translated.paymentTerms, true);
     set(sheet, 'E9', type === 'PI' ? 'Remark: The quotation is valid for one week.' : '');
+    // "To:" 目的国：写客户国别；为空时覆盖模板默认值（MOSCOW），留空即可
+    set(sheet, 'B9', translated.customerCountry);
     set(sheet, 'G11', 'CNY to RMB');
     for (let index = 0; index < derived.lines.length; index += 1) {
         const row = 12 + index;
@@ -514,37 +642,59 @@ function imageDimensions(buffer) {
     throw new DomainError(DomainErrorCodes.INVALID_INPUT, '公司 Logo 图片尺寸无法识别');
 }
 function fillPackingSheet(sheet, data) {
-    const { customer, purchaseOrder, derived, company, bank, translated } = data;
-    resizeSingleRowSection(sheet, 12, 2, derived.lines.length, 9);
+    const { customer, purchaseOrder, derived, company, translated, packing } = data;
+    resizeSingleRowSection(sheet, 12, 20, derived.lines.length, 12);
     set(sheet, 'B1', company?.addressEn, true);
     set(sheet, 'A2', company?.phone || company?.email ? `Tel:${company?.phone ?? ''}    Email:${company?.email ?? ''}` : undefined, true);
     set(sheet, 'A3', 'PACKING LIST');
+    // 收货信息(左)与卖家信息(右):标签为模板静态内容,值由生成数据填充
     set(sheet, 'B4', translated.customerName);
-    set(sheet, 'F4', company?.companyNameEn, true);
     set(sheet, 'B5', translated.customerAddress);
+    set(sheet, 'B6', '');
+    set(sheet, 'B7', translated.customerCountry);
+    set(sheet, 'B8', translated.customerContact);
+    set(sheet, 'B9', customer.phone ?? '');
+    set(sheet, 'F4', company?.companyNameEn, true);
     set(sheet, 'F5', dateValue(derived.orderDate ?? purchaseOrder.orderDate));
-    set(sheet, 'B6', translated.customerCountry);
-    set(sheet, 'B7', translated.customerContact);
-    set(sheet, 'F7', company?.email, true);
-    set(sheet, 'B8', customer.phone ?? '');
-    set(sheet, 'F8', company?.phone, true);
+    set(sheet, 'F6', translated.customerContact);
+    set(sheet, 'F7', company?.email ?? '');
+    set(sheet, 'F8', company?.phone ?? '');
     for (let index = 0; index < derived.lines.length; index += 1) {
         const row = 12 + index;
-        const defaults = [sheet.getCell(row, 6).value, sheet.getCell(row, 7).value, sheet.getCell(row, 8).value, sheet.getCell(row, 9).value];
-        [translated.lines[index]?.productName ?? '', translated.lines[index]?.model ?? '', translated.lines[index]?.description ?? '', Number(derived.lines[index].quantity), translated.lines[index]?.unit ?? '', ...defaults].forEach((value, offset) => sheet.getCell(row, offset + 1).value = value);
+        const linePacking = packing?.byPurchaseLine?.[derived.lines[index].purchaseOrderLineId];
+        let packingValues = null;
+        if (linePacking) {
+            // 列序(E 起):尺寸(cm)/单箱毛重/箱数/单箱体积/总体积/单件净重(缺)/总净重(缺)/总毛重
+            packingValues = [
+                linePacking.dimensions.join(' / '),
+                linePacking.weightPerCtn ?? '',
+                linePacking.cartons > 0 ? linePacking.cartons : '',
+                linePacking.boxVolumeCbm ?? '',
+                linePacking.totalVolumeCbm ?? '',
+                '',
+                '',
+                linePacking.grossKg ? Math.round(linePacking.grossKg * 100) / 100 : ''
+            ];
+        }
+        else if (packing) {
+            // 订单已有装箱数据但该行未匹配到:清空(该行已触发 PACKING_LINE_MISSING 告警)
+            packingValues = [null, null, null, null, null, null, null, null];
+        }
+        const values = [
+            translated.lines[index]?.productName ?? '',
+            translated.lines[index]?.model ?? '',
+            null,
+            Number(derived.lines[index].quantity),
+            ...(packingValues ?? [null, null, null, null, null, null, null, null])
+        ];
+        values.forEach((value, offset) => { sheet.getCell(row, offset + 1).value = value; });
     }
-    const total = 12 + derived.lines.length;
-    const bankStart = total + 4;
-    set(sheet, `B${bankStart}`, bank.beneficiary ?? '');
-    set(sheet, `B${bankStart + 1}`, bank.bankName ?? '');
-    set(sheet, `B${bankStart + 2}`, bank.bankAddress ?? '');
-    set(sheet, `A${bankStart + 3}`, '4. Account No.');
-    set(sheet, `B${bankStart + 3}`, bank.accountNo ?? '');
-    set(sheet, `B${bankStart + 4}`, bank.swiftCode ?? '');
-    set(sheet, `B${bankStart + 5}`, bank.cnapsCode ?? '');
-    sheet.getCell(`B${bankStart + 3}`).numFmt = '@';
-    sheet.getCell(`B${bankStart + 5}`).numFmt = '@';
-    fillIntermediaryChannelBankRows(sheet, { labelEnd: 'A', valueStart: 'B', valueEnd: 'I', lastColumn: 9 }, bankStart, null, bank, derived, null, { addressEn: company?.addressEn });
+    // 合计区(模板行 32-35,随行数平移):总毛重/总净重(供应商不提供,留空)/总体积/总箱数
+    const totalsRow = 12 + derived.lines.length;
+    set(sheet, `F${totalsRow}`, packing && packing.totals.grossKg > 0 ? packing.totals.grossKg : '');
+    set(sheet, `F${totalsRow + 1}`, '');
+    set(sheet, `F${totalsRow + 2}`, packing && packing.totals.volumeCbm > 0 ? packing.totals.volumeCbm : '');
+    set(sheet, `F${totalsRow + 3}`, packing && packing.totals.cartons > 0 ? packing.totals.cartons : '');
 }
 /**
  * 银行信息区块按通道分两种布局：
@@ -659,7 +809,7 @@ export function remittanceInformation(cnapsCode, goodsName, derived, civilUse) {
     return parts.join(',');
 }
 function fillCustomsSheet(sheet, data) {
-    const { customer, purchaseOrder, purchaseLines, derived, company } = data;
+    const { customer, purchaseOrder, purchaseLines, derived, company, packing } = data;
     resizeTwoRowSection(sheet, 14, 2, derived.lines.length, 12);
     const companyText = [company?.companyNameZh, company?.unifiedSocialCreditCode ? `（${company.unifiedSocialCreditCode}）` : ''].join('');
     set(sheet, 'K3', '1/1');
@@ -669,6 +819,11 @@ function fillCustomsSheet(sheet, data) {
     set(sheet, 'B6', companyText, true);
     set(sheet, 'F7', customer.country, true);
     set(sheet, 'H7', customer.country, true);
+    // 报关单表头件数/毛重：来自供应商装箱数据合计（净重供应商不提供，留空）
+    if (packing) {
+        set(sheet, 'H8', packing.totals.cartons > 0 ? packing.totals.cartons : '');
+        set(sheet, 'J8', packing.totals.grossKg > 0 ? packing.totals.grossKg : '');
+    }
     for (let index = 0; index < derived.lines.length; index += 1) {
         const row = 14 + index * 2;
         safeMerge(sheet, `A${row}:A${row + 1}`);