Made Changes to align with new shift designations
This commit is contained in:
committed by
Ouellette Jonathan (CSC FI SPS MESLEO)
parent
9119e91998
commit
531504c6b0
15208
LSL2/OIWIN/NCR.json
15208
LSL2/OIWIN/NCR.json
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -9,7 +9,7 @@
|
|||||||
"<2>": "-2",
|
"<2>": "-2",
|
||||||
"<3>": "-1",
|
"<3>": "-1",
|
||||||
"<4>": "-1",
|
"<4>": "-1",
|
||||||
"<5>": "16777215",
|
"<5>": "-2",
|
||||||
"<6>": {
|
"<6>": {
|
||||||
"<6,1>": {
|
"<6,1>": {
|
||||||
"<6,1,1>": "MS Sans Serif",
|
"<6,1,1>": "MS Sans Serif",
|
||||||
@ -31,20 +31,20 @@
|
|||||||
"<7>": "",
|
"<7>": "",
|
||||||
"<8>": {
|
"<8>": {
|
||||||
"<8,1>": {
|
"<8,1>": {
|
||||||
"<8,1,1>": "1",
|
"<8,1,1>": "A",
|
||||||
"<8,1,2>": "Team One"
|
"<8,1,2>": "Team A"
|
||||||
},
|
},
|
||||||
"<8,2>": {
|
"<8,2>": {
|
||||||
"<8,2,1>": "2",
|
"<8,2,1>": "B",
|
||||||
"<8,2,2>": "Team Two"
|
"<8,2,2>": "Team B"
|
||||||
},
|
},
|
||||||
"<8,3>": {
|
"<8,3>": {
|
||||||
"<8,3,1>": "3",
|
"<8,3,1>": "C",
|
||||||
"<8,3,2>": "Team Three"
|
"<8,3,2>": "Team C"
|
||||||
},
|
},
|
||||||
"<8,4>": {
|
"<8,4>": {
|
||||||
"<8,4,1>": "4",
|
"<8,4,1>": "D",
|
||||||
"<8,4,2>": "Team Four"
|
"<8,4,2>": "Team D"
|
||||||
},
|
},
|
||||||
"<8,5>": {
|
"<8,5>": {
|
||||||
"<8,5,1>": "5",
|
"<8,5,1>": "5",
|
||||||
@ -67,14 +67,6 @@
|
|||||||
"<9,2,4>": "C",
|
"<9,2,4>": "C",
|
||||||
"<9,2,5>": "",
|
"<9,2,5>": "",
|
||||||
"<9,2,6>": "Description"
|
"<9,2,6>": "Description"
|
||||||
},
|
|
||||||
"<9,3>": {
|
|
||||||
"<9,3,1>": "",
|
|
||||||
"<9,3,2>": "",
|
|
||||||
"<9,3,3>": "",
|
|
||||||
"<9,3,4>": "",
|
|
||||||
"<9,3,5>": "",
|
|
||||||
"<9,3,6>": ""
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"<10>": "L",
|
"<10>": "L",
|
||||||
@ -102,7 +94,17 @@
|
|||||||
"<32>": "0",
|
"<32>": "0",
|
||||||
"<33>": "1",
|
"<33>": "1",
|
||||||
"<34>": "16777215",
|
"<34>": "16777215",
|
||||||
"<35>": "16777215"
|
"<35>": "16777215",
|
||||||
|
"<36>": "",
|
||||||
|
"<37>": "",
|
||||||
|
"<38>": "",
|
||||||
|
"<39>": "",
|
||||||
|
"<40>": "-2",
|
||||||
|
"<41>": "1000",
|
||||||
|
"<42>": "",
|
||||||
|
"<43>": "",
|
||||||
|
"<44>": "",
|
||||||
|
"<45>": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -239,10 +239,10 @@ Ctrls := @WINDOW:'.STAGE_PRE':@RM ; Props := 'DEFPROP':@RM
|
|||||||
Ctrls := @WINDOW:'.STAGE_POST':@RM ; Props := 'DEFPROP':@RM
|
Ctrls := @WINDOW:'.STAGE_POST':@RM ; Props := 'DEFPROP':@RM
|
||||||
Ctrls := @WINDOW:'.BY_MANUFACTURING':@RM ; Props := 'DEFPROP':@RM
|
Ctrls := @WINDOW:'.BY_MANUFACTURING':@RM ; Props := 'DEFPROP':@RM
|
||||||
Ctrls := @WINDOW:'.BY_CUSTOMER':@RM ; Props := 'DEFPROP':@RM
|
Ctrls := @WINDOW:'.BY_CUSTOMER':@RM ; Props := 'DEFPROP':@RM
|
||||||
Ctrls := @WINDOW:'.TEAM1':@RM ; Props := 'DEFPROP':@RM
|
Ctrls := @WINDOW:'.CHK_TEAM_A':@RM ; Props := 'DEFPROP':@RM
|
||||||
Ctrls := @WINDOW:'.TEAM2':@RM ; Props := 'DEFPROP':@RM
|
Ctrls := @WINDOW:'.CHK_TEAM_B':@RM ; Props := 'DEFPROP':@RM
|
||||||
Ctrls := @WINDOW:'.TEAM3':@RM ; Props := 'DEFPROP':@RM
|
Ctrls := @WINDOW:'.CHK_TEAM_C':@RM ; Props := 'DEFPROP':@RM
|
||||||
Ctrls := @WINDOW:'.TEAM4':@RM ; Props := 'DEFPROP':@RM
|
Ctrls := @WINDOW:'.CHK_TEAM_D':@RM ; Props := 'DEFPROP':@RM
|
||||||
Ctrls := @WINDOW:'.REACTOR':@RM ; Props := 'DEFPROP':@RM
|
Ctrls := @WINDOW:'.REACTOR':@RM ; Props := 'DEFPROP':@RM
|
||||||
Ctrls := @WINDOW:'.CUST_NO':@RM ; Props := 'DEFPROP':@RM
|
Ctrls := @WINDOW:'.CUST_NO':@RM ; Props := 'DEFPROP':@RM
|
||||||
Ctrls := @WINDOW:'.PROD_SPEC_NO':@RM ; Props := 'DEFPROP':@RM
|
Ctrls := @WINDOW:'.PROD_SPEC_NO':@RM ; Props := 'DEFPROP':@RM
|
||||||
@ -260,10 +260,10 @@ StagePre = Props[COL2()+1,@RM]
|
|||||||
StagePost = Props[COL2()+1,@RM]
|
StagePost = Props[COL2()+1,@RM]
|
||||||
ByManufacturing = Props[COL2()+1,@RM]
|
ByManufacturing = Props[COL2()+1,@RM]
|
||||||
ByCustomer = Props[COL2()+1,@RM]
|
ByCustomer = Props[COL2()+1,@RM]
|
||||||
Team1 = Props[COL2()+1,@RM]
|
TeamA = Props[COL2()+1,@RM]
|
||||||
Team2 = Props[COL2()+1,@RM]
|
TeamB = Props[COL2()+1,@RM]
|
||||||
Team3 = Props[COL2()+1,@RM]
|
TeamC = Props[COL2()+1,@RM]
|
||||||
Team4 = Props[COL2()+1,@RM]
|
TeamD = Props[COL2()+1,@RM]
|
||||||
Reactor = Props[COL2()+1,@RM]
|
Reactor = Props[COL2()+1,@RM]
|
||||||
CustNo = Props[COL2()+1,@RM]
|
CustNo = Props[COL2()+1,@RM]
|
||||||
PsnNo = Props[COL2()+1,@RM]
|
PsnNo = Props[COL2()+1,@RM]
|
||||||
@ -312,10 +312,10 @@ IF CausedBy THEN SearchStr<-1> = 'LOSS_BY':@VM:CausedBy
|
|||||||
|
|
||||||
Shifts = '' ;* * * * * * Teams (Shift)
|
Shifts = '' ;* * * * * * Teams (Shift)
|
||||||
|
|
||||||
IF Team1 THEN Shifts<1,-1> = '1'
|
IF TeamA THEN Shifts<1,-1> = 'A'
|
||||||
IF Team2 THEN Shifts<1,-1> = '2'
|
IF TeamB THEN Shifts<1,-1> = 'B'
|
||||||
IF Team3 THEN Shifts<1,-1> = '3'
|
IF TeamC THEN Shifts<1,-1> = 'C'
|
||||||
IF Team4 THEN Shifts<1,-1> = '4'
|
IF TeamD THEN Shifts<1,-1> = 'D'
|
||||||
|
|
||||||
IF Shifts NE '' THEN SearchStr<-1> = 'SHIFT':@VM:Shifts
|
IF Shifts NE '' THEN SearchStr<-1> = 'SHIFT':@VM:Shifts
|
||||||
|
|
||||||
@ -371,3 +371,4 @@ RETURN
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ DataFields = "ENTRY_ID" :@VM:SQL_Format(Rec(NCR_ENTRY_ID$), "S
|
|||||||
DataFields := "ENTRY_DATE" :@VM:SQL_Format(Rec(NCR_ENTRY_DATE$), "DATE"):@FM
|
DataFields := "ENTRY_DATE" :@VM:SQL_Format(Rec(NCR_ENTRY_DATE$), "DATE"):@FM
|
||||||
DataFields := "ENTRY_TIME" :@VM:SQL_Format(Rec(NCR_ENTRY_TIME$), "TIME"):@FM
|
DataFields := "ENTRY_TIME" :@VM:SQL_Format(Rec(NCR_ENTRY_TIME$), "TIME"):@FM
|
||||||
DataFields := "DEPT" :@VM:SQL_Format(Rec(NCR_DEPT$), "STR"):@FM
|
DataFields := "DEPT" :@VM:SQL_Format(Rec(NCR_DEPT$), "STR"):@FM
|
||||||
DataFields := "SHIFT" :@VM:SQL_Format(Rec(NCR_SHIFT$), "INT"):@FM
|
DataFields := "SHIFT" :@VM:SQL_Format(Rec(NCR_SHIFT$), "STR"):@FM
|
||||||
DataFields := "STATUS" :@VM:SQL_Format(NCR_Status, "STR"):@FM
|
DataFields := "STATUS" :@VM:SQL_Format(NCR_Status, "STR"):@FM
|
||||||
DataFields := "LOSS_COMMENTS" :@VM:SQL_Format(Rec(NCR_LOSS_COMMENTS$), "STR", 1):@FM
|
DataFields := "LOSS_COMMENTS" :@VM:SQL_Format(Rec(NCR_LOSS_COMMENTS$), "STR", 1):@FM
|
||||||
DataFields := "AC_COMMENTS" :@VM:SQL_Format(Rec(NCR_AC_COMMENTS$), "STR", 1):@FM
|
DataFields := "AC_COMMENTS" :@VM:SQL_Format(Rec(NCR_AC_COMMENTS$), "STR", 1):@FM
|
||||||
@ -199,3 +199,4 @@ If Ans EQ "" AND PartNo NE "" then
|
|||||||
end
|
end
|
||||||
|
|
||||||
Return Ans
|
Return Ans
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user