From 7b29823f9e18db8869bdf80b0920251078dc4889 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Fri, 1 Mar 2024 13:58:04 +0700
Subject: [PATCH] fix

---
 src/controllers/OrganizationController.ts |  8 +++----
 src/controllers/PositionController.ts     | 29 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index 881721f8..01591b8b 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -825,7 +825,7 @@ export class OrganizationController extends Controller {
                 orgTreeFax: orgChild1.orgChild1Fax,
                 orgRevisionId: orgRoot.orgRevisionId,
                 orgRootName: orgRoot.orgRootName,
-                labelName: orgChild1.orgChild1Name + " " + orgChild1.orgChild1Code + "00" +" "+ orgChild1.orgChild1ShortName,
+                labelName: orgChild1.orgChild1Name + " " + orgRoot.orgRootCode +orgChild1.orgChild1Code +" "+ orgChild1.orgChild1ShortName,
                 totalPosition: await this.posMasterRepository.count({
                   where: { orgRevisionId: orgRoot.orgRevisionId, orgChild1Id: orgChild1.id },
                 }),
@@ -932,7 +932,7 @@ export class OrganizationController extends Controller {
                       orgTreeFax: orgChild2.orgChild2Fax,
                       orgRevisionId: orgRoot.orgRevisionId,
                       orgRootName: orgRoot.orgRootName,
-                      labelName: orgChild2.orgChild2Name + " " + orgChild2.orgChild2Code + "00" +" "+ orgChild2.orgChild2ShortName,
+                      labelName: orgChild2.orgChild2Name + " " + orgRoot.orgRootCode +orgChild2.orgChild2Code +" "+ orgChild2.orgChild2ShortName,
                       totalPosition: await this.posMasterRepository.count({
                         where: {
                           orgRevisionId: orgRoot.orgRevisionId,
@@ -1042,7 +1042,7 @@ export class OrganizationController extends Controller {
                             orgTreeFax: orgChild3.orgChild3Fax,
                             orgRevisionId: orgRoot.orgRevisionId,
                             orgRootName: orgRoot.orgRootName,
-                            labelName: orgChild3.orgChild3Name + " " + orgChild3.orgChild3Code + "00" +" "+ orgChild3.orgChild3ShortName,
+                            labelName: orgChild3.orgChild3Name + " " +  orgRoot.orgRootCode +orgChild3.orgChild3Code +" "+ orgChild3.orgChild3ShortName,
                             totalPosition: await this.posMasterRepository.count({
                               where: {
                                 orgRevisionId: orgRoot.orgRevisionId,
@@ -1152,7 +1152,7 @@ export class OrganizationController extends Controller {
                                   orgTreeFax: orgChild4.orgChild4Fax,
                                   orgRevisionId: orgRoot.orgRevisionId,
                                   orgRootName: orgRoot.orgRootName,
-                                  labelName: orgChild4.orgChild4Name + " " + orgChild4.orgChild4Code + "00" +" "+ orgChild4.orgChild4ShortName,
+                                  labelName: orgChild4.orgChild4Name + " " +  orgRoot.orgRootCode +orgChild4.orgChild4Code +" "+ orgChild4.orgChild4ShortName,
                                   totalPosition: await this.posMasterRepository.count({
                                     where: {
                                       orgRevisionId: orgRoot.orgRevisionId,
diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index c7d30262..c38b325e 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -1473,6 +1473,12 @@ export class PositionController extends Controller {
           posMaster.orgRootId = org.id;
           posMaster.orgRevisionId = org.orgRevisionId;
         }
+        const lastPosMasterNo = await this.posMasterRepository.find({
+          where:{
+            orgRootId:requestBody.id,
+            orgChild1Id: Not(IsNull())
+          }
+        })
       }
       if (requestBody.type == 1) {
         const org = await this.child1Repository.findOne({
@@ -1483,6 +1489,12 @@ export class PositionController extends Controller {
           posMaster.orgChild1Id = org.id;
           posMaster.orgRevisionId = org.orgRevisionId;
         }
+        const lastPosMasterNo = await this.posMasterRepository.find({
+          where:{
+            orgChild1Id:requestBody.id,
+            orgChild2Id: Not(IsNull())
+          }
+        })
       }
       if (requestBody.type == 2) {
         const org = await this.child2Repository.findOne({
@@ -1494,6 +1506,12 @@ export class PositionController extends Controller {
           posMaster.orgChild2Id = org.id;
           posMaster.orgRevisionId = org.orgRevisionId;
         }
+        const lastPosMasterNo = await this.posMasterRepository.find({
+          where:{
+            orgChild2Id:requestBody.id,
+            orgChild3Id: Not(IsNull())
+          }
+        })
       }
       if (requestBody.type == 3) {
         const org = await this.child3Repository.findOne({
@@ -1507,6 +1525,12 @@ export class PositionController extends Controller {
           posMaster.orgRevisionId = org.orgRevisionId;
         }
       }
+      const lastPosMasterNo = await this.posMasterRepository.find({
+        where:{
+          orgChild3Id:requestBody.id,
+          orgChild4Id: Not(IsNull())
+        }
+      })
       if (requestBody.type == 4) {
         const org = await this.child4Repository.findOne({
           where: { id: requestBody.id },
@@ -1519,6 +1543,11 @@ export class PositionController extends Controller {
           posMaster.orgChild4Id = org.id;
           posMaster.orgRevisionId = org.orgRevisionId;
         }
+        const lastPosMasterNo = await this.posMasterRepository.find({
+          where:{
+            orgChild4Id:requestBody.id
+          }
+        })
       }  
       const allPosMasterNo = posMasters.map(posMaster => posMaster.posMasterNo);
       const maxPosMasterNo = Math.max(...allPosMasterNo);