release: develop → main 2026-10-28 (backend image v2026-10-28, V200)

backend/src/main/java/th/co/glr/hr/dealquotation/DealQuotationRenderAdapter.java

@@ -32,6 +32,16 @@ private DealQuotationRenderAdapter() {}
 
     private static final ZoneId BANGKOK = ZoneId.of("Asia/Bangkok");
 
+    /** The deposit percent the PDF prints when a quotation's {@code deposit_percent} is NULL. The
+     * deposit notice bills the same default (owner ruling 2026-10-22), so the customer is billed
+     * what the accepted PDF promised. */
+    public static final int DEFAULT_DEPOSIT_PERCENT = 30;
+
+    /** The percent a new-engine quotation bills and prints: a blank one means {@link #DEFAULT_DEPOSIT_PERCENT}. */
+    public static int effectiveDepositPercent(Integer stored) {
+        return stored != null ? stored : DEFAULT_DEPOSIT_PERCENT;
+    }
+
     /** Overload for callers with no configured bank block — the English document then prints the
      * proforma-invoice line instead. Kept so tests and any hand-wired caller need not thread a
      * config value they do not care about. */
@@ -635,7 +645,7 @@ private static String noReturnLine(int number) {
       * lead time (dropped entirely, not blanked, when nothing on the document carries one — same
       * {@link #dropLeadTimeLineAndRenumber} the tile set uses), and the no-exchange-or-return rule. */
     private static List<String> nonTileRemarkLines(DealQuotationDto quotation) {
-        int depositPct = quotation.depositPercent() != null ? quotation.depositPercent() : 30;
+        int depositPct = quotation.depositPercent() != null ? quotation.depositPercent() : DEFAULT_DEPOSIT_PERCENT;
         String remainderText = "CREDIT".equals(quotation.remainderMode())
             ? "เครดิต " + (quotation.creditDays() != null ? quotation.creditDays() : 0) + " วัน"
             : "ขอรับก่อนส่งมอบสินค้าหรือเมื่อส่งมอบสินค้า";
@@ -652,7 +662,7 @@ private static List<String> nonTileRemarkLines(DealQuotationDto quotation) {
 
     private static List<String> remarkLines(DealQuotationDto quotation) {
         LocalDate offerDate = quotation.offerDate() != null ? quotation.offerDate() : LocalDate.now(BANGKOK);
-        int depositPct = quotation.depositPercent() != null ? quotation.depositPercent() : 30;
+        int depositPct = quotation.depositPercent() != null ? quotation.depositPercent() : DEFAULT_DEPOSIT_PERCENT;
         String remainderText = "CREDIT".equals(quotation.remainderMode())
             ? "เครดิต " + (quotation.creditDays() != null ? quotation.creditDays() : 0) + " วัน"
             : "ขอรับก่อนส่งมอบสินค้าหรือเมื่อส่งมอบสินค้า";
@@ -902,7 +912,7 @@ private static String fullPaymentTermEnglishText(String code) {
 
     private static List<String> englishRemarkLines(DealQuotationDto quotation, List<String> bankBlockLines) {
         LocalDate offerDate = quotation.offerDate() != null ? quotation.offerDate() : LocalDate.now(BANGKOK);
-        int depositPct = quotation.depositPercent() != null ? quotation.depositPercent() : 30;
+        int depositPct = quotation.depositPercent() != null ? quotation.depositPercent() : DEFAULT_DEPOSIT_PERCENT;
         // Wording-scan fix 7 (2026-09-17): singular "day credit" at exactly 1 day.
         String remainderText;
         if ("CREDIT".equals(quotation.remainderMode())) {
@@ -1029,7 +1039,7 @@ private static String englishNonTileLeadTimeLine(List<DealQuotationItemDto> item
 
     /** The English twin of {@link #nonTileRemarkLines}. */
     private static List<String> englishNonTileRemarkLines(DealQuotationDto quotation, List<String> bankBlockLines) {
-        int depositPct = quotation.depositPercent() != null ? quotation.depositPercent() : 30;
+        int depositPct = quotation.depositPercent() != null ? quotation.depositPercent() : DEFAULT_DEPOSIT_PERCENT;
         // Wording-scan fix 7 (2026-09-17): singular "day credit" at exactly 1 day.
         String remainderText;
         if ("CREDIT".equals(quotation.remainderMode())) {

backend/src/main/java/th/co/glr/hr/dealquotation/DealQuotationService.java

@@ -1711,6 +1711,16 @@ public DealQuotationDto approve(long id, ApproveRequest request, UserPrincipal a
             quotations.supersede(ancestorId);
             ancestorId = ancestor.parentQuotationId();
         }
+        // #1173 review F1: on a confirmed deal the system-owned deposit policy follows the newly
+        // approved quotation, so a revision that adds or drops the deposit moves the deal with it.
+        // A no-op before confirmation (confirmOrderFromDirectQuotation applies the confirmed
+        // quotation's percent then). Null-tolerant for hand-wired tests, like
+        // #advanceDealToRecipientStage. PRICING_REQUEST origin never reaches this: R8 allows one
+        // accepted quotation per deal, and its percent is applied at OrderConfirmationService#confirmOrder.
+        if (ticketService != null) {
+            ticketService.followQuotationDepositPolicy(approved.ticketId(), approved.number(),
+                DealQuotationRenderAdapter.effectiveDepositPercent(approved.depositPercent()), actor);
+        }
         tickets.addEventWithDocument(approved.ticketId(), actor.id(), actor.name(), TicketEventKind.QUOTATION_ISSUED,
             null, null, "อนุมัติใบเสนอราคา " + approved.number(), RelatedDocumentType.QUOTATION, id);
         String message = "ใบเสนอราคา " + approved.number() + " ได้รับอนุมัติแล้ว";
@@ -2107,9 +2117,10 @@ private String outcomeLabel(String outcome) {
      *   <li>{@code sales.ticket_item} replaced by the quotation's own goods lines (see
      *       {@link #ticketItemsFromQuotation}) — the delivery machinery's quantity source; the
      *       quotation is the agreed order, so it replaces any preliminary lines the deal carried;</li>
-     *   <li>{@code TicketService#confirmCustomerForPromotedQuotation} — the unmodified
-     *       confirmCustomer body: {@code payment_status = CUSTOMER_CONFIRMED}, stage auto-advanced to
-     *       {@code ORDER_RECEIVED}.</li>
+     *   <li>{@code TicketService#confirmCustomerForPromotedQuotation} — confirmCustomer's shared
+     *       body: {@code payment_status = CUSTOMER_CONFIRMED}, the deposit policy following this
+     *       quotation's percent ({@code TicketService#followQuotationDepositPolicy}), stage
+     *       auto-advanced to {@code ORDER_RECEIVED}.</li>
      * </ol>
      *
      * <p><strong>Order of checks</strong>: quotation exists on this engine (404 — a LEGACY
@@ -2178,7 +2189,8 @@ public PromoteToDealResultDto confirmOrderFromDirectQuotation(long quotationId,
         // or stock reservation exists — both key on quotation_issued or later), and the only other
         // reference to a ticket_item, pricing_request_item.source_ticket_item_id, is ON DELETE SET NULL.
         tickets.replaceItems(ticketId, ticketItemsFromQuotation(fresh));
-        ticketService.confirmCustomerForPromotedQuotation(ticketId, actor);
+        ticketService.confirmCustomerForPromotedQuotation(ticketId, fresh.number(),
+            DealQuotationRenderAdapter.effectiveDepositPercent(fresh.depositPercent()), actor);
         return promotionResult(ticketId, quotationId);
     }
 
@@ -2193,7 +2205,7 @@ private PromoteToDealResultDto promotionResult(long ticketId, long quotationId)
      * qty_sqm, unit_basis, raw_unit. NO pricing field is copied (proposed/approved/raw price stay
      * null) — those columns carry the legacy ticket-native approval history, and a direct
      * quotation's typed price was never "approved" on this ticket in that sense; money documents
-     * read the quotation itself ({@code DepositNoticeRepository#findDealQuotationItemsForDeposit}).
+     * read the quotation itself ({@code DepositNoticeRepository#findDealQuotationItems}).
      *
      * <p>Only goods lines: an {@code ADJUSTMENT} row (a negative discount/surcharge line, quantity −1)
      * is money, not something to deliver, and a non-positive quantity would violate

backend/src/main/java/th/co/glr/hr/deposit/DepositNoticeController.java

@@ -98,9 +98,11 @@ ResponseEntity<byte[]> preview(@PathVariable long docId, HttpSession session) {
 
     // Issue (assign doc number + transition ticket)
     @PostMapping("/deposit-notices/{docId}/issue")
-    Map<String, DepositNoticeDto> issue(@PathVariable long docId, HttpSession session) {
+    Map<String, DepositNoticeDto> issue(@PathVariable long docId,
+                                        @RequestBody(required = false) DepositNoticeIssueRequest body,
+                                        HttpSession session) {
         UserPrincipal user = sessions.requireUser(session);
-        return Map.of("depositNotice", service.issue(docId, user));
+        return Map.of("depositNotice", service.issue(docId, body == null ? null : body.expectedUpdatedAt(), user));
     }
 
     // File download

backend/src/main/java/th/co/glr/hr/deposit/DepositNoticeDraftRequest.java

@@ -5,6 +5,7 @@
 import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.Size;
 import java.math.BigDecimal;
+import java.time.OffsetDateTime;
 import java.util.List;
 
 public record DepositNoticeDraftRequest(
@@ -13,7 +14,17 @@ public record DepositNoticeDraftRequest(
     @Size(max = 255) String customerAddress,
     @Size(max = 255) String projectName,
     @Size(max = 255) String reference,
-    @DecimalMin("0") @DecimalMax("1") BigDecimal depositPercent,
+    @DecimalMin(value = "0", inclusive = false, message = "เปอร์เซ็นต์มัดจำต้องมากกว่า 0")
+    @DecimalMax(value = "1", message = "เปอร์เซ็นต์มัดจำต้องไม่เกิน 100") BigDecimal depositPercent,
     List<String> notes,
-    @Valid List<DepositNoticeItemRequest> items
-) {}
+    @Valid List<DepositNoticeItemRequest> items,
+    // The draft's updatedAt as this client last read it. null skips the stale-save check (older clients).
+    OffsetDateTime expectedUpdatedAt
+) {
+    /** Without a stamp: creation and the server-side callers. */
+    public DepositNoticeDraftRequest(String customerName, String customerTaxId, String customerAddress,
+                                     String projectName, String reference, BigDecimal depositPercent,
+                                     List<String> notes, List<DepositNoticeItemRequest> items) {
+        this(customerName, customerTaxId, customerAddress, projectName, reference, depositPercent, notes, items, null);
+    }
+}

backend/src/main/java/th/co/glr/hr/deposit/DepositNoticeIssueRequest.java

@@ -0,0 +1,6 @@
+package th.co.glr.hr.deposit;
+
+import java.time.OffsetDateTime;
+
+/** Optional body of the issue call: the draft's updatedAt as the caller last read it (null skips the check). */
+public record DepositNoticeIssueRequest(OffsetDateTime expectedUpdatedAt) {}