diff --git a/LSL2/STPROC/REPORT_SERVICES.txt b/LSL2/STPROC/REPORT_SERVICES.txt index be40cbc..cdeb0b7 100644 --- a/LSL2/STPROC/REPORT_SERVICES.txt +++ b/LSL2/STPROC/REPORT_SERVICES.txt @@ -604,7 +604,7 @@ Service GetMaterialTrackJSON() ErrCode = '' KeyList = '' - Query = 'SELECT MATERIAL_REPORT BY REACT_NO BY WO_NO' + Query = 'SELECT MATERIAL_REPORT BY REACT_NO BY START_DTM' RList(Query, TARGET_ACTIVELIST$, '', '', '') If Not(Get_Status(ErrCode)) then EOF = False$ @@ -1529,24 +1529,25 @@ Service GenerateMaterialTrackRows() * Calculate Value(s) For Column(s) - S.ATID = {@ID} - I.ATID = S.ATID - S.ReactNo = {REACT_NO} - I.ReactNo = S.ReactNo - S.WoNo = {WO_NO} - I.WoNo = S.WoNo - S.SubPartNo = XLATE('WO_LOG', S.WoNo, 'ORD_SUB_PART_NO', 'X') - I.SubPartNo = S.SubPartNo - S.EpiPartNo = XLATE('WO_LOG', S.WoNo, WO_LOG_EPI_PART_NO$, 'X') - I.EpiPartNo = S.EpiPartNo - S.WO_Qty = Xlate('WO_LOG', {WO_NO}, WO_LOG_WO_QTY$, 'X') - I.WO_Qty = S.WO_Qty - S.WO_RX_Qty = Xlate('WO_LOG', {WO_NO}, 'RX_QTY', 'X') - I.WO_RX_Qty = S.WO_RX_Qty - S.WO_UnRel_QTY = Xlate('WO_LOG', {WO_NO}, 'UNREL_QTY', 'X') - I.WO_UnRel_QTY = S.WO_UnRel_QTY - S.REACT_TYPE = Xlate('WO_LOG', {WO_NO}, 'REACT_TYPE', 'X') - S.ProdOrdNo = Xlate('WO_LOG', {WO_NO}, 'PROD_ORD_NO', 'X') + S.StartDtm = {START_DTM} + S.ATID = {@ID} + I.ATID = S.ATID + S.ReactNo = {REACT_NO} + I.ReactNo = S.ReactNo + S.WoNo = {WO_NO} + I.WoNo = S.WoNo + S.SubPartNo = XLATE('WO_LOG', S.WoNo, 'ORD_SUB_PART_NO', 'X') + I.SubPartNo = S.SubPartNo + S.EpiPartNo = XLATE('WO_LOG', S.WoNo, WO_LOG_EPI_PART_NO$, 'X') + I.EpiPartNo = S.EpiPartNo + S.WO_Qty = Xlate('WO_LOG', {WO_NO}, WO_LOG_WO_QTY$, 'X') + I.WO_Qty = S.WO_Qty + S.WO_RX_Qty = Xlate('WO_LOG', {WO_NO}, 'RX_QTY', 'X') + I.WO_RX_Qty = S.WO_RX_Qty + S.WO_UnRel_QTY = Xlate('WO_LOG', {WO_NO}, 'UNREL_QTY', 'X') + I.WO_UnRel_QTY = S.WO_UnRel_QTY + S.REACT_TYPE = Xlate('WO_LOG', {WO_NO}, 'REACT_TYPE', 'X') + S.ProdOrdNo = Xlate('WO_LOG', {WO_NO}, 'PROD_ORD_NO', 'X') Locate 'SR*KTR]' in LocationFilter using @VM setting vPos then KitData = Location_Services('GetLocationCassInfo', S.WONo, 'SR*KTR]') @@ -1737,6 +1738,7 @@ Service GenerateMaterialTrackRows() AllReportData = KitCassList ; // Skip field 14, it is populated by users AllReportData = PTICassList AllReportData = LoadedCassList ; // Skip field 17, it is populated by users + AllReportData = S.StartDtm end end else diff --git a/LSL2/STPROCINS/MATERIAL_REPORT_EQUATES.txt b/LSL2/STPROCINS/MATERIAL_REPORT_EQUATES.txt index 719eeee..0384c2e 100644 --- a/LSL2/STPROCINS/MATERIAL_REPORT_EQUATES.txt +++ b/LSL2/STPROCINS/MATERIAL_REPORT_EQUATES.txt @@ -24,5 +24,7 @@ compile insert MATERIAL_REPORT_EQUATES equ MATERIAL_REPORT.PTI_RO$ to 15 equ MATERIAL_REPORT.LOAD_RO$ to 16 equ MATERIAL_REPORT.COMMENTS$ to 17 - + equ MATERIAL_REPORT.START_DTM$ to 18 + #endif +