diff --git a/项目代码/RTBasicsV1/T01贸易生产计划/TradePlan.dproj.local b/项目代码/RTBasicsV1/T01贸易生产计划/TradePlan.dproj.local
index 428f651..e736dc2 100644
--- a/项目代码/RTBasicsV1/T01贸易生产计划/TradePlan.dproj.local
+++ b/项目代码/RTBasicsV1/T01贸易生产计划/TradePlan.dproj.local
@@ -1,76 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.329,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradeInspSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.537,=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanCard.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.568,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.472,=D:\Dp10Repo\public10\ThreeFun\Form\U_SysLogHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.dfm=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.pas=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.505,D:\Dp10RepoV1\项目代码\花蝴蝶\T01贸易生产计划\U_TradeInspSet.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\T01贸易生产计划\U_TradeLabelSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.780,=D:\Dp10RepoV1\项目代码\花蝴蝶\T01贸易生产计划\U_TradePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.030,=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProfit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.082,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanInPut.dfm=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.937,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanColorInPut.dfm=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.329,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradeInspSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.629,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanColorList.pas=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.764,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradeCardInStk.pas=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradeCardInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.505,D:\Dp10RepoV1\项目代码\花蝴蝶\T01贸易生产计划\U_TradeLabelSel.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\T01贸易生产计划\U_TradeInspSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.937,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanColorInPut.pas=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.904,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.314,=D:\Dp10RepoV1\项目代码\花蝴蝶\T01贸易生产计划\U_TradePlanInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\TradePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.505,D:\Dp10RepoV1\项目代码\花蝴蝶\T01贸易生产计划\U_TradeLabelSel.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\T01贸易生产计划\U_TradeInspSet.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.053,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanList.dfm=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.600,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.994,=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanScheduleDetail.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.276,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.681,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.764,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradeCardInStk.dfm=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradeCardInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.332,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.904,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.753,=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradeCardInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.764,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradeCardInPut.pas=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradeCardInStk.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.505,D:\Dp10RepoV1\项目代码\花蝴蝶\T01贸易生产计划\U_TradeInspSet.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\T01贸易生产计划\U_TradeLabelSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.396,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.555,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.629,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofList.pas=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanColorList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.440,D:\Dp10RepoV1\项目代码\须上\A00通用窗体\U_InputBoxSingleNumber.dfm=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_InputBoxCard.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.629,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofList.dfm=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanColorList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.053,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofList.dfm=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.895,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.365,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.649,=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanSchedule.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.134,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.555,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.053,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofList.pas=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.396,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.649,=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanSchedule.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.134,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.747,=D:\RTFormwork\项目代码\RTBasicsV1\T01贸易生产计划\U_TradePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.081,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofInPut.pas=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.442,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\PdfPrint.dll=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.103,=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\PdfPrint.dll</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.440,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_InputBoxCard.pas=D:\Dp10RepoV1\项目代码\须上\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.780,=D:\Dp10RepoV1\项目代码\花蝴蝶\T01贸易生产计划\U_TradePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.629,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanColorList.dfm=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.440,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_InputBoxCard.dfm=D:\Dp10RepoV1\项目代码\须上\A00通用窗体\U_InputBoxSingleNumber.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.082,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofInPut.dfm=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.560,=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_printPdf.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.370,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.686,=D:\Dp10RepoV1\项目代码\须上\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.440,D:\Dp10RepoV1\项目代码\须上\A00通用窗体\U_InputBoxSingleNumber.pas=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_InputBoxCard.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\TradePlan.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.937,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofInPut.pas=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanColorInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.103,=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\PdfPrint.dll</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.442,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\PdfPrint.dll=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.424,=D:\Dp10RepoV1\项目代码\须上\A00通用窗体\U_InputBoxSingleString.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.081,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanInPut.pas=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.370,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.560,=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_printPdf.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.937,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofInPut.dfm=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanColorInPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.053,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanList.pas=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradePlanProofList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.764,D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradeCardInPut.dfm=D:\Dp10RepoV1\项目代码\须上\T01贸易生产计划\U_TradeCardInStk.dfm</Transaction>
-    <Transaction>2024-07-07 15:20:39.747,=D:\RTFormwork\项目代码\RTBasicsV1\T01贸易生产计划\U_TradePlanList.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
diff --git a/项目代码/RTBasicsV1/T01贸易生产计划/TradePlan.identcache b/项目代码/RTBasicsV1/T01贸易生产计划/TradePlan.identcache
index b075cd9..40b36e0 100644
Binary files a/项目代码/RTBasicsV1/T01贸易生产计划/TradePlan.identcache and b/项目代码/RTBasicsV1/T01贸易生产计划/TradePlan.identcache differ
diff --git a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanInPut.dfm b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanInPut.dfm
index 411de5a..737fdc6 100644
--- a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanInPut.dfm
+++ b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanInPut.dfm
@@ -1169,6 +1169,9 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
     object cxTabSheet4: TcxTabSheet
       Caption = '  '#25216#26415#35201#27714'  '
       ImageIndex = 3
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object cxGrid2: TcxGrid
         Left = 0
         Top = 30
diff --git a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanInPut.pas b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanInPut.pas
index 48ea93a..605da63 100644
--- a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanInPut.pas
+++ b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanInPut.pas
@@ -514,6 +514,7 @@ begin
   end;
   SCSHData(ADOTemp, Panel3, 4);
   SCSHData(ADOTemp, ScrollBox1, 4);
+  FtyName.Properties.LookupItems.Text := Trim(ADOTemp.FieldByName('FtyNo').AsString);
   with ADOTemp do
   begin
     Close;
diff --git a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfit.dfm b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfit.dfm
index ee27211..23d4766 100644
--- a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfit.dfm
+++ b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfit.dfm
@@ -2,21 +2,22 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
   Left = 238
   Top = 107
   Caption = #35746#21333#21033#28070#26597#35810#34920
-  ClientHeight = 568
-  ClientWidth = 1592
+  ClientHeight = 747
+  ClientWidth = 1660
+  Font.Height = -16
   Position = poScreenCenter
-  ExplicitWidth = 1608
-  ExplicitHeight = 607
+  ExplicitWidth = 1676
+  ExplicitHeight = 786
   PixelsPerInch = 96
-  TextHeight = 17
+  TextHeight = 21
   object ToolBar1: TToolBar [0]
     Left = 0
     Top = 0
-    Width = 1592
+    Width = 1660
     Height = 30
     AutoSize = True
     ButtonHeight = 30
-    ButtonWidth = 83
+    ButtonWidth = 99
     Caption = 'ToolBar1'
     Color = clWhite
     DisabledImages = DataLink_TradePlan.cxImageList_bar
@@ -25,6 +26,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
     ParentColor = False
     ShowCaptions = True
     TabOrder = 0
+    ExplicitWidth = 1592
     object TBRafresh: TToolButton
       Left = 0
       Top = 0
@@ -33,16 +35,16 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
       ImageIndex = 1
       OnClick = TBRafreshClick
     end
-    object ToolButton2: TToolButton
-      Left = 63
+    object TBFind: TToolButton
+      Left = 71
       Top = 0
       AutoSize = True
       Caption = #36807#28388
       ImageIndex = 0
-      OnClick = ToolButton2Click
+      OnClick = TBFindClick
     end
     object ToolButton4: TToolButton
-      Left = 126
+      Left = 142
       Top = 0
       AutoSize = True
       Caption = #26597#30475#26126#32454
@@ -50,7 +52,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
       OnClick = ToolButton4Click
     end
     object ToolButton5: TToolButton
-      Left = 213
+      Left = 245
       Top = 0
       AutoSize = True
       Caption = #25171#21360
@@ -58,7 +60,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
       OnClick = ToolButton5Click
     end
     object ToolButton1: TToolButton
-      Left = 276
+      Left = 316
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -66,7 +68,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
       OnClick = ToolButton1Click
     end
     object ToolButton3: TToolButton
-      Left = 339
+      Left = 387
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -74,7 +76,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
       OnClick = ToolButton3Click
     end
     object TBClose: TToolButton
-      Left = 426
+      Left = 490
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -85,137 +87,80 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
   object Panel1: TPanel [1]
     Left = 0
     Top = 30
-    Width = 1592
-    Height = 57
+    Width = 1660
+    Height = 84
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
-    ExplicitTop = 38
-    object Label3: TLabel
-      Left = 166
-      Top = 35
-      Width = 24
-      Height = 17
-      Caption = #21697#21517
-    end
+    ExplicitWidth = 1592
     object Label1: TLabel
-      Left = 166
-      Top = 12
-      Width = 24
-      Height = 17
+      Left = 55
+      Top = 48
+      Width = 32
+      Height = 21
       Caption = #23458#25143
     end
     object Label4: TLabel
-      Left = 22
-      Top = 12
-      Width = 24
-      Height = 17
-      Caption = #26085#26399
-    end
-    object Label5: TLabel
-      Left = 31
-      Top = 35
-      Width = 12
-      Height = 17
-      Caption = #33267
-    end
-    object Label2: TLabel
-      Left = 301
-      Top = 12
+      Left = 215
+      Top = 48
       Width = 48
-      Height = 17
-      Caption = #25351#31034#21333#21495
+      Height = 21
+      AutoSize = False
+      Caption = #21512#21516#21495
     end
-    object Label7: TLabel
-      Left = 461
-      Top = 12
-      Width = 32
-      Height = 17
-      Caption = #29702'  '#21333
-    end
-    object Label6: TLabel
-      Left = 301
-      Top = 35
-      Width = 44
-      Height = 17
-      Caption = #19994' '#21153' '#21592
-    end
-    object CustName: TEdit
-      Tag = 2
-      Left = 191
-      Top = 8
-      Width = 100
-      Height = 25
-      TabOrder = 3
-      OnChange = CustNameChange
-    end
-    object EndDate: TDateTimePicker
-      Left = 50
-      Top = 31
-      Width = 87
-      Height = 20
-      Date = 40768.000000000000000000
-      Time = 0.458268587972270300
-      TabOrder = 2
-    end
-    object Begdate: TDateTimePicker
-      Left = 50
-      Top = 8
-      Width = 87
-      Height = 20
-      Date = 40768.000000000000000000
-      Time = 0.458268587972270300
+    inline frmFrameDateSel1: TfrmFrameDateSel
+      Left = 2
+      Top = 2
+      Width = 1656
+      Height = 37
+      Align = alTop
+      Color = clWhite
+      ParentBackground = False
+      ParentColor = False
       TabOrder = 0
+      ExplicitLeft = 2
+      ExplicitTop = 2
+      ExplicitWidth = 1446
+      inherited BegDate: TcxDateEdit
+        ExplicitHeight = 33
+      end
+      inherited EndDate: TcxDateEdit
+        ExplicitHeight = 33
+      end
+      inherited cbbType: TcxComboBox
+        ExplicitHeight = 33
+      end
     end
-    object OrderNo: TEdit
+    object BuyName: TcxTextEdit
       Tag = 2
-      Left = 350
-      Top = 8
-      Width = 100
-      Height = 25
+      Left = 91
+      Top = 42
+      ParentFont = False
+      Properties.OnChange = CustNamePropertiesChange
       TabOrder = 1
-      OnChange = CustNameChange
+      Width = 120
     end
-    object Tallyer: TEdit
+    object ConNo: TcxTextEdit
       Tag = 2
-      Left = 502
-      Top = 8
-      Width = 100
-      Height = 25
-      TabOrder = 4
-      OnChange = CustNameChange
-    end
-    object Saleser: TEdit
-      Tag = 2
-      Left = 351
-      Top = 31
-      Width = 100
-      Height = 25
-      TabOrder = 5
-      OnChange = CustNameChange
-    end
-    object C_Name: TEdit
-      Tag = 2
-      Left = 191
-      Top = 31
-      Width = 100
-      Height = 25
-      TabOrder = 6
-      OnChange = CustNameChange
+      Left = 267
+      Top = 42
+      ParentFont = False
+      Properties.OnChange = CustNamePropertiesChange
+      TabOrder = 2
+      Width = 120
     end
   end
   object cxGrid1: TcxGrid [2]
     Left = 0
-    Top = 87
-    Width = 1592
-    Height = 481
+    Top = 114
+    Width = 1660
+    Height = 633
     Align = alClient
     TabOrder = 2
-    ExplicitTop = 95
-    ExplicitHeight = 439
+    ExplicitTop = 111
     object Tv1: TcxGridDBTableView
       OnDblClick = Tv1DblClick
       Navigator.Buttons.CustomButtons = <>
@@ -255,6 +200,10 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         item
           Kind = skSum
           Column = Tv1Column8
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column11
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
@@ -262,29 +211,15 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
       OptionsView.GroupFooters = gfAlwaysVisible
-      Styles.IncSearch = DataLink_TradePlan.SHuangSe
-      Styles.Header = DataLink_TradePlan.Default
-      Styles.Inactive = DataLink_TradePlan.SHuangSe
-      Styles.Selection = DataLink_TradePlan.SHuangSe
-      object v1OrderNo: TcxGridDBColumn
-        Caption = #35745#21010#21333#21495
-        DataBinding.FieldName = 'OrderNo'
-        DataBinding.IsNullValueType = True
-        FooterAlignmentHorz = taCenter
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Styles.Header = DataLink_TradePlan.Default
-        Width = 79
-      end
       object v1CustomerNoName: TcxGridDBColumn
         Caption = #23458#25143
-        DataBinding.FieldName = 'CustName'
+        DataBinding.FieldName = 'BuyName'
         DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradePlan.Default
-        Width = 105
+        Width = 100
       end
       object Tv1Column14: TcxGridDBColumn
         Caption = #19994#21153#21592
@@ -292,7 +227,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 74
+        Width = 100
       end
       object Tv1Column15: TcxGridDBColumn
         Caption = #29702#21333
@@ -300,36 +235,27 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 68
+        Width = 100
       end
       object v1OrdDate: TcxGridDBColumn
         Caption = #21046#21333#26085#26399
-        DataBinding.FieldName = 'OrdDate'
+        DataBinding.FieldName = 'ConDate'
         DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradePlan.Default
-        Width = 80
+        Width = 100
       end
       object v1MPRTCodeName: TcxGridDBColumn
-        Caption = #20135#21697#21517#31216
-        DataBinding.FieldName = 'C_Name'
+        Caption = #21512#21516#21495
+        DataBinding.FieldName = 'conno'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradePlan.Default
-        Width = 80
-      end
-      object v1MPRTSpec: TcxGridDBColumn
-        Caption = #35268#26684
-        DataBinding.FieldName = 'C_Spec'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Styles.Header = DataLink_TradePlan.Default
-        Width = 80
+        Width = 100
       end
       object Tv1Column1: TcxGridDBColumn
         Caption = #37319#36141#36153
@@ -337,7 +263,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 66
+        Width = 100
       end
       object Tv1Column2: TcxGridDBColumn
         Caption = #21152#24037#36153
@@ -345,7 +271,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 66
+        Width = 100
       end
       object Tv1Column3: TcxGridDBColumn
         Caption = #26434#36153
@@ -353,7 +279,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 66
+        Width = 100
       end
       object Tv1Column4: TcxGridDBColumn
         Caption = #20854#20182#36153
@@ -361,7 +287,15 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 66
+        Width = 100
+      end
+      object Tv1Column11: TcxGridDBColumn
+        Caption = #36716#21333#25910#30410
+        DataBinding.FieldName = 'ZDFee'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 93
       end
       object Tv1Column5: TcxGridDBColumn
         Caption = #38144#21806#37329#39069
@@ -369,7 +303,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 66
+        Width = 100
       end
       object Tv1Column6: TcxGridDBColumn
         Caption = #25910#27454#37329#39069
@@ -377,7 +311,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 66
+        Width = 100
       end
       object Tv1Column7: TcxGridDBColumn
         Caption = #39044#35745#21033#28070
@@ -385,7 +319,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 66
+        Width = 100
       end
       object Tv1Column9: TcxGridDBColumn
         Caption = #39044#35745#21033#28070#29575
@@ -393,7 +327,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 77
+        Width = 100
       end
       object Tv1Column8: TcxGridDBColumn
         Caption = #23454#38469#21033#28070
@@ -401,7 +335,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 66
+        Width = 100
       end
       object Tv1Column10: TcxGridDBColumn
         Caption = #23454#38469#21033#28070#29575
@@ -409,7 +343,7 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 80
+        Width = 100
       end
     end
     object cxGrid1Level1: TcxGridLevel
@@ -417,25 +351,25 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
     end
   end
   inherited ADOQueryBaseCmd: TADOQuery
-    Left = 329
-    Top = 160
+    Left = 370
+    Top = 253
   end
   inherited ADOQueryBaseTemp: TADOQuery
-    Left = 201
-    Top = 153
+    Left = 190
+    Top = 201
   end
   object ADOQueryTemp: TADOQuery
     Connection = DataLink_TradePlan.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 269
-    Top = 209
+    Left = 261
+    Top = 248
   end
   object ADOQueryCmd: TADOQuery
     Connection = DataLink_TradePlan.ADOLink
     Parameters = <>
-    Left = 493
-    Top = 161
+    Left = 621
+    Top = 220
   end
   object RM1: TRMGridReport
     ThreadPrepareReport = True
@@ -490,19 +424,19 @@ inherited frmTradePlanProfit: TfrmTradePlanProfit
   object ADOQueryMain: TADOQuery
     Connection = DataLink_TradePlan.ADOLink
     Parameters = <>
-    Left = 416
-    Top = 192
+    Left = 521
+    Top = 251
   end
   object DataSource1: TDataSource
     DataSet = CDS_1
-    Left = 608
-    Top = 224
+    Left = 800
+    Top = 285
   end
   object CDS_1: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 536
-    Top = 216
+    Left = 850
+    Top = 369
   end
   object cxStyleRepository1: TcxStyleRepository
     Left = 40
diff --git a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfit.pas b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfit.pas
index ccaa993..4fdcdb1 100644
--- a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfit.pas
+++ b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfit.pas
@@ -15,7 +15,7 @@ uses
   cxTextEdit, cxDBLookupComboBox, cxGridBandedTableView, cxGridDBBandedTableView,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
   dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxSkinWXI,
-  dxScrollbarAnnotations;
+  dxScrollbarAnnotations, FrameDateSel, cxContainer;
 
 type
   TfrmTradePlanProfit = class(TfrmBaseList)
@@ -25,20 +25,11 @@ type
     ADOQueryTemp: TADOQuery;
     ADOQueryCmd: TADOQuery;
     Panel1: TPanel;
-    ToolButton2: TToolButton;
+    TBFind: TToolButton;
     ToolButton1: TToolButton;
     RM1: TRMGridReport;
     RMDB_1: TRMDBDataSet;
-    Label3: TLabel;
-    CustName: TEdit;
     cxGridPopupMenu2: TcxGridPopupMenu;
-    Label1: TLabel;
-    EndDate: TDateTimePicker;
-    Label4: TLabel;
-    Label5: TLabel;
-    Begdate: TDateTimePicker;
-    Label2: TLabel;
-    OrderNo: TEdit;
     CDS_P1: TClientDataSet;
     CDS_P2: TClientDataSet;
     RMDB_2: TRMDBDataSet;
@@ -49,16 +40,10 @@ type
     Tv1: TcxGridDBTableView;
     v1CustomerNoName: TcxGridDBColumn;
     v1OrdDate: TcxGridDBColumn;
-    v1OrderNo: TcxGridDBColumn;
     v1MPRTCodeName: TcxGridDBColumn;
-    v1MPRTSpec: TcxGridDBColumn;
     cxGrid1Level1: TcxGridLevel;
     cxStyleRepository1: TcxStyleRepository;
     cxStyle1: TcxStyle;
-    Label7: TLabel;
-    Tallyer: TEdit;
-    Label6: TLabel;
-    Saleser: TEdit;
     Tv1Column14: TcxGridDBColumn;
     Tv1Column15: TcxGridDBColumn;
     Tv1Column1: TcxGridDBColumn;
@@ -71,7 +56,6 @@ type
     Tv1Column8: TcxGridDBColumn;
     Tv1Column9: TcxGridDBColumn;
     Tv1Column10: TcxGridDBColumn;
-    C_Name: TEdit;
     ToolButton3: TToolButton;
     ToolButton4: TToolButton;
     ToolButton5: TToolButton;
@@ -85,19 +69,25 @@ type
     CDS_P6: TClientDataSet;
     CDS_P7: TClientDataSet;
     RMDB_7: TRMDBDataSet;
+    frmFrameDateSel1: TfrmFrameDateSel;
+    Label1: TLabel;
+    Label4: TLabel;
+    BuyName: TcxTextEdit;
+    ConNo: TcxTextEdit;
+    Tv1Column11: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
-    procedure ToolButton2Click(Sender: TObject);
-    procedure CustNameChange(Sender: TObject);
+    procedure TBFindClick(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure ToolButton3Click(Sender: TObject);
     procedure ToolButton4Click(Sender: TObject);
     procedure Tv1DblClick(Sender: TObject);
     procedure ToolButton5Click(Sender: TObject);
+    procedure CustNamePropertiesChange(Sender: TObject);
   private
 
     { Private declarations }
@@ -127,8 +117,8 @@ begin
     begin
       Close;
       SQL.Clear;
-      sql.Add(' exec P_Trade_Profit_Plan @Begdate=' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', Begdate.DateTime))));
-      sql.Add(' ,@enddate=' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', EndDate.DateTime + 1))));
+      sql.Add(' exec P_Trade_Profit_Plan @Begdate=' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.Begdate.Date))));
+      sql.Add(' ,@enddate=' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.EndDate.Date + 1))));
       if canshu1 = '��ѯ' then
       begin
         sql.Add(',@canshu=' + QuotedStr(Trim(DName)));
@@ -148,6 +138,11 @@ begin
   frmTradePlanProfit := nil;
 end;
 
+procedure TfrmTradePlanProfit.CustNamePropertiesChange(Sender: TObject);
+begin
+  TBFind.Click;
+end;
+
 procedure TfrmTradePlanProfit.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   Action := caFree;
@@ -172,7 +167,7 @@ begin
   InitGrid();
 end;
 
-procedure TfrmTradePlanProfit.ToolButton2Click(Sender: TObject);
+procedure TfrmTradePlanProfit.TBFindClick(Sender: TObject);
 begin
   if ADOQueryMain.Active then
   begin
@@ -194,7 +189,7 @@ begin
     with frmTradePlanProfitDetails do
     begin
 
-      FOrderNo := Trim(Self.CDS_1.fieldbyname('OrderNo').AsString);
+      FConNo := Trim(Self.CDS_1.fieldbyname('ConNo').AsString);
       if ShowModal = 1 then
       begin
         InitGrid();
@@ -320,11 +315,6 @@ begin
   ToolButton4.Click;
 end;
 
-procedure TfrmTradePlanProfit.CustNameChange(Sender: TObject);
-begin
-  ToolButton2.Click;
-end;
-
 procedure TfrmTradePlanProfit.ToolButton1Click(Sender: TObject);
 begin
   if ADOQueryMain.IsEmpty then
@@ -335,8 +325,8 @@ end;
 procedure TfrmTradePlanProfit.FormCreate(Sender: TObject);
 begin
   canshu1 := Trim(DParameters1);
-  EndDate.DateTime := SGetServerDate(ADOQueryTemp);
-  BegDate.DateTime := EndDate.DateTime - 90;
+  frmFrameDateSel1.EndDate.Date := SGetServerDate(ADOQueryTemp);
+  frmFrameDateSel1.BegDate.Date := frmFrameDateSel1.EndDate.Date - 90;
 end;
 
 end.
diff --git a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfitDetails.dfm b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfitDetails.dfm
index 7b5840b..d0bc3d6 100644
--- a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfitDetails.dfm
+++ b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfitDetails.dfm
@@ -2,70 +2,76 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
   Left = 403
   Top = 20
   Caption = #26126#32454#26597#35810
-  ClientHeight = 759
-  ClientWidth = 1539
+  ClientHeight = 868
+  ClientWidth = 1832
   Color = clWhite
   Font.Charset = GB2312_CHARSET
   Font.Color = clWindowText
   Font.Height = -12
-  Font.Name = #23435#20307
+  Font.Name = #24494#36719#38597#40657
   Font.Style = []
   OldCreateOrder = False
   Position = poDesktopCenter
   WindowState = wsMaximized
   OnClose = FormClose
   OnDestroy = FormDestroy
+  OnResize = FormResize
   OnShow = FormShow
   PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 17
   object GroupBox1: TGroupBox
     Left = 0
-    Top = 577
-    Width = 1539
-    Height = 182
+    Top = 105
+    Width = 1832
+    Height = 341
     Align = alClient
     Caption = #38144#21806#20986#24211
     TabOrder = 0
-    object cxGrid6: TcxGrid
+    ExplicitTop = 113
+    ExplicitWidth = 1539
+    ExplicitHeight = 333
+    object cxGrid1: TcxGrid
       Left = 2
-      Top = 14
-      Width = 1535
-      Height = 166
+      Top = 19
+      Width = 1828
+      Height = 320
       Align = alClient
       TabOrder = 0
-      object TV6: TcxGridDBTableView
+      ExplicitWidth = 1535
+      ExplicitHeight = 312
+      object Tv1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
         Navigator.Buttons.Delete.Visible = False
         ScrollbarAnnotations.CustomAnnotations = <>
-        DataController.DataSource = DS_6
+        DataController.DataSource = DS_1
         DataController.Filter.AutoDataSetFilter = True
         DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
         DataController.Summary.DefaultGroupSummaryItems = <>
         DataController.Summary.FooterSummaryItems = <
           item
             Kind = skSum
-            Column = cxGridDBColumn110
+            Column = Tv1Column12
           end
           item
             Kind = skSum
-            Column = cxGridDBColumn113
+            Column = Tv1Column15
           end
           item
             Kind = skSum
-            Column = cxGridDBColumn114
+            Column = Tv1Column16
           end
           item
             Kind = skSum
-            Column = cxGridDBColumn115
+            Column = Tv1Column17
           end
           item
             Kind = skSum
-            Column = cxGridDBColumn109
+            Column = Tv1Column11
           end
           item
             Kind = skSum
-            Column = cxGridDBColumn117
+            Column = cxGridDBColumn102
           end>
         DataController.Summary.SummaryGroups = <>
         OptionsBehavior.GoToNextCellOnEnter = True
@@ -74,11 +80,6 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
         OptionsData.DeletingConfirmation = False
         OptionsView.Footer = True
         OptionsView.GroupByBox = False
-        Styles.IncSearch = DataLink_TradePlan.SHuangSe
-        Styles.Footer = DataLink_TradePlan.Default
-        Styles.Header = DataLink_TradePlan.Default
-        Styles.Inactive = DataLink_TradePlan.SHuangSe
-        Styles.Selection = DataLink_TradePlan.SHuangSe
         object cxGridDBColumn91: TcxGridDBColumn
           Caption = #36873#25321
           DataBinding.FieldName = 'SSel'
@@ -106,7 +107,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
-          Width = 76
+          Width = 112
         end
         object cxGridDBColumn94: TcxGridDBColumn
           Caption = #25105#26041#21333#20301
@@ -114,7 +115,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
-          Width = 66
+          Width = 100
         end
         object cxGridDBColumn95: TcxGridDBColumn
           Caption = #23545#26041#21333#20301
@@ -122,7 +123,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
-          Width = 76
+          Width = 102
         end
         object cxGridDBColumn96: TcxGridDBColumn
           Tag = 7
@@ -131,17 +132,17 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
-          Width = 66
+          Width = 92
         end
-        object cxGridDBColumn97: TcxGridDBColumn
+        object Tv1Column3: TcxGridDBColumn
           Caption = #20184#27454#26041#24335
           DataBinding.FieldName = 'PayMent'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
-          Width = 66
+          Width = 91
         end
-        object cxGridDBColumn98: TcxGridDBColumn
+        object cxGridDBColumn97: TcxGridDBColumn
           Caption = #21512#21516#21495
           DataBinding.FieldName = 'ConNo'
           DataBinding.IsNullValueType = True
@@ -149,7 +150,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 77
         end
-        object cxGridDBColumn99: TcxGridDBColumn
+        object cxGridDBColumn98: TcxGridDBColumn
           Caption = #25688#35201
           DataBinding.FieldName = 'FFAbstract'
           DataBinding.IsNullValueType = True
@@ -157,22 +158,22 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 79
         end
-        object cxGridDBColumn100: TcxGridDBColumn
-          Caption = #35745#21010#21333#21495
+        object cxGridDBColumn99: TcxGridDBColumn
+          Caption = #35746#21333#21495
           DataBinding.FieldName = 'OrderNo'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
-          Width = 66
+          Width = 129
         end
-        object cxGridDBColumn101: TcxGridDBColumn
+        object cxGridDBColumn100: TcxGridDBColumn
           Caption = #23458#25143#21333#21495
           DataBinding.FieldName = 'BuyConNo'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
-          Width = 74
+          Width = 105
         end
-        object cxGridDBColumn102: TcxGridDBColumn
+        object Tv1Column4: TcxGridDBColumn
           Caption = #32534#21495
           DataBinding.FieldName = 'F_Code'
           DataBinding.IsNullValueType = True
@@ -180,7 +181,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn103: TcxGridDBColumn
+        object Tv1Column5: TcxGridDBColumn
           Caption = #21697#21517
           DataBinding.FieldName = 'F_Name'
           DataBinding.IsNullValueType = True
@@ -188,7 +189,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn104: TcxGridDBColumn
+        object Tv1Column6: TcxGridDBColumn
           Caption = #33457#22411
           DataBinding.FieldName = 'F_Pattern'
           DataBinding.IsNullValueType = True
@@ -196,7 +197,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn105: TcxGridDBColumn
+        object Tv1Column7: TcxGridDBColumn
           Caption = #39068#33394
           DataBinding.FieldName = 'F_Color'
           DataBinding.IsNullValueType = True
@@ -204,7 +205,15 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn106: TcxGridDBColumn
+        object Tv1Column28: TcxGridDBColumn
+          Caption = #27454#21495
+          DataBinding.FieldName = 'F_StyleNo'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 72
+        end
+        object Tv1Column8: TcxGridDBColumn
           Caption = #38376#24133
           DataBinding.FieldName = 'F_Width'
           DataBinding.IsNullValueType = True
@@ -212,7 +221,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn107: TcxGridDBColumn
+        object Tv1Column9: TcxGridDBColumn
           Caption = #20811#37325
           DataBinding.FieldName = 'F_GramWeight'
           DataBinding.IsNullValueType = True
@@ -220,7 +229,23 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn108: TcxGridDBColumn
+        object Tv1Column29: TcxGridDBColumn
+          Caption = #24067#31181
+          DataBinding.FieldName = 'GC_Name'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 78
+        end
+        object Tv1Column30: TcxGridDBColumn
+          Caption = #21152#24037#21035
+          DataBinding.FieldName = 'CraftCode'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 87
+        end
+        object Tv1Column10: TcxGridDBColumn
           Caption = #33394#21495
           DataBinding.FieldName = 'F_ColorNo'
           DataBinding.IsNullValueType = True
@@ -228,7 +253,23 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn109: TcxGridDBColumn
+        object Tv1Column31: TcxGridDBColumn
+          Caption = #32568#21495
+          DataBinding.FieldName = 'F_BatchNO'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 99
+        end
+        object Tv1Column27: TcxGridDBColumn
+          Caption = #38468#20214
+          DataBinding.FieldName = 'FJFlag'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 48
+        end
+        object Tv1Column11: TcxGridDBColumn
           Caption = #21305#25968
           DataBinding.FieldName = 'Piece'
           DataBinding.IsNullValueType = True
@@ -236,15 +277,15 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn110: TcxGridDBColumn
-          Caption = #25968#37327
+        object Tv1Column12: TcxGridDBColumn
+          Caption = #20986#36135#25968#37327
           DataBinding.FieldName = 'Qty'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
-          Width = 66
+          Width = 138
         end
-        object cxGridDBColumn111: TcxGridDBColumn
+        object Tv1Column13: TcxGridDBColumn
           Caption = #21333#20301
           DataBinding.FieldName = 'QtyUnit'
           DataBinding.IsNullValueType = True
@@ -252,7 +293,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn112: TcxGridDBColumn
+        object Tv1Column14: TcxGridDBColumn
           Caption = #21333#20215
           DataBinding.FieldName = 'Price'
           DataBinding.IsNullValueType = True
@@ -260,7 +301,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn113: TcxGridDBColumn
+        object Tv1Column15: TcxGridDBColumn
           Caption = #20854#20182#36153
           DataBinding.FieldName = 'OtherFee'
           DataBinding.IsNullValueType = True
@@ -268,7 +309,21 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn114: TcxGridDBColumn
+        object Tv1Column37: TcxGridDBColumn
+          Caption = #35746#37327
+          DataBinding.FieldName = 'ConQty'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 78
+        end
+        object Tv1Column38: TcxGridDBColumn
+          Caption = #27719#29575
+          DataBinding.FieldName = 'ExchangeRate'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 94
+        end
+        object Tv1Column16: TcxGridDBColumn
           Caption = #20943#20813
           DataBinding.FieldName = 'Deduction'
           DataBinding.IsNullValueType = True
@@ -276,7 +331,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn115: TcxGridDBColumn
+        object Tv1Column17: TcxGridDBColumn
           Caption = #37329#39069
           DataBinding.FieldName = 'Amount'
           DataBinding.IsNullValueType = True
@@ -284,7 +339,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn116: TcxGridDBColumn
+        object cxGridDBColumn101: TcxGridDBColumn
           Caption = #24065#31181
           DataBinding.FieldName = 'Currency'
           DataBinding.IsNullValueType = True
@@ -292,14 +347,21 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 66
         end
-        object cxGridDBColumn117: TcxGridDBColumn
+        object cxGridDBColumn102: TcxGridDBColumn
           Caption = #26680#38144#37329#39069
           DataBinding.FieldName = 'FFWoAmount'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
         end
-        object cxGridDBColumn118: TcxGridDBColumn
+        object Tv1Column26: TcxGridDBColumn
+          Caption = #26159#21542#21547#31246
+          DataBinding.FieldName = 'IsInvoice'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 78
+        end
+        object Tv1Column1: TcxGridDBColumn
           Caption = #26469#28304
           DataBinding.FieldName = 'FromID1'
           DataBinding.IsNullValueType = True
@@ -307,262 +369,68 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           Options.Editing = False
           Width = 70
         end
-        object cxGridDBColumn119: TcxGridDBColumn
+        object Tv1Column2: TcxGridDBColumn
           Caption = #22791#27880
           DataBinding.FieldName = 'Note'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
         end
+        object Tv1Column32: TcxGridDBColumn
+          Caption = #36229#20132
+          DataBinding.FieldName = 'MoreQty'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 66
+        end
+        object Tv1Column34: TcxGridDBColumn
+          Caption = #36229#20132#21333#20301
+          DataBinding.FieldName = 'MoreLessUnit'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 66
+        end
+        object Tv1Column33: TcxGridDBColumn
+          Caption = #30701#20132
+          DataBinding.FieldName = 'LessQty'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 66
+        end
+        object Tv1Column36: TcxGridDBColumn
+          Caption = #21512#21516#20132#26399
+          DataBinding.FieldName = 'DlyNote'
+          DataBinding.IsNullValueType = True
+          Width = 81
+        end
+        object Tv1Column35: TcxGridDBColumn
+          Caption = #19979#21333#26085#26399
+          DataBinding.FieldName = 'ConDate'
+          DataBinding.IsNullValueType = True
+          Width = 77
+        end
       end
       object cxGridLevel5: TcxGridLevel
-        GridView = TV6
-      end
-    end
-  end
-  object GroupBox3: TGroupBox
-    Left = 0
-    Top = 113
-    Width = 1539
-    Height = 150
-    Align = alTop
-    Caption = #35745#21010#20449#24687
-    TabOrder = 1
-    object cxGrid1: TcxGrid
-      Left = 2
-      Top = 14
-      Width = 1535
-      Height = 134
-      Align = alClient
-      TabOrder = 0
-      object Tv1: TcxGridDBTableView
-        Navigator.Buttons.CustomButtons = <>
-        ScrollbarAnnotations.CustomAnnotations = <>
-        DataController.DataSource = DS_1
-        DataController.Filter.AutoDataSetFilter = True
-        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
-        DataController.Summary.DefaultGroupSummaryItems = <>
-        DataController.Summary.FooterSummaryItems = <
-          item
-            Kind = skSum
-            Column = v1PRTOrderQty
-          end>
-        DataController.Summary.SummaryGroups = <>
-        OptionsView.Footer = True
-        OptionsView.GroupByBox = False
-        Styles.Header = DataLink_TradePlan.Default
-        object v1Column7: TcxGridDBColumn
-          Caption = #36873#25321
-          DataBinding.FieldName = 'Ssel'
-          DataBinding.IsNullValueType = True
-          PropertiesClassName = 'TcxCheckBoxProperties'
-          Properties.ImmediatePost = True
-          HeaderAlignmentHorz = taCenter
-          Width = 56
-        end
-        object Tv1Column11: TcxGridDBColumn
-          Caption = #23458#25143
-          DataBinding.FieldName = 'CustName'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Width = 80
-        end
-        object v1OrderNo: TcxGridDBColumn
-          Caption = #35745#21010#21333#21495
-          DataBinding.FieldName = 'OrderNo'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 72
-        end
-        object v1ConNo: TcxGridDBColumn
-          Caption = #21512#21516#21495
-          DataBinding.FieldName = 'ConNo'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 68
-        end
-        object v1DeliveryDate: TcxGridDBColumn
-          Caption = #20132#36135#26085#26399
-          DataBinding.FieldName = 'DlyDate'
-          DataBinding.IsNullValueType = True
-          PropertiesClassName = 'TcxDateEditProperties'
-          Properties.ShowTime = False
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 66
-        end
-        object Tv1Column4: TcxGridDBColumn
-          Caption = #23458#25143#21333#21495
-          DataBinding.FieldName = 'BuyConNo'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Width = 80
-        end
-        object Tv1Column5: TcxGridDBColumn
-          Caption = #24037#33402
-          DataBinding.FieldName = 'Technics'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-        end
-        object Tv1Column2: TcxGridDBColumn
-          Caption = #21152#24037#21378
-          DataBinding.FieldName = 'FtyName'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Width = 138
-        end
-        object v1OrdDefStr1: TcxGridDBColumn
-          Caption = #20135#21697#32534#21495
-          DataBinding.FieldName = 'C_Code'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 90
-        end
-        object v1MPRTCodeName: TcxGridDBColumn
-          Caption = #20135#21697#21517#31216
-          DataBinding.FieldName = 'C_Name'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 70
-        end
-        object v1MPRTSpec: TcxGridDBColumn
-          Caption = #35268#26684
-          DataBinding.FieldName = 'C_Spec'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 68
-        end
-        object Tv1Column1: TcxGridDBColumn
-          Caption = #25104#20998
-          DataBinding.FieldName = 'C_Composition'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Width = 66
-        end
-        object v1MPRTMF: TcxGridDBColumn
-          Caption = #38376#24133
-          DataBinding.FieldName = 'C_Width'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 70
-        end
-        object v1MPRTKZ: TcxGridDBColumn
-          Caption = #20811#37325
-          DataBinding.FieldName = 'C_GramWeight'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 54
-        end
-        object v1PRTColor: TcxGridDBColumn
-          Caption = #39068#33394
-          DataBinding.FieldName = 'C_Color'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 63
-        end
-        object v1Column1: TcxGridDBColumn
-          Caption = #33394#21495
-          DataBinding.FieldName = 'C_ColorNo'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 56
-        end
-        object v1Column6: TcxGridDBColumn
-          Caption = #33457#22411
-          DataBinding.FieldName = 'C_Pattern'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 80
-        end
-        object v1Column4: TcxGridDBColumn
-          Caption = #21305#25968
-          DataBinding.FieldName = 'OrdPiece'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Width = 87
-        end
-        object v1PRTOrderQty: TcxGridDBColumn
-          Caption = #25968#37327
-          DataBinding.FieldName = 'OrdQty'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 57
-        end
-        object v1Column5: TcxGridDBColumn
-          Caption = #25968#37327#21333#20301
-          DataBinding.FieldName = 'OrdUnit'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Options.Focusing = False
-          Width = 62
-        end
-        object v1Column3: TcxGridDBColumn
-          Caption = #20844#26020#25968
-          DataBinding.FieldName = 'PRTOrderKgQty'
-          DataBinding.IsNullValueType = True
-          Visible = False
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Width = 52
-        end
-        object Tv1Column3: TcxGridDBColumn
-          Caption = #22791#27880
-          DataBinding.FieldName = 'OrdSNote'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Width = 66
-        end
-      end
-      object cxGrid1Level1: TcxGridLevel
         GridView = Tv1
       end
     end
   end
   object ScrollBox1: TScrollBox
     Left = 0
-    Top = 38
-    Width = 1539
+    Top = 30
+    Width = 1832
     Height = 75
     Align = alTop
     BevelInner = bvNone
     BevelOuter = bvNone
     Ctl3D = False
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -14
-    Font.Name = #23435#20307
-    Font.Style = []
     ParentCtl3D = False
-    ParentFont = False
-    TabOrder = 2
+    TabOrder = 1
+    ExplicitTop = 38
+    ExplicitWidth = 1539
     object Label15: TLabel
       Left = 1335
       Top = 122
@@ -648,174 +516,123 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
       Visible = False
     end
     object Label3: TLabel
-      Left = 445
-      Top = 22
-      Width = 65
-      Height = 12
+      Left = 551
+      Top = 11
+      Width = 60
+      Height = 17
       Caption = #21046#21333#26085#26399#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
     end
     object Label9: TLabel
-      Left = 244
-      Top = 22
-      Width = 52
-      Height = 12
+      Left = 307
+      Top = 11
+      Width = 48
+      Height = 17
       Caption = #19994#21153#21592#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
     end
     object Label10: TLabel
       Left = 20
-      Top = 22
-      Width = 65
-      Height = 12
-      Caption = #35745#21010#21333#21495#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
+      Top = 11
+      Width = 48
+      Height = 17
+      Caption = #21512#21516#21495#65306
     end
     object Label1: TLabel
       Left = 20
-      Top = 48
-      Width = 65
-      Height = 12
+      Top = 46
+      Width = 60
+      Height = 17
       Caption = #39044#20272#21033#28070#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
     end
     object Label2: TLabel
-      Left = 218
-      Top = 48
-      Width = 78
-      Height = 12
+      Left = 281
+      Top = 46
+      Width = 72
+      Height = 17
       Caption = #39044#20272#21033#28070#29575#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
     end
     object Label5: TLabel
-      Left = 448
-      Top = 48
-      Width = 65
-      Height = 12
+      Left = 551
+      Top = 46
+      Width = 60
+      Height = 17
       Caption = #23454#38469#21033#28070#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
     end
     object Label6: TLabel
-      Left = 644
-      Top = 48
-      Width = 78
-      Height = 12
+      Left = 821
+      Top = 46
+      Width = 72
+      Height = 17
       Caption = #23454#38469#21033#28070#29575#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
     end
-    object OrdDate: TDateTimePicker
+    object ConNo: TcxTextEdit
       Tag = 2
-      Left = 508
-      Top = 18
-      Width = 125
-      Height = 20
-      BevelInner = bvNone
-      Date = 40916.000000000000000000
-      Format = 'yyyy-MM-dd'
-      Time = 0.670856296288548000
+      Left = 85
+      Top = 5
       TabOrder = 0
+      Width = 160
     end
-    object OrderNo: TEdit
+    object YJLRAmount: TcxTextEdit
       Tag = 2
       Left = 85
-      Top = 18
-      Width = 125
-      Height = 20
+      Top = 40
       TabOrder = 1
+      Width = 160
     end
-    object YJLRAmount: TEdit
+    object YJLRRatio: TcxTextEdit
       Tag = 2
-      Left = 85
-      Top = 44
-      Width = 125
-      Height = 20
+      Left = 355
+      Top = 40
       TabOrder = 2
+      Width = 160
     end
-    object YJLRRatio: TEdit
+    object SJLRAmount: TcxTextEdit
       Tag = 2
-      Left = 292
-      Top = 44
-      Width = 125
-      Height = 20
+      Left = 615
+      Top = 40
       TabOrder = 3
+      Width = 160
     end
-    object SJLRAmount: TEdit
+    object SJLRRatio: TcxTextEdit
       Tag = 2
-      Left = 509
-      Top = 44
-      Width = 125
-      Height = 20
+      Left = 900
+      Top = 40
       TabOrder = 4
+      Width = 160
     end
-    object SJLRRatio: TEdit
+    object Saleser: TcxTextEdit
       Tag = 2
-      Left = 723
-      Top = 44
-      Width = 125
-      Height = 20
+      Left = 355
+      Top = 5
       TabOrder = 5
+      Width = 160
     end
-    object Saleser: TEdit
-      Tag = 2
-      Left = 292
-      Top = 18
-      Width = 125
-      Height = 20
+    object ConDate: TcxDateEdit
+      Tag = 1
+      Left = 615
+      Top = 5
+      Enabled = False
+      Properties.ShowTime = False
       TabOrder = 6
+      Width = 160
     end
   end
   object ToolBar1: TToolBar
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1539
-    Height = 38
+    Width = 1832
+    Height = 30
     AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 91
+    ButtonHeight = 30
+    ButtonWidth = 83
     Caption = 'ToolBar1'
     Color = clSkyBlue
-    DisabledImages = DataLink_TradePlan.ImageList_new32
-    Images = DataLink_TradePlan.ImageList_new32
+    DisabledImages = DataLink_TradePlan.cxImageList_bar
+    Images = DataLink_TradePlan.cxImageList_bar
     List = True
     ParentColor = False
     ShowCaptions = True
-    TabOrder = 3
+    TabOrder = 2
     object TBRafresh: TToolButton
       Left = 0
       Top = 0
@@ -825,7 +642,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
       OnClick = TBRafreshClick
     end
     object ToolButton3: TToolButton
-      Left = 71
+      Left = 63
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -833,7 +650,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
       OnClick = ToolButton3Click
     end
     object TBClose: TToolButton
-      Left = 166
+      Left = 150
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -843,25 +660,26 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
   end
   object Panel1: TPanel
     Left = 0
-    Top = 263
-    Width = 1539
-    Height = 165
-    Align = alTop
+    Top = 446
+    Width = 1832
+    Height = 226
+    Align = alBottom
     Caption = 'Panel1'
-    TabOrder = 4
+    TabOrder = 3
+    ExplicitWidth = 1539
     object GroupBox5: TGroupBox
       Left = 1
       Top = 1
       Width = 824
-      Height = 163
+      Height = 224
       Align = alLeft
       Caption = #37319#36141#20449#24687
       TabOrder = 0
       object cxGrid2: TcxGrid
         Left = 2
-        Top = 14
+        Top = 19
         Width = 820
-        Height = 147
+        Height = 203
         Align = alClient
         TabOrder = 0
         object TV2: TcxGridDBTableView
@@ -876,26 +694,15 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           DataController.Summary.FooterSummaryItems = <
             item
               Kind = skSum
-              Column = cxGridDBColumn10
+              Column = TV2Column10
             end
             item
               Kind = skSum
-              Column = cxGridDBColumn13
-            end
-            item
-              Kind = skSum
-              Column = cxGridDBColumn14
-            end
-            item
-              Kind = skSum
-              Column = cxGridDBColumn16
-            end
-            item
-              Kind = skSum
-              Column = cxGridDBColumn9
+              Column = TV2Column7
             end
             item
               Kind = skSum
+              Column = TV2Column6
             end>
           DataController.Summary.SummaryGroups = <>
           OptionsBehavior.GoToNextCellOnEnter = True
@@ -904,246 +711,102 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           OptionsData.DeletingConfirmation = False
           OptionsView.Footer = True
           OptionsView.GroupByBox = False
-          Styles.IncSearch = DataLink_TradePlan.SHuangSe
-          Styles.Footer = DataLink_TradePlan.Default
-          Styles.Header = DataLink_TradePlan.Default
-          Styles.Inactive = DataLink_TradePlan.SHuangSe
           Styles.Selection = DataLink_TradePlan.SHuangSe
-          object Tv1Column22: TcxGridDBColumn
-            Caption = #36873#25321
-            DataBinding.FieldName = 'SSel'
-            DataBinding.IsNullValueType = True
-            PropertiesClassName = 'TcxCheckBoxProperties'
-            Properties.ImmediatePost = True
-            HeaderAlignmentHorz = taCenter
-            Width = 44
-          end
-          object v2CRTime: TcxGridDBColumn
-            Tag = 7
-            Caption = #21457#29983#26085#26399
-            DataBinding.FieldName = 'FFTime'
-            DataBinding.IsNullValueType = True
-            PropertiesClassName = 'TcxDateEditProperties'
-            Properties.SaveTime = False
-            Properties.ShowTime = False
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 82
-          end
-          object Tv1Column23: TcxGridDBColumn
-            Caption = #23545#36134#26085#26399
-            DataBinding.FieldName = 'ReconciliationDate'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 76
-          end
-          object v2Column2: TcxGridDBColumn
-            Caption = #25105#26041#21333#20301
-            DataBinding.FieldName = 'OurCoName'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object v2FactoryName: TcxGridDBColumn
-            Caption = #23545#26041#21333#20301
-            DataBinding.FieldName = 'OppCoName'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 76
-          end
-          object v2OrderNo: TcxGridDBColumn
-            Tag = 7
-            Caption = #19978#32423#21333#20301
-            DataBinding.FieldName = 'OppParentCoName'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn1: TcxGridDBColumn
-            Caption = #20184#27454#26041#24335
-            DataBinding.FieldName = 'PayMent'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object Tv1Column19: TcxGridDBColumn
-            Caption = #21512#21516#21495
-            DataBinding.FieldName = 'ConNo'
+          object TV2Column1: TcxGridDBColumn
+            Caption = #20379#24212#21830
+            DataBinding.FieldName = 'FromCoName'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 77
           end
-          object Tv1Column24: TcxGridDBColumn
-            Caption = #25688#35201
-            DataBinding.FieldName = 'FFAbstract'
+          object TV2Column2: TcxGridDBColumn
+            Caption = #31867#22411
+            DataBinding.FieldName = 'IOType'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 79
+            Width = 77
           end
-          object Tv1Column20: TcxGridDBColumn
-            Caption = #35745#21010#21333#21495
-            DataBinding.FieldName = 'OrderNo'
+          object TV2Column3: TcxGridDBColumn
+            Caption = #26102#38388
+            DataBinding.FieldName = 'IOTime'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object Tv1Column21: TcxGridDBColumn
-            Caption = #23458#25143#21333#21495
-            DataBinding.FieldName = 'BuyConNo'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Width = 74
-          end
-          object cxGridDBColumn2: TcxGridDBColumn
-            Caption = #32534#21495
-            DataBinding.FieldName = 'F_Code'
+          object TV2Column11: TcxGridDBColumn
+            Caption = #24067#31181
+            DataBinding.FieldName = 'GC_Name'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn3: TcxGridDBColumn
-            Caption = #21697#21517
-            DataBinding.FieldName = 'F_Name'
+          object TV2Column12: TcxGridDBColumn
+            Caption = #21152#24037#21035
+            DataBinding.FieldName = 'CraftCode'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn4: TcxGridDBColumn
-            Caption = #33457#22411
-            DataBinding.FieldName = 'F_Pattern'
+          object TV2Column4: TcxGridDBColumn
+            Caption = #26469#33258#21512#21516
+            DataBinding.FieldName = 'FromConNo'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn5: TcxGridDBColumn
-            Caption = #39068#33394
-            DataBinding.FieldName = 'F_Color'
+          object TV2Column5: TcxGridDBColumn
+            Caption = #20986#21040#21512#21516
+            DataBinding.FieldName = 'ToConNo'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn6: TcxGridDBColumn
-            Caption = #38376#24133
-            DataBinding.FieldName = 'F_Width'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn7: TcxGridDBColumn
-            Caption = #20811#37325
-            DataBinding.FieldName = 'F_GramWeight'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn8: TcxGridDBColumn
-            Caption = #33394#21495
-            DataBinding.FieldName = 'F_ColorNo'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn9: TcxGridDBColumn
+          object TV2Column6: TcxGridDBColumn
             Caption = #21305#25968
             DataBinding.FieldName = 'Piece'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn10: TcxGridDBColumn
+          object TV2Column7: TcxGridDBColumn
             Caption = #25968#37327
             DataBinding.FieldName = 'Qty'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn11: TcxGridDBColumn
+          object TV2Column8: TcxGridDBColumn
             Caption = #21333#20301
             DataBinding.FieldName = 'QtyUnit'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn12: TcxGridDBColumn
-            Caption = #21333#20215
-            DataBinding.FieldName = 'Price'
+          object TV2Column9: TcxGridDBColumn
+            Caption = #25104#26412#20215
+            DataBinding.FieldName = 'CostPrice'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn13: TcxGridDBColumn
-            Caption = #20854#20182#36153
-            DataBinding.FieldName = 'OtherFee'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn14: TcxGridDBColumn
-            Caption = #20943#20813
-            DataBinding.FieldName = 'Deduction'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn15: TcxGridDBColumn
-            Caption = #26159#21542#21547#31246
-            DataBinding.FieldName = 'IsInvoice'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-          end
-          object cxGridDBColumn16: TcxGridDBColumn
+          object TV2Column10: TcxGridDBColumn
             Caption = #37329#39069
-            DataBinding.FieldName = 'Amount'
+            DataBinding.FieldName = 'Cost'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
-          end
-          object Tv1Column25: TcxGridDBColumn
-            Caption = #22791#27880
-            DataBinding.FieldName = 'Note'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 78
-          end
-          object Tv1Column18: TcxGridDBColumn
-            Caption = #24065#31181
-            DataBinding.FieldName = 'Currency'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn17: TcxGridDBColumn
-            Caption = #26469#28304
-            DataBinding.FieldName = 'FromID1'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 70
+            Width = 77
           end
         end
         object cxGridLevel1: TcxGridLevel
@@ -1154,18 +817,21 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
     object GroupBox2: TGroupBox
       Left = 825
       Top = 1
-      Width = 713
-      Height = 163
+      Width = 1006
+      Height = 224
       Align = alClient
       Caption = #21152#24037#20449#24687
       TabOrder = 1
+      ExplicitWidth = 713
       object cxGrid3: TcxGrid
         Left = 2
-        Top = 14
-        Width = 709
-        Height = 147
+        Top = 19
+        Width = 1002
+        Height = 203
         Align = alClient
         TabOrder = 0
+        ExplicitLeft = 4
+        ExplicitTop = 18
         object TV3: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           Navigator.Buttons.Delete.Enabled = False
@@ -1178,26 +844,15 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           DataController.Summary.FooterSummaryItems = <
             item
               Kind = skSum
-              Column = cxGridDBColumn37
+              Column = cxGridDBColumn8
             end
             item
               Kind = skSum
-              Column = cxGridDBColumn40
-            end
-            item
-              Kind = skSum
-              Column = cxGridDBColumn41
-            end
-            item
-              Kind = skSum
-              Column = cxGridDBColumn43
-            end
-            item
-              Kind = skSum
-              Column = cxGridDBColumn36
+              Column = cxGridDBColumn9
             end
             item
               Kind = skSum
+              Column = cxGridDBColumn12
             end>
           DataController.Summary.SummaryGroups = <>
           OptionsBehavior.GoToNextCellOnEnter = True
@@ -1206,246 +861,102 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           OptionsData.DeletingConfirmation = False
           OptionsView.Footer = True
           OptionsView.GroupByBox = False
-          Styles.IncSearch = DataLink_TradePlan.SHuangSe
-          Styles.Footer = DataLink_TradePlan.Default
-          Styles.Header = DataLink_TradePlan.Default
-          Styles.Inactive = DataLink_TradePlan.SHuangSe
           Styles.Selection = DataLink_TradePlan.SHuangSe
-          object cxGridDBColumn18: TcxGridDBColumn
-            Caption = #36873#25321
-            DataBinding.FieldName = 'SSel'
-            DataBinding.IsNullValueType = True
-            PropertiesClassName = 'TcxCheckBoxProperties'
-            Properties.ImmediatePost = True
-            HeaderAlignmentHorz = taCenter
-            Width = 44
-          end
-          object cxGridDBColumn19: TcxGridDBColumn
-            Tag = 7
-            Caption = #21457#29983#26085#26399
-            DataBinding.FieldName = 'FFTime'
-            DataBinding.IsNullValueType = True
-            PropertiesClassName = 'TcxDateEditProperties'
-            Properties.SaveTime = False
-            Properties.ShowTime = False
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 82
-          end
-          object cxGridDBColumn20: TcxGridDBColumn
-            Caption = #23545#36134#26085#26399
-            DataBinding.FieldName = 'ReconciliationDate'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 76
-          end
-          object cxGridDBColumn21: TcxGridDBColumn
-            Caption = #25105#26041#21333#20301
-            DataBinding.FieldName = 'OurCoName'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn22: TcxGridDBColumn
-            Caption = #23545#26041#21333#20301
-            DataBinding.FieldName = 'OppCoName'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 76
-          end
-          object cxGridDBColumn23: TcxGridDBColumn
-            Tag = 7
-            Caption = #19978#32423#21333#20301
-            DataBinding.FieldName = 'OppParentCoName'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn24: TcxGridDBColumn
-            Caption = #20184#27454#26041#24335
-            DataBinding.FieldName = 'PayMent'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn25: TcxGridDBColumn
-            Caption = #21512#21516#21495
-            DataBinding.FieldName = 'ConNo'
+          object cxGridDBColumn1: TcxGridDBColumn
+            Caption = #20379#24212#21830
+            DataBinding.FieldName = 'FromCoName'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 77
           end
-          object cxGridDBColumn26: TcxGridDBColumn
-            Caption = #25688#35201
-            DataBinding.FieldName = 'FFAbstract'
+          object cxGridDBColumn2: TcxGridDBColumn
+            Caption = #31867#22411
+            DataBinding.FieldName = 'IOType'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 79
+            Width = 77
           end
-          object cxGridDBColumn27: TcxGridDBColumn
-            Caption = #35745#21010#21333#21495
-            DataBinding.FieldName = 'OrderNo'
+          object cxGridDBColumn3: TcxGridDBColumn
+            Caption = #26102#38388
+            DataBinding.FieldName = 'IOTime'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn28: TcxGridDBColumn
-            Caption = #23458#25143#21333#21495
-            DataBinding.FieldName = 'BuyConNo'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Width = 74
-          end
-          object cxGridDBColumn29: TcxGridDBColumn
-            Caption = #32534#21495
-            DataBinding.FieldName = 'F_Code'
+          object cxGridDBColumn4: TcxGridDBColumn
+            Caption = #24067#31181
+            DataBinding.FieldName = 'GC_Name'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn30: TcxGridDBColumn
-            Caption = #21697#21517
-            DataBinding.FieldName = 'F_Name'
+          object cxGridDBColumn5: TcxGridDBColumn
+            Caption = #21152#24037#21035
+            DataBinding.FieldName = 'CraftCode'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn31: TcxGridDBColumn
-            Caption = #33457#22411
-            DataBinding.FieldName = 'F_Pattern'
+          object cxGridDBColumn6: TcxGridDBColumn
+            Caption = #26469#33258#21512#21516
+            DataBinding.FieldName = 'FromConNo'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn32: TcxGridDBColumn
-            Caption = #39068#33394
-            DataBinding.FieldName = 'F_Color'
+          object cxGridDBColumn7: TcxGridDBColumn
+            Caption = #20986#21040#21512#21516
+            DataBinding.FieldName = 'ToConNo'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn33: TcxGridDBColumn
-            Caption = #38376#24133
-            DataBinding.FieldName = 'F_Width'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn34: TcxGridDBColumn
-            Caption = #20811#37325
-            DataBinding.FieldName = 'F_GramWeight'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn35: TcxGridDBColumn
-            Caption = #33394#21495
-            DataBinding.FieldName = 'F_ColorNo'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn36: TcxGridDBColumn
+          object cxGridDBColumn8: TcxGridDBColumn
             Caption = #21305#25968
             DataBinding.FieldName = 'Piece'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn37: TcxGridDBColumn
+          object cxGridDBColumn9: TcxGridDBColumn
             Caption = #25968#37327
             DataBinding.FieldName = 'Qty'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn38: TcxGridDBColumn
+          object cxGridDBColumn10: TcxGridDBColumn
             Caption = #21333#20301
             DataBinding.FieldName = 'QtyUnit'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn39: TcxGridDBColumn
-            Caption = #21333#20215
-            DataBinding.FieldName = 'Price'
+          object cxGridDBColumn11: TcxGridDBColumn
+            Caption = #25104#26412#20215
+            DataBinding.FieldName = 'CostPrice'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn40: TcxGridDBColumn
-            Caption = #20854#20182#36153
-            DataBinding.FieldName = 'OtherFee'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn41: TcxGridDBColumn
-            Caption = #20943#20813
-            DataBinding.FieldName = 'Deduction'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn42: TcxGridDBColumn
-            Caption = #26159#21542#21547#31246
-            DataBinding.FieldName = 'IsInvoice'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-          end
-          object cxGridDBColumn43: TcxGridDBColumn
+          object cxGridDBColumn12: TcxGridDBColumn
             Caption = #37329#39069
-            DataBinding.FieldName = 'Amount'
+            DataBinding.FieldName = 'Cost'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn44: TcxGridDBColumn
-            Caption = #22791#27880
-            DataBinding.FieldName = 'Note'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 78
-          end
-          object cxGridDBColumn45: TcxGridDBColumn
-            Caption = #24065#31181
-            DataBinding.FieldName = 'Currency'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn46: TcxGridDBColumn
-            Caption = #26469#28304
-            DataBinding.FieldName = 'FromID1'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 70
+            Width = 77
           end
         end
         object cxGridLevel2: TcxGridLevel
@@ -1456,27 +967,30 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
   end
   object Panel2: TPanel
     Left = 0
-    Top = 428
-    Width = 1539
-    Height = 149
-    Align = alTop
+    Top = 672
+    Width = 1832
+    Height = 196
+    Align = alBottom
     Caption = 'Panel1'
-    TabOrder = 5
+    TabOrder = 4
+    ExplicitWidth = 1539
     object GroupBox4: TGroupBox
       Left = 1
       Top = 1
       Width = 824
-      Height = 147
+      Height = 194
       Align = alLeft
-      Caption = #20854#20182#36153
+      Caption = #36716#21333#25910#30410
       TabOrder = 0
       object cxGrid4: TcxGrid
         Left = 2
-        Top = 14
+        Top = 19
         Width = 820
-        Height = 131
+        Height = 173
         Align = alClient
         TabOrder = 0
+        ExplicitLeft = 4
+        ExplicitTop = 21
         object TV4: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           Navigator.Buttons.Delete.Enabled = False
@@ -1489,26 +1003,15 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           DataController.Summary.FooterSummaryItems = <
             item
               Kind = skSum
-              Column = cxGridDBColumn66
+              Column = cxGridDBColumn24
             end
             item
               Kind = skSum
-              Column = cxGridDBColumn69
-            end
-            item
-              Kind = skSum
-              Column = cxGridDBColumn70
-            end
-            item
-              Kind = skSum
-              Column = cxGridDBColumn72
-            end
-            item
-              Kind = skSum
-              Column = cxGridDBColumn65
+              Column = cxGridDBColumn21
             end
             item
               Kind = skSum
+              Column = cxGridDBColumn20
             end>
           DataController.Summary.SummaryGroups = <>
           OptionsBehavior.GoToNextCellOnEnter = True
@@ -1517,246 +1020,102 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           OptionsData.DeletingConfirmation = False
           OptionsView.Footer = True
           OptionsView.GroupByBox = False
-          Styles.IncSearch = DataLink_TradePlan.SHuangSe
-          Styles.Footer = DataLink_TradePlan.Default
-          Styles.Header = DataLink_TradePlan.Default
-          Styles.Inactive = DataLink_TradePlan.SHuangSe
           Styles.Selection = DataLink_TradePlan.SHuangSe
-          object cxGridDBColumn47: TcxGridDBColumn
-            Caption = #36873#25321
-            DataBinding.FieldName = 'SSel'
-            DataBinding.IsNullValueType = True
-            PropertiesClassName = 'TcxCheckBoxProperties'
-            Properties.ImmediatePost = True
-            HeaderAlignmentHorz = taCenter
-            Width = 44
-          end
-          object cxGridDBColumn48: TcxGridDBColumn
-            Tag = 7
-            Caption = #21457#29983#26085#26399
-            DataBinding.FieldName = 'FFTime'
-            DataBinding.IsNullValueType = True
-            PropertiesClassName = 'TcxDateEditProperties'
-            Properties.SaveTime = False
-            Properties.ShowTime = False
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 82
-          end
-          object cxGridDBColumn49: TcxGridDBColumn
-            Caption = #23545#36134#26085#26399
-            DataBinding.FieldName = 'ReconciliationDate'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 76
-          end
-          object cxGridDBColumn50: TcxGridDBColumn
-            Caption = #25105#26041#21333#20301
-            DataBinding.FieldName = 'OurCoName'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn51: TcxGridDBColumn
-            Caption = #23545#26041#21333#20301
-            DataBinding.FieldName = 'OppCoName'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 76
-          end
-          object cxGridDBColumn52: TcxGridDBColumn
-            Tag = 7
-            Caption = #19978#32423#21333#20301
-            DataBinding.FieldName = 'OppParentCoName'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn53: TcxGridDBColumn
-            Caption = #20184#27454#26041#24335
-            DataBinding.FieldName = 'PayMent'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn54: TcxGridDBColumn
-            Caption = #21512#21516#21495
-            DataBinding.FieldName = 'ConNo'
+          object cxGridDBColumn13: TcxGridDBColumn
+            Caption = #20379#24212#21830
+            DataBinding.FieldName = 'FromCoName'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 77
           end
-          object cxGridDBColumn55: TcxGridDBColumn
-            Caption = #25688#35201
-            DataBinding.FieldName = 'FFAbstract'
+          object cxGridDBColumn14: TcxGridDBColumn
+            Caption = #31867#22411
+            DataBinding.FieldName = 'IOType'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 79
+            Width = 77
           end
-          object cxGridDBColumn56: TcxGridDBColumn
-            Caption = #35745#21010#21333#21495
-            DataBinding.FieldName = 'OrderNo'
+          object cxGridDBColumn15: TcxGridDBColumn
+            Caption = #26102#38388
+            DataBinding.FieldName = 'IOTime'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn57: TcxGridDBColumn
-            Caption = #23458#25143#21333#21495
-            DataBinding.FieldName = 'BuyConNo'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Width = 74
-          end
-          object cxGridDBColumn58: TcxGridDBColumn
-            Caption = #32534#21495
-            DataBinding.FieldName = 'F_Code'
+          object cxGridDBColumn16: TcxGridDBColumn
+            Caption = #24067#31181
+            DataBinding.FieldName = 'GC_Name'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn59: TcxGridDBColumn
-            Caption = #21697#21517
-            DataBinding.FieldName = 'F_Name'
+          object cxGridDBColumn17: TcxGridDBColumn
+            Caption = #21152#24037#21035
+            DataBinding.FieldName = 'CraftCode'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn60: TcxGridDBColumn
-            Caption = #33457#22411
-            DataBinding.FieldName = 'F_Pattern'
+          object cxGridDBColumn18: TcxGridDBColumn
+            Caption = #26469#33258#21512#21516
+            DataBinding.FieldName = 'FromConNo'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn61: TcxGridDBColumn
-            Caption = #39068#33394
-            DataBinding.FieldName = 'F_Color'
+          object cxGridDBColumn19: TcxGridDBColumn
+            Caption = #20986#21040#21512#21516
+            DataBinding.FieldName = 'ToConNo'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn62: TcxGridDBColumn
-            Caption = #38376#24133
-            DataBinding.FieldName = 'F_Width'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn63: TcxGridDBColumn
-            Caption = #20811#37325
-            DataBinding.FieldName = 'F_GramWeight'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn64: TcxGridDBColumn
-            Caption = #33394#21495
-            DataBinding.FieldName = 'F_ColorNo'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn65: TcxGridDBColumn
+          object cxGridDBColumn20: TcxGridDBColumn
             Caption = #21305#25968
             DataBinding.FieldName = 'Piece'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn66: TcxGridDBColumn
+          object cxGridDBColumn21: TcxGridDBColumn
             Caption = #25968#37327
             DataBinding.FieldName = 'Qty'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn67: TcxGridDBColumn
+          object cxGridDBColumn22: TcxGridDBColumn
             Caption = #21333#20301
             DataBinding.FieldName = 'QtyUnit'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn68: TcxGridDBColumn
-            Caption = #21333#20215
-            DataBinding.FieldName = 'Price'
+          object cxGridDBColumn23: TcxGridDBColumn
+            Caption = #25104#26412#20215
+            DataBinding.FieldName = 'CostPrice'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
+            Width = 77
           end
-          object cxGridDBColumn69: TcxGridDBColumn
-            Caption = #20854#20182#36153
-            DataBinding.FieldName = 'OtherFee'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn70: TcxGridDBColumn
-            Caption = #20943#20813
-            DataBinding.FieldName = 'Deduction'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn71: TcxGridDBColumn
-            Caption = #26159#21542#21547#31246
-            DataBinding.FieldName = 'IsInvoice'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-          end
-          object cxGridDBColumn72: TcxGridDBColumn
+          object cxGridDBColumn24: TcxGridDBColumn
             Caption = #37329#39069
-            DataBinding.FieldName = 'Amount'
+            DataBinding.FieldName = 'Cost'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn73: TcxGridDBColumn
-            Caption = #22791#27880
-            DataBinding.FieldName = 'Note'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 78
-          end
-          object cxGridDBColumn74: TcxGridDBColumn
-            Caption = #24065#31181
-            DataBinding.FieldName = 'Currency'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 66
-          end
-          object cxGridDBColumn75: TcxGridDBColumn
-            Caption = #26469#28304
-            DataBinding.FieldName = 'FromID1'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Options.Editing = False
-            Width = 70
+            Width = 77
           end
         end
         object cxGridLevel3: TcxGridLevel
@@ -1767,18 +1126,21 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
     object GroupBox6: TGroupBox
       Left = 825
       Top = 1
-      Width = 713
-      Height = 147
+      Width = 1006
+      Height = 194
       Align = alClient
       Caption = #26434#36153
       TabOrder = 1
+      ExplicitWidth = 713
       object cxGrid5: TcxGrid
         Left = 2
-        Top = 14
-        Width = 709
-        Height = 131
+        Top = 19
+        Width = 1002
+        Height = 173
         Align = alClient
         TabOrder = 0
+        ExplicitLeft = 4
+        ExplicitTop = 21
         object TV5: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           Navigator.Buttons.Delete.Enabled = False
@@ -1800,7 +1162,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             end
             item
               Kind = skSum
-              Column = cxGridDBColumn88
+              Column = cxGridDBColumn29
             end
             item
               Kind = skSum
@@ -1815,19 +1177,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
           OptionsData.DeletingConfirmation = False
           OptionsView.Footer = True
           OptionsView.GroupByBox = False
-          Styles.IncSearch = DataLink_TradePlan.SHuangSe
-          Styles.Footer = DataLink_TradePlan.Default
-          Styles.Header = DataLink_TradePlan.Default
-          Styles.Inactive = DataLink_TradePlan.SHuangSe
-          Styles.Selection = DataLink_TradePlan.SHuangSe
-          object cxGridDBColumn76: TcxGridDBColumn
-            Caption = #36873#25321
-            DataBinding.FieldName = 'SSel'
-            DataBinding.IsNullValueType = True
-            HeaderAlignmentHorz = taCenter
-            Width = 44
-          end
-          object cxGridDBColumn77: TcxGridDBColumn
+          object v2CRTime: TcxGridDBColumn
             Tag = 7
             Caption = #26085#26399
             DataBinding.FieldName = 'FFTime'
@@ -1839,7 +1189,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             Options.Editing = False
             Width = 66
           end
-          object cxGridDBColumn78: TcxGridDBColumn
+          object v2Column2: TcxGridDBColumn
             Caption = #25105#26041#21333#20301
             DataBinding.FieldName = 'OurCoName'
             DataBinding.IsNullValueType = True
@@ -1847,7 +1197,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             Options.Editing = False
             Width = 78
           end
-          object cxGridDBColumn79: TcxGridDBColumn
+          object v2FactoryName: TcxGridDBColumn
             Caption = #23545#26041#21333#20301
             DataBinding.FieldName = 'OppCoName'
             DataBinding.IsNullValueType = True
@@ -1855,7 +1205,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             Options.Editing = False
             Width = 73
           end
-          object cxGridDBColumn80: TcxGridDBColumn
+          object v2OrderNo: TcxGridDBColumn
             Tag = 7
             Caption = #19978#32423#21333#20301
             DataBinding.FieldName = 'OppParentCoName'
@@ -1864,7 +1214,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             Options.Editing = False
             Width = 82
           end
-          object cxGridDBColumn81: TcxGridDBColumn
+          object cxGridDBColumn25: TcxGridDBColumn
             Caption = #25105#26041#36134#25143
             DataBinding.FieldName = 'OurBankName'
             DataBinding.IsNullValueType = True
@@ -1872,7 +1222,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             Options.Editing = False
             Width = 66
           end
-          object cxGridDBColumn82: TcxGridDBColumn
+          object cxGridDBColumn26: TcxGridDBColumn
             Caption = #23545#26041#36134#25143
             DataBinding.FieldName = 'OppBankName'
             DataBinding.IsNullValueType = True
@@ -1880,7 +1230,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             Options.Editing = False
             Width = 74
           end
-          object cxGridDBColumn83: TcxGridDBColumn
+          object cxGridDBColumn27: TcxGridDBColumn
             Caption = #20184#27454#26041#24335
             DataBinding.FieldName = 'PayMent'
             DataBinding.IsNullValueType = True
@@ -1888,7 +1238,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             Options.Editing = False
             Width = 69
           end
-          object cxGridDBColumn84: TcxGridDBColumn
+          object Tv1Column19: TcxGridDBColumn
             Caption = #21512#21516#21495
             DataBinding.FieldName = 'ConNo'
             DataBinding.IsNullValueType = True
@@ -1896,7 +1246,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             Options.Editing = False
             Width = 66
           end
-          object cxGridDBColumn85: TcxGridDBColumn
+          object Tv1Column20: TcxGridDBColumn
             Caption = #35745#21010#21333#21495
             DataBinding.FieldName = 'OrderNo'
             DataBinding.IsNullValueType = True
@@ -1904,14 +1254,14 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             Options.Editing = False
             Width = 75
           end
-          object cxGridDBColumn86: TcxGridDBColumn
+          object Tv1Column21: TcxGridDBColumn
             Caption = #23458#25143#21333#21495
             DataBinding.FieldName = 'BuyConNo'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 74
           end
-          object cxGridDBColumn87: TcxGridDBColumn
+          object cxGridDBColumn28: TcxGridDBColumn
             Caption = #25688#35201
             DataBinding.FieldName = 'FFAbstract'
             DataBinding.IsNullValueType = True
@@ -1919,7 +1269,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             Options.Editing = False
             Width = 72
           end
-          object cxGridDBColumn88: TcxGridDBColumn
+          object cxGridDBColumn29: TcxGridDBColumn
             Caption = #37329#39069
             DataBinding.FieldName = 'Amount'
             DataBinding.IsNullValueType = True
@@ -1927,7 +1277,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             Options.Editing = False
             Width = 66
           end
-          object cxGridDBColumn89: TcxGridDBColumn
+          object Tv1Column18: TcxGridDBColumn
             Caption = #24065#31181
             DataBinding.FieldName = 'Currency'
             DataBinding.IsNullValueType = True
@@ -1935,7 +1285,7 @@ object frmTradePlanProfitDetails: TfrmTradePlanProfitDetails
             Options.Editing = False
             Width = 66
           end
-          object cxGridDBColumn90: TcxGridDBColumn
+          object cxGridDBColumn30: TcxGridDBColumn
             Caption = #22791#27880
             DataBinding.FieldName = 'Note'
             DataBinding.IsNullValueType = True
diff --git a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfitDetails.pas b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfitDetails.pas
index 58ba0cd..0504946 100644
--- a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfitDetails.pas
+++ b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanProfitDetails.pas
@@ -12,7 +12,7 @@ uses
   ComCtrls, cxContainer, cxMaskEdit, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
   dxBarBuiltInMenu, cxDropDownEdit, BtnEdit, Vcl.ToolWin, dxSkinWXI,
-  dxScrollbarAnnotations;
+  dxScrollbarAnnotations, dxCore, cxDateUtils,math;
 
 type
   TfrmTradePlanProfitDetails = class(TForm)
@@ -24,7 +24,6 @@ type
     DS_2: TDataSource;
     CDS_4: TClientDataSet;
     DS_4: TDataSource;
-    GroupBox3: TGroupBox;
     GPM_2: TcxGridPopupMenu;
     GPM_1: TcxGridPopupMenu;
     GPM_4: TcxGridPopupMenu;
@@ -49,8 +48,7 @@ type
     Label3: TLabel;
     Label9: TLabel;
     Label10: TLabel;
-    OrdDate: TDateTimePicker;
-    OrderNo: TEdit;
+    ConNo: TcxTextEdit;
     ToolBar1: TToolBar;
     TBRafresh: TToolButton;
     ToolButton3: TToolButton;
@@ -63,8 +61,8 @@ type
     DS_6: TDataSource;
     Label1: TLabel;
     Label2: TLabel;
-    YJLRAmount: TEdit;
-    YJLRRatio: TEdit;
+    YJLRAmount: TcxTextEdit;
+    YJLRRatio: TcxTextEdit;
     Panel1: TPanel;
     Panel2: TPanel;
     GroupBox5: TGroupBox;
@@ -73,21 +71,73 @@ type
     GroupBox6: TGroupBox;
     Label5: TLabel;
     Label6: TLabel;
-    SJLRAmount: TEdit;
-    SJLRRatio: TEdit;
+    SJLRAmount: TcxTextEdit;
+    SJLRRatio: TcxTextEdit;
     cxGrid2: TcxGrid;
     TV2: TcxGridDBTableView;
-    Tv1Column22: TcxGridDBColumn;
-    v2CRTime: TcxGridDBColumn;
-    Tv1Column23: TcxGridDBColumn;
-    v2Column2: TcxGridDBColumn;
-    v2FactoryName: TcxGridDBColumn;
-    v2OrderNo: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    Saleser: TcxTextEdit;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    cxGridDBColumn91: TcxGridDBColumn;
+    cxGridDBColumn92: TcxGridDBColumn;
+    cxGridDBColumn93: TcxGridDBColumn;
+    cxGridDBColumn94: TcxGridDBColumn;
+    cxGridDBColumn95: TcxGridDBColumn;
+    cxGridDBColumn96: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    cxGridDBColumn97: TcxGridDBColumn;
+    cxGridDBColumn98: TcxGridDBColumn;
+    cxGridDBColumn99: TcxGridDBColumn;
+    cxGridDBColumn100: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    Tv1Column7: TcxGridDBColumn;
+    Tv1Column28: TcxGridDBColumn;
+    Tv1Column8: TcxGridDBColumn;
+    Tv1Column9: TcxGridDBColumn;
+    Tv1Column29: TcxGridDBColumn;
+    Tv1Column30: TcxGridDBColumn;
+    Tv1Column10: TcxGridDBColumn;
+    Tv1Column31: TcxGridDBColumn;
+    Tv1Column27: TcxGridDBColumn;
+    Tv1Column11: TcxGridDBColumn;
+    Tv1Column12: TcxGridDBColumn;
+    Tv1Column13: TcxGridDBColumn;
+    Tv1Column14: TcxGridDBColumn;
+    Tv1Column15: TcxGridDBColumn;
+    Tv1Column37: TcxGridDBColumn;
+    Tv1Column38: TcxGridDBColumn;
+    Tv1Column16: TcxGridDBColumn;
+    Tv1Column17: TcxGridDBColumn;
+    cxGridDBColumn101: TcxGridDBColumn;
+    cxGridDBColumn102: TcxGridDBColumn;
+    Tv1Column26: TcxGridDBColumn;
+    Tv1Column1: TcxGridDBColumn;
+    Tv1Column2: TcxGridDBColumn;
+    Tv1Column32: TcxGridDBColumn;
+    Tv1Column34: TcxGridDBColumn;
+    Tv1Column33: TcxGridDBColumn;
+    Tv1Column36: TcxGridDBColumn;
+    Tv1Column35: TcxGridDBColumn;
+    cxGridLevel5: TcxGridLevel;
+    ConDate: TcxDateEdit;
+    TV2Column1: TcxGridDBColumn;
+    TV2Column2: TcxGridDBColumn;
+    TV2Column3: TcxGridDBColumn;
+    TV2Column4: TcxGridDBColumn;
+    TV2Column5: TcxGridDBColumn;
+    TV2Column6: TcxGridDBColumn;
+    TV2Column7: TcxGridDBColumn;
+    TV2Column8: TcxGridDBColumn;
+    TV2Column9: TcxGridDBColumn;
+    TV2Column10: TcxGridDBColumn;
+    TV2Column11: TcxGridDBColumn;
+    TV2Column12: TcxGridDBColumn;
+    cxGrid3: TcxGrid;
+    TV3: TcxGridDBTableView;
     cxGridDBColumn1: TcxGridDBColumn;
-    Tv1Column19: TcxGridDBColumn;
-    Tv1Column24: TcxGridDBColumn;
-    Tv1Column20: TcxGridDBColumn;
-    Tv1Column21: TcxGridDBColumn;
     cxGridDBColumn2: TcxGridDBColumn;
     cxGridDBColumn3: TcxGridDBColumn;
     cxGridDBColumn4: TcxGridDBColumn;
@@ -99,16 +149,14 @@ type
     cxGridDBColumn10: TcxGridDBColumn;
     cxGridDBColumn11: TcxGridDBColumn;
     cxGridDBColumn12: TcxGridDBColumn;
+    cxGridLevel2: TcxGridLevel;
+    cxGrid4: TcxGrid;
+    TV4: TcxGridDBTableView;
     cxGridDBColumn13: TcxGridDBColumn;
     cxGridDBColumn14: TcxGridDBColumn;
     cxGridDBColumn15: TcxGridDBColumn;
     cxGridDBColumn16: TcxGridDBColumn;
-    Tv1Column25: TcxGridDBColumn;
-    Tv1Column18: TcxGridDBColumn;
     cxGridDBColumn17: TcxGridDBColumn;
-    cxGridLevel1: TcxGridLevel;
-    cxGrid3: TcxGrid;
-    TV3: TcxGridDBTableView;
     cxGridDBColumn18: TcxGridDBColumn;
     cxGridDBColumn19: TcxGridDBColumn;
     cxGridDBColumn20: TcxGridDBColumn;
@@ -116,137 +164,24 @@ type
     cxGridDBColumn22: TcxGridDBColumn;
     cxGridDBColumn23: TcxGridDBColumn;
     cxGridDBColumn24: TcxGridDBColumn;
-    cxGridDBColumn25: TcxGridDBColumn;
-    cxGridDBColumn26: TcxGridDBColumn;
-    cxGridDBColumn27: TcxGridDBColumn;
-    cxGridDBColumn28: TcxGridDBColumn;
-    cxGridDBColumn29: TcxGridDBColumn;
-    cxGridDBColumn30: TcxGridDBColumn;
-    cxGridDBColumn31: TcxGridDBColumn;
-    cxGridDBColumn32: TcxGridDBColumn;
-    cxGridDBColumn33: TcxGridDBColumn;
-    cxGridDBColumn34: TcxGridDBColumn;
-    cxGridDBColumn35: TcxGridDBColumn;
-    cxGridDBColumn36: TcxGridDBColumn;
-    cxGridDBColumn37: TcxGridDBColumn;
-    cxGridDBColumn38: TcxGridDBColumn;
-    cxGridDBColumn39: TcxGridDBColumn;
-    cxGridDBColumn40: TcxGridDBColumn;
-    cxGridDBColumn41: TcxGridDBColumn;
-    cxGridDBColumn42: TcxGridDBColumn;
-    cxGridDBColumn43: TcxGridDBColumn;
-    cxGridDBColumn44: TcxGridDBColumn;
-    cxGridDBColumn45: TcxGridDBColumn;
-    cxGridDBColumn46: TcxGridDBColumn;
-    cxGridLevel2: TcxGridLevel;
-    cxGrid4: TcxGrid;
-    TV4: TcxGridDBTableView;
-    cxGridDBColumn47: TcxGridDBColumn;
-    cxGridDBColumn48: TcxGridDBColumn;
-    cxGridDBColumn49: TcxGridDBColumn;
-    cxGridDBColumn50: TcxGridDBColumn;
-    cxGridDBColumn51: TcxGridDBColumn;
-    cxGridDBColumn52: TcxGridDBColumn;
-    cxGridDBColumn53: TcxGridDBColumn;
-    cxGridDBColumn54: TcxGridDBColumn;
-    cxGridDBColumn55: TcxGridDBColumn;
-    cxGridDBColumn56: TcxGridDBColumn;
-    cxGridDBColumn57: TcxGridDBColumn;
-    cxGridDBColumn58: TcxGridDBColumn;
-    cxGridDBColumn59: TcxGridDBColumn;
-    cxGridDBColumn60: TcxGridDBColumn;
-    cxGridDBColumn61: TcxGridDBColumn;
-    cxGridDBColumn62: TcxGridDBColumn;
-    cxGridDBColumn63: TcxGridDBColumn;
-    cxGridDBColumn64: TcxGridDBColumn;
-    cxGridDBColumn65: TcxGridDBColumn;
-    cxGridDBColumn66: TcxGridDBColumn;
-    cxGridDBColumn67: TcxGridDBColumn;
-    cxGridDBColumn68: TcxGridDBColumn;
-    cxGridDBColumn69: TcxGridDBColumn;
-    cxGridDBColumn70: TcxGridDBColumn;
-    cxGridDBColumn71: TcxGridDBColumn;
-    cxGridDBColumn72: TcxGridDBColumn;
-    cxGridDBColumn73: TcxGridDBColumn;
-    cxGridDBColumn74: TcxGridDBColumn;
-    cxGridDBColumn75: TcxGridDBColumn;
     cxGridLevel3: TcxGridLevel;
     cxGrid5: TcxGrid;
     TV5: TcxGridDBTableView;
-    cxGridDBColumn76: TcxGridDBColumn;
-    cxGridDBColumn77: TcxGridDBColumn;
-    cxGridDBColumn78: TcxGridDBColumn;
-    cxGridDBColumn79: TcxGridDBColumn;
-    cxGridDBColumn80: TcxGridDBColumn;
-    cxGridDBColumn81: TcxGridDBColumn;
-    cxGridDBColumn82: TcxGridDBColumn;
-    cxGridDBColumn83: TcxGridDBColumn;
-    cxGridDBColumn84: TcxGridDBColumn;
-    cxGridDBColumn85: TcxGridDBColumn;
-    cxGridDBColumn86: TcxGridDBColumn;
-    cxGridDBColumn87: TcxGridDBColumn;
-    cxGridDBColumn88: TcxGridDBColumn;
-    cxGridDBColumn89: TcxGridDBColumn;
-    cxGridDBColumn90: TcxGridDBColumn;
+    v2CRTime: TcxGridDBColumn;
+    v2Column2: TcxGridDBColumn;
+    v2FactoryName: TcxGridDBColumn;
+    v2OrderNo: TcxGridDBColumn;
+    cxGridDBColumn25: TcxGridDBColumn;
+    cxGridDBColumn26: TcxGridDBColumn;
+    cxGridDBColumn27: TcxGridDBColumn;
+    Tv1Column19: TcxGridDBColumn;
+    Tv1Column20: TcxGridDBColumn;
+    Tv1Column21: TcxGridDBColumn;
+    cxGridDBColumn28: TcxGridDBColumn;
+    cxGridDBColumn29: TcxGridDBColumn;
+    Tv1Column18: TcxGridDBColumn;
+    cxGridDBColumn30: TcxGridDBColumn;
     cxGridLevel4: TcxGridLevel;
-    cxGrid6: TcxGrid;
-    TV6: TcxGridDBTableView;
-    cxGridDBColumn91: TcxGridDBColumn;
-    cxGridDBColumn92: TcxGridDBColumn;
-    cxGridDBColumn93: TcxGridDBColumn;
-    cxGridDBColumn94: TcxGridDBColumn;
-    cxGridDBColumn95: TcxGridDBColumn;
-    cxGridDBColumn96: TcxGridDBColumn;
-    cxGridDBColumn97: TcxGridDBColumn;
-    cxGridDBColumn98: TcxGridDBColumn;
-    cxGridDBColumn99: TcxGridDBColumn;
-    cxGridDBColumn100: TcxGridDBColumn;
-    cxGridDBColumn101: TcxGridDBColumn;
-    cxGridDBColumn102: TcxGridDBColumn;
-    cxGridDBColumn103: TcxGridDBColumn;
-    cxGridDBColumn104: TcxGridDBColumn;
-    cxGridDBColumn105: TcxGridDBColumn;
-    cxGridDBColumn106: TcxGridDBColumn;
-    cxGridDBColumn107: TcxGridDBColumn;
-    cxGridDBColumn108: TcxGridDBColumn;
-    cxGridDBColumn109: TcxGridDBColumn;
-    cxGridDBColumn110: TcxGridDBColumn;
-    cxGridDBColumn111: TcxGridDBColumn;
-    cxGridDBColumn112: TcxGridDBColumn;
-    cxGridDBColumn113: TcxGridDBColumn;
-    cxGridDBColumn114: TcxGridDBColumn;
-    cxGridDBColumn115: TcxGridDBColumn;
-    cxGridDBColumn116: TcxGridDBColumn;
-    cxGridDBColumn117: TcxGridDBColumn;
-    cxGridDBColumn118: TcxGridDBColumn;
-    cxGridDBColumn119: TcxGridDBColumn;
-    cxGridLevel5: TcxGridLevel;
-    Saleser: TEdit;
-    cxGrid1: TcxGrid;
-    Tv1: TcxGridDBTableView;
-    v1Column7: TcxGridDBColumn;
-    Tv1Column11: TcxGridDBColumn;
-    v1OrderNo: TcxGridDBColumn;
-    v1ConNo: TcxGridDBColumn;
-    v1DeliveryDate: TcxGridDBColumn;
-    Tv1Column4: TcxGridDBColumn;
-    Tv1Column5: TcxGridDBColumn;
-    Tv1Column2: TcxGridDBColumn;
-    v1OrdDefStr1: TcxGridDBColumn;
-    v1MPRTCodeName: TcxGridDBColumn;
-    v1MPRTSpec: TcxGridDBColumn;
-    Tv1Column1: TcxGridDBColumn;
-    v1MPRTMF: TcxGridDBColumn;
-    v1MPRTKZ: TcxGridDBColumn;
-    v1PRTColor: TcxGridDBColumn;
-    v1Column1: TcxGridDBColumn;
-    v1Column6: TcxGridDBColumn;
-    v1Column4: TcxGridDBColumn;
-    v1PRTOrderQty: TcxGridDBColumn;
-    v1Column5: TcxGridDBColumn;
-    v1Column3: TcxGridDBColumn;
-    Tv1Column3: TcxGridDBColumn;
-    cxGrid1Level1: TcxGridLevel;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);
@@ -256,11 +191,12 @@ type
     procedure cxGridDBColumn46PropertiesEditValueChanged(Sender: TObject);
     procedure cxGridDBColumn14PropertiesEditValueChanged(Sender: TObject);
     procedure TV2Column14PropertiesEditValueChanged(Sender: TObject);
+    procedure FormResize(Sender: TObject);
   private
     procedure InitOrder();
     { Private declarations }
   public
-    FOrderNo: string;
+    FConNo: string;
     { Public declarations }
   end;
 
@@ -280,9 +216,9 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add('exec  P_Trade_Profit_Plan_Details ');
-    sql.Add('@PFType=''������''  ');
-    sql.Add(',@OrderNo=  ' + quotedstr(Trim(FOrderNo)));
+    sql.Add('exec  P_Trade_Profit_Plan ');
+    sql.Add(' @CXType=''������ͬ''  ');
+    sql.Add(',@ConNo=' + quotedstr(Trim(FConNo)));
     Open;
   end;
   SCSHData(ADOQueryTemp, ScrollBox1, 2);
@@ -291,9 +227,9 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add('exec  P_Trade_Profit_Plan_Details ');
-    sql.Add('@PFType=''�ƻ���''  ');
-    sql.Add(',@OrderNo=  ' + quotedstr(Trim(FOrderNo)));
+    sql.Add('exec  P_Trade_Profit_Plan ');
+    sql.Add(' @CXType=''Ӧ�տ�''  ');
+    sql.Add(',@ConNo=' + quotedstr(Trim(FConNo)));
     Open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_1);
@@ -303,9 +239,9 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add('exec  P_Trade_Profit_Plan_Details ');
-    sql.Add('@PFType=''�ɹ�''  ');
-    sql.Add(',@OrderNo=  ' + quotedstr(Trim(FOrderNo)));
+    sql.Add('exec  P_Trade_Profit_Plan ');
+    sql.Add(' @CXType=''���ϳɱ�''  ');
+    sql.Add(',@ConNo=' + quotedstr(Trim(FConNo)));
     Open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_2);
@@ -315,9 +251,9 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add('exec  P_Trade_Profit_Plan_Details ');
-    sql.Add('@PFType=''�ӹ�''  ');
-    sql.Add(',@OrderNo=  ' + quotedstr(Trim(FOrderNo)));
+    sql.Add('exec  P_Trade_Profit_Plan ');
+    sql.Add(' @CXType=''�ӹ��ɱ�''  ');
+    sql.Add(',@ConNo=' + quotedstr(Trim(FConNo)));
 //    ShowMessage(sql.Text);
     Open;
   end;
@@ -328,9 +264,9 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add('exec  P_Trade_Profit_Plan_Details ');
-    sql.Add('@PFType=''����''  ');
-    sql.Add(',@OrderNo=  ' + quotedstr(Trim(FOrderNo)));
+    sql.Add('exec  P_Trade_Profit_Plan ');
+    sql.Add(' @CXType=''���ϳɱ�''  ');
+    sql.Add(',@ConNo=' + quotedstr(Trim(FConNo)));
     Open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_4);
@@ -340,25 +276,24 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add('exec  P_Trade_Profit_Plan_Details ');
-    sql.Add('@PFType=''����''  ');
-    sql.Add(',@OrderNo=  ' + quotedstr(Trim(FOrderNo)));
+    sql.Add('exec  P_Trade_Profit_Plan ');
+    sql.Add(' @CXType=''����''  ');
+    sql.Add(',@ConNo=' + quotedstr(Trim(FConNo)));
     Open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_5);
   SInitCDSData(ADOQueryTemp, CDS_5);
-
-  with ADOQueryTemp do
-  begin
-    Close;
-    SQL.Clear;
-    sql.Add('exec  P_Trade_Profit_Plan_Details ');
-    sql.Add('@PFType=''Ӧ��''  ');
-    sql.Add(',@OrderNo=  ' + quotedstr(Trim(FOrderNo)));
-    Open;
-  end;
-  SCreateCDS(ADOQueryTemp, CDS_6);
-  SInitCDSData(ADOQueryTemp, CDS_6);
+//      with ADOQueryTemp do
+//  begin
+//    Close;
+//    SQL.Clear;
+//    sql.Add('exec  P_Trade_Profit_Plan ');
+//    sql.Add(' @CXType=''Ӧ�տ�''  ');
+//    sql.Add(',@ConNo=' + quotedstr(Trim(FConNo)));
+//    Open;
+//  end;
+//  SCreateCDS(ADOQueryTemp, CDS_6);
+//  SInitCDSData(ADOQueryTemp, CDS_6);
 end;
 
 procedure TfrmTradePlanProfitDetails.FormDestroy(Sender: TObject);
@@ -366,6 +301,17 @@ begin
   frmTradePlanProfitDetails := nil;
 end;
 
+procedure TfrmTradePlanProfitDetails.FormResize(Sender: TObject);
+begin
+  GroupBox5.Width := ceil(Self.Width / 2);
+  GroupBox4.Width := ceil(Self.Width / 2);
+//  cxGrid1.Width := ceil(Self.Width / 2);
+//  cxGrid6.Width := ceil(Self.Width / 2);
+//  GroupBox2.Height := ceil((Self.Height - ToolBar1.Height - pnl1.Height) / 4);
+//  GroupBox3.Height := ceil((Self.Height - ToolBar1.Height - pnl1.Height) / 4);
+//  GroupBox4.Height := ceil((Self.Height - ToolBar1.Height - pnl1.Height) / 4);
+end;
+
 procedure TfrmTradePlanProfitDetails.cxGridDBColumn14PropertiesEditValueChanged(Sender: TObject);
 var
   mvalue, FFieldName: string;
@@ -493,7 +439,7 @@ begin
   WriteCxGrid('������ϸ����Tv3', Tv3, '������ϸ���ȹ���');
   WriteCxGrid('������ϸ����Tv4', Tv4, '������ϸ���ȹ���');
   WriteCxGrid('������ϸ����Tv5', Tv5, '������ϸ���ȹ���');
-  WriteCxGrid('������ϸ����Tv6', Tv6, '������ϸ���ȹ���');
+//  WriteCxGrid('������ϸ����Tv6', Tv6, '������ϸ���ȹ���');
 end;
 
 procedure TfrmTradePlanProfitDetails.TV2Column14PropertiesEditValueChanged(Sender: TObject);
@@ -555,7 +501,7 @@ begin
   ReadCxGrid('������ϸ����Tv3', Tv3, '������ϸ���ȹ���');
   ReadCxGrid('������ϸ����Tv4', Tv4, '������ϸ���ȹ���');
   ReadCxGrid('������ϸ����Tv5', Tv5, '������ϸ���ȹ���');
-  ReadCxGrid('������ϸ����Tv6', Tv6, '������ϸ���ȹ���');
+//  ReadCxGrid('������ϸ����Tv6', Tv6, '������ϸ���ȹ���');
   InitOrder();
 end;
 
diff --git a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanSchedule.dfm b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanSchedule.dfm
index ecb283b..e043237 100644
--- a/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanSchedule.dfm
+++ b/项目代码/RTBasicsV1/T01贸易生产计划/U_TradePlanSchedule.dfm
@@ -167,7 +167,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
       TabOrder = 3
       ExplicitLeft = 2
       ExplicitTop = 2
-      ExplicitWidth = 1583
+      ExplicitWidth = 1591
       inherited BegDate: TcxDateEdit
         ExplicitHeight = 33
       end
@@ -204,7 +204,6 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
     Height = 446
     Align = alClient
     TabOrder = 2
-    ExplicitTop = 177
     object TV1: TcxGridDBBandedTableView
       OnDblClick = TV1DblClick
       Navigator.Buttons.CustomButtons = <>
@@ -705,7 +704,6 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
       '   '#24050#23436#25104'   '
       '   '#20840'    '#37096'   ')
     OnChange = cxTabControl1Change
-    ExplicitTop = 97
     ClientRectBottom = 34
     ClientRectRight = 1595
     ClientRectTop = 31
diff --git a/项目代码/RTBasicsV1/T02贸易汇总仓库/ProjectGroup1.groupproj.local b/项目代码/RTBasicsV1/T02贸易汇总仓库/ProjectGroup1.groupproj.local
index d2af091..f791e6c 100644
--- a/项目代码/RTBasicsV1/T02贸易汇总仓库/ProjectGroup1.groupproj.local
+++ b/项目代码/RTBasicsV1/T02贸易汇总仓库/ProjectGroup1.groupproj.local
@@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10RepoV1\项目代码\D10myXushang\T02贸易汇总仓库\TradeTotalClothStk.dproj"/>
+		<Projects ActiveProject="D:\RTFormwork\项目代码\RTBasicsV1\T02贸易汇总仓库\TradeTotalClothStk.dproj"/>
 	</Default.Personality>
 </BorlandProject>
diff --git a/项目代码/RTBasicsV1/T02贸易汇总仓库/TradeTotalClothStk.identcache b/项目代码/RTBasicsV1/T02贸易汇总仓库/TradeTotalClothStk.identcache
index 9af0d34..baec347 100644
Binary files a/项目代码/RTBasicsV1/T02贸易汇总仓库/TradeTotalClothStk.identcache and b/项目代码/RTBasicsV1/T02贸易汇总仓库/TradeTotalClothStk.identcache differ
diff --git a/项目代码/RTBasicsV1/T02贸易汇总仓库/U_ClothScheduleList.dfm b/项目代码/RTBasicsV1/T02贸易汇总仓库/U_ClothScheduleList.dfm
index 39dbfed..6eb0e65 100644
--- a/项目代码/RTBasicsV1/T02贸易汇总仓库/U_ClothScheduleList.dfm
+++ b/项目代码/RTBasicsV1/T02贸易汇总仓库/U_ClothScheduleList.dfm
@@ -78,52 +78,36 @@ inherited frmClothScheduleList: TfrmClothScheduleList
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
-    object Label4: TLabel
-      Left = 451
-      Top = 50
-      Width = 64
-      Height = 21
-      Caption = #25105#26041#21333#20301
-    end
     object Label9: TLabel
       Left = 23
       Top = 50
       Width = 64
       Height = 21
-      Caption = #37319#36141#21333#21495
+      Caption = #21512#24182#21333#21495
     end
     object Label3: TLabel
       Left = 245
       Top = 50
       Width = 48
       Height = 21
-      Caption = #20379#24212#21830
+      Caption = #21152#24037#21378
     end
-    object BuyName: TcxTextEdit
+    object MasterOrderNo: TcxTextEdit
       Tag = 2
-      Left = 521
+      Left = 91
       Top = 44
       ParentFont = False
       Properties.OnChange = SellNamePropertiesChange
       TabOrder = 0
       Width = 150
     end
-    object PurNo: TcxTextEdit
-      Tag = 2
-      Left = 91
-      Top = 44
-      ParentFont = False
-      Properties.OnChange = SellNamePropertiesChange
-      TabOrder = 1
-      Width = 150
-    end
-    object SellName: TcxTextEdit
+    object FtyName: TcxTextEdit
       Tag = 2
       Left = 297
       Top = 44
       ParentFont = False
       Properties.OnChange = SellNamePropertiesChange
-      TabOrder = 2
+      TabOrder = 1
       Width = 150
     end
     inline frmFrameDateSel1: TfrmFrameDateSel
@@ -134,7 +118,7 @@ inherited frmClothScheduleList: TfrmClothScheduleList
       Color = clWhite
       ParentBackground = False
       ParentColor = False
-      TabOrder = 3
+      TabOrder = 2
       ExplicitTop = 6
       inherited BegDate: TcxDateEdit
         ExplicitHeight = 33
@@ -396,7 +380,7 @@ inherited frmClothScheduleList: TfrmClothScheduleList
     Align = alBottom
     AutoSize = True
     ButtonHeight = 30
-    ButtonWidth = 83
+    ButtonWidth = 99
     Caption = 'ToolBar1'
     Color = clSkyBlue
     DisabledImages = DataLink_TradeTotalClothStk.cxImageList_bar
@@ -414,7 +398,7 @@ inherited frmClothScheduleList: TfrmClothScheduleList
       OnClick = ToolButton2Click
     end
     object ToolButton5: TToolButton
-      Left = 87
+      Left = 103
       Top = 0
       AutoSize = True
       Caption = #38754#26009#25237#20837
@@ -422,7 +406,7 @@ inherited frmClothScheduleList: TfrmClothScheduleList
       OnClick = ToolButton5Click
     end
     object ToolButton6: TToolButton
-      Left = 174
+      Left = 206
       Top = 0
       AutoSize = True
       Caption = #35746#21333#23436#24037
@@ -430,7 +414,7 @@ inherited frmClothScheduleList: TfrmClothScheduleList
       OnClick = ToolButton6Click
     end
     object ToolButton3: TToolButton
-      Left = 261
+      Left = 309
       Top = 0
       AutoSize = True
       Caption = #24067#21305#20986#24211
@@ -438,7 +422,7 @@ inherited frmClothScheduleList: TfrmClothScheduleList
       OnClick = ToolButton3Click
     end
     object ToolButton4: TToolButton
-      Left = 348
+      Left = 412
       Top = 0
       AutoSize = True
       Caption = #21024#38500
@@ -446,7 +430,7 @@ inherited frmClothScheduleList: TfrmClothScheduleList
       OnClick = ToolButton4Click
     end
     object ToolButton8: TToolButton
-      Left = 411
+      Left = 483
       Top = 0
       AutoSize = True
       Caption = #25171#21360
diff --git a/项目代码/RTBasicsV1/T02贸易汇总仓库/U_ClothScheduleList.pas b/项目代码/RTBasicsV1/T02贸易汇总仓库/U_ClothScheduleList.pas
index 6867bb6..c919e13 100644
--- a/项目代码/RTBasicsV1/T02贸易汇总仓库/U_ClothScheduleList.pas
+++ b/项目代码/RTBasicsV1/T02贸易汇总仓库/U_ClothScheduleList.pas
@@ -43,13 +43,11 @@ type
     ADOQueryTemp: TADOQuery;
     DS_1: TDataSource;
     Panel1: TPanel;
-    Label4: TLabel;
     Label9: TLabel;
-    BuyName: TcxTextEdit;
-    PurNo: TcxTextEdit;
+    MasterOrderNo: TcxTextEdit;
     CDS_1: TClientDataSet;
     Label3: TLabel;
-    SellName: TcxTextEdit;
+    FtyName: TcxTextEdit;
     pm1: TPopupMenu;
     ADOQueryImage: TADOQuery;
     ToolButton7: TToolButton;
@@ -592,7 +590,7 @@ var
   Maxno: string;
 begin
 
-  PurNo.SetFocus;
+  ToolBar1.SetFocus;
   if CDS_1.IsEmpty then
     Exit;
   if Application.MessageBox('ȷ��Ҫ����ز�������', '��ʾ', 32 + 4) <> IDYES then
diff --git a/项目代码/RTBasicsV1/T02贸易汇总仓库/U_PurClothEnterInput.pas b/项目代码/RTBasicsV1/T02贸易汇总仓库/U_PurClothEnterInput.pas
index 1bf04fc..81174f7 100644
--- a/项目代码/RTBasicsV1/T02贸易汇总仓库/U_PurClothEnterInput.pas
+++ b/项目代码/RTBasicsV1/T02贸易汇总仓库/U_PurClothEnterInput.pas
@@ -135,7 +135,7 @@ begin
       sql.Add(' where PurSId=''' + Trim(FPurSId) + '''');
       Open;
     end;
-    FromCoName.Properties.LookupItems.Text := 'SellNo';
+    FromCoName.Properties.LookupItems.Text := ADOQueryTemp.FieldByName('SellNo').ASString;
     FromCoName.Text := ADOQueryTemp.FieldByName('SellName').ASString;
     FromPurNo.Text := ADOQueryTemp.FieldByName('PurNo').ASString;
     FromPurMId.Text := ADOQueryTemp.FieldByName('PurMId').ASString;
diff --git a/项目代码/RTBasicsV1/T02贸易汇总仓库/U_TradeClothTransferInput.pas b/项目代码/RTBasicsV1/T02贸易汇总仓库/U_TradeClothTransferInput.pas
index bc887c2..2f798d7 100644
--- a/项目代码/RTBasicsV1/T02贸易汇总仓库/U_TradeClothTransferInput.pas
+++ b/项目代码/RTBasicsV1/T02贸易汇总仓库/U_TradeClothTransferInput.pas
@@ -200,7 +200,7 @@ procedure TfrmTradeClothTransferInput.TBSaveClick(Sender: TObject);
 begin
   if CDS_Sub.IsEmpty then
     Exit;
-  FromOrdNo.SetFocus();
+  ToolBar1.SetFocus();
   if SaveData() then
   begin
     Application.MessageBox('����ɹ�!', '��ʾ', 0);
@@ -221,7 +221,7 @@ procedure TfrmTradeClothTransferInput.ToolButton3Click(Sender: TObject);
 begin
   if CDS_Sub.IsEmpty then
     Exit;
-  FromOrdNo.SetFocus();
+  ToolBar1.SetFocus();
   if SaveData() then
   begin
     Application.MessageBox('����ɹ�!', '��ʾ', 0);
diff --git a/项目代码/RTBasicsV1/T02贸易汇总仓库/testDll.identcache b/项目代码/RTBasicsV1/T02贸易汇总仓库/testDll.identcache
index 52fe360..d8ed734 100644
Binary files a/项目代码/RTBasicsV1/T02贸易汇总仓库/testDll.identcache and b/项目代码/RTBasicsV1/T02贸易汇总仓库/testDll.identcache differ