diff --git a/B01基础合同管理/Contract.dproj.local b/B01基础合同管理/Contract.dproj.local
index 7d18dc6..83e6426 100644
--- a/B01基础合同管理/Contract.dproj.local
+++ b/B01基础合同管理/Contract.dproj.local
@@ -1,87 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.659,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.569,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.398,=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_SalesContractList.pas</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.423,=D:\Dp10RepoV1\项目代码\RTBasicsV1\B01基础合同管理\U_SalesContractList.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.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.538,D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\E01梭织生产计划\U_PictureUpload22.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.564,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.237,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList_XT.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.375,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.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.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.419,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_BankSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.707,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.847,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.526,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.620,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\Contract.dproj=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\InformationBase.dproj</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.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.444,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.709,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.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.359,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.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.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.dfm</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.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.247,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B01基础合同管理\U_finishSalesConInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.676,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.348,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.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.690,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.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.993,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.157,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.237,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList_XT.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm</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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.538,D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\E01梭织生产计划\U_PictureUpload22.dfm</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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm</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.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.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.067,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.950,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.556,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.472,=D:\Dp10RepoV1\项目代码\花蝴蝶\B01基础合同管理\U_SalesConInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>2025-08-18 11:22:33.284,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_SalesContractCPSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.659,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.569,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.398,=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_SalesContractList.pas</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.423,=D:\Dp10RepoV1\项目代码\RTBasicsV1\B01基础合同管理\U_SalesContractList.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.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.538,D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\E01梭织生产计划\U_PictureUpload22.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.564,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.237,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList_XT.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.375,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.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.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.419,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_BankSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.707,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.847,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.526,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.620,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\Contract.dproj=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\InformationBase.dproj</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.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.444,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.709,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.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.359,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.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.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.dfm</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.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.247,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B01基础合同管理\U_finishSalesConInput.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.676,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.348,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.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.690,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.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.993,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.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.157,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.237,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList_XT.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.284,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_SalesContractCPSel.pas</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.538,D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\E01梭织生产计划\U_PictureUpload22.dfm</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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.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.067,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.950,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.556,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.472,=D:\Dp10RepoV1\项目代码\花蝴蝶\B01基础合同管理\U_SalesConInPut.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10SZKaiXiYa"/>
diff --git a/B01基础合同管理/U_SalesConInPut.dfm b/B01基础合同管理/U_SalesConInPut.dfm
index de7f722..cb06e4d 100644
--- a/B01基础合同管理/U_SalesConInPut.dfm
+++ b/B01基础合同管理/U_SalesConInPut.dfm
@@ -10,6 +10,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
   OldCreateOrder = True
   Position = poScreenCenter
   WindowState = wsMaximized
+  ExplicitLeft = -655
   ExplicitWidth = 1522
   ExplicitHeight = 787
   PixelsPerInch = 96
@@ -631,12 +632,13 @@ inherited frmSalesConInPut: TfrmSalesConInPut
     object Currency: TcxComboBox
       Tag = 2
       Left = 710
-      Top = 184
+      Top = 183
       Properties.Items.Strings = (
         'CNY'
         'USD'
         'EUR'
         'VND')
+      Properties.OnChange = CurrencyPropertiesChange
       TabOrder = 25
       Text = 'CNY'
       Width = 200
@@ -659,7 +661,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         #26159
         #21542)
       TabOrder = 27
-      Text = #26159
+      Text = #21542
       Width = 200
     end
     object BPType: TcxComboBox
@@ -671,6 +673,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         #22383#24067
         #25104#21697)
       TabOrder = 28
+      Text = #22383#24067
       Width = 200
     end
     object GFDZ: TcxTextEdit
@@ -802,7 +805,6 @@ inherited frmSalesConInPut: TfrmSalesConInPut
     BorderStyle = cxcbsNone
     PopupMenu = pm_sub
     TabOrder = 3
-    ExplicitTop = 445
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -863,7 +865,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         HeaderAlignmentHorz = taCenter
         SortIndex = 0
         SortOrder = soAscending
-        Width = 55
+        Width = 48
       end
       object VC_SCSCode: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
@@ -947,8 +949,9 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         Caption = #25968#37327
         DataBinding.FieldName = 'ConQty'
         DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
-        Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.AssignedValues.DisplayFormat = True
+        Properties.DecimalPlaces = 0
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
@@ -967,24 +970,26 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         Width = 58
       end
       object v1PRTPrice: TcxGridDBColumn
-        Caption = #21333#20215
+        Caption = #19981#21547#31246#21333#20215
         DataBinding.FieldName = 'ConPrice'
         DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCurrencyEditProperties'
-        Properties.DisplayFormat = ',0.00;-,0.00'
+        Properties.DecimalPlaces = 2
+        Properties.DisplayFormat = '0.00'
         Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
         Options.Sorting = False
-        Width = 70
+        Width = 107
       end
       object Tv1Column9: TcxGridDBColumn
-        Caption = #37329#39069
+        Caption = #19981#21547#31246#37329#39069
         DataBinding.FieldName = 'ConTotalAmount'
         DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCurrencyEditProperties'
-        Properties.DisplayFormat = ',0.00;-,0.00'
+        Properties.DecimalPlaces = 2
+        Properties.DisplayFormat = '0.00'
         HeaderAlignmentHorz = taCenter
-        Width = 84
+        Width = 105
       end
       object v1Column2: TcxGridDBColumn
         Caption = #22791#27880
@@ -1009,6 +1014,37 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         HeaderAlignmentHorz = taCenter
         Width = 120
       end
+      object Tv1Column13: TcxGridDBColumn
+        Caption = #31246#29575
+        DataBinding.FieldName = 'TaxRate'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DecimalPlaces = 2
+        Properties.DisplayFormat = '0.00'
+        Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column14: TcxGridDBColumn
+        Caption = #31246#39069
+        DataBinding.FieldName = 'Tax'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DecimalPlaces = 2
+        Properties.DisplayFormat = '0.00'
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column15: TcxGridDBColumn
+        Caption = #21547#31246#37329#39069
+        DataBinding.FieldName = 'TaxInclude'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DecimalPlaces = 2
+        Properties.DisplayFormat = '0.00'
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
       object Tv1Column2: TcxGridDBColumn
         Caption = #22270#29255
         DataBinding.FieldName = 'AttName'
@@ -1042,13 +1078,21 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         Caption = #25104#21697#25968#37327
         DataBinding.FieldName = 'CP_QTY'
         DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.AssignedValues.DisplayFormat = True
+        Properties.DecimalPlaces = 0
+        Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
       object Tv1Column12: TcxGridDBColumn
-        Caption = #25237#22383#31995#25968
+        Caption = #25237#22383#31995#25968'%'
         DataBinding.FieldName = 'CP_TPXS'
         DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DecimalPlaces = 2
+        Properties.DisplayFormat = '0.00'
+        Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
diff --git a/B01基础合同管理/U_SalesConInPut.pas b/B01基础合同管理/U_SalesConInPut.pas
index 88bd685..6e362ba 100644
--- a/B01基础合同管理/U_SalesConInPut.pas
+++ b/B01基础合同管理/U_SalesConInPut.pas
@@ -140,6 +140,9 @@ type
     Tv1Column11: TcxGridDBColumn;
     Tv1Column12: TcxGridDBColumn;
     ToolButton5: TToolButton;
+    Tv1Column13: TcxGridDBColumn;
+    Tv1Column14: TcxGridDBColumn;
+    Tv1Column15: TcxGridDBColumn;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
@@ -170,6 +173,7 @@ type
     procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure BankNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure ToolButton5Click(Sender: TObject);
+    procedure CurrencyPropertiesChange(Sender: TObject);
   private
     FLeft, FTop: Integer;
     fuserName, Fstatus: string;
@@ -790,7 +794,11 @@ procedure TfrmSalesConInPut.v1PRTOrderQtyPropertiesEditValueChanged(Sender: TObj
 var
   mvalue, FFieldName: string;
   FConQty, FConPrice, FC_Money: Double;        //���������ۣ����
+  mTaxRate, mTax, mTaxInclude: Double;        //˰�ʣ�˰���˰���
+
+  mCP_QTY, mCP_TPXS: Double;                 //��Ʒ������Ͷ��ϵ��
 begin
+
   mvalue := TcxTextEdit(Sender).EditingText;
   if Trim(mvalue) = '' then
   begin
@@ -801,19 +809,35 @@ begin
   with Order_Sub do
   begin
     Edit;
-    FieldByName(FFieldName).Value := Trim(mvalue);
+    FieldByName(FFieldName).Value := StrToFloat(Trim(mvalue));
     Post;
+//    ShowMessage(Fieldbyname('TaxRate').AsString);
     FConQty := Fieldbyname('ConQty').AsFloat;
     FConPrice := Fieldbyname('ConPrice').AsFloat;
+
+    mTaxRate := Fieldbyname('TaxRate').AsFloat;
+    mTax := Fieldbyname('Tax').AsFloat;
+    mTaxInclude := Fieldbyname('TaxInclude').AsFloat;
+
+    mCP_QTY := Fieldbyname('CP_QTY').AsFloat;
+    mCP_TPXS := Fieldbyname('CP_TPXS').AsFloat;
   end;
+
+  FConQty := RoundFloat((mCP_TPXS + 1) * mCP_QTY, 0);
   FC_Money := RoundFloat(FConQty * FConPrice, 2);
+  mTax := RoundFloat(FC_Money * mTaxRate, 2);
+  mTaxInclude := RoundFloat(FC_Money + mTax, 2);
 
   with Order_Sub do
   begin
     Edit;
     FieldByName('ConQty').Value := FConQty;
-    FieldByName('ConPrice').Value := FConPrice;
+//    FieldByName('ConPrice').Value := FConPrice;
     FieldByName('ConTotalAmount').Value := FC_Money;
+
+    FieldByName('TaxRate').Value := mTaxRate;
+    FieldByName('Tax').Value := mTax;
+    FieldByName('TaxInclude').Value := mTaxInclude;
     Post;
   end;
   tv1.Controller.EditingController.ShowEdit();
@@ -853,6 +877,45 @@ begin
   TcxButtonEdit(Sender).Properties.LookupItems.Text := '';
 end;
 
+procedure TfrmSalesConInPut.CurrencyPropertiesChange(Sender: TObject);
+begin
+  inherited;
+  if Currency.Text = 'VND' then
+  begin
+    (Tv1Column9.Properties as TcxCurrencyEditProperties).DisplayFormat := '';
+    (v1PRTPrice.Properties as TcxCurrencyEditProperties).DisplayFormat := '';
+    (Tv1Column14.Properties as TcxCurrencyEditProperties).DisplayFormat := '';
+    (Tv1Column15.Properties as TcxCurrencyEditProperties).DisplayFormat := '';
+
+    (Tv1Column9.Properties as TcxCurrencyEditProperties).DecimalPlaces := 0;
+    (v1PRTPrice.Properties as TcxCurrencyEditProperties).DecimalPlaces := 0;
+    (Tv1Column14.Properties as TcxCurrencyEditProperties).DecimalPlaces := 0;
+    (Tv1Column15.Properties as TcxCurrencyEditProperties).DecimalPlaces := 0;
+
+    with Order_Sub do
+    begin
+      Edit;
+      Fieldbyname('ConPrice').Value := RoundFloat(Fieldbyname('ConPrice').AsFloat, 0);
+      Fieldbyname('ConTotalAmount').value := RoundFloat(Fieldbyname('ConQty').AsFloat * Fieldbyname('ConPrice').Asfloat, 0);
+      Fieldbyname('Tax').Value := RoundFloat(Fieldbyname('Tax').AsFloat, 0);
+      Fieldbyname('TaxInclude').value := RoundFloat(Fieldbyname('TaxInclude').AsFloat * Fieldbyname('ConPrice').Asfloat, 0);
+      Post;
+    end;
+
+  end
+  else
+  begin
+    (Tv1Column9.Properties as TcxCurrencyEditProperties).DisplayFormat := '0.00';
+    (v1PRTPrice.Properties as TcxCurrencyEditProperties).DisplayFormat := '0.00';
+    (Tv1Column14.Properties as TcxCurrencyEditProperties).DisplayFormat := '0.00';
+    (Tv1Column15.Properties as TcxCurrencyEditProperties).DisplayFormat := '0.00';
+    (Tv1Column9.Properties as TcxCurrencyEditProperties).DecimalPlaces := 2;
+    (v1PRTPrice.Properties as TcxCurrencyEditProperties).DecimalPlaces := 2;
+    (Tv1Column14.Properties as TcxCurrencyEditProperties).DecimalPlaces := 2;
+    (Tv1Column15.Properties as TcxCurrencyEditProperties).DecimalPlaces := 2;
+  end;
+end;
+
 procedure TfrmSalesConInPut.ParentCoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try
@@ -1046,6 +1109,8 @@ begin
 
       if ShowModal = 1 then
       begin
+        Self.BuyConNo.Text := frmSalesContractCPSel.CDS_1.fieldbyname('ConNO').asString;
+        Self.BuyName.Text := frmSalesContractCPSel.CDS_1.fieldbyname('BuyName').asString;
         with CDS_1 do
         begin
           DisableControls;
@@ -1070,6 +1135,7 @@ begin
                 Order_Sub.fieldbyname('CP_Name').Value := frmSalesContractCPSel.CDS_1.fieldbyname('C_Name').asstring;
                 Order_Sub.fieldbyname('FROMCPSID').Value := frmSalesContractCPSel.CDS_1.fieldbyname('CONSID').asstring;
                 Order_Sub.fieldbyname('FROMCPMID').Value := frmSalesContractCPSel.CDS_1.fieldbyname('CONMID').asstring;
+                Order_Sub.fieldbyname('ConUnit').Value := 'M';
 
                 FieldByName('SSEL').Value := FALSE;
                 FieldByName('SerialNo').Value := i;
diff --git a/B01基础合同管理/U_SalesContractList.dfm b/B01基础合同管理/U_SalesContractList.dfm
index 615b7d5..8481c0f 100644
--- a/B01基础合同管理/U_SalesContractList.dfm
+++ b/B01基础合同管理/U_SalesContractList.dfm
@@ -567,7 +567,7 @@ inherited frmSalesContractList: TfrmSalesContractList
     TabOrder = 2
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 11
-    Properties.TabIndex = 0
+    Properties.TabIndex = 3
     Properties.Tabs.Strings = (
       #26410#25552#20132
       #24050#25552#20132
@@ -606,8 +606,6 @@ inherited frmSalesContractList: TfrmSalesContractList
       Align = alClient
       BorderStyle = cxcbsNone
       TabOrder = 0
-      ExplicitLeft = -5
-      ExplicitTop = -2
       object TV2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>
diff --git a/B01基础合同管理/U_SalesContractList.pas b/B01基础合同管理/U_SalesContractList.pas
index 95d37fe..ce16bc6 100644
--- a/B01基础合同管理/U_SalesContractList.pas
+++ b/B01基础合同管理/U_SalesContractList.pas
@@ -419,11 +419,11 @@ begin
           end;
         3:
           begin
-            sql.Add(' and  isnull(AA.status,''0'')=''10''');
+            sql.Add(' and  isnull(AA.status,''0'')=''10''');  //�����
           end;
         4:
           begin
-            sql.Add(' and  isnull(AA.status,''0'')=''-1''');
+            sql.Add(' and  isnull(AA.status,''0'')=''-1''');    // ��ȡ��
           end;
       end;
       Open;
diff --git a/B01基础合同管理/U_TatSCTLLIST.dfm b/B01基础合同管理/U_TatSCTLLIST.dfm
index 1123c48..77eafcf 100644
--- a/B01基础合同管理/U_TatSCTLLIST.dfm
+++ b/B01基础合同管理/U_TatSCTLLIST.dfm
@@ -3,10 +3,10 @@ inherited frmSCTLLIST: TfrmSCTLLIST
   Top = 76
   Caption = #29983#20135#25237#26009#35745#31639#34920
   ClientHeight = 637
-  ClientWidth = 1541
+  ClientWidth = 1540
   Font.Height = -16
   Position = poScreenCenter
-  ExplicitWidth = 1557
+  ExplicitWidth = 1556
   ExplicitHeight = 676
   PixelsPerInch = 96
   TextHeight = 21
@@ -14,7 +14,7 @@ inherited frmSCTLLIST: TfrmSCTLLIST
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1541
+    Width = 1540
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -69,7 +69,7 @@ inherited frmSCTLLIST: TfrmSCTLLIST
   object Panel1: TPanel [1]
     Left = 0
     Top = 30
-    Width = 1541
+    Width = 1540
     Height = 91
     Align = alTop
     BevelInner = bvRaised
@@ -77,7 +77,6 @@ inherited frmSCTLLIST: TfrmSCTLLIST
     Color = clWhite
     ParentBackground = False
     TabOrder = 3
-    ExplicitTop = 24
     object Label9: TLabel
       Left = 36
       Top = 6
@@ -150,7 +149,7 @@ inherited frmSCTLLIST: TfrmSCTLLIST
   object cxGrid1: TcxGrid [4]
     Left = 0
     Top = 121
-    Width = 1541
+    Width = 1540
     Height = 516
     Align = alClient
     PopupMenu = PopupMenu1
@@ -263,6 +262,13 @@ inherited frmSCTLLIST: TfrmSCTLLIST
         Options.Editing = False
         Width = 100
       end
+      object Tv1GKBH: TcxGridDBColumn
+        Caption = #38050#31576#32534#21495
+        DataBinding.FieldName = 'GKBH'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 107
+      end
     end
     object cxGridLevel2: TcxGridLevel
       GridView = Tv1
diff --git a/B01基础合同管理/U_TatSCTLLIST.pas b/B01基础合同管理/U_TatSCTLLIST.pas
index 788a7ea..664fe82 100644
--- a/B01基础合同管理/U_TatSCTLLIST.pas
+++ b/B01基础合同管理/U_TatSCTLLIST.pas
@@ -56,6 +56,7 @@ type
     ConNo: TcxTextEdit;
     C_CODE: TcxTextEdit;
     Label4: TLabel;
+    Tv1GKBH: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
diff --git a/B01基础合同管理/U_finishSalesContractList.dfm b/B01基础合同管理/U_finishSalesContractList.dfm
index d579f5f..db571d0 100644
--- a/B01基础合同管理/U_finishSalesContractList.dfm
+++ b/B01基础合同管理/U_finishSalesContractList.dfm
@@ -7,6 +7,8 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
   Font.Height = -16
   FormStyle = fsMDIChild
   Visible = True
+  ExplicitLeft = -689
+  ExplicitTop = -185
   ExplicitWidth = 1556
   ExplicitHeight = 810
   PixelsPerInch = 96
@@ -33,7 +35,6 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
     ParentFont = False
     ShowCaptions = True
     TabOrder = 4
-    ExplicitTop = -1
     object TBRafresh: TToolButton
       Left = 0
       Top = 0
@@ -195,7 +196,8 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
     Align = alClient
     PopupMenu = pm1
     TabOrder = 3
-    ExplicitTop = 159
+    ExplicitLeft = 1
+    ExplicitTop = 152
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -398,8 +400,6 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
       #20840#37096)
     LookAndFeel.Kind = lfUltraFlat
     OnChange = cxTabControl1Change
-    ExplicitLeft = 72
-    ExplicitTop = 107
     ClientRectBottom = 34
     ClientRectLeft = 2
     ClientRectRight = 1538
@@ -407,15 +407,16 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
   end
   object cxSplitter1: TcxSplitter [4]
     Left = 0
-    Top = 493
+    Top = 763
     Width = 1540
     Height = 8
     HotZoneClassName = 'TcxMediaPlayer9Style'
     AlignSplitter = salBottom
+    ExplicitTop = 493
   end
   object Panel2: TPanel [5]
     Left = 0
-    Top = 501
+    Top = 493
     Width = 1540
     Height = 270
     Align = alBottom
@@ -424,13 +425,13 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
     object cxGrid2: TcxGrid
       Left = 1
       Top = 1
-      Width = 1538
+      Width = 904
       Height = 268
-      Align = alClient
+      Align = alLeft
       BorderStyle = cxcbsNone
       TabOrder = 0
       ExplicitLeft = 0
-      ExplicitTop = 6
+      ExplicitTop = -4
       object TV2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>
@@ -577,6 +578,49 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
         GridView = TV2
       end
     end
+    object cxGrid3: TcxGrid
+      Left = 905
+      Top = 1
+      Width = 634
+      Height = 268
+      Align = alClient
+      TabOrder = 1
+      ExplicitLeft = 906
+      ExplicitTop = -4
+      object Tv3: TcxGridDBTableView
+        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
+        DataController.DataSource = DS_3
+        DataController.Summary.DefaultGroupSummaryItems = <>
+        DataController.Summary.FooterSummaryItems = <>
+        DataController.Summary.SummaryGroups = <>
+        OptionsView.GroupByBox = False
+        object Tv3Column1: TcxGridDBColumn
+          Caption = #22383#24067#32534#21495
+          DataBinding.FieldName = 'C_Code'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 100
+        end
+        object Tv3Column2: TcxGridDBColumn
+          Caption = #22383#24067#21517#31216
+          DataBinding.FieldName = 'C_Name'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 100
+        end
+        object Tv3Column3: TcxGridDBColumn
+          Caption = #22383#24067#35268#26684
+          DataBinding.FieldName = 'C_Spec'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 100
+        end
+      end
+      object cxGrid3Level1: TcxGridLevel
+        GridView = Tv3
+      end
+    end
   end
   inherited loadProcess: TPanel
     Left = 296
@@ -659,6 +703,7 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
     Top = 544
   end
   object GPM_2: TcxGridPopupMenu
+    Grid = cxGrid2
     PopupMenus = <>
     Left = 416
     Top = 536
@@ -710,4 +755,21 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
     Left = 748
     Top = 524
   end
+  object CDS_3: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 1216
+    Top = 557
+  end
+  object DS_3: TDataSource
+    DataSet = CDS_3
+    Left = 1168
+    Top = 557
+  end
+  object GPM_3: TcxGridPopupMenu
+    Grid = cxGrid3
+    PopupMenus = <>
+    Left = 1112
+    Top = 557
+  end
 end
diff --git a/B01基础合同管理/U_finishSalesContractList.pas b/B01基础合同管理/U_finishSalesContractList.pas
index 40b2707..e1a619c 100644
--- a/B01基础合同管理/U_finishSalesContractList.pas
+++ b/B01基础合同管理/U_finishSalesContractList.pas
@@ -97,6 +97,15 @@ type
     TV2density: TcxGridDBColumn;
     Tv1Status: TcxGridDBColumn;
     ToolButton3: TToolButton;
+    Tv3: TcxGridDBTableView;
+    cxGrid3Level1: TcxGridLevel;
+    cxGrid3: TcxGrid;
+    Tv3Column1: TcxGridDBColumn;
+    Tv3Column2: TcxGridDBColumn;
+    Tv3Column3: TcxGridDBColumn;
+    CDS_3: TClientDataSet;
+    DS_3: TDataSource;
+    GPM_3: TcxGridPopupMenu;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -809,8 +818,27 @@ begin
 //    ShowMessage(sql.text);
     open;
   end;
+
+
+  if CDS_2.IsEmpty then
+    exit;
+  with ADOQueryTemp do
+  begin
+    close;
+    sql.Clear;
+    sql.Add('select * from BS_Contract_sub A  ');
+    sql.Add('where CP_code =' + quotedstr((CDS_2.fieldbyname('C_Code').AsString)));
+    open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_3);
+  SInitCDSData(ADOQueryTemp, CDS_3);
+
+
 end;
 
+
+
+
 procedure TfrmfinishSalesContractList.TqxClick(Sender: TObject);
 var
   MConMIDS: string;
diff --git a/B01基础合同管理/testDll.res b/B01基础合同管理/testDll.res
index 2465ca0..e116c48 100644
Binary files a/B01基础合同管理/testDll.res and b/B01基础合同管理/testDll.res differ