From 75d9e98ec8dcea6cd6f87cb8dda18a068d37ae57 Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Sat, 1 Aug 2026 21:13:42 +0800 Subject: [PATCH] 1 --- Antis.Erp.Plat/.cursor/skills/api-interface-testing/SKILL.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ Antis.Erp.Plat/AGENTS.md | 2 +- Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/Form.vue | 23 +++++++++++++++++------ Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue | 5 ++++- Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- 6 files changed, 281 insertions(+), 24 deletions(-) diff --git a/Antis.Erp.Plat/.cursor/skills/api-interface-testing/SKILL.md b/Antis.Erp.Plat/.cursor/skills/api-interface-testing/SKILL.md index a727d2d..9348dcb 100644 --- a/Antis.Erp.Plat/.cursor/skills/api-interface-testing/SKILL.md +++ b/Antis.Erp.Plat/.cursor/skills/api-interface-testing/SKILL.md @@ -16,6 +16,56 @@ description: 按项目规范执行接口测试,包含获取 Token、使用 cur 1. **获取 Token**:先调用登录接口拿到 `data.token` 2. **调用目标接口**:请求头带上 `Authorization: {data.token}` 3. **验证结果**:按下方清单检查返回值与行为 +4. **查库验证**:遵循 skill `mcp-mysql-and-sql-validation`,用 MCP 核对落库结果 +5. **测试单收尾**:凡创建了业务单据做联调,必须按「测试单规范」标注、清理并确认零影响(见下节) + +## 测试单规范(强制) + +凡通过接口 / 脚本 / 手工在**真实环境**创建用于验证的业务数据(销售出库、采购入库、会员流水等),**必须**遵守以下三条,**无例外**: + +### 1. 必须标注为测试单 + +- 主表 **`bz`(备注)** 必须以固定前缀开头,推荐格式: + + `【测试单】<场景简述>-自动创建-禁止用于业务` + +- 示例:`【测试单】驳回积分冲回验证-自动创建-禁止用于业务` +- 禁止用与真实业务无法区分的备注;禁止不写备注。 + +### 2. 测试结束必须删除测试单 + +- 销售出库单等待审单据:先 **驳回**(`RejectGeneric`)回到草稿,再 **DELETE** 删除(仅草稿可删)。 +- 已审核单据:先 **反审** 回草稿,再删除。 +- 删除后须查库确认 `wt_xsckd` / 对应明细表 **无残留**。 + +### 3. 必须确认未污染业务数据 + +删除测试单后,用 MCP 逐项确认(按场景选取): + +| 检查项 | 表 / 条件 | 期望 | +|--------|-----------|------| +| 主单已删 | `wt_xsckd` `F_Id = 测试单号` | 0 行 | +| 明细已删 | `wt_xsckd_mx` `djbh = 测试单号` | 0 行 | +| 积分净影响为 0 | `wt_hy_jf` `F_Jfgz LIKE '%测试单号%'` | `SUM(F_Jf) = 0` 或仅有对称赠送/冲回 | +| 提成无残留 | `wt_dgtchsb` `djbh = 测试单号` | 0 行 | +| 库存无异常占用 | `wt_sp_cost` / `wt_serial_number` 按单号 | 与测试前一致或已冲回 | + +**交付测试报告时须写明**:测试单号、标注位置、删除接口调用结果、上述查库结论。 + +### 测试单 SQL 核对示例 + +```sql +-- 积分流水(消费送积分 + 驳回冲回应对称) +SELECT F_Jfgz, F_Jf, F_Jfsj +FROM wt_hy_jf +WHERE F_Jfgz LIKE '%CK202608010019%' +ORDER BY F_Jfsj; + +-- 净影响 +SELECT SUM(CAST(F_Jf AS SIGNED)) AS net_points +FROM wt_hy_jf +WHERE F_Jfgz LIKE '%CK202608010019%'; +``` ## 获取 Token diff --git a/Antis.Erp.Plat/AGENTS.md b/Antis.Erp.Plat/AGENTS.md index fa9d07a..3f9c3bb 100644 --- a/Antis.Erp.Plat/AGENTS.md +++ b/Antis.Erp.Plat/AGENTS.md @@ -20,7 +20,7 @@ ## Project Knowledge Files -- `.cursor/skills/api-interface-testing/SKILL.md`: API test flow, login token, curl examples, and verification checklist. +- `.cursor/skills/api-interface-testing/SKILL.md`: API test flow, login token, curl examples, verification checklist, and **mandatory test-order labeling/cleanup rules**. - `.cursor/skills/api-xml-comments/SKILL.md`: required XML comment format for API methods. - `.cursor/skills/mcp-mysql-and-sql-validation/SKILL.md`: real database query and SQL validation rules. - `.cursor/skills/mcp-db-auto-retry/SKILL.md`: retry workflow when MySQL MCP connection fails. diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/Form.vue index 0129c54..55f5662 100644 --- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/Form.vue +++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/Form.vue @@ -742,6 +742,7 @@ setFullName(item,row){ background: 'rgba(0, 0, 0, 0.5)' }) try { + this.reconcileAllMxJeFromQtyAndPrice() const payload = { ...this.dataForm, isDraft: !!isDraftMode, @@ -995,25 +996,35 @@ setFullName(item,row){ } }, handleAmountChange(row) { - const sl = parseFloat(row.sl) || 0; - const dj = parseFloat(row.dj) || 0; - row.je = (sl * dj).toFixed(2); + this.reconcileMxJeFromQtyAndPrice(row) const q = parseInt(String(row.sl || '').trim(), 10) || 0 if (Array.isArray(row.serialNumbers) && row.serialNumbers.length > q && q >= 0) { row.serialNumbers = row.serialNumbers.slice(0, q) } this.calculateTotalAmount(); }, - // 处理金额字段输入变化:根据金额和数量自动计算单价 + /** 金额 = round(单价×数量, 2),保证界面单价/数量/金额自洽 */ + reconcileMxJeFromQtyAndPrice(row) { + if (!row) return + const sl = parseFloat(row.sl) || 0 + const dj = parseFloat(row.dj) || 0 + if (sl > 0 && dj >= 0) { + row.je = (Math.round(sl * dj * 100) / 100).toFixed(2) + } + }, + reconcileAllMxJeFromQtyAndPrice() { + ;(this.dataForm.wtXsckdMxList || []).forEach(row => this.reconcileMxJeFromQtyAndPrice(row)) + }, + // 处理金额字段输入变化:根据金额和数量反推单价,再按单价×数量回写金额(避免 je≠dj×sl) handleAmountFieldChange(row) { const je = parseFloat(row.je); const sl = parseFloat(row.sl); - // 如果金额和数量都有值且大于0,计算单价 + // 如果金额和数量都有值且大于0,计算单价后回写标准金额 if (!isNaN(je) && je > 0 && !isNaN(sl) && sl > 0) { const calculatedDj = je / sl; - // 保留2位小数,避免浮点数精度问题 row.dj = parseFloat(calculatedDj.toFixed(4)).toFixed(2); + this.reconcileMxJeFromQtyAndPrice(row) } else if (!isNaN(je) && je > 0 && (isNaN(sl) || sl <= 0)) { // 如果金额有值但数量为空或0,提示用户先输入数量 // 不清空金额,等待用户输入数量后再计算 diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue index 96e6731..3eea610 100644 --- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue +++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue @@ -313,7 +313,7 @@ - + @@ -339,7 +339,7 @@ - + @@ -759,6 +759,62 @@ return true }, /** + * 单账户收款:主表 skzh 与 skmx 单行入账账户保持一致(反审后改收款账户场景) + */ + syncSkzhToPaymentDetails() { + const skzh = this.dataForm.skzh + if (!skzh || skzh === '组合支付') return + const skje = parseFloat(this.dataForm.skje) + const skjeStr = !isNaN(skje) && skje > 0 ? skje.toFixed(2) : '0.00' + const skList = this.parsePaymentDetails(this.dataForm.skmx) + if (skList.length === 0) { + if (!isNaN(skje) && skje > 0) { + this.dataForm.skmx = JSON.stringify([{ skfs: '入账账户', skje: skjeStr, skzh }]) + } + return + } + if (skList.length !== 1) return + const row = { ...skList[0], skzh } + if (!row.skfs) row.skfs = '入账账户' + if (!isNaN(skje) && skje > 0) row.skje = skjeStr + this.dataForm.skmx = JSON.stringify([row]) + }, + handleSkzhChange() { + this.syncSkzhToPaymentDetails() + }, + /** 原价 − 优惠 = 收款;ERP 编辑时以主表金额为准(反审后改优惠不被旧 skmx 覆盖) */ + reconcileSkjeFromYdjeAndYsje() { + const ydje = parseFloat(this.dataForm.ydje) + const ysje = parseFloat(this.dataForm.ysje) + if (!isNaN(ydje) && !isNaN(ysje)) { + this.dataForm.skje = Math.max(ydje - ysje, 0).toFixed(2) + } + }, + isComboPaymentMode() { + if (this.dataForm.skzh === '组合支付') return true + return this.parsePaymentDetails(this.dataForm.skmx).length > 1 + }, + handleYsjeInput() { + if (this.isComboPaymentMode()) { + this.calculateTotalAmount() + return + } + this.reconcileSkjeFromYdjeAndYsje() + this.syncSkzhToPaymentDetails() + }, + /** 提交/存草稿前:单账户以主表金额+账户同步 skmx;组合支付仍以 skmx 汇总为准 */ + preparePaymentFieldsForSubmit() { + if (this.isComboPaymentMode()) { + this.syncHeaderAmountFromSkmx() + if (this.shouldPreserveHeaderAmountsOnLoad()) { + this.syncDiscountFromLineRetailAfterSkmx() + } + return + } + this.reconcileSkjeFromYdjeAndYsje() + this.syncSkzhToPaymentDetails() + }, + /** * 明细改价后同步 skmx/fkmx 各行金额,使收款明细与主表 skje 一致(收银台带出单编辑场景) */ syncPaymentDetailsToSkje(targetSkje) { @@ -1250,6 +1306,7 @@ // 确保单据类型字段赋值 this.dataForm.djlx = '销售出库单'; this.ensureBackendSalesSource(); + this.preparePaymentFieldsForSubmit(); this.syncUserRefsForSubmit(); const qtyCheck = validateMxPositiveQtyRows(this.dataForm.wtXsckdMxList) if (!qtyCheck.valid) { @@ -1339,10 +1396,7 @@ if (!valid) return; // 确保单据类型字段赋值 this.dataForm.djlx = '销售出库单'; - this.syncHeaderAmountFromSkmx() - if (this.shouldPreserveHeaderAmountsOnLoad()) { - this.syncDiscountFromLineRetailAfterSkmx() - } + this.preparePaymentFieldsForSubmit() // 先置 ly=后台,再解析 djzt,保证反审后门店单也进「待审核」 this.ensureBackendSalesSource(); this.dataForm.djzt = this.resolveSubmitDjzt() diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue index 1feba4f..8d5f9d0 100644 --- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue +++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue @@ -399,8 +399,9 @@ { prop: 'xsmd', label: '销售门店' }, { prop: 'fhr', label: '发货人' }, { prop: 'skzh', label: '收款账户' }, - { prop: 'skje', label: '收款金额' }, + { prop: 'ydje', label: '原价' }, { prop: 'ysje', label: '优惠金额' }, + { prop: 'skje', label: '收款金额' }, { prop: 'shr', label: '审核人' }, { prop: 'gzr', label: '过账人' }, { prop: 'xgr', label: '最后修改人' }, @@ -839,6 +840,8 @@ return this.getProductDisplay(row) case 'skzh': return this.displayText(this.formatSkzhRow(row)) || '无' + case 'ydje': + return this.getDisplayOriginalPrice(row) case 'skje': return this.getDisplayCollectionAmount(row) case 'ysje': diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs index a24cc58..b4d0e1c 100644 --- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs +++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs @@ -1428,6 +1428,121 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') } /// + /// 明细逐行导出时,将主表列表口径的收款/优惠/原价按行金额占比分摊到各行; + /// 避免整单金额重复写入每行,也避免用 mx.Je 误当收款(整单优惠时 mx 仍为标价)。 + /// + private static (decimal skje, decimal ysje, decimal ydje) AllocateExportMxRowBillAmounts( + WtXsckdListOutput bill, + decimal lineJe, + decimal totalLineJe, + int lineIndex, + int lineCount, + ref decimal allocatedSkje, + ref decimal allocatedYsje, + ref decimal allocatedYdje) + { + var billSkje = ResolveListDisplayCollectionAmount( + bill.ydje, bill.skje, bill.ysje, bill.skmx, bill.fkmx); + var billYdje = ResolveListDisplayOriginalPrice( + bill.ydje, bill.skje, bill.ysje, bill.skmx, bill.fkmx); + var billYsje = ResolveListDisplayDiscountAmount( + bill.ydje, bill.skje, bill.ysje, bill.skmx, bill.fkmx); + + if (lineCount <= 0) + return (0m, 0m, 0m); + + var isLast = lineIndex >= lineCount - 1; + if (isLast) + { + var skje = Math.Round(billSkje - allocatedSkje, 2, MidpointRounding.AwayFromZero); + var ysje = Math.Round(billYsje - allocatedYsje, 2, MidpointRounding.AwayFromZero); + var ydje = Math.Round(billYdje - allocatedYdje, 2, MidpointRounding.AwayFromZero); + allocatedSkje += skje; + allocatedYsje += ysje; + allocatedYdje += ydje; + return (skje, ysje, ydje); + } + + decimal ratio; + if (totalLineJe > 0) + ratio = lineJe / totalLineJe; + else + ratio = 1m / lineCount; + + var rowSkje = Math.Round(billSkje * ratio, 2, MidpointRounding.AwayFromZero); + var rowYsje = Math.Round(billYsje * ratio, 2, MidpointRounding.AwayFromZero); + var rowYdje = Math.Round(billYdje * ratio, 2, MidpointRounding.AwayFromZero); + allocatedSkje += rowSkje; + allocatedYsje += rowYsje; + allocatedYdje += rowYdje; + return (rowSkje, rowYsje, rowYdje); + } + + /// + /// 采购入库单明细:金额必须为 round(单价×数量, 2),避免手改金额后单价四舍五入导致 je≠dj×sl。 + /// + private static void NormalizePurchaseInboundMxJeFromQtyAndPrice(string? djlx, IList? mxList) + { + if (!string.Equals(djlx, "采购入库单", StringComparison.Ordinal) || mxList == null) return; + foreach (var row in mxList) + { + if (row == null) continue; + if (!decimal.TryParse(row.sl, out var sl) || sl <= 0) continue; + if (!row.dj.HasValue) continue; + row.je = Math.Round(row.dj.Value * sl, 2, MidpointRounding.AwayFromZero); + } + } + + /// + /// 单账户收款:主表 skzh 与 skmx 单行入账账户保持一致(修复反审后只改收款账户未同步 skmx)。 + /// + private static void SyncSkmxAccountFromHeader(WtXsckdEntity entity) + { + if (entity == null) return; + var skzh = (entity.Skzh ?? string.Empty).Trim(); + if (string.IsNullOrEmpty(skzh) || string.Equals(skzh, "组合支付", StringComparison.Ordinal)) + return; + + var skjeStr = Math.Round(entity.Skje, 2, MidpointRounding.AwayFromZero).ToString("F2"); + + if (string.IsNullOrWhiteSpace(entity.Skmx)) + { + if (entity.Skje > 0) + { + entity.Skmx = Newtonsoft.Json.JsonConvert.SerializeObject(new[] + { + new Dictionary + { + ["skfs"] = "入账账户", + ["skje"] = skjeStr, + ["skzh"] = skzh + } + }); + } + return; + } + + try + { + var skList = Newtonsoft.Json.JsonConvert.DeserializeObject>>(entity.Skmx) + ?? new List>(); + if (skList.Count != 1) return; + + var row = skList[0]; + row["skzh"] = skzh; + if (!row.ContainsKey("skfs") || string.IsNullOrWhiteSpace(row["skfs"])) + row["skfs"] = "入账账户"; + if (entity.Skje > 0) + row["skje"] = skjeStr; + entity.Skmx = Newtonsoft.Json.JsonConvert.SerializeObject(skList); + } + catch + { + // ignore malformed skmx + } + } + + /// /// 门店/抖音单:以 skmx 实收同步主表 skje,并按原价-实收重算优惠(修复收银台主表 skje 与 skmx 不一致)。 /// private static void NormalizeCashierPaymentHeaderAmounts(WtXsckdEntity entity) @@ -5811,6 +5926,8 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') if (!skipEmptyMxCheckCreate && input.djlx != null && input.djlx.Contains("报损单")) await EnsureLossDocumentSerialSelectionAsync(input.wtXsckdMxList); + NormalizePurchaseInboundMxJeFromQtyAndPrice(input.djlx, input.wtXsckdMxList); + // 收银折扣权限校验(仅当收银台传入手动整单折扣/改价折数时生效):操作员角色最低折不得被突破。 await ValidateSyDiscountPermissionAsync(input); EnsureCbjeColumn(); @@ -5856,6 +5973,7 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') entity.Wlgs = null; } ApplyYcddhForReturnOrder(entity, input); + SyncSkmxAccountFromHeader(entity); NormalizeCashierPaymentHeaderAmounts(entity); // 获取用户ID(匿名访问时为null或空字符串) @@ -6488,6 +6606,7 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') EnrichListOutputYcddhFromRemarkIfNeeded(row); await EnrichWtXsckdListWarehouseDisplayAsync(data); await EnrichListOutputKhDisplayAsync(data); + EnrichCashierPaymentAmountsForList(data); await EnrichListOutputGysWldwDisplayAsync(data); await EnrichListPersonDisplayFromMemberHyAsync(data); await EnrichOutboundLinkedReturnBillsAsync(data); @@ -6574,6 +6693,8 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') } // 收款账户:导出写可读名称(含组合支付展开),与列表 formatWtSkzhDisplay 口径一致 await EnrichExportSkzhDisplayAsync(exportData); + if (exportData != null && exportData.Count > 0) + EnrichCashierPaymentAmountsForList(exportData); List paramList = ("[" + "{\"value\":\"单据编号\",\"field\":\"id\"}," + @@ -6636,7 +6757,7 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') { selectKeyList = new List { - "id", "djrq", "cjck", "spmcDigest", "jsr", "bz", "skzh", "skje", "djzt" + "id", "djrq", "cjck", "spmcDigest", "jsr", "bz", "skzh", "ydje", "ysje", "skje", "djzt" }; } else if (!selectKeyList.Contains("spmcDigest", StringComparer.OrdinalIgnoreCase)) @@ -6729,6 +6850,20 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') } var mxLineIndex = 0; + var lineWeights = lines.Select(mx => + { + var q = ParseMxSl(mx.Sl); + var je = mx.Je; + if (je > 0) return je; + return q > 0 + ? Math.Round(mx.Dj * q, 2, MidpointRounding.AwayFromZero) + : 0m; + }).ToList(); + var totalLineJe = lineWeights.Sum(); + decimal allocatedSkje = 0m; + decimal allocatedYsje = 0m; + decimal allocatedYdje = 0m; + foreach (var mx in lines) { var spmc = mx.Spmc ?? ""; @@ -6753,15 +6888,14 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') row.mxPdSjsl = FormatPdSnapshotExport(pdSnap.pdSjsl); row.mxPdCy = FormatPdSnapshotExport(pdSnap.pdCy); - // 明细展开:金额类字段按 wt_xsckd_mx 行口径(与详情页「单价/金额」列一致), - // 避免 CloneRow 把整单 skje/ysje/ydje/cbje 重复写到每一行导致 Excel 求和翻倍。 - var lineJe = mx.Je; - var lineYdje = qty > 0 - ? Math.Round(mx.Dj * qty, 2, MidpointRounding.AwayFromZero) - : lineJe; - row.skje = lineJe; - row.ydje = lineYdje; - row.ysje = Math.Round(Math.Max(0m, lineYdje - lineJe), 2, MidpointRounding.AwayFromZero); + // 明细展开:mxDj/mxJe 仍为行商品口径;skje/ysje/ydje 按主表列表展示口径分摊,与列表/收银台一致。 + var lineJe = lineWeights[mxLineIndex]; + var (rowSkje, rowYsje, rowYdje) = AllocateExportMxRowBillAmounts( + bill, lineJe, totalLineJe, mxLineIndex, lines.Count, + ref allocatedSkje, ref allocatedYsje, ref allocatedYdje); + row.skje = rowSkje; + row.ydje = rowYdje; + row.ysje = rowYsje; row.cbje = mx.Cbje; if (mxLineIndex > 0) row.sjssrje = null; @@ -7134,7 +7268,10 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') entity.SyPch = string.IsNullOrWhiteSpace(input.sy_pch) ? null : NormalizeSyPch(input.sy_pch); if (input.skmx != null) entity.Skmx = input.skmx; + else if (string.IsNullOrWhiteSpace(entity.Skmx)) + entity.Skmx = oldHeader.Skmx; entity.Ydje = input.ydje ?? entity.Ydje; + SyncSkmxAccountFromHeader(entity); NormalizeCashierPaymentHeaderAmounts(entity); Console.WriteLine($"[Update] 会员手机号码: input.hysjh={input.hysjh}, entity.Hysjh={entity.Hysjh}"); @@ -7160,6 +7297,8 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') ValidateDouyinSalesOutboundMxEdit(oldMxList, newMxForValidate); } + NormalizePurchaseInboundMxJeFromQtyAndPrice(input.djlx ?? oldHeader.Djlx, input.wtXsckdMxList); + string? updateOperatorUserId = null; try { -- libgit2 0.21.4