diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index 565d9c59..18e2a959 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -2083,7 +2083,9 @@ public partial class CommonServices : BaseServices>, ICommon AND B.RoleNo = 'F_TrainPlanTransferToConfirmed'"; toolbarRoles = DbAccess.QueryList(sql); if (toolbarRoles != null && toolbarRoles.Any()) - result.JM_PageControlT1.Toolbar.Add(new Toolbar() + { + index = result.JM_PageControlT1.Toolbar.FindIndex(x => x.fnKey == "NewYN"); + result.JM_PageControlT1.Toolbar.Insert(index + 1, new Toolbar() { display = true, fnKey = "TBD5YN", @@ -2092,6 +2094,7 @@ public partial class CommonServices : BaseServices>, ICommon icon = "ghr-icon-user-wait", position = "left" }); + } break; case "F_TrainPlan_WaitConfirm": result.JM_PageControlT1.Toolbar.Insert(0, new Toolbar()