Commit 75d9e98ec8dcea6cd6f87cb8dda18a068d37ae57
1 parent
fed8d37a
1
Showing
6 changed files
with
281 additions
and
24 deletions
Antis.Erp.Plat/.cursor/skills/api-interface-testing/SKILL.md
| ... | ... | @@ -16,6 +16,56 @@ description: 按项目规范执行接口测试,包含获取 Token、使用 cur |
| 16 | 16 | 1. **获取 Token**:先调用登录接口拿到 `data.token` |
| 17 | 17 | 2. **调用目标接口**:请求头带上 `Authorization: {data.token}` |
| 18 | 18 | 3. **验证结果**:按下方清单检查返回值与行为 |
| 19 | +4. **查库验证**:遵循 skill `mcp-mysql-and-sql-validation`,用 MCP 核对落库结果 | |
| 20 | +5. **测试单收尾**:凡创建了业务单据做联调,必须按「测试单规范」标注、清理并确认零影响(见下节) | |
| 21 | + | |
| 22 | +## 测试单规范(强制) | |
| 23 | + | |
| 24 | +凡通过接口 / 脚本 / 手工在**真实环境**创建用于验证的业务数据(销售出库、采购入库、会员流水等),**必须**遵守以下三条,**无例外**: | |
| 25 | + | |
| 26 | +### 1. 必须标注为测试单 | |
| 27 | + | |
| 28 | +- 主表 **`bz`(备注)** 必须以固定前缀开头,推荐格式: | |
| 29 | + | |
| 30 | + `【测试单】<场景简述>-自动创建-禁止用于业务` | |
| 31 | + | |
| 32 | +- 示例:`【测试单】驳回积分冲回验证-自动创建-禁止用于业务` | |
| 33 | +- 禁止用与真实业务无法区分的备注;禁止不写备注。 | |
| 34 | + | |
| 35 | +### 2. 测试结束必须删除测试单 | |
| 36 | + | |
| 37 | +- 销售出库单等待审单据:先 **驳回**(`RejectGeneric`)回到草稿,再 **DELETE** 删除(仅草稿可删)。 | |
| 38 | +- 已审核单据:先 **反审** 回草稿,再删除。 | |
| 39 | +- 删除后须查库确认 `wt_xsckd` / 对应明细表 **无残留**。 | |
| 40 | + | |
| 41 | +### 3. 必须确认未污染业务数据 | |
| 42 | + | |
| 43 | +删除测试单后,用 MCP 逐项确认(按场景选取): | |
| 44 | + | |
| 45 | +| 检查项 | 表 / 条件 | 期望 | | |
| 46 | +|--------|-----------|------| | |
| 47 | +| 主单已删 | `wt_xsckd` `F_Id = 测试单号` | 0 行 | | |
| 48 | +| 明细已删 | `wt_xsckd_mx` `djbh = 测试单号` | 0 行 | | |
| 49 | +| 积分净影响为 0 | `wt_hy_jf` `F_Jfgz LIKE '%测试单号%'` | `SUM(F_Jf) = 0` 或仅有对称赠送/冲回 | | |
| 50 | +| 提成无残留 | `wt_dgtchsb` `djbh = 测试单号` | 0 行 | | |
| 51 | +| 库存无异常占用 | `wt_sp_cost` / `wt_serial_number` 按单号 | 与测试前一致或已冲回 | | |
| 52 | + | |
| 53 | +**交付测试报告时须写明**:测试单号、标注位置、删除接口调用结果、上述查库结论。 | |
| 54 | + | |
| 55 | +### 测试单 SQL 核对示例 | |
| 56 | + | |
| 57 | +```sql | |
| 58 | +-- 积分流水(消费送积分 + 驳回冲回应对称) | |
| 59 | +SELECT F_Jfgz, F_Jf, F_Jfsj | |
| 60 | +FROM wt_hy_jf | |
| 61 | +WHERE F_Jfgz LIKE '%CK202608010019%' | |
| 62 | +ORDER BY F_Jfsj; | |
| 63 | + | |
| 64 | +-- 净影响 | |
| 65 | +SELECT SUM(CAST(F_Jf AS SIGNED)) AS net_points | |
| 66 | +FROM wt_hy_jf | |
| 67 | +WHERE F_Jfgz LIKE '%CK202608010019%'; | |
| 68 | +``` | |
| 19 | 69 | |
| 20 | 70 | ## 获取 Token |
| 21 | 71 | ... | ... |
Antis.Erp.Plat/AGENTS.md
| ... | ... | @@ -20,7 +20,7 @@ |
| 20 | 20 | |
| 21 | 21 | ## Project Knowledge Files |
| 22 | 22 | |
| 23 | -- `.cursor/skills/api-interface-testing/SKILL.md`: API test flow, login token, curl examples, and verification checklist. | |
| 23 | +- `.cursor/skills/api-interface-testing/SKILL.md`: API test flow, login token, curl examples, verification checklist, and **mandatory test-order labeling/cleanup rules**. | |
| 24 | 24 | - `.cursor/skills/api-xml-comments/SKILL.md`: required XML comment format for API methods. |
| 25 | 25 | - `.cursor/skills/mcp-mysql-and-sql-validation/SKILL.md`: real database query and SQL validation rules. |
| 26 | 26 | - `.cursor/skills/mcp-db-auto-retry/SKILL.md`: retry workflow when MySQL MCP connection fails. | ... | ... |
Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/Form.vue
| ... | ... | @@ -742,6 +742,7 @@ setFullName(item,row){ |
| 742 | 742 | background: 'rgba(0, 0, 0, 0.5)' |
| 743 | 743 | }) |
| 744 | 744 | try { |
| 745 | + this.reconcileAllMxJeFromQtyAndPrice() | |
| 745 | 746 | const payload = { |
| 746 | 747 | ...this.dataForm, |
| 747 | 748 | isDraft: !!isDraftMode, |
| ... | ... | @@ -995,25 +996,35 @@ setFullName(item,row){ |
| 995 | 996 | } |
| 996 | 997 | }, |
| 997 | 998 | handleAmountChange(row) { |
| 998 | - const sl = parseFloat(row.sl) || 0; | |
| 999 | - const dj = parseFloat(row.dj) || 0; | |
| 1000 | - row.je = (sl * dj).toFixed(2); | |
| 999 | + this.reconcileMxJeFromQtyAndPrice(row) | |
| 1001 | 1000 | const q = parseInt(String(row.sl || '').trim(), 10) || 0 |
| 1002 | 1001 | if (Array.isArray(row.serialNumbers) && row.serialNumbers.length > q && q >= 0) { |
| 1003 | 1002 | row.serialNumbers = row.serialNumbers.slice(0, q) |
| 1004 | 1003 | } |
| 1005 | 1004 | this.calculateTotalAmount(); |
| 1006 | 1005 | }, |
| 1007 | - // 处理金额字段输入变化:根据金额和数量自动计算单价 | |
| 1006 | + /** 金额 = round(单价×数量, 2),保证界面单价/数量/金额自洽 */ | |
| 1007 | + reconcileMxJeFromQtyAndPrice(row) { | |
| 1008 | + if (!row) return | |
| 1009 | + const sl = parseFloat(row.sl) || 0 | |
| 1010 | + const dj = parseFloat(row.dj) || 0 | |
| 1011 | + if (sl > 0 && dj >= 0) { | |
| 1012 | + row.je = (Math.round(sl * dj * 100) / 100).toFixed(2) | |
| 1013 | + } | |
| 1014 | + }, | |
| 1015 | + reconcileAllMxJeFromQtyAndPrice() { | |
| 1016 | + ;(this.dataForm.wtXsckdMxList || []).forEach(row => this.reconcileMxJeFromQtyAndPrice(row)) | |
| 1017 | + }, | |
| 1018 | + // 处理金额字段输入变化:根据金额和数量反推单价,再按单价×数量回写金额(避免 je≠dj×sl) | |
| 1008 | 1019 | handleAmountFieldChange(row) { |
| 1009 | 1020 | const je = parseFloat(row.je); |
| 1010 | 1021 | const sl = parseFloat(row.sl); |
| 1011 | 1022 | |
| 1012 | - // 如果金额和数量都有值且大于0,计算单价 | |
| 1023 | + // 如果金额和数量都有值且大于0,计算单价后回写标准金额 | |
| 1013 | 1024 | if (!isNaN(je) && je > 0 && !isNaN(sl) && sl > 0) { |
| 1014 | 1025 | const calculatedDj = je / sl; |
| 1015 | - // 保留2位小数,避免浮点数精度问题 | |
| 1016 | 1026 | row.dj = parseFloat(calculatedDj.toFixed(4)).toFixed(2); |
| 1027 | + this.reconcileMxJeFromQtyAndPrice(row) | |
| 1017 | 1028 | } else if (!isNaN(je) && je > 0 && (isNaN(sl) || sl <= 0)) { |
| 1018 | 1029 | // 如果金额有值但数量为空或0,提示用户先输入数量 |
| 1019 | 1030 | // 不清空金额,等待用户输入数量后再计算 | ... | ... |
Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/Form.vue
| ... | ... | @@ -313,7 +313,7 @@ |
| 313 | 313 | </el-col> |
| 314 | 314 | <el-col :span="12"> |
| 315 | 315 | <el-form-item label="收款账户" prop="skzh"> |
| 316 | - <el-select v-model="dataForm.skzh" placeholder="请选择" clearable :style='{"width":"100%"}' filterable > | |
| 316 | + <el-select v-model="dataForm.skzh" placeholder="请选择" clearable :style='{"width":"100%"}' filterable @change="handleSkzhChange"> | |
| 317 | 317 | <el-option v-for="(item, index) in skzhOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option> |
| 318 | 318 | </el-select> |
| 319 | 319 | </el-form-item> |
| ... | ... | @@ -339,7 +339,7 @@ |
| 339 | 339 | </el-col> |
| 340 | 340 | <el-col v-if="dataForm.id" :span="8"> |
| 341 | 341 | <el-form-item label="优惠金额" prop="ysje"> |
| 342 | - <el-input v-model="dataForm.ysje" placeholder="请输入" clearable :style='{"width":"100%"}' @input="calculateTotalAmount"> | |
| 342 | + <el-input v-model="dataForm.ysje" placeholder="请输入" clearable :style='{"width":"100%"}' @input="handleYsjeInput"> | |
| 343 | 343 | </el-input> |
| 344 | 344 | </el-form-item> |
| 345 | 345 | </el-col> |
| ... | ... | @@ -759,6 +759,62 @@ |
| 759 | 759 | return true |
| 760 | 760 | }, |
| 761 | 761 | /** |
| 762 | + * 单账户收款:主表 skzh 与 skmx 单行入账账户保持一致(反审后改收款账户场景) | |
| 763 | + */ | |
| 764 | + syncSkzhToPaymentDetails() { | |
| 765 | + const skzh = this.dataForm.skzh | |
| 766 | + if (!skzh || skzh === '组合支付') return | |
| 767 | + const skje = parseFloat(this.dataForm.skje) | |
| 768 | + const skjeStr = !isNaN(skje) && skje > 0 ? skje.toFixed(2) : '0.00' | |
| 769 | + const skList = this.parsePaymentDetails(this.dataForm.skmx) | |
| 770 | + if (skList.length === 0) { | |
| 771 | + if (!isNaN(skje) && skje > 0) { | |
| 772 | + this.dataForm.skmx = JSON.stringify([{ skfs: '入账账户', skje: skjeStr, skzh }]) | |
| 773 | + } | |
| 774 | + return | |
| 775 | + } | |
| 776 | + if (skList.length !== 1) return | |
| 777 | + const row = { ...skList[0], skzh } | |
| 778 | + if (!row.skfs) row.skfs = '入账账户' | |
| 779 | + if (!isNaN(skje) && skje > 0) row.skje = skjeStr | |
| 780 | + this.dataForm.skmx = JSON.stringify([row]) | |
| 781 | + }, | |
| 782 | + handleSkzhChange() { | |
| 783 | + this.syncSkzhToPaymentDetails() | |
| 784 | + }, | |
| 785 | + /** 原价 − 优惠 = 收款;ERP 编辑时以主表金额为准(反审后改优惠不被旧 skmx 覆盖) */ | |
| 786 | + reconcileSkjeFromYdjeAndYsje() { | |
| 787 | + const ydje = parseFloat(this.dataForm.ydje) | |
| 788 | + const ysje = parseFloat(this.dataForm.ysje) | |
| 789 | + if (!isNaN(ydje) && !isNaN(ysje)) { | |
| 790 | + this.dataForm.skje = Math.max(ydje - ysje, 0).toFixed(2) | |
| 791 | + } | |
| 792 | + }, | |
| 793 | + isComboPaymentMode() { | |
| 794 | + if (this.dataForm.skzh === '组合支付') return true | |
| 795 | + return this.parsePaymentDetails(this.dataForm.skmx).length > 1 | |
| 796 | + }, | |
| 797 | + handleYsjeInput() { | |
| 798 | + if (this.isComboPaymentMode()) { | |
| 799 | + this.calculateTotalAmount() | |
| 800 | + return | |
| 801 | + } | |
| 802 | + this.reconcileSkjeFromYdjeAndYsje() | |
| 803 | + this.syncSkzhToPaymentDetails() | |
| 804 | + }, | |
| 805 | + /** 提交/存草稿前:单账户以主表金额+账户同步 skmx;组合支付仍以 skmx 汇总为准 */ | |
| 806 | + preparePaymentFieldsForSubmit() { | |
| 807 | + if (this.isComboPaymentMode()) { | |
| 808 | + this.syncHeaderAmountFromSkmx() | |
| 809 | + if (this.shouldPreserveHeaderAmountsOnLoad()) { | |
| 810 | + this.syncDiscountFromLineRetailAfterSkmx() | |
| 811 | + } | |
| 812 | + return | |
| 813 | + } | |
| 814 | + this.reconcileSkjeFromYdjeAndYsje() | |
| 815 | + this.syncSkzhToPaymentDetails() | |
| 816 | + }, | |
| 817 | + /** | |
| 762 | 818 | * 明细改价后同步 skmx/fkmx 各行金额,使收款明细与主表 skje 一致(收银台带出单编辑场景) |
| 763 | 819 | */ |
| 764 | 820 | syncPaymentDetailsToSkje(targetSkje) { |
| ... | ... | @@ -1250,6 +1306,7 @@ |
| 1250 | 1306 | // 确保单据类型字段赋值 |
| 1251 | 1307 | this.dataForm.djlx = '销售出库单'; |
| 1252 | 1308 | this.ensureBackendSalesSource(); |
| 1309 | + this.preparePaymentFieldsForSubmit(); | |
| 1253 | 1310 | this.syncUserRefsForSubmit(); |
| 1254 | 1311 | const qtyCheck = validateMxPositiveQtyRows(this.dataForm.wtXsckdMxList) |
| 1255 | 1312 | if (!qtyCheck.valid) { |
| ... | ... | @@ -1339,10 +1396,7 @@ |
| 1339 | 1396 | if (!valid) return; |
| 1340 | 1397 | // 确保单据类型字段赋值 |
| 1341 | 1398 | this.dataForm.djlx = '销售出库单'; |
| 1342 | - this.syncHeaderAmountFromSkmx() | |
| 1343 | - if (this.shouldPreserveHeaderAmountsOnLoad()) { | |
| 1344 | - this.syncDiscountFromLineRetailAfterSkmx() | |
| 1345 | - } | |
| 1399 | + this.preparePaymentFieldsForSubmit() | |
| 1346 | 1400 | // 先置 ly=后台,再解析 djzt,保证反审后门店单也进「待审核」 |
| 1347 | 1401 | this.ensureBackendSalesSource(); |
| 1348 | 1402 | this.dataForm.djzt = this.resolveSubmitDjzt() | ... | ... |
Antis.Erp.Plat/antis-ncc-admin/src/views/wtXsckd/index.vue
| ... | ... | @@ -399,8 +399,9 @@ |
| 399 | 399 | { prop: 'xsmd', label: '销售门店' }, |
| 400 | 400 | { prop: 'fhr', label: '发货人' }, |
| 401 | 401 | { prop: 'skzh', label: '收款账户' }, |
| 402 | - { prop: 'skje', label: '收款金额' }, | |
| 402 | + { prop: 'ydje', label: '原价' }, | |
| 403 | 403 | { prop: 'ysje', label: '优惠金额' }, |
| 404 | + { prop: 'skje', label: '收款金额' }, | |
| 404 | 405 | { prop: 'shr', label: '审核人' }, |
| 405 | 406 | { prop: 'gzr', label: '过账人' }, |
| 406 | 407 | { prop: 'xgr', label: '最后修改人' }, |
| ... | ... | @@ -839,6 +840,8 @@ |
| 839 | 840 | return this.getProductDisplay(row) |
| 840 | 841 | case 'skzh': |
| 841 | 842 | return this.displayText(this.formatSkzhRow(row)) || '无' |
| 843 | + case 'ydje': | |
| 844 | + return this.getDisplayOriginalPrice(row) | |
| 842 | 845 | case 'skje': |
| 843 | 846 | return this.getDisplayCollectionAmount(row) |
| 844 | 847 | case 'ysje': | ... | ... |
Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs
| ... | ... | @@ -1428,6 +1428,121 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') |
| 1428 | 1428 | } |
| 1429 | 1429 | |
| 1430 | 1430 | /// <summary> |
| 1431 | + /// 明细逐行导出时,将主表列表口径的收款/优惠/原价按行金额占比分摊到各行; | |
| 1432 | + /// 避免整单金额重复写入每行,也避免用 mx.Je 误当收款(整单优惠时 mx 仍为标价)。 | |
| 1433 | + /// </summary> | |
| 1434 | + private static (decimal skje, decimal ysje, decimal ydje) AllocateExportMxRowBillAmounts( | |
| 1435 | + WtXsckdListOutput bill, | |
| 1436 | + decimal lineJe, | |
| 1437 | + decimal totalLineJe, | |
| 1438 | + int lineIndex, | |
| 1439 | + int lineCount, | |
| 1440 | + ref decimal allocatedSkje, | |
| 1441 | + ref decimal allocatedYsje, | |
| 1442 | + ref decimal allocatedYdje) | |
| 1443 | + { | |
| 1444 | + var billSkje = ResolveListDisplayCollectionAmount( | |
| 1445 | + bill.ydje, bill.skje, bill.ysje, bill.skmx, bill.fkmx); | |
| 1446 | + var billYdje = ResolveListDisplayOriginalPrice( | |
| 1447 | + bill.ydje, bill.skje, bill.ysje, bill.skmx, bill.fkmx); | |
| 1448 | + var billYsje = ResolveListDisplayDiscountAmount( | |
| 1449 | + bill.ydje, bill.skje, bill.ysje, bill.skmx, bill.fkmx); | |
| 1450 | + | |
| 1451 | + if (lineCount <= 0) | |
| 1452 | + return (0m, 0m, 0m); | |
| 1453 | + | |
| 1454 | + var isLast = lineIndex >= lineCount - 1; | |
| 1455 | + if (isLast) | |
| 1456 | + { | |
| 1457 | + var skje = Math.Round(billSkje - allocatedSkje, 2, MidpointRounding.AwayFromZero); | |
| 1458 | + var ysje = Math.Round(billYsje - allocatedYsje, 2, MidpointRounding.AwayFromZero); | |
| 1459 | + var ydje = Math.Round(billYdje - allocatedYdje, 2, MidpointRounding.AwayFromZero); | |
| 1460 | + allocatedSkje += skje; | |
| 1461 | + allocatedYsje += ysje; | |
| 1462 | + allocatedYdje += ydje; | |
| 1463 | + return (skje, ysje, ydje); | |
| 1464 | + } | |
| 1465 | + | |
| 1466 | + decimal ratio; | |
| 1467 | + if (totalLineJe > 0) | |
| 1468 | + ratio = lineJe / totalLineJe; | |
| 1469 | + else | |
| 1470 | + ratio = 1m / lineCount; | |
| 1471 | + | |
| 1472 | + var rowSkje = Math.Round(billSkje * ratio, 2, MidpointRounding.AwayFromZero); | |
| 1473 | + var rowYsje = Math.Round(billYsje * ratio, 2, MidpointRounding.AwayFromZero); | |
| 1474 | + var rowYdje = Math.Round(billYdje * ratio, 2, MidpointRounding.AwayFromZero); | |
| 1475 | + allocatedSkje += rowSkje; | |
| 1476 | + allocatedYsje += rowYsje; | |
| 1477 | + allocatedYdje += rowYdje; | |
| 1478 | + return (rowSkje, rowYsje, rowYdje); | |
| 1479 | + } | |
| 1480 | + | |
| 1481 | + /// <summary> | |
| 1482 | + /// 采购入库单明细:金额必须为 round(单价×数量, 2),避免手改金额后单价四舍五入导致 je≠dj×sl。 | |
| 1483 | + /// </summary> | |
| 1484 | + private static void NormalizePurchaseInboundMxJeFromQtyAndPrice(string? djlx, IList<WtXsckdMxCrInput>? mxList) | |
| 1485 | + { | |
| 1486 | + if (!string.Equals(djlx, "采购入库单", StringComparison.Ordinal) || mxList == null) return; | |
| 1487 | + foreach (var row in mxList) | |
| 1488 | + { | |
| 1489 | + if (row == null) continue; | |
| 1490 | + if (!decimal.TryParse(row.sl, out var sl) || sl <= 0) continue; | |
| 1491 | + if (!row.dj.HasValue) continue; | |
| 1492 | + row.je = Math.Round(row.dj.Value * sl, 2, MidpointRounding.AwayFromZero); | |
| 1493 | + } | |
| 1494 | + } | |
| 1495 | + | |
| 1496 | + /// <summary> | |
| 1497 | + /// 单账户收款:主表 <c>skzh</c> 与 <c>skmx</c> 单行入账账户保持一致(修复反审后只改收款账户未同步 skmx)。 | |
| 1498 | + /// </summary> | |
| 1499 | + private static void SyncSkmxAccountFromHeader(WtXsckdEntity entity) | |
| 1500 | + { | |
| 1501 | + if (entity == null) return; | |
| 1502 | + var skzh = (entity.Skzh ?? string.Empty).Trim(); | |
| 1503 | + if (string.IsNullOrEmpty(skzh) || string.Equals(skzh, "组合支付", StringComparison.Ordinal)) | |
| 1504 | + return; | |
| 1505 | + | |
| 1506 | + var skjeStr = Math.Round(entity.Skje, 2, MidpointRounding.AwayFromZero).ToString("F2"); | |
| 1507 | + | |
| 1508 | + if (string.IsNullOrWhiteSpace(entity.Skmx)) | |
| 1509 | + { | |
| 1510 | + if (entity.Skje > 0) | |
| 1511 | + { | |
| 1512 | + entity.Skmx = Newtonsoft.Json.JsonConvert.SerializeObject(new[] | |
| 1513 | + { | |
| 1514 | + new Dictionary<string, string> | |
| 1515 | + { | |
| 1516 | + ["skfs"] = "入账账户", | |
| 1517 | + ["skje"] = skjeStr, | |
| 1518 | + ["skzh"] = skzh | |
| 1519 | + } | |
| 1520 | + }); | |
| 1521 | + } | |
| 1522 | + return; | |
| 1523 | + } | |
| 1524 | + | |
| 1525 | + try | |
| 1526 | + { | |
| 1527 | + var skList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(entity.Skmx) | |
| 1528 | + ?? new List<Dictionary<string, string>>(); | |
| 1529 | + if (skList.Count != 1) return; | |
| 1530 | + | |
| 1531 | + var row = skList[0]; | |
| 1532 | + row["skzh"] = skzh; | |
| 1533 | + if (!row.ContainsKey("skfs") || string.IsNullOrWhiteSpace(row["skfs"])) | |
| 1534 | + row["skfs"] = "入账账户"; | |
| 1535 | + if (entity.Skje > 0) | |
| 1536 | + row["skje"] = skjeStr; | |
| 1537 | + entity.Skmx = Newtonsoft.Json.JsonConvert.SerializeObject(skList); | |
| 1538 | + } | |
| 1539 | + catch | |
| 1540 | + { | |
| 1541 | + // ignore malformed skmx | |
| 1542 | + } | |
| 1543 | + } | |
| 1544 | + | |
| 1545 | + /// <summary> | |
| 1431 | 1546 | /// 门店/抖音单:以 skmx 实收同步主表 skje,并按原价-实收重算优惠(修复收银台主表 skje 与 skmx 不一致)。 |
| 1432 | 1547 | /// </summary> |
| 1433 | 1548 | private static void NormalizeCashierPaymentHeaderAmounts(WtXsckdEntity entity) |
| ... | ... | @@ -5811,6 +5926,8 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') |
| 5811 | 5926 | if (!skipEmptyMxCheckCreate && input.djlx != null && input.djlx.Contains("报损单")) |
| 5812 | 5927 | await EnsureLossDocumentSerialSelectionAsync(input.wtXsckdMxList); |
| 5813 | 5928 | |
| 5929 | + NormalizePurchaseInboundMxJeFromQtyAndPrice(input.djlx, input.wtXsckdMxList); | |
| 5930 | + | |
| 5814 | 5931 | // 收银折扣权限校验(仅当收银台传入手动整单折扣/改价折数时生效):操作员角色最低折不得被突破。 |
| 5815 | 5932 | await ValidateSyDiscountPermissionAsync(input); |
| 5816 | 5933 | EnsureCbjeColumn(); |
| ... | ... | @@ -5856,6 +5973,7 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') |
| 5856 | 5973 | entity.Wlgs = null; |
| 5857 | 5974 | } |
| 5858 | 5975 | ApplyYcddhForReturnOrder(entity, input); |
| 5976 | + SyncSkmxAccountFromHeader(entity); | |
| 5859 | 5977 | NormalizeCashierPaymentHeaderAmounts(entity); |
| 5860 | 5978 | |
| 5861 | 5979 | // 获取用户ID(匿名访问时为null或空字符串) |
| ... | ... | @@ -6488,6 +6606,7 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') |
| 6488 | 6606 | EnrichListOutputYcddhFromRemarkIfNeeded(row); |
| 6489 | 6607 | await EnrichWtXsckdListWarehouseDisplayAsync(data); |
| 6490 | 6608 | await EnrichListOutputKhDisplayAsync(data); |
| 6609 | + EnrichCashierPaymentAmountsForList(data); | |
| 6491 | 6610 | await EnrichListOutputGysWldwDisplayAsync(data); |
| 6492 | 6611 | await EnrichListPersonDisplayFromMemberHyAsync(data); |
| 6493 | 6612 | await EnrichOutboundLinkedReturnBillsAsync(data); |
| ... | ... | @@ -6574,6 +6693,8 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') |
| 6574 | 6693 | } |
| 6575 | 6694 | // 收款账户:导出写可读名称(含组合支付展开),与列表 formatWtSkzhDisplay 口径一致 |
| 6576 | 6695 | await EnrichExportSkzhDisplayAsync(exportData); |
| 6696 | + if (exportData != null && exportData.Count > 0) | |
| 6697 | + EnrichCashierPaymentAmountsForList(exportData); | |
| 6577 | 6698 | |
| 6578 | 6699 | List<ParamsModel> paramList = ("[" + |
| 6579 | 6700 | "{\"value\":\"单据编号\",\"field\":\"id\"}," + |
| ... | ... | @@ -6636,7 +6757,7 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') |
| 6636 | 6757 | { |
| 6637 | 6758 | selectKeyList = new List<string> |
| 6638 | 6759 | { |
| 6639 | - "id", "djrq", "cjck", "spmcDigest", "jsr", "bz", "skzh", "skje", "djzt" | |
| 6760 | + "id", "djrq", "cjck", "spmcDigest", "jsr", "bz", "skzh", "ydje", "ysje", "skje", "djzt" | |
| 6640 | 6761 | }; |
| 6641 | 6762 | } |
| 6642 | 6763 | else if (!selectKeyList.Contains("spmcDigest", StringComparer.OrdinalIgnoreCase)) |
| ... | ... | @@ -6729,6 +6850,20 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') |
| 6729 | 6850 | } |
| 6730 | 6851 | |
| 6731 | 6852 | var mxLineIndex = 0; |
| 6853 | + var lineWeights = lines.Select(mx => | |
| 6854 | + { | |
| 6855 | + var q = ParseMxSl(mx.Sl); | |
| 6856 | + var je = mx.Je; | |
| 6857 | + if (je > 0) return je; | |
| 6858 | + return q > 0 | |
| 6859 | + ? Math.Round(mx.Dj * q, 2, MidpointRounding.AwayFromZero) | |
| 6860 | + : 0m; | |
| 6861 | + }).ToList(); | |
| 6862 | + var totalLineJe = lineWeights.Sum(); | |
| 6863 | + decimal allocatedSkje = 0m; | |
| 6864 | + decimal allocatedYsje = 0m; | |
| 6865 | + decimal allocatedYdje = 0m; | |
| 6866 | + | |
| 6732 | 6867 | foreach (var mx in lines) |
| 6733 | 6868 | { |
| 6734 | 6869 | var spmc = mx.Spmc ?? ""; |
| ... | ... | @@ -6753,15 +6888,14 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') |
| 6753 | 6888 | row.mxPdSjsl = FormatPdSnapshotExport(pdSnap.pdSjsl); |
| 6754 | 6889 | row.mxPdCy = FormatPdSnapshotExport(pdSnap.pdCy); |
| 6755 | 6890 | |
| 6756 | - // 明细展开:金额类字段按 wt_xsckd_mx 行口径(与详情页「单价/金额」列一致), | |
| 6757 | - // 避免 CloneRow 把整单 skje/ysje/ydje/cbje 重复写到每一行导致 Excel 求和翻倍。 | |
| 6758 | - var lineJe = mx.Je; | |
| 6759 | - var lineYdje = qty > 0 | |
| 6760 | - ? Math.Round(mx.Dj * qty, 2, MidpointRounding.AwayFromZero) | |
| 6761 | - : lineJe; | |
| 6762 | - row.skje = lineJe; | |
| 6763 | - row.ydje = lineYdje; | |
| 6764 | - row.ysje = Math.Round(Math.Max(0m, lineYdje - lineJe), 2, MidpointRounding.AwayFromZero); | |
| 6891 | + // 明细展开:mxDj/mxJe 仍为行商品口径;skje/ysje/ydje 按主表列表展示口径分摊,与列表/收银台一致。 | |
| 6892 | + var lineJe = lineWeights[mxLineIndex]; | |
| 6893 | + var (rowSkje, rowYsje, rowYdje) = AllocateExportMxRowBillAmounts( | |
| 6894 | + bill, lineJe, totalLineJe, mxLineIndex, lines.Count, | |
| 6895 | + ref allocatedSkje, ref allocatedYsje, ref allocatedYdje); | |
| 6896 | + row.skje = rowSkje; | |
| 6897 | + row.ydje = rowYdje; | |
| 6898 | + row.ysje = rowYsje; | |
| 6765 | 6899 | row.cbje = mx.Cbje; |
| 6766 | 6900 | if (mxLineIndex > 0) |
| 6767 | 6901 | row.sjssrje = null; |
| ... | ... | @@ -7134,7 +7268,10 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') |
| 7134 | 7268 | entity.SyPch = string.IsNullOrWhiteSpace(input.sy_pch) ? null : NormalizeSyPch(input.sy_pch); |
| 7135 | 7269 | if (input.skmx != null) |
| 7136 | 7270 | entity.Skmx = input.skmx; |
| 7271 | + else if (string.IsNullOrWhiteSpace(entity.Skmx)) | |
| 7272 | + entity.Skmx = oldHeader.Skmx; | |
| 7137 | 7273 | entity.Ydje = input.ydje ?? entity.Ydje; |
| 7274 | + SyncSkmxAccountFromHeader(entity); | |
| 7138 | 7275 | NormalizeCashierPaymentHeaderAmounts(entity); |
| 7139 | 7276 | Console.WriteLine($"[Update] 会员手机号码: input.hysjh={input.hysjh}, entity.Hysjh={entity.Hysjh}"); |
| 7140 | 7277 | |
| ... | ... | @@ -7160,6 +7297,8 @@ WHERE d.djlx IN ('销售退货单','预售退货单','委托代销退货单') |
| 7160 | 7297 | ValidateDouyinSalesOutboundMxEdit(oldMxList, newMxForValidate); |
| 7161 | 7298 | } |
| 7162 | 7299 | |
| 7300 | + NormalizePurchaseInboundMxJeFromQtyAndPrice(input.djlx ?? oldHeader.Djlx, input.wtXsckdMxList); | |
| 7301 | + | |
| 7163 | 7302 | string? updateOperatorUserId = null; |
| 7164 | 7303 | try |
| 7165 | 7304 | { | ... | ... |