From 968d5a2be4534519d0049750885dcca586166183 Mon Sep 17 00:00:00 2001
From: mamoss <>
Date: Sat, 29 Mar 2025 18:12:03 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=B5=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/CommandController.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 74e4c106..a10c93ce 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -3390,7 +3390,7 @@ export class CommandController extends Controller {
           }
           profile.isLeave = item.isLeave;
           profile.leaveCommandId = item.commandId ?? _null;
-          profile.leaveCommandNo = item.commandNo ?? _null;
+          profile.leaveCommandNo = `${item.commandNo}/${item.commandYear}`;
           profile.leaveRemark = clearProfile.leaveRemark ?? _null;
           profile.leaveDate = item.commandDateAffect ?? _null;
           profile.leaveType = clearProfile.LeaveType ?? _null;
@@ -3734,7 +3734,7 @@ export class CommandController extends Controller {
           const metaDis = {
             date: item.commandDateAffect,
             refCommandDate: item.commandDateSign,
-            refCommandNo: item.commandNo,
+            refCommandNo: `${item.commandNo}/${item.commandYear}`,
             createdUserId: req.user.sub,
             createdFullName: req.user.name,
             lastUpdateUserId: req.user.sub,
@@ -4168,7 +4168,7 @@ export class CommandController extends Controller {
           ...metaDis,
           date: item.commandDateAffect,
           refCommandDate: item.commandDateSign,
-          refCommandNo: item.commandNo,
+          refCommandNo: `${item.commandNo}/${item.commandYear}`,
           profileEmployeeId: item.profileId,
           profileId: undefined,
         });
@@ -5317,9 +5317,9 @@ export class CommandController extends Controller {
             createdAt: new Date(),
             lastUpdatedAt: new Date(),
             commandNo: body.refIds[0].commandNo,
-            refCommandNo: body.refIds[0].commandNo,
+            refCommandNo: `${body.refIds[0].commandNo}/${body.refIds[0].commandYear}`,
             commandYear: body.refIds[0].commandYear,
-            posNo: item.posMaster.posMasterNo,
+            posNo: `${shortName}${item.posMaster.posMasterNo}`,
             posNoAbb: shortName,
             commandDateAffect: body.refIds[0].commandDateAffect,
             commandDateSign: body.refIds[0].commandDateSign,