Merge branch 'develop' into adiDev
This commit is contained in:
commit
299df901a1
6 changed files with 50 additions and 268 deletions
|
|
@ -3452,8 +3452,8 @@ export class CommandController extends Controller {
|
|||
isGovernment: item.isGovernment,
|
||||
commandNo: item.commandNo,
|
||||
commandYear: item.commandYear,
|
||||
posNo: shortName,
|
||||
posNoAbb: posNo,
|
||||
posNo: posNo,
|
||||
posNoAbb: shortName,
|
||||
commandDateAffect: item.commandDateAffect,
|
||||
commandDateSign: item.commandDateSign,
|
||||
commandCode: item.commandCode,
|
||||
|
|
@ -3640,8 +3640,8 @@ export class CommandController extends Controller {
|
|||
isGovernment: item.isGovernment,
|
||||
commandNo: item.commandNo,
|
||||
commandYear: item.commandYear,
|
||||
posNo: shortName,
|
||||
posNoAbb: posNo,
|
||||
posNo: posNo,
|
||||
posNoAbb: shortName,
|
||||
commandDateAffect: item.commandDateAffect,
|
||||
commandDateSign: item.commandDateSign,
|
||||
commandCode: item.commandCode,
|
||||
|
|
@ -3869,8 +3869,8 @@ export class CommandController extends Controller {
|
|||
isGovernment: item.isGovernment,
|
||||
commandNo: item.commandNo,
|
||||
commandYear: item.commandYear,
|
||||
posNo: shortName,
|
||||
posNoAbb: posNo,
|
||||
posNo: posNo,
|
||||
posNoAbb: shortName,
|
||||
commandDateAffect: item.commandDateAffect,
|
||||
commandDateSign: item.commandDateSign,
|
||||
commandCode: item.commandCode,
|
||||
|
|
@ -4093,8 +4093,8 @@ export class CommandController extends Controller {
|
|||
lastUpdatedAt: new Date(),
|
||||
commandNo: item.commandNo,
|
||||
commandYear: item.commandYear,
|
||||
posNo: shortName,
|
||||
posNoAbb: posNo,
|
||||
posNo: posNo,
|
||||
posNoAbb: shortName,
|
||||
commandDateAffect: item.commandDateAffect,
|
||||
commandDateSign: item.commandDateSign,
|
||||
commandCode: item.commandCode,
|
||||
|
|
@ -4268,8 +4268,8 @@ export class CommandController extends Controller {
|
|||
isGovernment: item.isGovernment,
|
||||
commandNo: item.commandNo,
|
||||
commandYear: item.commandYear,
|
||||
posNo: shortName,
|
||||
posNoAbb: posNo,
|
||||
posNo: posNo,
|
||||
posNoAbb: shortName,
|
||||
commandDateAffect: item.commandDateAffect,
|
||||
commandDateSign: item.commandDateSign,
|
||||
commandCode: item.commandCode,
|
||||
|
|
@ -4796,8 +4796,8 @@ export class CommandController extends Controller {
|
|||
lastUpdatedAt: new Date(),
|
||||
commandNo: item.commandNo,
|
||||
commandYear: item.commandYear,
|
||||
posNo: orgShortName,
|
||||
posNoAbb: profile.posMasterNoTemp ?? "",
|
||||
posNo: profile.posMasterNoTemp ?? "",
|
||||
posNoAbb: orgShortName,
|
||||
commandDateAffect: item.commandDateAffect,
|
||||
commandDateSign: item.commandDateSign,
|
||||
commandCode: item.commandCode,
|
||||
|
|
@ -5050,8 +5050,8 @@ export class CommandController extends Controller {
|
|||
lastUpdatedAt: new Date(),
|
||||
commandNo: body.refIds[0].commandNo,
|
||||
commandYear: body.refIds[0].commandYear,
|
||||
posNo: shortName,
|
||||
posNoAbb: item.posMaster.posMasterNo,
|
||||
posNo: item.posMaster.posMasterNo,
|
||||
posNoAbb: shortName,
|
||||
commandDateAffect: body.refIds[0].commandDateAffect,
|
||||
commandDateSign: body.refIds[0].commandDateSign,
|
||||
commandCode: body.refIds[0].commandCode,
|
||||
|
|
@ -5295,8 +5295,8 @@ export class CommandController extends Controller {
|
|||
lastUpdatedAt: new Date(),
|
||||
commandNo: item.commandNo,
|
||||
commandYear: item.commandYear,
|
||||
posNo: shortName,
|
||||
posNoAbb: posMaster.posMasterNo,
|
||||
posNo: posMaster.posMasterNo,
|
||||
posNoAbb: shortName,
|
||||
commandDateAffect: item.commandDateAffect,
|
||||
commandDateSign: item.commandDateSign,
|
||||
commandCode: item.commandCode,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue