添加产品代码

wukan1986 · wukan1986 · commit db49a2b6cf2a · 2015-05-12T13:44:13.000+08:00
diff --git a/QuantBox_CTP_Trade/TraderApi.cpp b/QuantBox_CTP_Trade/TraderApi.cpp
@@ -1174,6 +1174,7 @@ void CTraderApi::OnRspQryInstrument(CThostFtdcInstrumentField *pInstrument, CTho
 			strncpy(pField->ExchangeID, pInstrument->ExchangeID, sizeof(ExchangeIDType));
 
 			strncpy(pField->Symbol, pInstrument->InstrumentID, sizeof(SymbolType));
+			strncpy(pField->ProductID, pInstrument->ProductID, sizeof(InstrumentIDType));
 
 			strncpy(pField->InstrumentName, pInstrument->InstrumentName, sizeof(InstrumentNameType));
 			pField->Type = CThostFtdcInstrumentField_2_InstrumentType(pInstrument);
diff --git a/QuantBox_Femas_Trade/TraderApi.cpp b/QuantBox_Femas_Trade/TraderApi.cpp
@@ -1120,6 +1120,7 @@ void CTraderApi::OnRspQryInstrument(CUstpFtdcRspInstrumentField *pRspInstrument,
 			strcpy(pField->ExchangeID, pRspInstrument->ExchangeID);
 
 			strcpy(pField->Symbol, pRspInstrument->InstrumentID);
+			strncpy(pField->ProductID, pRspInstrument->ProductID, sizeof(InstrumentIDType));
 
 			strcpy(pField->InstrumentName, pRspInstrument->InstrumentName);
 			pField->Type = CUstpFtdcRspInstrumentField_2_InstrumentType(pRspInstrument);
diff --git a/QuantBox_Kingstar_Trade/TraderApi.cpp b/QuantBox_Kingstar_Trade/TraderApi.cpp
@@ -1167,6 +1167,7 @@ void CTraderApi::OnRspQryInstrument(CThostFtdcInstrumentField *pInstrument, CTho
 			strncpy(pField->ExchangeID, pInstrument->ExchangeID, sizeof(ExchangeIDType));
 
 			strncpy(pField->Symbol, pInstrument->InstrumentID, sizeof(SymbolType));
+			strncpy(pField->ProductID, pInstrument->ProductID, sizeof(InstrumentIDType));
 
 			strncpy(pField->InstrumentName, pInstrument->InstrumentName, sizeof(InstrumentNameType));
 			pField->Type = CThostFtdcInstrumentField_2_InstrumentType(pInstrument);
diff --git a/QuantBox_LTS_Level2/QuantBox_LTS_Level2.vcxproj b/QuantBox_LTS_Level2/QuantBox_LTS_Level2.vcxproj
@@ -124,8 +124,8 @@
       <ModuleDefinitionFile>..\include\ApiHeader.def</ModuleDefinitionFile>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy "$(TargetPath)"  "$(SolutionDir)XAPI\LTS_L2\x86\" /Y
-xcopy "$(SolutionDir)include\LTS_L2\win32\*.dll"  "$(SolutionDir)XAPI\LTS_L2\x86\" /Y</Command>
+      <Command>xcopy "$(TargetPath)"  "$(SolutionDir)XAPI\LTS\x86\" /Y
+xcopy "$(SolutionDir)include\LTS_L2\win32\*.dll"  "$(SolutionDir)XAPI\LTS\x86\" /Y</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
diff --git a/QuantBox_LTS_Trade/TraderApi.cpp b/QuantBox_LTS_Trade/TraderApi.cpp
@@ -805,6 +805,7 @@ void CTraderApi::OnRspQryInstrument(CSecurityFtdcInstrumentField *pInstrument, C
 
 			sprintf(pField->Symbol,"%s.%s",pInstrument->InstrumentID,pInstrument->ExchangeID);
 			sprintf(pField->InstrumentName, "%s(%s)", pInstrument->ExchangeInstID, pInstrument->InstrumentName);
+			strncpy(pField->ProductID, pInstrument->ProductID, sizeof(InstrumentIDType));
 
 			//strncpy(pField->InstrumentName, pInstrument->InstrumentName, sizeof(InstrumentNameType));
 			pField->Type = CSecurityFtdcInstrumentField_2_InstrumentType(pInstrument);
diff --git a/csharp/QuantBox.XAPI/Properties/AssemblyInfo.cs b/csharp/QuantBox.XAPI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.0.1")]
+[assembly: AssemblyFileVersion("1.2.0.1")]
diff --git a/csharp/QuantBox.XAPI/Struct.cs b/csharp/QuantBox.XAPI/Struct.cs
@@ -432,6 +432,11 @@ public struct InstrumentField
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 9)]
         public string ExchangeID;
         /// <summary>
+        /// 产品代码
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 31)]
+        public string ProductID;
+        /// <summary>
         /// 合约名称
         /// </summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
diff --git a/include/ApiStruct.h b/include/ApiStruct.h
@@ -337,6 +337,8 @@ struct InstrumentField
 	InstrumentIDType	InstrumentID;
 	///交易所代码
 	ExchangeIDType	ExchangeID;
+	///产品代码
+	InstrumentIDType	ProductID;
 	///合约名称
 	InstrumentNameType InstrumentName;
 	///基础商品代码
