Subversion Repositories DevTools

Rev

Rev 5513 | Rev 5958 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5513 Rev 5955
Line 53... Line 53...
53 
		outobjDetails.Item ("rtag_id_fk") = rsQry("rtag_id")
 53 
		outobjDetails.Item ("rtag_id_fk") = rsQry("rtag_id")
54 
		outobjDetails.Item ("rtag_name") = rsQry("rtag_name")
 54 
		outobjDetails.Item ("rtag_name") = rsQry("rtag_name")
55 
		outobjDetails.Item ("parent_bom_id") = rsQry("parent_bom_id")
 55 
		outobjDetails.Item ("parent_bom_id") = rsQry("parent_bom_id")
56 
	End If
 56 
	End If
57
57
58
- 
 
59 
	OraDatabase.Parameters.Remove "BOM_ID"
 58 
	OraDatabase.Parameters.Remove "BOM_ID"
60
59
61 
	rsQry.Close
 60 
	rsQry.Close
62 
	Set rsQry = Nothing
 61 
	Set rsQry = Nothing
63 
End Sub
 62 
End Sub
Line 71... Line 70...
71 
	OraDatabase.Parameters.Add "BOM_ID", parBom_id,		ORAPARM_INPUT, ORATYPE_NUMBER
70 
	OraDatabase.Parameters.Add "BOM_ID", parBom_id,		ORAPARM_INPUT, ORATYPE_NUMBER
72 
	OraDatabase.Parameters.Add "COMPARE_BOM_ID", objFormCollector.Item("parent_bom_id"), ORAPARM_INPUT, ORATYPE_NUMBER
71 
	OraDatabase.Parameters.Add "COMPARE_BOM_ID", objFormCollector.Item("parent_bom_id"), ORAPARM_INPUT, ORATYPE_NUMBER
73
72
74 
	Set rsQry = OraDatabase.DbCreateDynaset( GetQuery ("RevertProducts.sql"), ORADYN_DEFAULT )
 73 
	Set rsQry = OraDatabase.DbCreateDynaset( GetQuery ("RevertProducts.sql"), ORADYN_DEFAULT )
75
74
- 
 
 75 
	OraDatabase.Parameters.Remove "BOM_ID"
- 
 
 76 
	OraDatabase.Parameters.Remove "COMPARE_BOM_ID"
76
77
77 
	'-- Get Rows
 78 
	'-- Get Rows
78 
	If rsQry.RecordCount > 0 Then
 79 
	If rsQry.RecordCount > 0 Then
79 
		aDiffList = rsQry.GetRows()
 80 
		aDiffList = rsQry.GetRows()
80
81
81 
	Else
 82 
	Else
82 
		'-- No differences compared to Previous BOM, hence exit
 83 
		'-- No differences compared to Previous BOM, hence exit
83 
		OraDatabase.Parameters.Remove "BOM_ID"
 - 
 
84 
		OraDatabase.Parameters.Remove "COMPARE_BOM_ID"
 - 
 
85 
		Exit Sub
 84 
		Exit Sub
86
85
87 
	End If
 86 
	End If
88
87
89
88
90
89
91 
	'/* Revert Versions */
 90 
	'/* Revert Versions */
92 
	On Error Resume Next
 91 
	On Error Resume Next
93
92
- 
 
 93 
	OraDatabase.Parameters.Add "BOM_ID", parBom_id,		ORAPARM_INPUT, ORATYPE_NUMBER
- 
 
 94 
	OraDatabase.Parameters.Add "COMPARE_BOM_ID", objFormCollector.Item("parent_bom_id"), ORAPARM_INPUT, ORATYPE_NUMBER
94 
	OraDatabase.Parameters.Add "OLD_PROD_ID", 	0, 	ORAPARM_INPUT, ORATYPE_NUMBER
95 
	OraDatabase.Parameters.Add "OLD_PROD_ID", 	0, 	ORAPARM_INPUT, ORATYPE_NUMBER
95 
	OraDatabase.Parameters.Add "NEW_PROD_ID", 	0, 	ORAPARM_INPUT, ORATYPE_NUMBER
96 
	OraDatabase.Parameters.Add "NEW_PROD_ID", 	0, 	ORAPARM_INPUT, ORATYPE_NUMBER
96 
	OraDatabase.Parameters.Add "OS_ID", 		0, 	ORAPARM_INPUT, ORATYPE_NUMBER
97 
	OraDatabase.Parameters.Add "OS_ID", 		0, 	ORAPARM_INPUT, ORATYPE_NUMBER
97 
	OraDatabase.Parameters.Add "USER_ID", 		objAccessControl.UserId, 	ORAPARM_INPUT, ORATYPE_NUMBER
98 
	OraDatabase.Parameters.Add "USER_ID", 		objAccessControl.UserId, 	ORAPARM_INPUT, ORATYPE_NUMBER
98
99
Line 129... Line 130...
129
130
130
131
131 
	objEH.CatchORA ( OraSession )
132 
	objEH.CatchORA ( OraSession )
132
133
133 
	OraDatabase.Parameters.Remove "BOM_ID"
 134 
	OraDatabase.Parameters.Remove "BOM_ID"
134 
	OraDatabase.Parameters.Remove "RTAG_ID"
 135 
	OraDatabase.Parameters.Remove "COMPARE_BOM_ID"
135 
	OraDatabase.Parameters.Remove "OLD_PROD_ID"
 136 
	OraDatabase.Parameters.Remove "OLD_PROD_ID"
136 
	OraDatabase.Parameters.Remove "NEW_PROD_ID"
 137 
	OraDatabase.Parameters.Remove "NEW_PROD_ID"
137 
	OraDatabase.Parameters.Remove "OS_ID"
 138 
	OraDatabase.Parameters.Remove "OS_ID"
138 
	OraDatabase.Parameters.Remove "USER_ID"
 139 
	OraDatabase.Parameters.Remove "USER_ID"
139 
End Sub
 140 
End Sub