fix(inward): add Service Charge column to Itemized Service Summary (OPD + Inward)

[buddhika75]

Summary

Fixes the two bugs reported in #22050 on the Itemized Service Summary - OPD and Inward report (/inward/inward_itemized_service_summary_dto.xhtml):

1. Service Charge column was missing — added it (the inward margin, BillItem.marginValue) between Gross Amount and Discount, with a footer grand total. The Excel export includes it automatically via the existing p:dataExporter target="tbl".
2. Cancelled bills added to the report instead of deducting — root cause was double negation (inward cancellation BillItems already store negative values and the old aggregated query negated them again). This was fixed by the merged PR Show per-billing rows with billed date in Itemized Service Summary (#21920) #22051, which this branch builds on; verified end-to-end here.

Closes #22050

What changed

• OpdSaleSummaryDTO: new serviceCharge field + one new delegating constructor (existing constructors untouched, per DTO guidelines)
• BillService.fetchItemizedServiceInstanceDTOs: selects bi.marginValue (stored sign used as-is — BillItem.invertValue inverts marginValue on cancellation, so cancellations deduct)
• SearchController: getOpdSaleSummaryServiceChargeTotal() mirroring the existing footer-total getters
• Report page: new Service Charge column with footer total

No schema change (no new persisted fields), so no DDL regeneration needed.

Verification (local Payara + browser E2E + DB cross-check)

Exercised on the local coop DB, Inward department:

1. Added Inward ETU ECG to BHT/56744 → bill Inward//26/000466 (gross 400.00, service charge 56.00, net 456.00)
2. Report showed the row with Service Charge 56.00
3. Cancelled the bill (Inward/INWCAN/36) → report shows a separate negative row (Count −1, Gross −400.00, Service Charge −56.00, Net −456.00) and all grand totals net to 0.00

DB cross-check — report rows match BILLITEM exactly:

DEPTID              BILLTYPEATOMIC                    GROSS  MARGIN  NET
Inward//26/000466   INWARD_SERVICE_BILL                 400      56   456
Inward/INWCAN/36    INWARD_SERVICE_BILL_CANCELLATION   -400     -56  -456

🤖 Generated with Claude Code

Summary by CodeRabbit

• New Features
  • Added a Service Charge column to itemized service summaries.
  • Service charges are displayed per row and totaled in the table footer.
  • Service charge handling is now consistent across regular sales and refund/cancellation rows.
• Bug Fixes
  • Corrected the itemized query-to-DTO mapping so service charge values use the stored sign consistently.

[chatgpt-codex-connector]

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 23e72e47-9f82-4c7a-aa82-fb3a8efb25bf

📥 Commits

Reviewing files that changed from the base of the PR and between 39e2166 and 4a34b9b.

📒 Files selected for processing (1)

• src/main/java/com/divudi/core/data/dto/OpdSaleSummaryDTO.java

🚧 Files skipped from review as they are similar to previous changes (1)

• src/main/java/com/divudi/core/data/dto/OpdSaleSummaryDTO.java

---

Walkthrough

The itemized service summary now includes service charge in its DTO and billing projection, calculates a total in SearchController, and displays per-row and footer values in the XHTML report.

Changes

Service charge reporting

Layer / File(s)	Summary
Service charge DTO and query projection src/main/java/com/divudi/core/data/dto/OpdSaleSummaryDTO.java, src/main/java/com/divudi/service/BillService.java	The DTO exposes serviceCharge, and the JPQL constructor projection supplies bi.marginValue in the matching position.
Service charge aggregation and report column src/main/java/com/divudi/bean/common/SearchController.java, src/main/webapp/inward/inward_itemized_service_summary_dto.xhtml	The controller sums non-null service charges, while the report renders row values and the formatted footer total.

Estimated code review effort: 2 (Simple) | ~10 minutes

Sequence Diagram(s)

sequenceDiagram
  participant BillService
  participant OpdSaleSummaryDTO
  participant SearchController
  participant ItemizedServiceSummary
  BillService->>OpdSaleSummaryDTO: Populate serviceCharge from bi.marginValue
  OpdSaleSummaryDTO->>SearchController: Provide service charge values
  SearchController->>SearchController: Calculate aggregate total
  SearchController->>ItemizedServiceSummary: Render row values and footer total

Loading

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly matches the main change: adding a Service Charge column for the OPD/Inward itemized service summary.
Linked Issues check	✅ Passed	The PR adds the Service Charge field and report column, and negative cancellation values now flow through totals as expected for #22050.
Out of Scope Changes check	✅ Passed	The changes stay focused on the report column, DTO plumbing, and totals needed for the linked issue.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch 22050-itemized-service-summary-fixes

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[coderabbitai]

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/main/java/com/divudi/core/data/dto/OpdSaleSummaryDTO.java`:
- Around line 32-34: Update OpdSaleSummaryDTO’s serviceCharge field to
initialize to 0.0, and null-coalesce the bi.marginValue assignment in the
per-instance constructor so null margins become 0.0. Preserve the documented
zero value for OPD rows and ensure all constructor paths produce a non-null
serviceCharge.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 9d331b82-0c33-4c3d-9d5b-64e4e9d35b8a

📥 Commits

Reviewing files that changed from the base of the PR and between 14d6546 and 39e2166.

📒 Files selected for processing (4)

• src/main/java/com/divudi/bean/common/SearchController.java
• src/main/java/com/divudi/core/data/dto/OpdSaleSummaryDTO.java
• src/main/java/com/divudi/service/BillService.java
• src/main/webapp/inward/inward_itemized_service_summary_dto.xhtml