@chenchaolong/plugin-trade-compliance-workbench 1.0.161 → 1.0.163

package/dist/lib/workbench.service.js

@@ -2925,7 +2925,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
     async listSalesLines(scope, query) {
         assertOptionalEnum(query.parameters?.complianceCategory, CatalogTypes, '合规分类');
         const rows = await this.salesOrderDtos(scope, await this.listDerivedSalesOrders(scope, query.customerId));
-        const order = rows.find(item => item.customerContractId === query.customerContractId && item.purchaseOrderId === query.purchaseOrderId);
+        const order = rows.find(item => item.customerContractId === query.customerContractId);
         if (!order)
             throw new DomainError(DomainErrorCodes.NOT_FOUND, '销售订单不存在');
         const parameters = query.parameters ?? {};
@@ -3438,15 +3438,18 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         if (!identities.length)
             return [];
         const contractIds = [...new Set(identities.map(identity => identity.customerContractId))];
-        const purchaseIds = [...new Set(identities.map(identity => identity.purchaseOrderId))];
-        const selectedKeys = new Set(identities.map(identity => derivedOrderKey(identity.customerContractId, identity.purchaseOrderId)));
-        const [customers, contracts, purchases, manuals, lines] = await Promise.all([
+        const selectedContracts = new Set(identities.map(identity => identity.customerContractId));
+        const [customers, contracts, purchases, lines] = await Promise.all([
             this.dataSource.getRepository(Customer).find({ where: { ...activeScope(scope), ...(customerId ? { id: customerId } : {}), deletedAt: IsNull() } }),
             this.dataSource.getRepository(CustomerContract).find({ where: { ...activeScope(scope), id: In(contractIds), ...(customerId ? { customerId } : {}), deletedAt: IsNull() } }),
-            this.dataSource.getRepository(PurchaseOrder).find({ where: { ...activeScope(scope), id: In(purchaseIds), deletedAt: IsNull() } }),
-            this.dataSource.getRepository(DerivedSalesOrderManualData).find({ where: { ...activeScope(scope), customerContractId: In(contractIds), purchaseOrderId: In(purchaseIds), deletedAt: IsNull() } }),
-            this.dataSource.getRepository(PurchaseOrderLine).find({ where: { ...activeScope(scope), purchaseOrderId: In(purchaseIds), deletedAt: IsNull() }, order: { lineNumber: 'ASC' } })
+            this.dataSource.getRepository(PurchaseOrder).find({ where: { ...activeScope(scope), deletedAt: IsNull() }, order: { id: 'ASC' } }),
+            this.dataSource.getRepository(PurchaseOrderLine).find({ where: { ...activeScope(scope), deletedAt: IsNull() }, order: { purchaseOrderId: 'ASC', lineNumber: 'ASC' } })
         ]);
+        const associatedPurchaseIds = purchases.filter(purchase => {
+            const baseCode = parsePurchaseContractNo(purchase.contractNo).baseCode;
+            return contracts.some(contract => selectedContracts.has(contract.id) && parseCustomerContractNo(contract.contractNo).baseCode === baseCode);
+        }).map(purchase => purchase.id);
+        const manuals = associatedPurchaseIds.length ? await this.dataSource.getRepository(DerivedSalesOrderManualData).find({ where: { ...activeScope(scope), customerContractId: In(contractIds), purchaseOrderId: In(associatedPurchaseIds), deletedAt: IsNull() } }) : [];
         const customerMap = new Map(customers.map(customer => [customer.id, customer]));
         const manualMap = new Map(manuals.map(manual => [derivedOrderKey(manual.customerContractId, manual.purchaseOrderId), manual]));
         const linesByPurchase = groupBy(lines, line => line.purchaseOrderId);
@@ -3463,7 +3466,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 continue;
             const baseCode = parseCustomerContractNo(contract.contractNo).baseCode;
             for (const purchase of purchasesByBaseCode.get(baseCode) ?? []) {
-                if (!selectedKeys.has(derivedOrderKey(contract.id, purchase.id)))
+                if (!selectedContracts.has(contract.id))
                     continue;
                 const manual = manualMap.get(derivedOrderKey(contract.id, purchase.id));
                 const effectiveRate = manual?.pricingProfitRateOverride ?? (customer.pricingProfitRateStatus === 'CONFIGURED' ? customer.defaultPricingProfitRate : null);
@@ -3492,10 +3495,28 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 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: 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 });
+                results.push({ customerContractId: contract.id, purchaseOrderId: purchase.id, purchaseOrderIds: [purchase.id], purchaseContractNos: [purchase.contractNo], customerId: customer.id, salesOrderNo: contract.contractNo, 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);
+        const grouped = new Map();
+        for (const item of results.sort(compareDerivedSalesOrders)) {
+            const existing = grouped.get(item.customerContractId);
+            if (!existing) {
+                grouped.set(item.customerContractId, item);
+                continue;
+            }
+            existing.purchaseOrderIds = [...(existing.purchaseOrderIds ?? [existing.purchaseOrderId]), item.purchaseOrderId];
+            existing.purchaseContractNos = [...new Set([...(existing.purchaseContractNos ?? [existing.purchaseContractNo]), item.purchaseContractNo])];
+            existing.lines.push(...item.lines);
+            existing.orderAmountCny = new Decimal(existing.orderAmountCny).plus(item.orderAmountCny).toFixed(0);
+            existing.receivedAmountCny = new Decimal(existing.receivedAmountCny).plus(item.receivedAmountCny).toFixed(2);
+            existing.unreceivedAmountCny = Decimal.max(new Decimal(existing.orderAmountCny).minus(existing.receivedAmountCny), 0).toFixed(2);
+            if (item.orderDate && (!existing.orderDate || item.orderDate < existing.orderDate))
+                existing.orderDate = item.orderDate;
+            existing.pricingStatus = existing.pricingStatus === 'UNPRICED' || item.pricingStatus === 'UNPRICED' ? 'UNPRICED' : existing.pricingStatus;
+            existing.missingPricingFields = [...new Set([...existing.missingPricingFields, ...item.missingPricingFields])];
+        }
+        return [...grouped.values()].sort(compareDerivedSalesOrders);
     }
     derivedSalesIdentityQuery(scope, customerId, parameters, includeParties) {
         const qb = this.dataSource.getRepository(CustomerContract).createQueryBuilder('contract')
@@ -3509,7 +3530,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             qb.andWhere('customer.id = :customerId', { customerId });
         const fuzzy = (expression, key) => { if (hasQueryValue(parameters[key]))
             qb.andWhere(`${expression} ILIKE :${key}`, { [key]: `%${String(parameters[key]).trim()}%` }); };
-        fuzzy(`regexp_replace(purchase."contractNo", 'C$', 'X')`, 'salesOrderNo');
+        fuzzy('contract."contractNo"', 'salesOrderNo');
         fuzzy('contract."contractNo"', 'customerContractNo');
         fuzzy('purchase."contractNo"', 'purchaseContractNo');
         if (includeParties) {
@@ -3532,21 +3553,30 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         return qb;
     }
     async selectAllDerivedSalesOrderIdentities(scope, customerId, parameters, includeParties) {
-        return this.derivedSalesIdentityQuery(scope, customerId, parameters, includeParties).orderBy('contract.id', 'ASC').addOrderBy('purchase.id', 'ASC').getRawMany();
+        const rows = await this.derivedSalesIdentityQuery(scope, customerId, parameters, includeParties).orderBy('contract.id', 'ASC').addOrderBy('purchase.id', 'ASC').getRawMany();
+        const seen = new Set();
+        return rows.filter(row => { if (seen.has(row.customerContractId))
+            return false; seen.add(row.customerContractId); return true; });
     }
     async selectDerivedSalesOrderIdentities(scope, customerId, query, includeParties) {
         const pageSize = Math.min(200, Math.max(1, Number(query.pageSize ?? 20)));
         const identityQuery = this.derivedSalesIdentityQuery(scope, customerId, query.parameters ?? {}, includeParties);
         const identitySql = identityQuery.getQuery();
         const identityParameters = identityQuery.getParameters();
-        const countRow = await this.dataSource.createQueryBuilder().select('COUNT(*)', 'total').from(`(${identitySql})`, 'identity').setParameters(identityParameters).getRawOne();
+        // 一个客户合同聚合为一条销售订单：按合同去重计数与分页，代表采购单取组内最小 id。
+        const countRow = await this.dataSource.createQueryBuilder()
+            .select('COUNT(*)', 'total')
+            .from(`(SELECT DISTINCT identity."customerContractId" FROM (${identitySql}) identity)`, 'distinct_identity')
+            .setParameters(identityParameters)
+            .getRawOne();
         const total = Number(countRow?.total ?? 0);
         const pageCount = Math.max(1, Math.ceil(total / pageSize));
         const page = Math.min(pageCount, Math.max(1, Number(query.page ?? 1)));
         const items = await this.dataSource.createQueryBuilder()
-            .select('identity."customerContractId"', 'customerContractId').addSelect('identity."purchaseOrderId"', 'purchaseOrderId')
+            .select('identity."customerContractId"', 'customerContractId').addSelect('MIN(identity."purchaseOrderId")', 'purchaseOrderId')
             .from(`(${identitySql})`, 'identity').setParameters(identityParameters)
-            .orderBy('identity."customerContractId"', 'ASC').addOrderBy('identity."purchaseOrderId"', 'ASC')
+            .groupBy('identity."customerContractId"')
+            .orderBy('identity."customerContractId"', 'ASC')
             .offset((page - 1) * pageSize).limit(pageSize).getRawMany();
         return { items: items, total, page, pageSize };
     }
@@ -3591,44 +3621,78 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         await this.recalculateCompanyRisks(scope, 'SOURCE_CHANGED');
         return saved;
     }
+    /**
+     * 一个客户合同聚合一笔销售订单后，订单级人工数据（利润率、总额、已收款）按“组”写入：
+     * 利润率覆盖值同步到组内全部采购单；总额/已收款写在代表采购单上、其余清零，保证聚合展示值与录入值一致；
+     * 商品行定价按行自身归属的采购单路由到对应人工数据行。
+     */
     async saveDerivedManualData(scope, customerContractId, purchaseOrderId, input) {
         return this.dataSource.transaction(async (manager) => {
             const contract = await required(manager.getRepository(CustomerContract).findOne({ where: { ...activeScope(scope), id: customerContractId, deletedAt: IsNull() } }), '客户合同不存在');
             const customer = await required(manager.getRepository(Customer).findOne({ where: { ...activeScope(scope), id: contract.customerId, deletedAt: IsNull() }, lock: { mode: 'pessimistic_write' } }), '客户不存在');
-            const purchase = await required(manager.getRepository(PurchaseOrder).findOne({ where: { ...activeScope(scope), id: purchaseOrderId, deletedAt: IsNull() }, lock: { mode: 'pessimistic_write' } }), '采购订单不存在');
-            if (parseCustomerContractNo(contract.contractNo).baseCode !== parsePurchaseContractNo(purchase.contractNo).baseCode)
+            const representative = await required(manager.getRepository(PurchaseOrder).findOne({ where: { ...activeScope(scope), id: purchaseOrderId, deletedAt: IsNull() }, lock: { mode: 'pessimistic_write' } }), '采购订单不存在');
+            const contractBaseCode = parseCustomerContractNo(contract.contractNo).baseCode;
+            if (parsePurchaseContractNo(representative.contractNo).baseCode !== contractBaseCode)
                 throw new DomainError(DomainErrorCodes.DERIVED_LINK_CONFLICT, '客户合同与采购订单未形成派生销售订单');
-            const lines = await manager.getRepository(PurchaseOrderLine).find({ where: { ...activeScope(scope), purchaseOrderId, deletedAt: IsNull() }, order: { id: 'ASC' }, lock: { mode: 'pessimistic_write' } });
+            const groupPurchases = (await manager.getRepository(PurchaseOrder).find({ where: { ...activeScope(scope), deletedAt: IsNull() } }))
+                .filter(purchase => parsePurchaseContractNo(purchase.contractNo).baseCode === contractBaseCode)
+                .sort((left, right) => (left.id === purchaseOrderId ? -1 : right.id === purchaseOrderId ? 1 : left.id.localeCompare(right.id)));
+            const lines = await manager.getRepository(PurchaseOrderLine).find({ where: { ...activeScope(scope), purchaseOrderId: In(groupPurchases.map(purchase => purchase.id)), deletedAt: IsNull() }, order: { id: 'ASC' }, lock: { mode: 'pessimistic_write' } });
+            const linesByPurchase = groupBy(lines, line => line.purchaseOrderId);
             const repo = manager.getRepository(DerivedSalesOrderManualData);
-            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, 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);
-            const received = input.receivedAmountCny ?? row.receivedAmountCny;
-            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;
-            return repo.save(row);
+            const rows = new Map();
+            for (const purchaseId of groupPurchases.map(purchase => purchase.id)) {
+                const where = { ...activeScope(scope), customerContractId, purchaseOrderId: purchaseId, 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: purchaseId, pricingProfitRateOverride: null, orderAmountCnyOverride: null, linePricingOverrides: null, receivedAmountCny: '0' }).orIgnore().execute();
+                    row = await required(repo.findOne({ where, lock: { mode: 'pessimistic_write' } }), '销售订单人工维护数据创建失败');
+                }
+                rows.set(purchaseId, row);
+            }
+            if (input.pricingProfitRateOverride !== undefined) {
+                const override = normalizeOptionalDecimalInput(input.pricingProfitRateOverride);
+                if (override != null && new Decimal(override).isNegative())
+                    throw new DomainError(DomainErrorCodes.INVALID_INPUT, '订单利润率不能小于 0');
+                for (const row of rows.values())
+                    row.pricingProfitRateOverride = override;
+            }
+            if (input.orderAmountCnyOverride !== undefined) {
+                const override = normalizeOptionalDecimalInput(input.orderAmountCnyOverride);
+                if (override != null && new Decimal(override).isNegative())
+                    throw new DomainError(DomainErrorCodes.INVALID_INPUT, '销售订单总额不能小于 0');
+                for (const [purchaseId, row] of rows)
+                    row.orderAmountCnyOverride = override == null ? null : purchaseId === purchaseOrderId ? override : '0';
+            }
+            if (input.linePricingOverrides !== undefined) {
+                const incoming = linePricingOverrides(input.linePricingOverrides);
+                const incomingByPurchase = new Map();
+                for (const [lineId, value] of Object.entries(incoming)) {
+                    const ownerPurchaseId = lines.find(line => line.id === lineId)?.purchaseOrderId ?? purchaseOrderId;
+                    incomingByPurchase.set(ownerPurchaseId, { ...(incomingByPurchase.get(ownerPurchaseId) ?? {}), [lineId]: value });
+                }
+                for (const [purchaseId, row] of rows) {
+                    const next = incomingByPurchase.get(purchaseId);
+                    if (!next)
+                        continue;
+                    row.linePricingOverrides = normalizeLinePricingOverrides({ ...linePricingOverrides(row.linePricingOverrides), ...next });
+                }
+            }
+            if (input.receivedAmountCny !== undefined) {
+                for (const [purchaseId, row] of rows)
+                    row.receivedAmountCny = purchaseId === purchaseOrderId ? input.receivedAmountCny : '0';
+            }
+            const groupFinalAmount = [...rows.values()].reduce((total, row) => {
+                const effectiveRate = row.pricingProfitRateOverride ?? (customer.pricingProfitRateStatus === 'CONFIGURED' ? customer.defaultPricingProfitRate : null);
+                const purchaseFinal = row.orderAmountCnyOverride != null ? new Decimal(row.orderAmountCnyOverride) : new Decimal(deriveOrderPricingAmount(linesByPurchase.get(row.purchaseOrderId) ?? [], row.linePricingOverrides, effectiveRate));
+                return total.plus(purchaseFinal);
+            }, new Decimal(0));
+            const groupReceived = [...rows.values()].reduce((total, row) => total.plus(row.receivedAmountCny ?? 0), new Decimal(0));
+            assertReceivedAmount(groupFinalAmount, groupReceived);
+            for (const row of rows.values())
+                row.updatedById = scope.userId ?? null;
+            const saved = await repo.save([...rows.values()]);
+            return saved.find(row => row.purchaseOrderId === purchaseOrderId) ?? saved[0];
         });
     }
     async softDelete(scope, entityType, id) {
@@ -4319,7 +4383,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
     async salesOrderDtos(scope, orders) {
         if (!orders.length)
             return [];
-        const purchaseIds = [...new Set(orders.map(item => item.purchaseOrderId))];
+        const purchaseIds = [...new Set(orders.flatMap(item => item.purchaseOrderIds?.length ? item.purchaseOrderIds : [item.purchaseOrderId]))];
         const [customers, purchases] = await Promise.all([
             this.dataSource.getRepository(Customer).find({ where: { ...activeScope(scope), id: In([...new Set(orders.map(item => item.customerId))]), deletedAt: IsNull() } }),
             this.dataSource.getRepository(PurchaseOrder).find({ where: { ...activeScope(scope), id: In(purchaseIds), deletedAt: IsNull() } })
@@ -4333,7 +4397,9 @@ 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: order.pricingStatus === 'UNPRICED' ? 'MISSING' : 'CONFIGURED', paymentStatus, lines: order.lines.map(line => ({ ...line, complianceCategories: [...new Set(line.complianceMatches.map(match => match.catalogType))] })) };
+            const orderPurchaseIds = order.purchaseOrderIds?.length ? order.purchaseOrderIds : [order.purchaseOrderId];
+            const orderSupplierNames = [...new Set(orderPurchaseIds.map(id => supplierNames.get(purchaseSuppliers.get(id) ?? '') ?? '').filter(Boolean))];
+            return { ...order, customerName: customerNames.get(order.customerId) ?? '', supplierName: orderSupplierNames.join('、'), 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) {