Draft
Conversation
1. 添加平账相关字段：客户平账、供应商平账（日/月/年） 2. 添加平账行显示：客户平账、供应商平账、平账金额（客户平账-供应商平账） 3. 修改合计计算公式：本日应当利润 = 利润 + 实收返利 - 平账 4. 修改已入账部分描述为'加：实收返利金额' 5. 添加平账行样式（蓝色背景） Co-authored-by: ming10655 <ming10655@gmail.com>
|
Cursor Agent can help with this pull request. Just |
This reverts commit b5ab14f.
根据 OrderSystemDataMultiDimensionVo 类重构前端组件：
1. 更新 data 字段，与后端 VO 完全对应：
- 保留：玻璃收入/成本、应付运费、票点收入/成本、管理费用
- 新增：实收返利(systemActualReceivedRebate)、新增入库(systemNewInventory)、
平账(systemBalanceAccounts)、利润(systemProfit)、合计(systemTotal)
- 删除：未入账部分相关字段
2. 简化表格结构：
- 订单系统利润（黄色）：6个明细行 + 利润小计
- 实收返利金额（绿色）
- 当日新增入库（蓝色）
- 平账（紫色）
- 合计（橙色）：利润 + 实收返利 - 平账
3. 移除前端计算逻辑，使用后端返回的计算结果
Co-authored-by: ming10655 <ming10655@gmail.com>
按照要求调整字段顺序： 1. 加：当日新增入库 2. 加：订单系统玻璃收入 3. 减：订单系统玻璃成本 4. 减：订单系统应付运费 5. 加：订单系统票点收入 6. 减：订单系统票点成本 7. 减：订单系统管理费用 8. 订单系统利润 9. 实收返利金额 10. 平账 11. 合计 Co-authored-by: ming10655 <ming10655@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add "平账" (balance adjustment) to the Daily Profit Statistics table and update the "本日应当利润" calculation.
This PR introduces a "平账" (balance adjustment) row, calculated as customer balance minus supplier balance, into the daily profit statistics. The "本日应当利润" (daily expected profit) formula is updated to
利润 + 实收返利 - 平账to reflect this new business requirement. Backend changes are required to providesystemCustomerBalanceDay/Month/YearandsystemSupplierBalanceDay/Month/Yearfields.