From d78677690513dd72bd107efe03d34d93182b3a4f Mon Sep 17 00:00:00 2001
From: "Infineon\\Ouellette" <jonathan.ouellette@infineon.com>
Date: Wed, 9 Oct 2024 15:36:54 -0700
Subject: [PATCH] AdditionalChanges

---
 LSL2/POPUP/NCR_QUERY.json      | 20 +++++++++----
 LSL2/STPROC/COMM_NCR_QUERY.txt | 20 ++++++++++---
 LSL2/STPROC/NCR_ACTIONS.txt    | 51 ++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/LSL2/POPUP/NCR_QUERY.json b/LSL2/POPUP/NCR_QUERY.json
index 968ca36..4213e96 100644
--- a/LSL2/POPUP/NCR_QUERY.json
+++ b/LSL2/POPUP/NCR_QUERY.json
@@ -107,10 +107,10 @@
                 },
                 "<9,10>": {
                     "<9,10,1>": "SHIFT",
-                    "<9,10,2>": "6",
-                    "<9,10,3>": "C",
+                    "<9,10,2>": "20",
+                    "<9,10,3>": "L",
                     "<9,10,4>": "C",
-                    "<9,10,5>": "MD0",
+                    "<9,10,5>": "<<none>>",
                     "<9,10,6>": "Shift"
                 },
                 "<9,11>": {
@@ -146,8 +146,18 @@
             "<31>": "0",
             "<32>": "0",
             "<33>": "0",
-            "<34>": "16777215",
-            "<35>": "16777215"
+            "<34>": "-2",
+            "<35>": "-2",
+            "<36>": "",
+            "<37>": "",
+            "<38>": "",
+            "<39>": "",
+            "<40>": "-2",
+            "<41>": "1000",
+            "<42>": "",
+            "<43>": "",
+            "<44>": "",
+            "<45>": ""
         }
     }
 }
\ No newline at end of file
diff --git a/LSL2/STPROC/COMM_NCR_QUERY.txt b/LSL2/STPROC/COMM_NCR_QUERY.txt
index 5bf1c34..a9055f0 100644
--- a/LSL2/STPROC/COMM_NCR_QUERY.txt
+++ b/LSL2/STPROC/COMM_NCR_QUERY.txt
@@ -312,10 +312,22 @@ IF CausedBy	THEN SearchStr<-1> = 'LOSS_BY':@VM:CausedBy
 
 Shifts = ''			;* * * * * *  Teams (Shift)
 
-IF TeamA THEN Shifts<1,-1> = 'A'
-IF TeamB THEN Shifts<1,-1> = 'B'	
-IF TeamC THEN Shifts<1,-1> = 'C'
-IF TeamD THEN Shifts<1,-1> = 'D'
+IF TeamA THEN
+    Shifts<1,-1> = 'A'
+    Shifts<1,-1> = '1'
+end
+IF TeamB THEN
+    Shifts<1,-1> = 'B'
+    Shifts<1,-1> = '2'
+end
+IF TeamC THEN
+    Shifts<1,-1> = 'C'
+    Shifts<1,-1> = '3'
+end
+IF TeamD THEN
+    Shifts<1,-1> = 'D'
+    Shifts<1,-1> = '4'
+end
 
 IF Shifts NE '' THEN SearchStr<-1> = 'SHIFT':@VM:Shifts
 
diff --git a/LSL2/STPROC/NCR_ACTIONS.txt b/LSL2/STPROC/NCR_ACTIONS.txt
index 759c9e3..f076d11 100644
--- a/LSL2/STPROC/NCR_ACTIONS.txt
+++ b/LSL2/STPROC/NCR_ACTIONS.txt
@@ -152,6 +152,23 @@ READ_RECORD:
 	//    OrigFileError   = 100 : @FM : KeyID
 	//    Status          = 0
 	//    Record          = ''
+	If {SHIFT} then
+	    Begin Case
+	        Case {SHIFT} EQ 1
+	            Record<NCR_SHIFT$> = 'A'
+	        Case {SHIFT} EQ 2
+	            Record<NCR_SHIFT$> = 'B'
+	        Case {SHIFT} EQ 3
+	            Record<NCR_SHIFT$> = 'C'
+	        Case {SHIFT} EQ 4
+	            Record<NCR_SHIFT$> = 'D'
+	        Case {SHIFT} EQ 5
+	            Record<NCR_SHIFT$> = '5'
+	        Case Otherwise$
+	            Null
+	    End Case
+	end
+	
 return
 
 READONLY_RECORD_PRE:
@@ -169,6 +186,23 @@ READONLY_RECORD:
 	//    OrigFileError   = 100 : @FM : KeyID
 	//    Status          = 0
 	//    Record          = ''
+	
+	If {SHIFT} then
+	    Begin Case
+	        Case {SHIFT} EQ 1
+	            Record<NCR_SHIFT$> = 'A'
+	        Case {SHIFT} EQ 2
+	            Record<NCR_SHIFT$> = 'B'
+	        Case {SHIFT} EQ 3
+	            Record<NCR_SHIFT$> = 'C'
+	        Case {SHIFT} EQ 4
+	            Record<NCR_SHIFT$> = 'D'
+	        Case {SHIFT} EQ 5
+	            Record<NCR_SHIFT$> = '5'
+	        Case Otherwise$
+	            Null
+	    End Case
+	end
 return
 
 WRITE_RECORD_PRE:
@@ -177,6 +211,22 @@ WRITE_RECORD_PRE:
 	CassNo      = {WO_MAT_CASS_NO}
 	WoMatKey    = WorkOrderNo : '*' : CassNo
 	SAPBatchNo  = Xlate('WO_MAT', WOMatKey, 'SAP_BATCH_NO', 'X')
+	If {SHIFT} then
+	    Begin Case
+	        Case {SHIFT} EQ 1
+	            Record<NCR_SHIFT$> = 'A'
+	        Case {SHIFT} EQ 2
+	            Record<NCR_SHIFT$> = 'B'
+	        Case {SHIFT} EQ 3
+	            Record<NCR_SHIFT$> = 'C'
+	        Case {SHIFT} EQ 4
+	            Record<NCR_SHIFT$> = 'D'
+	        Case {SHIFT} EQ 5
+	            Record<NCR_SHIFT$> = '5'
+	        Case Otherwise$
+	            Null
+	    End Case
+	end
 	If SAPBatchNo NE '' then
 		NCRNo      = Name
 		OrigRejQty = Sum(obj_NCR('RejQty',NCRNo:@RM:OrigRecord))
@@ -759,3 +809,4 @@ LogRecord:
 return
 
 
+