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,