251212:1650 Frontend: refactor Document Numbering)

backend/src/modules/correspondence/correspondence.service.ts

@@ -121,12 +121,18 @@ export class CorrespondenceService {
     try {
       const orgCode = 'ORG'; // TODO: Fetch real ORG Code from Organization Entity
 
+      // Extract recipient organization from details
+      const recipientOrganizationId = createDto.details?.to_organization_id as
+        | number
+        | undefined;
+
       const docNumber = await this.numberingService.generateNextNumber({
         projectId: createDto.projectId,
         originatorId: userOrgId,
         typeId: createDto.typeId,
         disciplineId: createDto.disciplineId,
         subTypeId: createDto.subTypeId,
+        recipientOrganizationId, // [v1.5.1] Pass recipient for document number format
         year: new Date().getFullYear(),
         customTokens: {
           TYPE_CODE: type.typeCode,

backend/src/modules/document-numbering/document-numbering.service.ts

@@ -298,7 +298,7 @@ export class DocumentNumberingService implements OnModuleInit, OnModuleDestroy {
       where: { projectId, correspondenceTypeId: typeId },
     });
     // Default Fallback Format (ตาม Req 2.1)
-    return format ? format.formatTemplate : '{ORG}-{ORG}-{SEQ:4}-{YEAR}';
+    return format ? format.formatTemplate : '{ORG}-{RECIPIENT}-{SEQ:4}-{YEAR}';
   }
 
   /**