20251108

2025-11-08 10:16:26 +08:00 · 2025-11-08 10:16:26 +08:00 · 0a8618ee3c
commit 0a8618ee3c
parent eee7793ac4
167 changed files with 15463 additions and 1313 deletions
--- a/A01基础公司管理/Company.dproj
+++ b/A01基础公司管理/Company.dproj
@ -4,7 +4,7 @@
        <MainSource>Company.dpr</MainSource>
        <Base>True</Base>
        <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>38017</TargetedPlatforms>
+        <TargetedPlatforms>1</TargetedPlatforms>
        <AppType>Library</AppType>
        <FrameworkType>VCL</FrameworkType>
        <ProjectVersion>19.2</ProjectVersion>
@ -13,16 +13,6 @@
    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
        <Base_Android64>true</Base_Android64>
        <CfgParent>Base</CfgParent>
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
        <Base_iOSDevice64>true</Base_iOSDevice64>
        <CfgParent>Base</CfgParent>
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
        <Base_Win32>true</Base_Win32>
        <CfgParent>Base</CfgParent>
@ -43,24 +33,6 @@
        <CfgParent>Base</CfgParent>
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Android64)'!=''">
        <Cfg_2_Android64>true</Cfg_2_Android64>
        <CfgParent>Cfg_2</CfgParent>
        <Cfg_2>true</Cfg_2>
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
        <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
        <CfgParent>Cfg_2</CfgParent>
        <Cfg_2>true</Cfg_2>
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX64)'!=''">
        <Cfg_2_OSX64>true</Cfg_2_OSX64>
        <CfgParent>Cfg_2</CfgParent>
        <Cfg_2>true</Cfg_2>
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
        <Cfg_2_Win32>true</Cfg_2_Win32>
        <CfgParent>Cfg_2</CfgParent>
@ -84,13 +56,6 @@
        <VerInfo_Locale>2052</VerInfo_Locale>
        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Base_Android64)'!=''">
        <Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
        <EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
        <iOS_AppStore1024>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png</iOS_AppStore1024>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Base_Win32)'!=''">
        <DCC_Namespace>System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
        <BT_BuildType>Debug</BT_BuildType>
@ -113,17 +78,8 @@
        <DCC_Optimize>false</DCC_Optimize>
        <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_Android64)'!=''">
        <BT_BuildType>Debug</BT_BuildType>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
        <BT_BuildType>Debug</BT_BuildType>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_OSX64)'!=''">
        <BT_BuildType>Debug</BT_BuildType>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A01基础公司管理\testDll.exe</Debugger_HostApplication>
        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
    </PropertyGroup>
    <ItemGroup>
@ -251,10 +207,6 @@
                </Source>
            </Delphi.Personality>
            <Platforms>
                <Platform value="Android64">True</Platform>
                <Platform value="iOSDevice64">True</Platform>
                <Platform value="Linux64">True</Platform>
                <Platform value="OSX64">True</Platform>
                <Platform value="Win32">True</Platform>
                <Platform value="Win64">False</Platform>
            </Platforms>
--- a/A01基础公司管理/Company.dproj.local
+++ b/A01基础公司管理/Company.dproj.local
@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.560,D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_CoBankSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.328,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_YGRZInput.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.212,=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.167,=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.167,=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.560,D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_CoBankSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.560,D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_CoBankSel.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_EmpFileUp.dfm=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustFileUp.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas=</Transaction>
@ -39,35 +39,7 @@
    <Transaction>1899-12-30 00:00:00.000.027,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInput.pas=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInRC.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
-    <File Path="android-support-v4.dex.jar"/>
+    <File Path="..\..\D10zzbiaoqi"/>
    <File Path="cloud-messaging.dex.jar"/>
    <File Path="com-google-android-gms.play-services-ads-base.17.2.0.dex.jar"/>
    <File Path="com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar"/>
    <File Path="com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar"/>
    <File Path="com-google-android-gms.play-services-ads.17.2.0.dex.jar"/>
    <File Path="com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar"/>
    <File Path="com-google-android-gms.play-services-analytics.16.0.8.dex.jar"/>
    <File Path="com-google-android-gms.play-services-base.16.0.1.dex.jar"/>
    <File Path="com-google-android-gms.play-services-basement.16.2.0.dex.jar"/>
    <File Path="com-google-android-gms.play-services-gass.17.2.0.dex.jar"/>
    <File Path="com-google-android-gms.play-services-identity.16.0.0.dex.jar"/>
    <File Path="com-google-android-gms.play-services-maps.16.1.0.dex.jar"/>
    <File Path="com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar"/>
    <File Path="com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar"/>
    <File Path="com-google-android-gms.play-services-stats.16.0.1.dex.jar"/>
    <File Path="com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar"/>
    <File Path="com-google-android-gms.play-services-tasks.16.0.1.dex.jar"/>
    <File Path="com-google-android-gms.play-services-wallet.16.0.1.dex.jar"/>
    <File Path="com-google-firebase.firebase-analytics.16.4.0.dex.jar"/>
    <File Path="com-google-firebase.firebase-common.16.1.0.dex.jar"/>
    <File Path="com-google-firebase.firebase-iid-interop.16.0.1.dex.jar"/>
    <File Path="com-google-firebase.firebase-iid.17.1.1.dex.jar"/>
    <File Path="com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar"/>
    <File Path="com-google-firebase.firebase-messaging.17.5.0.dex.jar"/>
    <File Path="fmx.dex.jar"/>
    <File Path="google-play-billing.dex.jar"/>
    <File Path="google-play-licensing.dex.jar"/>
    <File Path="..\..\D10myBiaoqi"/>
    <File Path="..\A00通用窗体"/>
    <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
    <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>
@ -83,7 +55,7 @@
    <File Path="..\A00通用窗体\U_PictureUpload.dfm"/>
    <File Path="..\A00通用窗体\U_UserSel.pas"/>
    <File Path="..\A00通用窗体\U_UserSel.dfm"/>
-    <File Path="D:\Dp10Repo"/>
+    <File Path="..\..\..\..\Dp10Repo"/>
    <File Path="..\..\..\public10"/>
    <File Path="..\..\..\public10\design"/>
    <File Path="..\..\..\public10\design\U_BaseHelp.pas"/>
--- a/A01基础公司管理/Company.identcache
+++ b/A01基础公司管理/Company.identcache
--- a/A01基础公司管理/Company.res
+++ b/A01基础公司管理/Company.res
--- a/A01基础公司管理/Company.skincfg
+++ b/A01基础公司管理/Company.skincfg
@ -1,5 +1,5 @@
 [ExpressSkins]
-Default=0
+Default=1
 ShowNotifications=1
 Enabled=1
 dxSkinBasic=0
--- a/A01基础公司管理/ProjectGroup1.groupproj.local
+++ b/A01基础公司管理/ProjectGroup1.groupproj.local
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\Company.dproj"/>
+		<Projects ActiveProject="E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A01基础公司管理\Company.dproj"/>
 	</Default.Personality>
 </BorlandProject>
--- a/A01基础公司管理/U_BankList.dfm
+++ b/A01基础公司管理/U_BankList.dfm
@ -94,6 +94,7 @@ inherited frmBankList: TfrmBankList
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
      Navigator.Buttons.Delete.Visible = False
      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_1
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -126,6 +127,7 @@ inherited frmBankList: TfrmBankList
      object v2Column1: TcxGridDBColumn
        Caption = #24207#21495
        DataBinding.FieldName = 'SerialNo'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column1PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -134,6 +136,7 @@ inherited frmBankList: TfrmBankList
      object Tv2Column3: TcxGridDBColumn
        Caption = #21517#31216
        DataBinding.FieldName = 'BankName'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -142,6 +145,7 @@ inherited frmBankList: TfrmBankList
      object Tv2Column4: TcxGridDBColumn
        Caption = #21345#21495
        DataBinding.FieldName = 'BankCardNo'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -150,6 +154,7 @@ inherited frmBankList: TfrmBankList
      object Tv2Column1: TcxGridDBColumn
        Caption = #24065#31181
        DataBinding.FieldName = 'Currency'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxComboBoxProperties'
        Properties.DropDownListStyle = lsFixedList
        Properties.Items.Strings = (
@ -163,6 +168,7 @@ inherited frmBankList: TfrmBankList
      object Tv2Column5: TcxGridDBColumn
        Caption = #24320#25143#34892
        DataBinding.FieldName = 'BankDeposit'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -171,6 +177,7 @@ inherited frmBankList: TfrmBankList
      object Tv2Column6: TcxGridDBColumn
        Caption = #34892#21495
        DataBinding.FieldName = 'BankNo'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -198,7 +205,7 @@ inherited frmBankList: TfrmBankList
      Height = 12
      Caption = #21517#31216
    end
-    object BKName: TEdit
+    object BankName: TEdit
      Tag = 2
      Left = 96
      Top = 11
--- a/A01基础公司管理/U_BankList.pas
+++ b/A01基础公司管理/U_BankList.pas
@ -14,7 +14,8 @@ uses
  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
  cxTextEdit, cxPC, cxCheckComboBox, cxDropDownEdit, Menus, RM_e_Xls,
  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxSkinWXI,
  dxScrollbarAnnotations;
 type
  TfrmBankList = class(TfrmBaseList)
@ -35,7 +36,7 @@ type
    N1: TMenuItem;
    N2: TMenuItem;
    Panel1: TPanel;
-    BKName: TEdit;
+    BankName: TEdit;
    Label1: TLabel;
    btnadd: TToolButton;
    btndel: TToolButton;
@ -286,7 +287,7 @@ procedure TfrmBankList.btnaddClick(Sender: TObject);
 var
  maxId: string;
 begin
-  BKName.SetFocus;
+  BankName.SetFocus;
  if GetLSNo(ADOQueryCmd, maxId, 'BK', 'BS_Bank', 4, 0) = False then
  begin
    Application.MessageBox('È¡×î´óºÅÊ§°Ü£¡', 'ÌáÊ¾', 0);
--- a/A01基础公司管理/U_Customer.dfm
+++ b/A01基础公司管理/U_Customer.dfm
@ -178,8 +178,6 @@ inherited frmCustomer: TfrmCustomer
    Color = 16242829
    ParentBackground = False
    TabOrder = 1
    ExplicitLeft = -1
    ExplicitTop = 44
    object Label3: TLabel
      Left = 190
      Top = 13
@ -245,7 +243,7 @@ inherited frmCustomer: TfrmCustomer
      OnChange = CoCodeChange
      OnKeyPress = CoCodeKeyPress
    end
-    object country: TEdit
+    object CoCountry: TEdit
      Tag = 2
      Left = 705
      Top = 9
--- a/A01基础公司管理/U_Customer.pas
+++ b/A01基础公司管理/U_Customer.pas
@ -49,7 +49,7 @@ type
    btnEdit: TToolButton;
    Label2: TLabel;
    Saleser: TEdit;
-    country: TEdit;
+    CoCountry: TEdit;
    Label4: TLabel;
    v2Column15: TcxGridDBColumn;
    CDS_2: TClientDataSet;
--- a/A01基础公司管理/U_EmployeeList.dfm
+++ b/A01基础公司管理/U_EmployeeList.dfm
@ -186,6 +186,7 @@ inherited frmEmployeeList: TfrmEmployeeList
    Color = clWhite
    ParentBackground = False
    TabOrder = 1
    ExplicitTop = 34
    object Label1: TLabel
      Left = 186
      Top = 12
@ -214,13 +215,6 @@ inherited frmEmployeeList: TfrmEmployeeList
      Height = 12
      Caption = #37096#38376
    end
    object Label3: TLabel
      Left = 657
      Top = 12
      Width = 24
      Height = 12
      Caption = #36710#38388
    end
    object Label7: TLabel
      Left = 43
      Top = 12
@ -228,16 +222,16 @@ inherited frmEmployeeList: TfrmEmployeeList
      Height = 12
      Caption = #21592#24037#32534#21495
    end
-    object YGName: TEdit
+    object EEName: TEdit
      Tag = 2
      Left = 211
      Top = 8
      Width = 83
      Height = 20
      TabOrder = 0
-      OnChange = YGNameChange
+      OnChange = EENameChange
    end
-    object YGSex: TComboBox
+    object EEType: TComboBox
      Tag = 1
      Left = 452
      Top = 8
@ -245,20 +239,20 @@ inherited frmEmployeeList: TfrmEmployeeList
      Height = 20
      Style = csDropDownList
      TabOrder = 1
-      OnChange = YGNameChange
+      OnChange = EENameChange
      Items.Strings = (
        #30007
        #22899
        '')
    end
-    object GangWei: TEdit
+    object Post: TEdit
      Tag = 2
      Left = 564
      Top = 8
      Width = 75
      Height = 20
      TabOrder = 2
-      OnChange = YGNameChange
+      OnChange = EENameChange
    end
    object Dept: TEdit
      Tag = 2
@ -267,25 +261,16 @@ inherited frmEmployeeList: TfrmEmployeeList
      Width = 75
      Height = 20
      TabOrder = 3
-      OnChange = YGNameChange
+      OnChange = EENameChange
    end
-    object SYRName: TEdit
+    object EECode: TEdit
      Tag = 2
      Left = 684
      Top = 8
      Width = 75
      Height = 20
      TabOrder = 4
      OnChange = YGNameChange
    end
    object YGNo: TEdit
      Tag = 2
      Left = 91
      Top = 8
      Width = 83
      Height = 20
-      TabOrder = 5
+      TabOrder = 4
-      OnChange = YGNameChange
+      OnChange = EENameChange
    end
  end
  object cxDBTreeList1: TcxDBTreeList [2]
@ -307,6 +292,7 @@ inherited frmEmployeeList: TfrmEmployeeList
    OptionsView.CellAutoHeight = True
    OptionsView.Headers = False
    RootValue = -1
    ScrollbarAnnotations.CustomAnnotations = <>
    Styles.Inactive = DataLink_Company.Red
    Styles.Selection = DataLink_Company.Red
    Styles.IncSearch = DataLink_Company.Red
@ -372,8 +358,11 @@ inherited frmEmployeeList: TfrmEmployeeList
      Align = alClient
      PopupMenu = PopupMenu1
      TabOrder = 1
      ExplicitLeft = -47
      ExplicitTop = 33
      object Tv1: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DataSource1
        DataController.Filter.AutoDataSetFilter = True
        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -388,6 +377,7 @@ inherited frmEmployeeList: TfrmEmployeeList
        object v1Column4: TcxGridDBColumn
          Caption = #36873#25321
          DataBinding.FieldName = 'SSel'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxCheckBoxProperties'
          Properties.ImmediatePost = True
          HeaderAlignmentHorz = taCenter
@ -396,6 +386,7 @@ inherited frmEmployeeList: TfrmEmployeeList
        object v1RuZhiDate: TcxGridDBColumn
          Caption = #20837#32844#26085#26399
          DataBinding.FieldName = 'EntryDate'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 84
@ -403,6 +394,7 @@ inherited frmEmployeeList: TfrmEmployeeList
        object v1YGNo: TcxGridDBColumn
          Caption = #32534#21495
          DataBinding.FieldName = 'EECode'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 70
@ -410,6 +402,7 @@ inherited frmEmployeeList: TfrmEmployeeList
        object v1YGName: TcxGridDBColumn
          Caption = #22995#21517
          DataBinding.FieldName = 'EEName'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 88
@ -417,6 +410,7 @@ inherited frmEmployeeList: TfrmEmployeeList
        object v1Column1: TcxGridDBColumn
          Caption = #37096#38376
          DataBinding.FieldName = 'Dept'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Buttons = <
            item
@ -430,6 +424,7 @@ inherited frmEmployeeList: TfrmEmployeeList
        object v1Column2: TcxGridDBColumn
          Caption = #23703#20301
          DataBinding.FieldName = 'Post'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 82
@ -437,6 +432,7 @@ inherited frmEmployeeList: TfrmEmployeeList
        object v1Column8: TcxGridDBColumn
          Caption = #31867#21035
          DataBinding.FieldName = 'EEType'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 78
@ -444,6 +440,7 @@ inherited frmEmployeeList: TfrmEmployeeList
        object v1SFZNo: TcxGridDBColumn
          Caption = #36523#20221#35777#21495
          DataBinding.FieldName = 'IdCard'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 70
@ -451,6 +448,7 @@ inherited frmEmployeeList: TfrmEmployeeList
        object v1Column6: TcxGridDBColumn
          Caption = #24615#21035
          DataBinding.FieldName = 'Sex'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 85
@ -458,6 +456,7 @@ inherited frmEmployeeList: TfrmEmployeeList
        object v1Column29: TcxGridDBColumn
          Caption = #25163#26426
          DataBinding.FieldName = 'Phone'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 91
@ -465,6 +464,7 @@ inherited frmEmployeeList: TfrmEmployeeList
        object v1SJLiZhiDate: TcxGridDBColumn
          Caption = #31163#32844#26085#26399
          DataBinding.FieldName = 'SJLiZhiDate'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxDateEditProperties'
          Properties.SaveTime = False
          Properties.ShowTime = False
@ -476,6 +476,7 @@ inherited frmEmployeeList: TfrmEmployeeList
        object Tv1Column1: TcxGridDBColumn
          Caption = #31163#32844#26102#38388
          DataBinding.FieldName = 'DepartureDate'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 69
        end
--- a/A01基础公司管理/U_EmployeeList.pas
+++ b/A01基础公司管理/U_EmployeeList.pas
@ -12,7 +12,8 @@ uses
  RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit,
  cxDropDownEdit, cxPC, cxTL, cxMaskEdit, cxInplaceContainer, cxDBTL, cxTLData,
  cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxBarBuiltInMenu,
-  cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges;
+  cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
  dxSkinWXI, dxScrollbarAnnotations;
 type
  TfrmEmployeeList = class(TfrmBaseList)
@ -36,11 +37,11 @@ type
    N2: TMenuItem;
    N1: TMenuItem;
    Label1: TLabel;
-    YGName: TEdit;
+    EEName: TEdit;
    Label2: TLabel;
-    YGSex: TComboBox;
+    EEType: TComboBox;
    Label5: TLabel;
-    GangWei: TEdit;
+    Post: TEdit;
    cxDBTreeList1: TcxDBTreeList;
    cxDBTreeList1cxDBTreeListColumn2: TcxDBTreeListColumn;
    DataSource2: TDataSource;
@ -67,15 +68,13 @@ type
    Label4: TLabel;
    Dept: TEdit;
    v1SFZNo: TcxGridDBColumn;
    Label3: TLabel;
    SYRName: TEdit;
    Panel2: TPanel;
    Label6: TLabel;
    SJLiZhiDate: TDateTimePicker;
    ToolButton1: TToolButton;
    v1YGNo: TcxGridDBColumn;
    Label7: TLabel;
-    YGNo: TEdit;
+    EECode: TEdit;
    ToolButton2: TToolButton;
    v1Column4: TcxGridDBColumn;
    Tv1Column1: TcxGridDBColumn;
@ -101,7 +100,7 @@ type
    procedure N1Click(Sender: TObject);
    procedure cxTabControl1Change(Sender: TObject);
    procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
-    procedure YGNameChange(Sender: TObject);
+    procedure EENameChange(Sender: TObject);
    procedure cxDBTreeList1DblClick(Sender: TObject);
    procedure Tv1CellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
    procedure TLZClick(Sender: TObject);
@ -444,7 +443,7 @@ begin
  TBView.Click;
 end;
-procedure TfrmEmployeeList.YGNameChange(Sender: TObject);
+procedure TfrmEmployeeList.EENameChange(Sender: TObject);
 begin
  TBFind.Click;
 end;
--- a/A01基础公司管理/testDll.identcache
+++ b/A01基础公司管理/testDll.identcache
--- a/A01基础公司管理/testDll.res
+++ b/A01基础公司管理/testDll.res
--- a/A02基础产品管理/ClothInfo.identcache
+++ b/A02基础产品管理/ClothInfo.identcache
--- a/A02基础产品管理/ClothInfo.res
+++ b/A02基础产品管理/ClothInfo.res
--- a/A02基础产品管理/ProjectGroup1.groupproj.local
+++ b/A02基础产品管理/ProjectGroup1.groupproj.local
@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10zzbiaoqi\A02基础产品管理\ClothInfo.dproj"/>
+		<Projects ActiveProject="E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A02基础产品管理\ClothInfo.dproj"/>
 	</Default.Personality>
 </BorlandProject>
--- a/A02基础产品管理/testDll.identcache
+++ b/A02基础产品管理/testDll.identcache
--- a/A03基础价格管理/MarketValue.dproj.local
+++ b/A03基础价格管理/MarketValue.dproj.local
@ -1,76 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.401,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.321,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\MarketValue.dproj=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\Contract.dproj</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.590,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A03基础价格管理\U_QuiryCompanySel.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.321,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\MarketValue.dproj=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\Contract.dproj</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.590,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A03基础价格管理\U_QuiryCompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.332,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothInquiryInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.332,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothInquiryInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.590,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A03基础价格管理\U_QuiryCompanySel.dfm</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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.451,=D:\Dp10Repo\项目代码\骉骐\A03基础价格管理\U_PriceFileUp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.451,=D:\Dp10Repo\项目代码\骉骐\A03基础价格管理\U_PriceFileUp.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.620,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\Contract.dproj=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\InformationBase.dproj</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.401,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_CompanySel.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.950,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.844,=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.556,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm</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.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm</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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.590,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A03基础价格管理\U_QuiryCompanySel.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm</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.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.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.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.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.564,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.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</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.526,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas</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.709,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.332,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothInquiryInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.332,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothInquiryInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.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.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</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.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.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.dfm</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.123,=D:\Dp10Repo\public10\design\U_globalVar.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.242,=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.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.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.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.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.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.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.348,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.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.522,=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.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.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.123,=D:\Dp10Repo\public10\design\U_globalVar.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.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.041,=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.041,=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.376,=D:\Dp10Repo\项目代码\骉骐\A03基础价格管理\U_SLT.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.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.376,=D:\Dp10Repo\项目代码\骉骐\A03基础价格管理\U_SLT.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.444,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.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.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.422,=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.441,=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.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.603,=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.067,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.569,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>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="..\..\D10zzbiaoqi"/>
@ -89,7 +89,7 @@
    <File Path="..\A00通用窗体\U_UserSel.dfm"/>
    <File Path="..\A00通用窗体\U_CompanySel.pas"/>
    <File Path="..\A00通用窗体\U_CompanySel.dfm"/>
-    <File Path="D:\Dp10Repo"/>
+    <File Path="..\..\..\..\Dp10Repo"/>
    <File Path="..\..\..\public10"/>
    <File Path="..\..\..\public10\design"/>
    <File Path="..\..\..\public10\design\U_BaseHelp.pas"/>
--- a/A03基础价格管理/MarketValue.identcache
+++ b/A03基础价格管理/MarketValue.identcache
--- a/A03基础价格管理/ProjectGroup1.groupproj.local
+++ b/A03基础价格管理/ProjectGroup1.groupproj.local
@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10zzbiaoqi\A03基础价格管理\MarketValue.dproj"/>
+		<Projects ActiveProject="E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A03基础价格管理\MarketValue.dproj"/>
 	</Default.Personality>
 </BorlandProject>
--- a/A03基础价格管理/testDll.identcache
+++ b/A03基础价格管理/testDll.identcache
--- a/A09财务通用管理/Financial.dpr
+++ b/A09财务通用管理/Financial.dpr
@ -41,7 +41,11 @@ uses
  U_UserSel in 'U_UserSel.pas' {frmUserSel},
  U_FtyFileUp in 'U_FtyFileUp.pas' {frmFtyFileUp},
  U_TaxInput in 'U_TaxInput.pas' {frmTaxInput},
-  U_TaxList in 'U_TaxList.pas' {frmTaxList};
+  U_TaxList in 'U_TaxList.pas' {frmTaxList},
  U_ZDPrice in 'U_ZDPrice.pas' {frmZDPrice},
  U_BatchEdit in 'U_BatchEdit.pas' {frmBatchEdit},
  U_PlanProfitDetails in 'U_PlanProfitDetails.pas' {frmPlanProfitDetails},
  U_TaxSet in 'U_TaxSet.pas' {frmTaxSet};
 {$R *.res}
--- a/A09财务通用管理/Financial.dproj
+++ b/A09财务通用管理/Financial.dproj
@ -80,7 +80,7 @@
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
@ -206,6 +206,22 @@
            <Form>frmTaxList</Form>
            <FormType>dfm</FormType>
        </DCCReference>
        <DCCReference Include="U_ZDPrice.pas">
            <Form>frmZDPrice</Form>
            <FormType>dfm</FormType>
        </DCCReference>
        <DCCReference Include="U_BatchEdit.pas">
            <Form>frmBatchEdit</Form>
            <FormType>dfm</FormType>
        </DCCReference>
        <DCCReference Include="U_PlanProfitDetails.pas">
            <Form>frmPlanProfitDetails</Form>
            <FormType>dfm</FormType>
        </DCCReference>
        <DCCReference Include="U_TaxSet.pas">
            <Form>frmTaxSet</Form>
            <FormType>dfm</FormType>
        </DCCReference>
        <BuildConfiguration Include="Debug">
            <Key>Cfg_2</Key>
            <CfgParent>Base</CfgParent>
--- a/A09财务通用管理/Financial.dproj.local
+++ b/A09财务通用管理/Financial.dproj.local
@ -1,69 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
    <Transaction>1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.349,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_PictureUpload.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.318,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.927,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableList.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj</Transaction>
    <Transaction>1899-12-30 00:00:00.000.654,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableInPut.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm</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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=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.064,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.753,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.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.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.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.715,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.103,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_BankSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.110,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableList.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</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.552,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm</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.064,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.349,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.402,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.255,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPriceDetails.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.860,=D:\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxList.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.061,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.072,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FinFileUp.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.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.110,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableList.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.345,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_FtyStatement.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.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.654,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.dfm</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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.215,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxSet.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.297,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.659,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.255,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPriceDetails.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.103,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_BankSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.715,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.684,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.531,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj</Transaction>
    <Transaction>1899-12-30 00:00:00.000.402,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.552,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas=</Transaction>
    <Transaction>1899-12-30 00:00:00.000.889,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPriceDetails.pas=</Transaction>
    <Transaction>1899-12-30 00:00:00.000.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.753,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.014,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_BatchEdit.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.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.110,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.654,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.860,=D:\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxList.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.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.061,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.654,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.215,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxSet.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.110,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.072,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FinFileUp.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.dfm=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.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.646,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_PayableEdit.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.487,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableInput.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.687,=D:\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxInput.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.076,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.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.724,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_UpdatePrice.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.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.345,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_FtyStatement.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.487,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableInput.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm</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.724,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_UpdatePrice.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.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.256,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPrice.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.433,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FtyFileUp.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.687,=D:\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxInput.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="..\..\D10zzbiaoqi"/>
@ -87,7 +100,7 @@
    <File Path="..\T00贸易通用窗体"/>
    <File Path="..\T00贸易通用窗体\U_TradePlanSel.pas"/>
    <File Path="..\T00贸易通用窗体\U_TradePlanSel.dfm"/>
-    <File Path="D:\Dp10Repo"/>
+    <File Path="..\..\..\..\Dp10Repo"/>
    <File Path="..\..\..\public10"/>
    <File Path="..\..\..\public10\design"/>
    <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
@ -116,12 +129,12 @@
    <File Path="U_FtyStatement.dfm"/>
    <File Path="U_CompanySel.pas"/>
    <File Path="U_CompanySel.dfm"/>
    <File Path="U_OtherPayableList.pas"/>
    <File Path="U_OtherPayableList.dfm"/>
    <File Path="U_OtherPayableInput.pas"/>
    <File Path="U_OtherPayableInput.dfm"/>
    <File Path="U_HandPayableImport.pas"/>
    <File Path="U_HandPayableImport.dfm"/>
    <File Path="U_OtherPayableList.pas"/>
    <File Path="U_OtherPayableList.dfm"/>
    <File Path="U_FinFileUp.pas"/>
    <File Path="U_FinFileUp.dfm"/>
    <File Path="U_PayableEdit.pas"/>
@ -138,5 +151,13 @@
    <File Path="U_TaxInput.dfm"/>
    <File Path="U_TaxList.pas"/>
    <File Path="U_TaxList.dfm"/>
    <File Path="U_ZDPrice.pas"/>
    <File Path="U_ZDPrice.dfm"/>
    <File Path="U_BatchEdit.pas"/>
    <File Path="U_BatchEdit.dfm"/>
    <File Path="U_PlanProfitDetails.pas"/>
    <File Path="U_PlanProfitDetails.dfm"/>
    <File Path="U_TaxSet.pas"/>
    <File Path="U_TaxSet.dfm"/>
  </ProjectSortOrder>
 </BorlandProject>
--- a/A09财务通用管理/Financial.identcache
+++ b/A09财务通用管理/Financial.identcache
--- a/A09财务通用管理/ProjectGroup1.groupproj.local
+++ b/A09财务通用管理/ProjectGroup1.groupproj.local
@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Financial.dproj"/>
+		<Projects ActiveProject="E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Financial.dproj"/>
 	</Default.Personality>
 </BorlandProject>
--- a/A09财务通用管理/U_BankFlowInInput.pas
+++ b/A09财务通用管理/U_BankFlowInInput.pas
@ -6,7 +6,8 @@ uses
  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
  Dialogs, ComCtrls, ToolWin, DB, ADODB, cxControls, cxContainer, cxEdit,
  cxTextEdit, cxCurrencyEdit, BtnEdit, StdCtrls, ExtCtrls, cxGraphics,
-  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters;
+  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
  dxSkinWXI;
 type
  TfrmBankFlowInInput = class(TForm)
--- a/A09财务通用管理/U_BankFlowList.dfm
+++ b/A09财务通用管理/U_BankFlowList.dfm
@ -308,9 +308,9 @@ inherited frmBankFlowList: TfrmBankFlowList
      Align = alClient
      PopupMenu = PM_1
      TabOrder = 0
      ExplicitTop = -2
      object TV1: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DataSource1
        DataController.Summary.DefaultGroupSummaryItems = <>
        DataController.Summary.FooterSummaryItems = <
@ -335,6 +335,7 @@ inherited frmBankFlowList: TfrmBankFlowList
        object V1Column1: TcxGridDBColumn
          Caption = #27969#27700#21495
          DataBinding.FieldName = 'BFID'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Sorting = False
@ -343,6 +344,7 @@ inherited frmBankFlowList: TfrmBankFlowList
        object V1CRTime: TcxGridDBColumn
          Caption = #26085#26399
          DataBinding.FieldName = 'BFTime'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxDateEditProperties'
          HeaderAlignmentHorz = taCenter
          Options.Sorting = False
@ -351,18 +353,21 @@ inherited frmBankFlowList: TfrmBankFlowList
        object V1Column2: TcxGridDBColumn
          Caption = #23545#26041#36134#25143
          DataBinding.FieldName = 'OppBKName'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 109
        end
        object V1Column3: TcxGridDBColumn
          Caption = #23545#26041#21333#20301
          DataBinding.FieldName = 'OppCoName'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 85
        end
        object V1CRType: TcxGridDBColumn
          Caption = #31867#22411
          DataBinding.FieldName = 'BFType'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Sorting = False
          Width = 100
@ -370,6 +375,7 @@ inherited frmBankFlowList: TfrmBankFlowList
        object V1InMoney: TcxGridDBColumn
          Caption = #20511#26041
          DataBinding.FieldName = 'InAmount'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Sorting = False
@ -381,6 +387,7 @@ inherited frmBankFlowList: TfrmBankFlowList
        object V1OutMoney: TcxGridDBColumn
          Caption = #36151#26041
          DataBinding.FieldName = 'OutAmount'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Sorting = False
          Styles.Content = DataLink_Financial.FoneRed
@ -391,6 +398,7 @@ inherited frmBankFlowList: TfrmBankFlowList
        object V1YEMoney: TcxGridDBColumn
          Caption = #20313#39069
          DataBinding.FieldName = 'YEAmount'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxCurrencyEditProperties'
          Properties.AssignedValues.DisplayFormat = True
          HeaderAlignmentHorz = taCenter
@ -400,6 +408,7 @@ inherited frmBankFlowList: TfrmBankFlowList
        object V1NOTE: TcxGridDBColumn
          Caption = #22791#27880
          DataBinding.FieldName = 'NOTE'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Sorting = False
          Width = 188
@ -407,6 +416,7 @@ inherited frmBankFlowList: TfrmBankFlowList
        object V1Column4: TcxGridDBColumn
          Caption = #30331#35760#20154
          DataBinding.FieldName = 'filler'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 70
@ -414,6 +424,7 @@ inherited frmBankFlowList: TfrmBankFlowList
        object V1Column5: TcxGridDBColumn
          Caption = #30331#35760#26102#38388
          DataBinding.FieldName = 'filltime'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 56
@ -421,6 +432,7 @@ inherited frmBankFlowList: TfrmBankFlowList
        object TV1Column1: TcxGridDBColumn
          Caption = #26469#28304
          DataBinding.FieldName = 'fromID'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 69
--- a/A09财务通用管理/U_BankFlowList.pas
+++ b/A09财务通用管理/U_BankFlowList.pas
@ -10,7 +10,8 @@ uses
  cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView,
  cxGrid, ToolWin, cxCalendar, cxCurrencyEdit, cxTextEdit, cxLookAndFeels,
  cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd;
+  dxSkinsDefaultPainters, dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd,
  dxSkinWXI, dxScrollbarAnnotations;
 type
  TfrmBankFlowList = class(TfrmBaseList)
--- a/A09财务通用管理/U_BatchEdit.dfm
+++ b/A09财务通用管理/U_BatchEdit.dfm
@ -0,0 +1,59 @@
 object frmBatchEdit: TfrmBatchEdit
  Left = 0
  Top = 0
  BorderStyle = bsDialog
  Caption = #20215#26684#20462#25913
  ClientHeight = 131
  ClientWidth = 395
  Color = clBtnFace
  Font.Charset = DEFAULT_CHARSET
  Font.Color = clWindowText
  Font.Height = -11
  Font.Name = 'Tahoma'
  Font.Style = []
  OldCreateOrder = False
  Position = poScreenCenter
  OnShow = FormShow
  PixelsPerInch = 96
  TextHeight = 13
  object price: TcxTextEdit
    Left = 114
    Top = 24
    TabOrder = 0
    Width = 156
  end
  object btnOK: TcxButton
    Left = 80
    Top = 80
    Width = 75
    Height = 25
    Caption = #20445#23384
    ModalResult = 1
    TabOrder = 1
    OnClick = btnOKClick
  end
  object btnCancel: TcxButton
    Left = 195
    Top = 80
    Width = 75
    Height = 25
    Caption = #21462#28040
    ModalResult = 2
    TabOrder = 2
    OnClick = btnCancelClick
  end
  object cxLabel2: TcxLabel
    Left = 80
    Top = 25
    Caption = #20215#26684
  end
  object ADOConnection1: TADOConnection
    Left = 312
  end
  object ADOQuery1: TADOQuery
    Connection = ADOConnection1
    Parameters = <>
    Left = 312
    Top = 64
  end
 end
--- a/A09财务通用管理/U_BatchEdit.pas
+++ b/A09财务通用管理/U_BatchEdit.pas
@ -0,0 +1,124 @@
 unit U_BatchEdit;
 interface
 uses
  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics, cxControls, cxLookAndFeels,
  cxLookAndFeelPainters, cxContainer, cxEdit,   Vcl.Menus,
  Vcl.StdCtrls, cxButtons, cxLabel, cxTextEdit, cxMaskEdit, cxDropDownEdit,
  dxSkinsCore, dxSkinWXI, Data.DB, Data.Win.ADODB, U_BaseInput;
 type
  TfrmBatchEdit = class(TfrmBaseInput)
    price: TcxTextEdit;
    btnOK: TcxButton;
    btnCancel: TcxButton;
    cxLabel2: TcxLabel;
    ADOConnection1: TADOConnection;
    ADOQuery1: TADOQuery;
    procedure btnOKClick(Sender: TObject);
    procedure btnCancelClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
  private
    { Private declarations }
  public
    FBCIOID: string;
    FStkId: string;
    FIOID: string;
    Fflag: Integer;
    { Public declarations }
  end;
 var
  frmBatchEdit: TfrmBatchEdit;
 implementation
 uses
  U_DataLink;
 {$R *.dfm}
 procedure TfrmBatchEdit.btnCancelClick(Sender: TObject);
 begin
  close;
 end;
 procedure TfrmBatchEdit.btnOKClick(Sender: TObject);
 begin
  if price.Text = '' then
    price.Text := 'null';
  if (Fflag = 0) or (Fflag = 1) then
  begin
    if FBCIOID = '' then
      exit;
    try
      with ADOQuery1 do
      begin
        close;
        sql.Clear;
        sql.Add(' update bs_cloth_io set price = ' + price.Text  + ' where BCIOID in (' + FBCIOID + ')');
        ExecSQL;
      end;
    finally
      ModalResult := 1;;
    end;
  end
  else if Fflag = 2 then
  begin
    if FStkId = '' then
      exit;
    try
      with ADOQuery1 do
      begin
        close;
        sql.Clear;
        sql.Add(' update Trade_Cloth_Stock_ZD set ZDprice = ' + price.Text  + ' where StkId in (' + FStkId + ')');
        ExecSQL;
      end;
    finally
      ModalResult := 1;;
    end;
  end
  else if Fflag = 3 then
  begin
    if FIOID = '' then
      exit;
    try
      with ADOQuery1 do
      begin
        close;
        sql.Clear;
        sql.Add(' update Trade_Cloth_IO set price = ' + price.Text  + ' where IOID in (' + FIOID + ')');
 //        ShowMessage(sql.Text);
        ExecSQL;
      end;
    finally
      ModalResult := 1;;
    end;
  end;
 end;
 procedure TfrmBatchEdit.FormShow(Sender: TObject);
 begin
  try
    with ADOConnection1 do
    begin
      if not Connected then
      begin
        Connected := false;
        ConnectionString := DConString;
        LoginPrompt := false;
        Connected := true;
      end;
    end;
  except
    application.MessageBox('Êý¾Ý¿âÁ¬½ÓÊ§°Ü£¡', '´íÎó', mb_Ok + MB_ICONERROR);
  end;
 end;
 end.
--- a/A09财务通用管理/U_ClaimsableList.dfm
+++ b/A09财务通用管理/U_ClaimsableList.dfm
@ -244,7 +244,7 @@ inherited frmClaimsableList: TfrmClaimsableList
      Time = 0.918237847232376200
      TabOrder = 2
    end
-    object FactoryName: TEdit
+    object OppCoName: TEdit
      Tag = 2
      Left = 266
      Top = 10
--- a/A09财务通用管理/U_ClaimsableList.pas
+++ b/A09财务通用管理/U_ClaimsableList.pas
@ -46,7 +46,7 @@ type
    v1InvoiceDate: TcxGridDBColumn;
    v1note: TcxGridDBColumn;
    Label5: TLabel;
-    FactoryName: TEdit;
+    OppCoName: TEdit;
    TCHK: TToolButton;
    TNOCHK: TToolButton;
    cxTabControl1: TcxTabControl;
@ -314,6 +314,20 @@ end;
 procedure TfrmClaimsableList.TUPDATEClick(Sender: TObject);
 begin
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_Invoice.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法删除', '提示');
    Exit;
  end;
  frmClaimsableInPut := TfrmClaimsableInPut.Create(self);
  with frmClaimsableInPut do
  begin
@ -349,6 +363,21 @@ begin
      Exit;
    end;
  end;
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_Invoice.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法删除', '提示');
    Exit;
  end;
  if application.MessageBox('确定要删除吗？', '提示', 1) = 2 then
    exit;
  try
--- a/A09财务通用管理/U_CollectList.dfm
+++ b/A09财务通用管理/U_CollectList.dfm
@ -181,40 +181,47 @@ inherited frmCollectList: TfrmCollectList
      ParentFont = False
    end
    object Label4: TLabel
-      Left = 333
+      Left = 330
      Top = 13
      Width = 24
      Height = 12
      Caption = #21697#21517
    end
    object Label6: TLabel
-      Left = 333
+      Left = 329
      Top = 39
      Width = 24
      Height = 12
      Caption = #32534#21495
    end
    object Label10: TLabel
-      Left = 479
+      Left = 473
-      Top = 39
+      Top = 38
      Width = 48
      Height = 12
      Caption = #21512' '#21516' '#21495
    end
    object Label11: TLabel
      Left = 475
-      Top = 17
+      Top = 13
      Width = 48
      Height = 12
      Caption = #23458#25143#21333#21495
    end
    object Label2: TLabel
-      Left = 174
+      Left = 173
      Top = 39
      Width = 48
      Height = 12
      Caption = #19978#32423#21333#20301
    end
    object Label7: TLabel
      Left = 637
      Top = 13
      Width = 48
      Height = 12
      Caption = #25171#27454#37329#39069
    end
    object OppCoName: TEdit
      Tag = 2
      Left = 228
@ -261,7 +268,7 @@ inherited frmCollectList: TfrmCollectList
      State = cbChecked
      TabOrder = 4
    end
-    object P_Code: TEdit
+    object F_Code: TEdit
      Tag = 1
      Left = 359
      Top = 35
@ -297,6 +304,15 @@ inherited frmCollectList: TfrmCollectList
      TabOrder = 8
      OnKeyPress = OppCoNameKeyPress
    end
    object DKAmount: TEdit
      Tag = 2
      Left = 693
      Top = 9
      Width = 87
      Height = 20
      TabOrder = 9
      OnKeyPress = OppCoNameKeyPress
    end
  end
  object cxGrid1: TcxGrid [2]
    Left = 0
@ -524,12 +540,17 @@ inherited frmCollectList: TfrmCollectList
        Caption = #25163#32493#36153
        DataBinding.FieldName = 'SXFAmount'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCalcEditProperties'
        Properties.DisplayFormat = '0.00'
        HeaderAlignmentHorz = taCenter
      end
      object Tv1Column14: TcxGridDBColumn
        AlternateCaption = '0.##'
        Caption = #23454#25910#37329#39069
        DataBinding.FieldName = 'SSAmount'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCalcEditProperties'
        Properties.DisplayFormat = '0.00'
        HeaderAlignmentHorz = taCenter
        Width = 70
      end
@ -537,6 +558,8 @@ inherited frmCollectList: TfrmCollectList
        Caption = #23454#25910#20154#27665#24065
        DataBinding.FieldName = 'SSCNYAmount'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCalcEditProperties'
        Properties.DisplayFormat = '0.00'
        HeaderAlignmentHorz = taCenter
        Width = 86
      end
--- a/A09财务通用管理/U_CollectList.pas
+++ b/A09财务通用管理/U_CollectList.pas
@ -15,7 +15,7 @@ uses
  cxTextEdit, cxPC, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters,
  cxNavigator, dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters,
  dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd, dxSkinWXI,
-  dxScrollbarAnnotations;
+  dxScrollbarAnnotations, cxCalc;
 type
  TfrmCollectList = class(TfrmBaseList)
@ -46,7 +46,7 @@ type
    Label4: TLabel;
    CheckBox1: TCheckBox;
    Label6: TLabel;
-    P_Code: TEdit;
+    F_Code: TEdit;
    v2OrderNo: TcxGridDBColumn;
    cxTabControl1: TcxTabControl;
    Label10: TLabel;
@ -102,6 +102,8 @@ type
    Tv1Column13: TcxGridDBColumn;
    Tv1Column14: TcxGridDBColumn;
    Tv1Column15: TcxGridDBColumn;
    DKAmount: TEdit;
    Label7: TLabel;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure btnDelClick(Sender: TObject);
@ -289,6 +291,20 @@ begin
    Exit;
  end;
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法删除', '提示');
    Exit;
  end;
  with CDS_1 do
  begin
    DisableControls;
@ -521,23 +537,46 @@ begin
 end;
 procedure TfrmCollectList.Button2Click(Sender: TObject);
 var
  PJHExchangeRate: string;
  PSXFAmount: string;
 begin
  if FFID.Text <> '' then
  begin
    if JHExchangeRate.Text <> '' then
      PJHExchangeRate := JHExchangeRate.Text
    else
      PJHExchangeRate := 'Null';
    if SXFAmount.Text <> '' then
      PSXFAmount := SXFAmount.Text
    else
      PSXFAmount := 'Null';
    with ADOQueryCmd do
    begin
      Close;
      sql.Clear;
      sql.Add('UPdate Finance_Flow ');
-      sql.Add(' Set JHExchangeRate=''' + Trim(JHExchangeRate.Text) + '''');
+      sql.Add(' Set JHExchangeRate=' + Trim(PJHExchangeRate) + '');
-      sql.Add(',SXFAmount=''' + Trim(SXFAmount.Text) + '''');
+      sql.Add(',SXFAmount=' + Trim(PSXFAmount) + '');
      SQL.Add(' where FFID=''' + Trim(FFID.Text) + '''');
      sql.Add('UPdate Finance_WriteOff ');
-      sql.Add(' Set WoJHExchangeRate=''' + Trim(JHExchangeRate.Text) + '''');
+      sql.Add(' Set WoJHExchangeRate=' + Trim(PJHExchangeRate) + '');
 //      sql.Add(',SXFAmount=''' + Trim(SXFAmount.Text) + '''');
      SQL.Add(' where FromId=''' + Trim(FFID.Text) + '''');
-
+      sql.Add('UPDATE f');
-//      ShowMessage(SQL.text);
+      sql.Add('SET f.WoSXFAmount = ');
      sql.Add('    CASE ');
      sql.Add('        WHEN t.Amount = 0 OR t.Amount IS NULL THEN 0');
      sql.Add('        ELSE (f.WoAmount / t.Amount) * ' + Trim(PSXFAmount) + '');
      sql.Add('    END');
      sql.Add('FROM Finance_WriteOff f');
      sql.Add('CROSS APPLY (');
      sql.Add('    SELECT Amount ');
      sql.Add('    FROM Finance_Flow ');
      sql.Add('    WHERE FFID = ''' + Trim(FFID.Text) + '''');
      sql.Add(') t');
      sql.Add('WHERE f.FromId = ''' + Trim(FFID.Text) + '''');
 //      ShowMessage(sql.Text);
      execsql;
    end;
@ -710,6 +749,20 @@ end;
 procedure TfrmCollectList.btnEditClick(Sender: TObject);
 begin
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法修改', '提示');
    Exit;
  end;
  try
    with ADOQueryCmd do
    begin
--- a/A09财务通用管理/U_CollectWriteOff.dfm
+++ b/A09财务通用管理/U_CollectWriteOff.dfm
@ -223,7 +223,7 @@ inherited frmCollectWriteOff: TfrmCollectWriteOff
    BevelOuter = bvLowered
    TabOrder = 1
    object Label6: TLabel
-      Left = 49
+      Left = 32
      Top = 10
      Width = 24
      Height = 12
@ -246,7 +246,7 @@ inherited frmCollectWriteOff: TfrmCollectWriteOff
      Visible = False
    end
    object Label3: TLabel
-      Left = 334
+      Left = 477
      Top = 10
      Width = 130
      Height = 12
@ -259,15 +259,22 @@ inherited frmCollectWriteOff: TfrmCollectWriteOff
      ParentFont = False
    end
    object Label7: TLabel
-      Left = 185
+      Left = 166
      Top = 10
      Width = 48
      Height = 12
      Caption = #23458#25143#21333#21495
    end
    object Label12: TLabel
      Left = 323
      Top = 10
      Width = 48
      Height = 12
      Caption = #25351#31034#21333#21495
    end
    object F_Name: TEdit
      Tag = 2
-      Left = 77
+      Left = 62
      Top = 6
      Width = 89
      Height = 20
@ -275,8 +282,8 @@ inherited frmCollectWriteOff: TfrmCollectWriteOff
      OnKeyPress = KHConNoKeyPress
    end
    object Button1: TButton
-      Left = 616
+      Left = 719
-      Top = 8
+      Top = 5
      Width = 107
      Height = 25
      Caption = #20998#37197#26680#38144#37329#39069
@ -307,7 +314,7 @@ inherited frmCollectWriteOff: TfrmCollectWriteOff
    end
    object curHsNum: TEdit
      Tag = 9
-      Left = 469
+      Left = 610
      Top = 6
      Width = 101
      Height = 20
@ -321,13 +328,22 @@ inherited frmCollectWriteOff: TfrmCollectWriteOff
    end
    object BuyConNo: TEdit
      Tag = 2
-      Left = 239
+      Left = 220
      Top = 6
      Width = 89
      Height = 20
      TabOrder = 5
      OnKeyPress = KHConNoKeyPress
    end
    object OrderNO: TEdit
      Tag = 2
      Left = 376
      Top = 6
      Width = 89
      Height = 20
      TabOrder = 6
      OnKeyPress = KHConNoKeyPress
    end
  end
  object ScrollBox1: TScrollBox [3]
    Left = 0
--- a/A09财务通用管理/U_CollectWriteOff.pas
+++ b/A09财务通用管理/U_CollectWriteOff.pas
@ -71,6 +71,8 @@ type
    Label11: TLabel;
    JHExchangeRate: TEdit;
    Tv1Column2: TcxGridDBColumn;
    OrderNO: TEdit;
    Label12: TLabel;
    procedure FormDestroy(Sender: TObject);
    procedure FormCreate(Sender: TObject);
    procedure FormShow(Sender: TObject);
--- a/A09财务通用管理/U_CollectWriteOffList.dfm
+++ b/A09财务通用管理/U_CollectWriteOffList.dfm
@ -177,6 +177,7 @@ object frmCollectWriteOffList: TfrmCollectWriteOffList
    Height = 499
    Align = alClient
    TabOrder = 2
    ExplicitLeft = 40
    ExplicitTop = 119
    object Tv2: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
@ -190,6 +191,10 @@ object frmCollectWriteOffList: TfrmCollectWriteOffList
        item
          Kind = skSum
          Column = v2Column4
        end
        item
          Kind = skSum
          Column = Tv2Column2
        end>
      DataController.Summary.SummaryGroups = <>
      OptionsCustomize.ColumnFiltering = False
--- a/A09财务通用管理/U_CustStatementWriteOff.dfm
+++ b/A09财务通用管理/U_CustStatementWriteOff.dfm
@ -246,6 +246,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
    TabOrder = 2
    object TV1: TcxGridDBBandedTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_HZ
      DataController.Filter.AutoDataSetFilter = True
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -483,6 +484,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column37: TcxGridDBBandedColumn
        Caption = #32534#21495
        DataBinding.FieldName = 'FactoryNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -494,6 +496,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column36: TcxGridDBBandedColumn
        Caption = #31867#22411
        DataBinding.FieldName = 'FactType'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -505,6 +508,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object V1Column1: TcxGridDBBandedColumn
        Caption = #23545#26041#21333#20301
        DataBinding.FieldName = 'factoryName'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.Alignment.Horz = taCenter
        HeaderAlignmentHorz = taCenter
@ -517,6 +521,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column1: TcxGridDBBandedColumn
        Caption = #24212#20184
        DataBinding.FieldName = 'YFMoney1'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -527,6 +532,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column2: TcxGridDBBandedColumn
        Caption = #24212#20184
        DataBinding.FieldName = 'YFMoney2'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -537,6 +543,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column3: TcxGridDBBandedColumn
        Caption = #24212#20184
        DataBinding.FieldName = 'YFMoney3'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -547,6 +554,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column4: TcxGridDBBandedColumn
        Caption = #26680#38144
        DataBinding.FieldName = 'HXMoney4'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -557,6 +565,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column5: TcxGridDBBandedColumn
        Caption = #26680#38144
        DataBinding.FieldName = 'HXMoney5'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -567,6 +576,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column6: TcxGridDBBandedColumn
        Caption = #24212#20184
        DataBinding.FieldName = 'YFMoney6'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -577,6 +587,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column7: TcxGridDBBandedColumn
        Caption = #24212#20184
        DataBinding.FieldName = 'YFMoney7'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -587,6 +598,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column8: TcxGridDBBandedColumn
        Caption = #24212#20184
        DataBinding.FieldName = 'YFMoney8'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -597,6 +609,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column9: TcxGridDBBandedColumn
        Caption = #24212#20184
        DataBinding.FieldName = 'YFMoney9'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -607,6 +620,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column10: TcxGridDBBandedColumn
        Caption = #24212#20184
        DataBinding.FieldName = 'YFMoney10'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -617,6 +631,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column11: TcxGridDBBandedColumn
        Caption = #26680#38144
        DataBinding.FieldName = 'HXMoney11'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -627,6 +642,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column12: TcxGridDBBandedColumn
        Caption = #24212#20184
        DataBinding.FieldName = 'YFMoney12'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -637,6 +653,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column13: TcxGridDBBandedColumn
        Caption = #26680#38144
        DataBinding.FieldName = 'HXMoney1'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -647,6 +664,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column14: TcxGridDBBandedColumn
        Caption = #26680#38144
        DataBinding.FieldName = 'HXMoney2'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -657,6 +675,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column15: TcxGridDBBandedColumn
        Caption = #26680#38144
        DataBinding.FieldName = 'HXMoney3'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -667,6 +686,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column16: TcxGridDBBandedColumn
        Caption = #24212#20184
        DataBinding.FieldName = 'YFMoney4'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -677,6 +697,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column17: TcxGridDBBandedColumn
        Caption = #24212#20184
        DataBinding.FieldName = 'YFMoney5'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -687,6 +708,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column18: TcxGridDBBandedColumn
        Caption = #26680#38144
        DataBinding.FieldName = 'HXMoney6'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -697,6 +719,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column19: TcxGridDBBandedColumn
        Caption = #26680#38144
        DataBinding.FieldName = 'HXMoney8'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -707,6 +730,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column20: TcxGridDBBandedColumn
        Caption = #26680#38144
        DataBinding.FieldName = 'HXMoney10'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -717,6 +741,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column21: TcxGridDBBandedColumn
        Caption = #24212#20184
        DataBinding.FieldName = 'YFMoney11'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -727,6 +752,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column22: TcxGridDBBandedColumn
        Caption = #26680#38144
        DataBinding.FieldName = 'HXMoney12'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -737,6 +763,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column23: TcxGridDBBandedColumn
        Caption = #26680#38144
        DataBinding.FieldName = 'HXMoney9'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -747,6 +774,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column24: TcxGridDBBandedColumn
        Caption = #26680#38144
        DataBinding.FieldName = 'HXMoney7'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -757,6 +785,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column25: TcxGridDBBandedColumn
        Caption = #27424#27454
        DataBinding.FieldName = 'YuEMoney10'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Position.BandIndex = 10
@ -766,6 +795,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column26: TcxGridDBBandedColumn
        Caption = #27424#27454
        DataBinding.FieldName = 'YuEMoney9'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Position.BandIndex = 9
@ -775,6 +805,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column27: TcxGridDBBandedColumn
        Caption = #27424#27454
        DataBinding.FieldName = 'YuEMoney8'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Position.BandIndex = 8
@ -784,6 +815,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column28: TcxGridDBBandedColumn
        Caption = #27424#27454
        DataBinding.FieldName = 'YuEMoney7'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Position.BandIndex = 7
@ -793,6 +825,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column29: TcxGridDBBandedColumn
        Caption = #27424#27454
        DataBinding.FieldName = 'YuEMoney6'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Position.BandIndex = 6
@ -802,6 +835,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column30: TcxGridDBBandedColumn
        Caption = #27424#27454
        DataBinding.FieldName = 'YuEMoney5'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Position.BandIndex = 5
@ -811,6 +845,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column31: TcxGridDBBandedColumn
        Caption = #27424#27454
        DataBinding.FieldName = 'YuEMoney1'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Position.BandIndex = 1
@ -820,6 +855,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column32: TcxGridDBBandedColumn
        Caption = #27424#27454
        DataBinding.FieldName = 'YuEMoney3'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Position.BandIndex = 3
@ -829,6 +865,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column33: TcxGridDBBandedColumn
        Caption = #27424#27454
        DataBinding.FieldName = 'YuEMoney4'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Position.BandIndex = 4
@ -838,6 +875,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column34: TcxGridDBBandedColumn
        Caption = #27424#27454
        DataBinding.FieldName = 'YuEMoney2'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Position.BandIndex = 2
@ -847,6 +885,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column35: TcxGridDBBandedColumn
        Caption = #27424#27454
        DataBinding.FieldName = 'YuEMoney12'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Position.BandIndex = 12
@ -856,6 +895,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column38: TcxGridDBBandedColumn
        Caption = #27424#27454
        DataBinding.FieldName = 'YuEMoney11'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Position.BandIndex = 11
@ -865,6 +905,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column39: TcxGridDBBandedColumn
        Caption = #26399#21021
        DataBinding.FieldName = 'QCYuEMoney'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Width = 34
@ -875,6 +916,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column40: TcxGridDBBandedColumn
        Caption = #26399#26411
        DataBinding.FieldName = 'YuEMoney'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Width = 32
@ -885,6 +927,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column41: TcxGridDBBandedColumn
        Caption = #24065#31181
        DataBinding.FieldName = 'BZType'
        DataBinding.IsNullValueType = True
        Options.Editing = False
        Options.Moving = False
        Width = 31
@ -895,6 +938,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column42: TcxGridDBBandedColumn
        Caption = #20184#27454#26085#26399
        DataBinding.FieldName = 'CRTime'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -906,6 +950,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column43: TcxGridDBBandedColumn
        Caption = #24212#20184#26085#26399
        DataBinding.FieldName = 'YFTime'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Moving = False
        Width = 75
@ -916,6 +961,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column44: TcxGridDBBandedColumn
        Caption = #20184#27454#26410#26680#38144
        DataBinding.FieldName = 'FKWHXMoney'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -927,6 +973,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column45: TcxGridDBBandedColumn
        Caption = #20184#27454#38480#39069
        DataBinding.FieldName = 'FKXE'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Width = 66
@ -937,6 +984,7 @@ inherited frmCustStatementWriteOff: TfrmCustStatementWriteOff
      object TV1Column46: TcxGridDBBandedColumn
        Caption = #20184#27454#26410#23457#26680
        DataBinding.FieldName = 'FKWSHMoney'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Position.BandIndex = 0
--- a/A09财务通用管理/U_CustStatementWriteOff.pas
+++ b/A09财务通用管理/U_CustStatementWriteOff.pas
@ -16,7 +16,8 @@ uses
  cxGridDBBandedTableView, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
  cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
  dxBarBuiltInMenu, U_BaseList, DateUtils, cxContainer, Vcl.Menus,
-  cxCurrencyEdit, System.Math, System.Character, Vcl.Clipbrd;
+  cxCurrencyEdit, System.Math, System.Character, Vcl.Clipbrd, dxSkinWXI,
  dxScrollbarAnnotations;
 type
  TfrmCustStatementWriteOff = class(TfrmBaseList)
@ -194,7 +195,7 @@ begin
  finally
    ADOQueryMain.EnableControls;
    TV1.DataController.Filter.Clear;
-    ToolButton2.Click;
+//    ToolButton2.Click;
    Panetime.Visible := false;
    screen.Cursor := crdefault;
--- a/A09财务通用管理/U_ExpenseInput.pas
+++ b/A09财务通用管理/U_ExpenseInput.pas
@ -14,7 +14,7 @@ uses
  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
  cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
  cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  dxBarBuiltInMenu, U_BaseList, cxContainer, cxCurrencyEdit;
+  dxBarBuiltInMenu, U_BaseList, cxContainer, cxCurrencyEdit, dxSkinWXI;
 type
  TfrmExpenseInput = class(TForm)
--- a/A09财务通用管理/U_ExpenseList.pas
+++ b/A09财务通用管理/U_ExpenseList.pas
@ -226,6 +226,20 @@ begin
    Exit;
  end;
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法删除', '提示');
    Exit;
  end;
  with CDS_1 do
  begin
    DisableControls;
@ -481,6 +495,20 @@ end;
 procedure TfrmExpenseList.btnEditClick(Sender: TObject);
 begin
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法修改', '提示');
    Exit;
  end;
  try
    with ADOQueryCmd do
    begin
--- a/A09财务通用管理/U_GetDllForm.pas
+++ b/A09财务通用管理/U_GetDllForm.pas
@ -18,7 +18,7 @@ uses
  U_DataLink, U_iniParam, U_ReceivableList, U_CollectList, U_InvoiceOutList,
  U_CustStatement, U_CustStatementWriteOff, U_BankFlowList, U_BankFlowTotalList,
  U_PayableList, U_PayList, U_FtyStatement, U_InvoiceInList, U_ExpenseList,
-  U_OtherPayableList,U_handPayableList,U_ClaimsableList,U_TaxList;
+  U_OtherPayableList,U_handPayableList,U_ClaimsableList,U_TaxList, U_ZDPrice;
       /////////////////////////////////////////////////////////////////
      //         功能说明:取Dll中得窗体                              //
@ -72,10 +72,15 @@ begin
  if trim(DataBaseStr) = '' then
  begin
-    server := '101.132.143.144,7781';
+//    server := '101.132.143.144,7781';
 //    dtbase := 'BiaoqiData';
 //    user := 'rtsa';
 //    pswd := 'rightsoft@5740';
    server := '127.0.0.1';
    dtbase := 'BiaoqiData';
-    user := 'rtsa';
+    user := 'sa';
-    pswd := 'rightsoft@5740';
+    pswd := 'root';
    DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
    DParameters1 := '管理';
@ -283,6 +288,18 @@ begin
        end;
      end;
    252:  //×ªµ¥¼Û¸ñ
      begin
        with TfrmZDPrice.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
        begin
          fFormID := FormID;
          FormStyle := mstyle;
          WindowState := mstate;
          BorderStyle := mborderstyle;
          mnewHandle := Handle;
        end;
      end;
    311:  //费用登记
      begin
        with TfrmExpenseList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
--- a/A09财务通用管理/U_InvoiceInList.dfm
+++ b/A09财务通用管理/U_InvoiceInList.dfm
@ -6,7 +6,6 @@ inherited frmInvoiceInList: TfrmInvoiceInList
  ClientWidth = 1540
  FormStyle = fsMDIChild
  Visible = True
  ExplicitLeft = -23
  ExplicitWidth = 1556
  ExplicitHeight = 665
  PixelsPerInch = 96
@ -191,19 +190,6 @@ inherited frmInvoiceInList: TfrmInvoiceInList
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label7: TLabel
      Left = 537
      Top = 13
      Width = 52
      Height = 12
      Caption = #24320#31080#21333#20301
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label8: TLabel
      Left = 365
      Top = 37
@ -231,8 +217,8 @@ inherited frmInvoiceInList: TfrmInvoiceInList
      ParentFont = False
    end
    object Label1: TLabel
-      Left = 537
+      Left = 535
-      Top = 37
+      Top = 13
      Width = 52
      Height = 12
      Caption = #25105#26041#21333#20301
@ -243,13 +229,13 @@ inherited frmInvoiceInList: TfrmInvoiceInList
      Font.Style = [fsBold]
      ParentFont = False
    end
-    object P_CodeName: TEdit
+    object F_Name: TEdit
      Tag = 2
      Left = 259
      Top = 33
      Width = 89
      Height = 20
-      TabOrder = 5
+      TabOrder = 4
      OnChange = IVNoChange
    end
    object IVNo: TEdit
@ -277,18 +263,18 @@ inherited frmInvoiceInList: TfrmInvoiceInList
      Height = 20
      Date = 41256.000000000000000000
      Time = 0.918237847232376200
-      TabOrder = 4
+      TabOrder = 3
    end
-    object P_Spec: TEdit
+    object F_Spec: TEdit
      Tag = 2
      Left = 419
      Top = 33
      Width = 89
      Height = 20
-      TabOrder = 6
+      TabOrder = 5
      OnChange = IVNoChange
    end
-    object FactoryName: TEdit
+    object OppCoName: TEdit
      Tag = 2
      Left = 420
      Top = 9
@ -297,22 +283,13 @@ inherited frmInvoiceInList: TfrmInvoiceInList
      TabOrder = 2
      OnChange = IVNoChange
    end
-    object KPFactoryName: TEdit
+    object OurCoName: TEdit
      Tag = 2
-      Left = 593
+      Left = 591
      Top = 9
      Width = 89
      Height = 20
-      TabOrder = 3
+      TabOrder = 6
      OnChange = IVNoChange
    end
    object SYRName: TEdit
      Tag = 2
      Left = 593
      Top = 33
      Width = 89
      Height = 20
      TabOrder = 7
      OnChange = IVNoChange
    end
  end
@ -324,8 +301,6 @@ inherited frmInvoiceInList: TfrmInvoiceInList
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 3
    ExplicitLeft = -8
    ExplicitTop = 44
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
--- a/A09财务通用管理/U_InvoiceInList.pas
+++ b/A09财务通用管理/U_InvoiceInList.pas
@ -26,7 +26,7 @@ type
    ADOQueryCmd: TADOQuery;
    Panel1: TPanel;
    ToolButton2: TToolButton;
-    P_CodeName: TEdit;
+    F_Name: TEdit;
    ADOQueryMain: TADOQuery;
    ToolButton1: TToolButton;
    RM1: TRMGridReport;
@ -51,9 +51,9 @@ type
    v1InvoiceDate: TcxGridDBColumn;
    v1FactoryName: TcxGridDBColumn;
    v1note: TcxGridDBColumn;
-    P_Spec: TEdit;
+    F_Spec: TEdit;
    Label5: TLabel;
-    FactoryName: TEdit;
+    OppCoName: TEdit;
    TCHK: TToolButton;
    TNOCHK: TToolButton;
    cxTabControl1: TcxTabControl;
@ -67,12 +67,10 @@ type
    ToolButton4: TToolButton;
    v1Column3: TcxGridDBColumn;
    ADOQueryPrint: TADOQuery;
    Label7: TLabel;
    KPFactoryName: TEdit;
    Label8: TLabel;
    Label9: TLabel;
    Label1: TLabel;
-    SYRName: TEdit;
+    OurCoName: TEdit;
    v1Column8: TcxGridDBColumn;
    v1Column9: TcxGridDBColumn;
    v1Column10: TcxGridDBColumn;
--- a/A09财务通用管理/U_InvoiceOutList.dfm
+++ b/A09财务通用管理/U_InvoiceOutList.dfm
@ -182,19 +182,6 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label7: TLabel
      Left = 537
      Top = 13
      Width = 52
      Height = 12
      Caption = #24320#31080#21333#20301
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label8: TLabel
      Left = 365
      Top = 37
@ -222,8 +209,8 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
      ParentFont = False
    end
    object Label1: TLabel
-      Left = 537
+      Left = 535
-      Top = 37
+      Top = 14
      Width = 52
      Height = 12
      Caption = #25105#26041#21333#20301
@ -234,13 +221,13 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
      Font.Style = [fsBold]
      ParentFont = False
    end
-    object P_CodeName: TEdit
+    object F_Name: TEdit
      Tag = 2
      Left = 259
      Top = 33
      Width = 89
      Height = 20
-      TabOrder = 5
+      TabOrder = 4
      OnChange = IVNoChange
    end
    object IVNo: TEdit
@ -268,18 +255,18 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
      Height = 20
      Date = 41256.000000000000000000
      Time = 0.918237847232376200
-      TabOrder = 4
+      TabOrder = 3
    end
-    object P_Spec: TEdit
+    object F_Spec: TEdit
      Tag = 2
      Left = 419
      Top = 33
      Width = 89
      Height = 20
-      TabOrder = 6
+      TabOrder = 5
      OnChange = IVNoChange
    end
-    object FactoryName: TEdit
+    object OppCoName: TEdit
      Tag = 2
      Left = 420
      Top = 9
@ -288,22 +275,13 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
      TabOrder = 2
      OnChange = IVNoChange
    end
-    object KPFactoryName: TEdit
+    object OurCoName: TEdit
      Tag = 2
      Left = 593
      Top = 9
      Width = 89
      Height = 20
-      TabOrder = 3
+      TabOrder = 6
      OnChange = IVNoChange
    end
    object SYRName: TEdit
      Tag = 2
      Left = 593
      Top = 33
      Width = 89
      Height = 20
      TabOrder = 7
      OnChange = IVNoChange
    end
  end
@ -315,6 +293,8 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 3
    ExplicitLeft = -128
    ExplicitTop = 133
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
--- a/A09财务通用管理/U_InvoiceOutList.pas
+++ b/A09财务通用管理/U_InvoiceOutList.pas
@ -26,7 +26,7 @@ type
    ADOQueryCmd: TADOQuery;
    Panel1: TPanel;
    ToolButton2: TToolButton;
-    P_CodeName: TEdit;
+    F_Name: TEdit;
    ADOQueryMain: TADOQuery;
    ToolButton1: TToolButton;
    RM1: TRMGridReport;
@ -51,9 +51,9 @@ type
    v1InvoiceDate: TcxGridDBColumn;
    v1FactoryName: TcxGridDBColumn;
    v1note: TcxGridDBColumn;
-    P_Spec: TEdit;
+    F_Spec: TEdit;
    Label5: TLabel;
-    FactoryName: TEdit;
+    OppCoName: TEdit;
    TCHK: TToolButton;
    TNOCHK: TToolButton;
    cxTabControl1: TcxTabControl;
@ -67,12 +67,10 @@ type
    ToolButton4: TToolButton;
    v1Column3: TcxGridDBColumn;
    ADOQueryPrint: TADOQuery;
    Label7: TLabel;
    KPFactoryName: TEdit;
    Label8: TLabel;
    Label9: TLabel;
    Label1: TLabel;
-    SYRName: TEdit;
+    OurCoName: TEdit;
    v1Column8: TcxGridDBColumn;
    v1Column9: TcxGridDBColumn;
    v1Column10: TcxGridDBColumn;
--- a/A09财务通用管理/U_OtherPayableList.dfm
+++ b/A09财务通用管理/U_OtherPayableList.dfm
@ -213,7 +213,7 @@ inherited frmOtherPayableList: TfrmOtherPayableList
      State = cbChecked
      TabOrder = 4
    end
-    object P_Code: TEdit
+    object F_Code: TEdit
      Tag = 1
      Left = 359
      Top = 35
--- a/A09财务通用管理/U_OtherPayableList.pas
+++ b/A09财务通用管理/U_OtherPayableList.pas
@ -46,7 +46,7 @@ type
    Label4: TLabel;
    CheckBox1: TCheckBox;
    Label6: TLabel;
-    P_Code: TEdit;
+    F_Code: TEdit;
    v2OrderNo: TcxGridDBColumn;
    cxTabControl1: TcxTabControl;
    Label10: TLabel;
@ -117,9 +117,7 @@ type
    procedure btnEditClick(Sender: TObject);
    procedure N3Click(Sender: TObject);
    procedure ToolButton1Click(Sender: TObject);
-    procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView;
+    procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
      var ADone: Boolean);
  private
    procedure InitGrid();
    procedure SetStatus();
@ -252,6 +250,21 @@ begin
    application.MessageBox('请选择数据', '提示');
    Exit;
  end;
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法删除', '提示');
    Exit;
  end;
  with CDS_1 do
  begin
    DisableControls;
@ -501,9 +514,7 @@ begin
  WriteCxGrid(trim(Self.Caption), Tv1, '财务管理');
 end;
-procedure TfrmOtherPayableList.Tv1CustomDrawCell(Sender: TcxCustomGridTableView;
+procedure TfrmOtherPayableList.Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
  ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
  var ADone: Boolean);
 begin
  if AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('Filler').Index] <> '自动' then
    ACanvas.Font.Color := clBlue;
@ -514,6 +525,19 @@ end;
 procedure TfrmOtherPayableList.btnEditClick(Sender: TObject);
 begin
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法修改', '提示');
    Exit;
  end;
  try
    with ADOQueryCmd do
    begin
--- a/A09财务通用管理/U_PayList.dfm
+++ b/A09财务通用管理/U_PayList.dfm
@ -160,7 +160,6 @@ inherited frmPayList: TfrmPayList
    Color = clWhite
    ParentBackground = False
    TabOrder = 1
    ExplicitTop = 32
    object Label3: TLabel
      Left = 172
      Top = 13
@ -262,7 +261,7 @@ inherited frmPayList: TfrmPayList
      State = cbChecked
      TabOrder = 4
    end
-    object P_Code: TEdit
+    object F_Code: TEdit
      Tag = 1
      Left = 359
      Top = 35
@ -316,7 +315,6 @@ inherited frmPayList: TfrmPayList
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 2
    ExplicitTop = 142
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
--- a/A09财务通用管理/U_PayList.pas
+++ b/A09财务通用管理/U_PayList.pas
@ -62,7 +62,7 @@ type
    Label4: TLabel;
    CheckBox1: TCheckBox;
    Label6: TLabel;
-    P_Code: TEdit;
+    F_Code: TEdit;
    v2OrderNo: TcxGridDBColumn;
    cxTabControl1: TcxTabControl;
    Label10: TLabel;
@ -145,9 +145,7 @@ type
    procedure Button4Click(Sender: TObject);
    procedure ToolButton6Click(Sender: TObject);
    procedure ToolButton7Click(Sender: TObject);
-    procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView;
+    procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
      var ADone: Boolean);
  private
    procedure InitGrid();
    procedure SetStatus();
@ -330,6 +328,20 @@ begin
    Exit;
  end;
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法删除', '提示');
    Exit;
  end;
  with CDS_1 do
  begin
    DisableControls;
@ -870,6 +882,20 @@ end;
 procedure TfrmPayList.btnEditClick(Sender: TObject);
 begin
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法修改', '提示');
    Exit;
  end;
  try
    with ADOQueryCmd do
    begin
@ -926,9 +952,7 @@ begin
 end;
-procedure TfrmPayList.Tv1CustomDrawCell(Sender: TcxCustomGridTableView;
+procedure TfrmPayList.Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
  ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
  var ADone: Boolean);
 begin
  if AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('RegType').Index] = 'ÊÕ¿î' then
  begin
--- a/A09财务通用管理/U_PayableList.dfm
+++ b/A09财务通用管理/U_PayableList.dfm
@ -31,12 +31,12 @@ inherited frmPayableList: TfrmPayableList
      Left = 0
      Top = 0
      AutoSize = True
-      Caption = #21047#26032'a'
+      Caption = #21047#26032
      ImageIndex = 1
      OnClick = TBRafreshClick
    end
    object btnAdd: TToolButton
-      Left = 77
+      Left = 71
      Top = 0
      AutoSize = True
      Caption = #26032#22686
@ -44,7 +44,7 @@ inherited frmPayableList: TfrmPayableList
      OnClick = btnAddClick
    end
    object btnEdit: TToolButton
-      Left = 148
+      Left = 142
      Top = 0
      AutoSize = True
      Caption = #20462#25913
@ -52,7 +52,7 @@ inherited frmPayableList: TfrmPayableList
      OnClick = btnEditClick
    end
    object ToolButton2: TToolButton
-      Left = 219
+      Left = 213
      Top = 0
      AutoSize = True
      Caption = #21333#20215#20462#25913
@ -60,7 +60,7 @@ inherited frmPayableList: TfrmPayableList
      OnClick = ToolButton2Click
    end
    object ToolButton1: TToolButton
-      Left = 314
+      Left = 308
      Top = 0
      AutoSize = True
      Caption = #22797#21046
@ -68,7 +68,7 @@ inherited frmPayableList: TfrmPayableList
      OnClick = ToolButton1Click
    end
    object btnDel: TToolButton
-      Left = 385
+      Left = 379
      Top = 0
      AutoSize = True
      Caption = #21024#38500
@ -76,7 +76,7 @@ inherited frmPayableList: TfrmPayableList
      OnClick = btnDelClick
    end
    object btnChk: TToolButton
-      Left = 456
+      Left = 450
      Top = 0
      AutoSize = True
      Caption = #23457#26680
@ -84,7 +84,7 @@ inherited frmPayableList: TfrmPayableList
      OnClick = btnChkClick
    end
    object btnReChk: TToolButton
-      Left = 527
+      Left = 521
      Top = 0
      AutoSize = True
      Caption = #25764#38144#23457#26680
@ -92,7 +92,7 @@ inherited frmPayableList: TfrmPayableList
      OnClick = btnReChkClick
    end
    object ToolButton4: TToolButton
-      Left = 622
+      Left = 616
      Top = 0
      AutoSize = True
      Caption = #23548#20986
@ -100,7 +100,7 @@ inherited frmPayableList: TfrmPayableList
      OnClick = ToolButton4Click
    end
    object ToolButton5: TToolButton
-      Left = 693
+      Left = 687
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
@ -108,7 +108,7 @@ inherited frmPayableList: TfrmPayableList
      OnClick = ToolButton5Click
    end
    object TBClose: TToolButton
-      Left = 788
+      Left = 782
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -228,7 +228,7 @@ inherited frmPayableList: TfrmPayableList
      State = cbChecked
      TabOrder = 4
    end
-    object P_Code: TEdit
+    object F_Code: TEdit
      Tag = 1
      Left = 359
      Top = 35
--- a/A09财务通用管理/U_PayableList.pas
+++ b/A09财务通用管理/U_PayableList.pas
@ -46,7 +46,7 @@ type
    Label4: TLabel;
    CheckBox1: TCheckBox;
    Label6: TLabel;
-    P_Code: TEdit;
+    F_Code: TEdit;
    v2OrderNo: TcxGridDBColumn;
    cxTabControl1: TcxTabControl;
    Label10: TLabel;
@ -117,9 +117,7 @@ type
    procedure btnEditClick(Sender: TObject);
    procedure N3Click(Sender: TObject);
    procedure ToolButton1Click(Sender: TObject);
-    procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView;
+    procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
      var ADone: Boolean);
    procedure ToolButton2Click(Sender: TObject);
  private
    procedure InitGrid();
@ -252,6 +250,7 @@ end;
 procedure TfrmPayableList.btnDelClick(Sender: TObject);
 var
  FFFIDS: string;
  MOrderNoS: string;
 begin
  if CDS_1.IsEmpty then
    exit;
@ -261,16 +260,36 @@ begin
    application.MessageBox('请选择数据', '提示');
    Exit;
  end;
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法删除', '提示');
    Exit;
  end;
  with CDS_1 do
  begin
    DisableControls;
    while CDS_1.Locate('SSel', True, []) do
    begin
      FFFIDS := FFFIDS + Trim(CDS_1.fieldbyname('FFID').AsString) + ',';
      if MOrderNoS <> '' then
        MOrderNoS := MOrderNoS + ',' + QuotedStr(CDS_1.fieldbyname('OrderNo').AsString)
      else
        MOrderNoS := MOrderNoS + QuotedStr(CDS_1.fieldbyname('OrderNo').AsString);
      CDS_1.Delete;
    end;
    EnableControls;
  end;
  try
    with ADOQueryCmd do
    begin
@ -285,6 +304,23 @@ begin
    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
      raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
    application.MessageBox('删除成功', '提示');
    with ADOQueryCmd do
    begin
      close;
      sql.clear;
      SQL.Add(' UPDATE Costing_Table ');
      SQL.Add(' SET COrderSF = cast(( ');
      SQL.Add('    (cast(isnull(CCPKPJE,0) as decimal(18,2)) -  ');
      SQL.Add('    (SELECT ISNULL(SUM(ISNULL(price,0) * ISNULL(qty, 0)),0) ');
      SQL.Add('    FROM Finance_Flow X ');
      SQL.Add('    WHERE FFType = ''应付款登记'' ');
      SQL.Add('      AND FFAbstract IN (''S1-面料支出'', ''S2-印染支出'', ''S3-后加工费用'') ');
      SQL.Add('      AND X.OrderNo = Costing_Table.COrderNo)) * cast(ISNULL(COrtherRate,0) as decimal(18,2)))  as decimal(18, 2))  ');
      SQL.Add(' where COrderNo in( '  + MOrderNoS + ')');
 //      ShowMessage(sql.Text);
      ExecSQL;
    end;
  except
    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
    InitGrid();
@ -372,7 +408,9 @@ end;
 procedure TfrmPayableList.btnChkClick(Sender: TObject);
 var
-  FFFIDS: string;
+  FFFIDS, FFFIDS2: string;
  Count: Integer;
  Value: string;
 begin
  if CDS_1.IsEmpty then
    exit;
@ -382,16 +420,68 @@ begin
    application.MessageBox('请选择数据', '提示');
    Exit;
  end;
-
+  Count := 1;
 //  value :=FConNo;
  CDS_1.DisableControls;
  with CDS_1 do
  begin
-    DisableControls;
+    First;
-    while CDS_1.Locate('SSel', True, []) do
+    while not Eof do
    begin
      if CDS_1.fieldbyname('SSel').AsBoolean then
      begin
        FFFIDS := FFFIDS + Trim(CDS_1.fieldbyname('FFID').AsString) + ',';
-      CDS_1.Delete;
+        if Value = '' then
        begin
          Value := FieldByName('OrderNo').AsString;
        end;
        if Value <> '' then
        begin
          if Value <> FieldByName('OrderNo').AsString then
          begin
            Count := Count + 1;
          end;
        end;
      end;
      Next;
    end;
  end;
  CDS_1.EnableControls;
  if Count > 1 then
  begin
    application.MessageBox('选择的不是同一计划单！', '提示信息');
    exit;
  end;
  with ADOQueryTemp do
  begin
    close;
    sql.Clear;
    sql.Add(' select COrderNO from Costing_Table where COrderNO = ' + QuotedStr(CDS_1.FieldByName('OrderNO').AsString));
    Open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    with ADOQueryCmd do
    begin
      close;
      sql.clear;
      sql.add(' update Costing_Table set HYStatus = 1 where COrderNo =' + QuotedStr(CDS_1.FieldByName('OrderNO').AsString));
      SQL.Add(' UPDATE Costing_Table ');
      SQL.Add(' SET COrderSF = cast(( ');
      SQL.Add('    (cast(isnull(CCPKPJE,0) as decimal(18,2)) -  ');
      SQL.Add('    (SELECT ISNULL(SUM(ISNULL(price,0) * ISNULL(qty, 0)),0) ');
      SQL.Add('    FROM Finance_Flow X ');
      SQL.Add('    WHERE FFType = ''应付款登记'' ');
      SQL.Add('      AND FFAbstract IN (''S1-面料支出'', ''S2-印染支出'', ''S3-后加工费用'') ');
      SQL.Add('      AND X.OrderNo = Costing_Table.COrderNo)) * cast(ISNULL(COrtherRate,0) as decimal(18,2)))  as decimal(18, 2))  ');
      SQL.Add(' where COrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString));
 //      ShowMessage(sql.Text);
      ExecSQL;
    end;
    EnableControls;
  end;
  try
@ -409,16 +499,18 @@ begin
    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
      raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
    application.MessageBox('审核成功', '提示');
    InitGrid();
  except
    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
    InitGrid();
  end;
 end;
 procedure TfrmPayableList.btnReChkClick(Sender: TObject);
 var
-  FFFIDS: string;
+  FFFIDS, FFFIDS2: string;
  Value: string;
  count: Integer;
 begin
  if CDS_1.IsEmpty then
    exit;
@ -429,15 +521,60 @@ begin
    Exit;
  end;
  count := 1;
 //  value :=FConNo;
  CDS_1.DisableControls;
  with CDS_1 do
  begin
-    DisableControls;
+    First;
-    while CDS_1.Locate('SSel', True, []) do
+    while not Eof do
    begin
      if CDS_1.fieldbyname('SSel').AsBoolean then
      begin
        FFFIDS := FFFIDS + Trim(CDS_1.fieldbyname('FFID').AsString) + ',';
-      CDS_1.Delete;
+        if Value = '' then
        begin
          Value := FieldByName('OrderNo').AsString;
        end;
-    EnableControls;
+        if Value <> '' then
        begin
          if Value <> FieldByName('OrderNo').AsString then
          begin
            count := count + 1;
          end;
        end;
      end;
      Next;
    end;
  end;
  CDS_1.EnableControls;
  if count > 1 then
  begin
    application.MessageBox('选择的不是同一计划单！', '提示信息');
    exit;
  end;
 //  with CDS_1 do
 //  begin
 //    DisableControls;
 //    while CDS_1.Locate('SSel', True, []) do
 //    begin
 //      FFFIDS := FFFIDS + Trim(CDS_1.fieldbyname('FFID').AsString) + ',';
 //      CDS_1.Delete;
 ////      Next;
 //    end;
 //    EnableControls;
 //  end;
  with ADOQueryCmd do
  begin
    close;
    sql.clear;
    sql.add(' update Costing_Table set HYStatus = 1 where COrderNo =' + QuotedStr(CDS_1.FieldByName('OrderNO').AsString));
 //      ShowMessage(sql.Text);
    ExecSQL;
  end;
  try
@ -455,9 +592,10 @@ begin
    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
      raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
    application.MessageBox('撤销审核成功', '提示');
    InitGrid();
  except
    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
-    InitGrid();
+
  end;
 end;
@ -511,6 +649,20 @@ begin
    Exit;
  end;
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，单价无法删除', '提示');
    Exit;
  end;
  with CDS_1 do
  begin
    DisableControls;
@ -567,12 +719,9 @@ begin
  WriteCxGrid(trim(Self.Caption), Tv1, '财务管理');
 end;
-procedure TfrmPayableList.Tv1CustomDrawCell(Sender: TcxCustomGridTableView;
+procedure TfrmPayableList.Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
  ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
  var ADone: Boolean);
 begin
-  if (AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('Filler').Index] <> '×Ô¶¯')
+  if (AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('Filler').Index] <> '自动') and (AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('FFAbstract').Index] <> 'S4-仓储打包费用') then
   and (AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('FFAbstract').Index] <> 'S4-²Ö´¢´ò°ü·ÑÓÃ') then
    ACanvas.Font.Color := clBlue;
 //  if '自动' <> AViewInfo.GridRecord.Values[Tv1Column25.Index] then ACanvas.Font.Color := clBlue;
@ -581,6 +730,20 @@ end;
 procedure TfrmPayableList.btnEditClick(Sender: TObject);
 begin
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法修改', '提示');
    Exit;
  end;
  try
    with ADOQueryCmd do
    begin
--- a/A09财务通用管理/U_PlanProfitDetails.dfm
+++ b/A09财务通用管理/U_PlanProfitDetails.dfm
--- a/A09财务通用管理/U_PlanProfitDetails.pas
+++ b/A09财务通用管理/U_PlanProfitDetails.pas
@ -0,0 +1,774 @@
 unit U_PlanProfitDetails;
 interface
 uses
  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB,
  cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls,
  cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient,
  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls,
  cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid,
  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
  cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
  dxBarBuiltInMenu, cxPC, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
  U_BaseHelp, Vcl.Menus, Vcl.Clipbrd, DateUtils, dxSkinWXI,
  dxScrollbarAnnotations, U_BaseList, System.ImageList, Vcl.ImgList;
 type
  TfrmPlanProfitDetails = class(TfrmBasehelp)
    ToolBar1: TToolBar;
    TBRafresh: TToolButton;
    TBClose: TToolButton;
    ADOQueryTemp: TADOQuery;
    ADOQueryCmd: TADOQuery;
    Panel1: TPanel;
    ToolButton2: TToolButton;
    ADOQueryMain: TADOQuery;
    RM1: TRMGridReport;
    RMDB_Main: TRMDBDataSet;
    Label3: TLabel;
    OrderNo: TEdit;
    Label2: TLabel;
    Label6: TLabel;
    begdate: TDateTimePicker;
    Enddate: TDateTimePicker;
    cxGridPopupMenu2: TcxGridPopupMenu;
    DS_HZ: TDataSource;
    CDS_HZ: TClientDataSet;
    Label1: TLabel;
    ComTaiTou: TEdit;
    ADOQueryPrint: TADOQuery;
    ToolButton1: TToolButton;
    PM_1: TPopupMenu;
    N1: TMenuItem;
    cxGrid1: TcxGrid;
    Tv1: TcxGridDBTableView;
    v2CRTime: TcxGridDBColumn;
    Tv1Column27: TcxGridDBColumn;
    Tv1Column23: TcxGridDBColumn;
    v2Column2: TcxGridDBColumn;
    v2FactoryName: TcxGridDBColumn;
    Tv1Column2: TcxGridDBColumn;
    v2OrderNo: TcxGridDBColumn;
    Tv1Column3: TcxGridDBColumn;
    Tv1Column24: TcxGridDBColumn;
    Tv1Column20: TcxGridDBColumn;
    Tv1Column21: TcxGridDBColumn;
    Tv1Column4: TcxGridDBColumn;
    Tv1Column5: TcxGridDBColumn;
    Tv1Column6: TcxGridDBColumn;
    Tv1Column7: TcxGridDBColumn;
    Tv1Column8: TcxGridDBColumn;
    Tv1Column9: TcxGridDBColumn;
    Tv1Column10: TcxGridDBColumn;
    Tv1Column30: TcxGridDBColumn;
    Tv1Column11: TcxGridDBColumn;
    Tv1Column12: TcxGridDBColumn;
    Tv1Column13: TcxGridDBColumn;
    Tv1Column14: TcxGridDBColumn;
    Tv1Column15: TcxGridDBColumn;
    Tv1Column16: TcxGridDBColumn;
    Tv1Column26: TcxGridDBColumn;
    Tv1Column17: TcxGridDBColumn;
    Tv1Column18: TcxGridDBColumn;
    Tv1Column25: TcxGridDBColumn;
    Tv1Column1: TcxGridDBColumn;
    Tv1Column28: TcxGridDBColumn;
    Tv1Column29: TcxGridDBColumn;
    cxGridLevel1: TcxGridLevel;
    Panel2: TPanel;
    cxGrid2: TcxGrid;
    TV2: TcxGridDBTableView;
    cxGridDBColumn10: TcxGridDBColumn;
    cxGridDBColumn12: TcxGridDBColumn;
    cxGridDBColumn13: TcxGridDBColumn;
    cxGridDBColumn14: TcxGridDBColumn;
    cxGridDBColumn15: TcxGridDBColumn;
    cxGridLevel2: TcxGridLevel;
    cxGrid3: TcxGrid;
    TV3: TcxGridDBTableView;
    cxGridDBColumn42: TcxGridDBColumn;
    cxGridDBColumn46: TcxGridDBColumn;
    cxGridDBColumn47: TcxGridDBColumn;
    cxGridDBColumn50: TcxGridDBColumn;
    cxGridDBColumn52: TcxGridDBColumn;
    cxGridDBColumn53: TcxGridDBColumn;
    cxGridDBColumn55: TcxGridDBColumn;
    cxGridDBColumn56: TcxGridDBColumn;
    cxGridDBColumn57: TcxGridDBColumn;
    cxGridLevel3: TcxGridLevel;
    ADOQuery3: TADOQuery;
    ADOQuery2: TADOQuery;
    CDS_2: TClientDataSet;
    DS_2: TDataSource;
    DS_3: TDataSource;
    CDS_3: TClientDataSet;
    TV2Column1: TcxGridDBColumn;
    TV2Column2: TcxGridDBColumn;
    TV2Column3: TcxGridDBColumn;
    TV2Column4: TcxGridDBColumn;
    Tv1Column19: TcxGridDBColumn;
    TV2Column5: TcxGridDBColumn;
    TV2Column6: TcxGridDBColumn;
    TV3Column1: TcxGridDBColumn;
    TV3Column2: TcxGridDBColumn;
    cxSplitter1: TcxSplitter;
    TV2Column7: TcxGridDBColumn;
    TV3Column3: TcxGridDBColumn;
    cxGrid4: TcxGrid;
    TV4: TcxGridDBTableView;
    cxGridDBColumn1: TcxGridDBColumn;
    cxGridDBColumn2: TcxGridDBColumn;
    cxGridDBColumn3: TcxGridDBColumn;
    cxGridDBColumn4: TcxGridDBColumn;
    cxGridDBColumn5: TcxGridDBColumn;
    cxGridDBColumn6: TcxGridDBColumn;
    cxGridDBColumn7: TcxGridDBColumn;
    cxGridDBColumn8: TcxGridDBColumn;
    cxGridDBColumn9: TcxGridDBColumn;
    cxGridDBColumn11: TcxGridDBColumn;
    cxGridDBColumn16: TcxGridDBColumn;
    cxGridDBColumn17: TcxGridDBColumn;
    cxGridDBColumn18: TcxGridDBColumn;
    cxGridDBColumn19: TcxGridDBColumn;
    cxGridDBColumn20: TcxGridDBColumn;
    cxGridDBColumn21: TcxGridDBColumn;
    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;
    cxGridLevel4: TcxGridLevel;
    cxSplitter2: TcxSplitter;
    DataSource1: TDataSource;
    TV4Column1: TcxGridDBColumn;
    Tv1Column22: TcxGridDBColumn;
    ClientDataSet1: TClientDataSet;
    DataSource2: TDataSource;
    ADOQuery5: TADOQuery;
    TV4Column2: TcxGridDBColumn;
    TV4Column3: TcxGridDBColumn;
    TV4Column4: TcxGridDBColumn;
    Tv1Column31: TcxGridDBColumn;
    Tv1Column32: TcxGridDBColumn;
    CDS_31: TClientDataSet;
    CDS_21: TClientDataSet;
    TV2Column8: TcxGridDBColumn;
    TV3Column4: TcxGridDBColumn;
    TV2Column9: TcxGridDBColumn;
    TV3Column5: TcxGridDBColumn;
    TV2Column10: TcxGridDBColumn;
    TV3Column6: TcxGridDBColumn;
    TV2Column11: TcxGridDBColumn;
    TV3Column7: TcxGridDBColumn;
    CDS_32: TClientDataSet;
    CDS_22: TClientDataSet;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBRafreshClick(Sender: TObject);
    procedure ToolButton2Click(Sender: TObject);
    procedure OrderNoChange(Sender: TObject);
    procedure ToolButton4Click(Sender: TObject);
    procedure cxTabControl1Change(Sender: TObject);
    procedure ToolButton1Click(Sender: TObject);
    procedure N1Click(Sender: TObject);
    procedure FormResize(Sender: TObject);
  private
    { Private declarations }
    procedure InitGrid();
    procedure InitYFFGrid();
    procedure InitZD();
  public
    fmanage, FZKType, FOrderNo, FMainID, FOrderNo2: string;
    { Public declarations }
    RKFlag, FCYID, FUnit, FStkName: string;
  end;
 var
  frmPlanProfitDetails: TfrmPlanProfitDetails;
 implementation
 uses
  U_DataLink, U_RtFun, U_ZDYHelp;
 {$R *.dfm}
 procedure TfrmPlanProfitDetails.InitGrid();
 begin
  try
    ADOQueryMain.DisableControls;
    with ADOQueryMain do
    begin
      Filtered := False;
      Close;
      SQL.Clear;
      sql.Add('Select Amount=(Case when ISNULL(A.RegType,'''')=''收款'' then -1*Amount else Amount end)');
 //      sql.Add(',SSAmount=(Case when ISNULL(A.RegType,'''')=''收款'' then -1*Amount else Amount end)-ISNULL(A.SXFAmount,0)');
 //      sql.Add(',SSCNYAmount=((Case when ISNULL(A.RegType,'''')=''收款'' then -1*Amount else Amount end) ');
 //      sql.Add('-ISNULL(A.SXFAmount,0))*ISNULL((Case when Currency=''CNY'' then 1 else A.JHExchangeRate end),1)');
      sql.Add(',WBSJRMB = ISNULL((select sum(cast(CWBSY as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0),');
      sql.Add('RMBSHJE = ISNULL((select sum(cast(CRMBSSJE as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0),');
      sql.Add('TSSJ = ISNULL((select sum(cast(CTSSY as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0)');
      SQL.Add(',BuyConNO=ISNULL(A.BuyConNo,(select TOP 1 BuyConNo from Trade_Plan_Sub X where X.MainID=A.OrdMainId ))');
      SQL.Add(',A.*,Saleser=(select Top 1 Saleser from BS_Company X where X.CoAbbrName=A.OppCoName)');
      sql.Add(' from Finance_Flow A where A.OrderNo= ' + QuotedStr(Trim(FOrderNo)));
      sql.Add(' and FFType =  ''应收款登记'' ');
 //      sql.Add(' and ISNULL(A.FFTime,A.SQDate)<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' ');
      //ShowMessage(sql.text);
      Open;
    end;
    SCreateCDS(ADOQueryMain, CDS_HZ);
    SInitCDSData(ADOQueryMain, CDS_HZ);
    if not CDS_HZ.IsEmpty then
    begin
      with CDS_HZ do
      begin
        for var i := 0 to 2 do
        begin
          append;
          if i = 0 then
          begin
            CDS_HZ.FieldByName('FFAbstract').Value := '外币收益RMB';
            CDS_HZ.FieldByName('Amount').Value := ADOQueryMain.FieldByName('WBSJRMB').Value;
          end
          else if i = 1 then
          begin
            CDS_HZ.FieldByName('FFAbstract').Value := '人民币实收金额';
            CDS_HZ.FieldByName('Amount').Value := ADOQueryMain.FieldByName('RMBSHJE').Value;
          end
          else if i = 2 then
          begin
            CDS_HZ.FieldByName('FFAbstract').Value := '退税收益';
            CDS_HZ.FieldByName('Amount').Value := ADOQueryMain.FieldByName('TSSJ').Value;
          end;
          post;
        end;
      end;
    end;
  finally
    ADOQueryMain.EnableControls;
    TV4.DataController.Filter.Clear;
  end;
 //  ToolButton2.Click;
 end;
 procedure TfrmPlanProfitDetails.InitYFFGrid();
 begin
  try
    ADOQuery5.DisableControls;
    with ADOQuery5 do
    begin
      Filtered := False;
      Close;
      SQL.Clear;
      sql.Add('Select Amount=(Case when ISNULL(A.RegType,'''')=''付款'' then -1*Amount else Amount end)');
 //      sql.Add(',SSAmount=(Case when ISNULL(A.RegType,'''')=''收款'' then -1*Amount else Amount end)-ISNULL(A.SXFAmount,0)');
 //      sql.Add(',SSCNYAmount=((Case when ISNULL(A.RegType,'''')=''收款'' then -1*Amount else Amount end) ');
 //      sql.Add('-ISNULL(A.SXFAmount,0))*ISNULL((Case when Currency=''CNY'' then 1 else A.JHExchangeRate end),1)');
      sql.Add(',GDSs = ISNULL((select sum(cast(GDS as decimal(18, 2))) from Costing_Table where COrderNo = A.OrderNo), 0),');
      sql.Add('QTSF = ISNULL((select sum(cast(COrderSF as decimal(18, 2))) from Costing_Table where COrderNo = A.OrderNo), 0),');
      SQL.Add('BuyConNO=ISNULL(A.BuyConNo,(select TOP 1 BuyConNo from Trade_Plan_Sub X where X.MainID=A.OrdMainId ))');
      SQL.Add(',A.*,Saleser=(select Top 1 Saleser from BS_Company X where X.CoAbbrName=A.OppCoName)');
      sql.Add(' from Finance_Flow A where A.OrderNo= ' + QuotedStr(Trim(FOrderNo)));
      sql.Add(' and (FFType =  ''应付款登记'' or FFType = ''其他应付款登记'' or FFType = ''手工费用登记'' ) ');
 //      sql.Add(' and ISNULL(A.FFTime,A.SQDate)>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' ');
 //      sql.Add(' and ISNULL(A.FFTime,A.SQDate)<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' ');
      //ShowMessage(sql.text);
      Open;
    end;
    SCreateCDS(ADOQuery5, ClientDataSet1);
    SInitCDSData(ADOQuery5, ClientDataSet1);
    if not ClientDataSet1.IsEmpty then
    begin
      with ClientDataSet1 do
      begin
        for var i := 0 to 1 do
        begin
          append;
          if i = 0 then
          begin
            FieldByName('FFAbstract').Value := '国地税';
            FieldByName('Amount').Value := ADOQuery5.FieldByName('GDSs').Value;
          end
          else if i = 1 then
          begin
            FieldByName('FFAbstract').Value := '其他税费';
            FieldByName('Amount').Value := ADOQuery5.FieldByName('QTSF').Value;
          end;
          post;
        end;
      end;
    end;
  finally
    ADOQuery5.EnableControls;
    TV1.DataController.Filter.Clear;
  end;
 //  ToolButton2.Click;
 end;
 procedure TfrmPlanProfitDetails.InitZD();
 begin
  with ADOQuery2 do
  begin
    Filtered := False;
    Close;
    SQL.Clear;
    sql.Add('select A.OrderNo,C.OrderNo TOOrdNO,A.C_Pattern,A.C_Color,A.C_ColorNo, ISNULL(A.ZDPrice,0) ZDPrice, U.QtyUnit OrdUnit, A.ZDTime ');
 //    if FUnit = 'M' then
 //    begin
 //      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkMeter))')
 //    end
 //    else if FUnit = 'Y' then
 //    begin
 //      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkYardage))')
 //    end
 //    else if FUnit = 'Kg' then
 //    begin
 //      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkNetWeight))')
 //    end;
    SQL.Add(' ,ZDAmount = ISNULL(SUM(ISNULL(A.ZDPrice,0) *');
    SQL.Add(' CASE U.QtyUnit');
    sql.Add(' WHEN ''M'' THEN A.StkMeter');
    SQL.Add(' WHEN ''Y'' THEN A.StkYardage');
    SQL.Add(' ELSE A.StkNetWeight');
    sql.Add(' END), 0) ');
    SQL.Add(',COUNT(CIID) Piece,SUM(StkGrossWeight) GrossWeight');
    sql.Add(',SUM(StkNetWeight) NetWeight,SUM(StkMeter) Meter,SUM(StkYardage) Yardage');
    SQL.Add('from Trade_Cloth_Stock_ZD  A left join Trade_Plan_Sub B on A.ZDSubId=B.SubID');
    sql.Add('left join Trade_Plan_Main C on C.MainId=B.MainId');
    sql.add(' OUTER APPLY (SELECT TOP 1 QtyUnit ');
    sql.Add(' FROM Trade_Cloth_DR_Sub X');
    sql.add(' WHERE X.DRSID = A.DRSID) AS U');
    sql.Add(' where A.MainID= ' + QuotedStr(Trim(FMainID)));
    sql.Add(' and C.OrderNo <> '''' ');
    Sql.Add('GROUP BY A.OrderNo,C.OrderNo,A.C_Pattern,A.C_Color,A.C_ColorNo,A.ZDPrice,U.QtyUnit, A.ZDTime');
 //      ShowMessage(sql.text);
    Open;
  end;
  SCreateCDS(ADOQuery2, CDS_2);
  SInitCDSData(ADOQuery2, CDS_2);
  with CDS_2 do
  begin
    first;
    while not eof do
    begin
      Edit;
      FieldByName('SDefNote').AsString := '成品转单';
      post;
      Next;
    end;
  end;
  with ADOQuery2 do
  begin
    Filtered := False;
    Close;
    SQL.Clear;
    SQL.Add(' select FromOrdNo, stkName, C_Pattern, C_Color, C_ColorNo, sum(qty) as qty, price, sum(piece) as piece, qtyUnit, ZDAmount = (isnull(price, 0) * sum(qty)), qty = sum(qty), iotime, ');
    SQL.Add(' (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)) ToOrdNo ');
    SQL.Add(' from Bs_Cloth_IO A where STKName in (''贸易坯布'', ''贸易待检布'')');
    SQL.Add(' and FromOrdNo <> (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)) ');
    sql.Add(' and FromOrdNo = ' + quotedstr(FOrderNo));
    SQL.Add(' group by FromOrdNo, ToOrdNo, C_Pattern, C_Color, C_ColorNo, Price, stkName, qtyUnit, iotime ');
 //    ShowMessage(sql.text);
    Open;
  end;
  SCreateCDS(ADOQuery2, CDS_21);
  SInitCDSData(ADOQuery2, CDS_21);
  if not CDS_21.IsEmpty then
  begin
    CDS_21.First;
    with CDS_2 do
    begin
      for var i := 0 to CDS_21.RecordCount - 1 do
      begin
        append;
        FieldByName('OrderNo').AsString := CDS_21.FieldByName('FromOrdNo').AsString;
        FieldByName('ToOrdNo').AsString := CDS_21.FieldByName('ToOrdNo').AsString;
        FieldByName('C_Pattern').AsString := CDS_21.FieldByName('C_Pattern').AsString;
        FieldByName('C_Color').AsString := CDS_21.FieldByName('C_Color').AsString;
        FieldByName('ZDAmount').AsString := CDS_21.FieldByName('ZDAmount').AsString;
        FieldByName('C_ColorNo').AsString := CDS_21.FieldByName('C_ColorNo').AsString;
        FieldByName('ZDPrice').AsString := CDS_21.FieldByName('Price').AsString;
        FieldByName('OrdUnit').AsString := CDS_21.FieldByName('qtyUnit').AsString;
        FieldByName('Piece').AsString := CDS_21.FieldByName('Piece').AsString;
        FieldByName('ZDTime').AsString := CDS_21.FieldByName('iotime').AsString;
        if CDS_21.FieldByName('stkName').AsString = '贸易坯布' then
          FieldByName('SDefNote').AsString := '坯布转单'
        else if CDS_21.FieldByName('stkName').AsString = '贸易待检布' then
          FieldByName('SDefNote').AsString := '待检布转单';
        if LowerCase(CDS_21.FieldByName('QtyUnit').AsString) = 'kg' then
          FieldByName('NetWeight').AsString := CDS_21.FieldByName('qty').AsString
        else if LowerCase(CDS_21.FieldByName('QtyUnit').AsString) = 'm' then
          FieldByName('Meter').AsString := CDS_21.FieldByName('qty').AsString;
        CDS_21.Next;
      end;
      post;
    end;
  end;
  with ADOQuery2 do
  begin
    Filtered := False;
    Close;
    SQL.Clear;
    SQL.Add('SELECT ');
    SQL.Add('  B.OrderNo AS FromOrdNo, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, ISNULL(A.price, sub.price) price, sub.QtyUnit, A.IOTime,COUNT(*) Piece, A.IOType,');
    SQL.Add(' Sum(A.Meter) Meter, Sum(A.NetWeight) NetWeight, Sum(A.GrossWeight) GrossWeight, Sum(A.Yardage) Yardage,');
    SQL.Add('  (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO)  AS TOOrdNo,');
    SQL.Add('  CAST(ISNULL(Sum(');
    SQL.Add('  ISNULL(A.price, sub.price) * ');
    SQL.Add('  ISNULL( CASE sub.QtyUnit');
    SQL.Add(' WHEN ''M'' THEN  A.Meter');
    SQL.Add(' 	WHEN ''Kg'' THEN A.NetWeight  ');
    SQL.Add(' 				WHEN ''Y'' THEN A.Yardage');
    SQL.Add(' 	END, 0)),0) AS DECIMAL(18,2)) AS zdamount');
    SQL.Add('FROM Trade_Cloth_IO A ');
    SQL.Add('JOIN Trade_Cloth_Stock B ON A.StkID = B.StkID ');
    SQL.Add('CROSS APPLY (');
    SQL.Add('  SELECT TOP 1 QtyUnit, price ');
    SQL.Add('  FROM Trade_Cloth_DR_Sub X ');
    SQL.Add('  WHERE X.DRMID = A.IONO');
    SQL.Add(') sub');
    SQL.Add('WHERE B.OrderNo <> (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) ');
    SQL.Add('  AND A.IOType IN (''加工出库'', ''回修出库'')');
    SQL.Add(' AND B.OrderNo = ' + QuotedStr(FOrderNo));
    SQL.Add('GROUP BY B.OrderNo, A.IONO, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, sub.price, sub.QtyUnit, A.IOTime, A.price');
    Open;
  end;
  SCreateCDS(ADOQuery2, CDS_22);
  SInitCDSData(ADOQuery2, CDS_22);
  if not CDS_22.IsEmpty then
  begin
    CDS_22.First;
    with CDS_2 do
    begin
      for var i := 0 to CDS_22.RecordCount - 1 do
      begin
        append;
        FieldByName('OrderNo').AsString := CDS_22.FieldByName('FromOrdNo').AsString;
        FieldByName('ToOrdNo').AsString := CDS_22.FieldByName('ToOrdNo').AsString;
        FieldByName('C_Pattern').AsString := CDS_22.FieldByName('C_Pattern').AsString;
        FieldByName('C_Color').AsString := CDS_22.FieldByName('C_Color').AsString;
        FieldByName('ZDAmount').AsString := CDS_22.FieldByName('ZDAmount').AsString;
        FieldByName('C_ColorNo').AsString := CDS_22.FieldByName('C_ColorNo').AsString;
        FieldByName('ZDPrice').AsString := CDS_22.FieldByName('Price').AsString;
        FieldByName('OrdUnit').AsString := CDS_22.FieldByName('qtyUnit').AsString;
        FieldByName('Piece').AsString := CDS_22.FieldByName('Piece').AsString;
        FieldByName('ZDTime').AsString := CDS_22.FieldByName('iotime').AsString;
        FieldByName('Meter').AsString := CDS_22.FieldByName('Meter').AsString;
        FieldByName('GrossWeight').AsString := CDS_22.FieldByName('GrossWeight').AsString;
        FieldByName('Yardage').AsString := CDS_22.FieldByName('Yardage').AsString;
        FieldByName('NetWeight').AsString := CDS_22.FieldByName('NetWeight').AsString;
        if CDS_22.FieldByName('IOType').AsString = '加工出库' then
          FieldByName('SDefNote').AsString := ' 加工转单'
        else if CDS_22.FieldByName('IOType').AsString = '回修出库' then
          FieldByName('SDefNote').AsString := ' 回修转单';
        CDS_22.Next;
      end;
      post;
    end;
  end;
  with ADOQuery3 do
  begin
    Filtered := False;
    Close;
    SQL.Clear;
    sql.Add('select A.OrderNo FromOrdNo,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,COUNT(CIID) Piece,ISNULL(A.ZDPrice,0) ZDPrice, B.OrdUnit, A.ZDTime');
    if FUnit = 'M' then
    begin
      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkMeter))')
    end
    else if FUnit = 'Y' then
    begin
      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkYardage))')
    end
    else if FUnit = 'Kg' then
    begin
      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkNetWeight))')
    end;
    SQL.Add(',SUM(StkGrossWeight) GrossWeight,SUM(StkNetWeight) NetWeight,SUM(StkMeter) Meter,SUM(StkYardage) Yardage');
    SQL.Add('from Trade_Cloth_Stock_ZD  A left join Trade_Plan_Sub B on A.ZDSubId=B.SubID');
    sql.Add('left join Trade_Plan_Main C on C.MainId=B.MainId where A.ZDMainID= ' + QuotedStr(Trim(FMainID)));
    Sql.Add('GROUP BY A.OrderNO,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,A.ZDPrice, B.OrdUnit, A.ZDTime');
 //      ShowMessage(sql.text);
    Open;
  end;
  SCreateCDS(ADOQuery3, CDS_3);
  SInitCDSData(ADOQuery3, CDS_3);
  with CDS_3 do
  begin
    first;
    while not eof do
    begin
      Edit;
      FieldByName('SDefNote').AsString := '成品转单';
      post;
      Next;
    end;
  end;
  with ADOQuery3 do
  begin
    Filtered := False;
    Close;
    SQL.Clear;
    SQL.Add('select stkName, FromOrdNo, C_Pattern, C_Color, C_ColorNo, Price, qtyUnit, ZDAmount = (isnull(price, 0) * sum(qty)), qty = sum(qty), sum(piece) as piece, iotime, ');
    SQL.Add(' (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)) ToOrdNo ');
    SQL.Add(' from Bs_Cloth_IO A where STKName in (''贸易坯布'', ''贸易待检布'')');
    SQL.Add(' and FromOrdNo <> (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)) ');
    sql.Add(' and (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)) = ' + quotedstr(FOrderNo));
    SQL.Add(' group by FromOrdNo, ToOrdNo, C_Pattern, C_Color, C_ColorNo, Price, stkName, qtyUnit, iotime ');
 //      ShowMessage(sql.text);
    Open;
  end;
  SCreateCDS(ADOQuery3, CDS_31);
  SInitCDSData(ADOQuery3, CDS_31);
  if not CDS_31.IsEmpty then
  begin
    with CDS_3 do
    begin
      CDS_31.First;
      for var i := 0 to CDS_31.RecordCount - 1 do
      begin
        append;
        FieldByName('OrderNo').AsString := OrderNo.Text;
        FieldByName('FromOrdNo').AsString := CDS_31.FieldByName('FromOrdNo').AsString;
        FieldByName('C_Pattern').AsString := CDS_31.FieldByName('C_Pattern').AsString;
        FieldByName('C_Color').AsString := CDS_31.FieldByName('C_Color').AsString;
        FieldByName('ZDAmount').AsString := CDS_31.FieldByName('ZDAmount').AsString;
        FieldByName('C_ColorNo').AsString := CDS_31.FieldByName('C_ColorNo').AsString;
        FieldByName('ZDPrice').AsString := CDS_31.FieldByName('Price').AsString;
        FieldByName('OrdUnit').AsString := CDS_31.FieldByName('qtyUnit').AsString;
        FieldByName('ZDTime').AsString := CDS_31.FieldByName('iotime').AsString;
        FieldByName('Piece').AsString := CDS_31.FieldByName('Piece').AsString;
        if CDS_31.FieldByName('stkName').AsString = '贸易坯布' then
          FieldByName('SDefNote').AsString := '坯布转单'
        else if CDS_31.FieldByName('stkName').AsString = '贸易待检布' then
          FieldByName('SDefNote').AsString := '待检布转单';
        if LowerCase(CDS_31.FieldByName('QtyUnit').AsString) = 'kg' then
          FieldByName('NetWeight').AsString := CDS_31.FieldByName('qty').AsString
        else if LowerCase(CDS_31.FieldByName('QtyUnit').AsString) = 'm' then
          FieldByName('Meter').AsString := CDS_31.FieldByName('qty').AsString;
        CDS_31.Next;
      end;
      post;
    end;
  end;
  with ADOQuery3 do
  begin
    Filtered := False;
    Close;
    SQL.Clear;
    SQL.Add('SELECT ');
    SQL.Add('  B.OrderNo AS FromOrdNo, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, ISNULL(A.price, sub.price) price, sub.QtyUnit, A.IOTime,COUNT(*) Piece, A.IOType,');
    SQL.Add(' Sum(A.Meter) Meter, Sum(A.NetWeight) NetWeight, Sum(A.GrossWeight) GrossWeight, Sum(A.Yardage) Yardage,');
    SQL.Add('  (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO)  AS ToOrdNo,');
    SQL.Add('  CAST(ISNULL(Sum(');
    SQL.Add('  ISNULL(A.price, sub.price) * ');
    SQL.Add('  ISNULL( CASE sub.QtyUnit');
    SQL.Add(' WHEN ''M'' THEN  A.Meter');
    SQL.Add(' 	WHEN ''Kg'' THEN  A.NetWeight  ');
    SQL.Add(' 				WHEN ''Y'' THEN A.Yardage');
    SQL.Add(' 	END, 0)),0) AS DECIMAL(18,2)) AS zdamount');
    SQL.Add('FROM Trade_Cloth_IO A ');
    SQL.Add('JOIN Trade_Cloth_Stock B ON A.StkID = B.StkID ');
    SQL.Add('CROSS APPLY (');
    SQL.Add('  SELECT TOP 1 QtyUnit, price ');
    SQL.Add('  FROM Trade_Cloth_DR_Sub X ');
    SQL.Add('  WHERE X.DRMID = A.IONO');
    SQL.Add(') sub');
    SQL.Add('WHERE B.OrderNo <> (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) ');
    SQL.Add('  AND A.IOType IN (''加工出库'', ''回修出库'')');
    SQL.Add(' AND (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) = ' + QuotedStr(FOrderNo));
    SQL.Add('GROUP BY B.OrderNo, A.IONO, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, sub.price, sub.QtyUnit, A.IOTime, A.price');
    Open;
  end;
  SCreateCDS(ADOQuery3, CDS_32);
  SInitCDSData(ADOQuery3, CDS_32);
  if not CDS_32.IsEmpty then
  begin
    with CDS_3 do
    begin
      CDS_32.First;
      for var i := 0 to CDS_32.RecordCount - 1 do
      begin
        append;
        FieldByName('OrderNo').AsString := OrderNo.Text;
        FieldByName('FromOrdNo').AsString := CDS_32.FieldByName('FromOrdNo').AsString;
        FieldByName('C_Pattern').AsString := CDS_32.FieldByName('C_Pattern').AsString;
        FieldByName('C_Color').AsString := CDS_32.FieldByName('C_Color').AsString;
        FieldByName('ZDAmount').AsString := CDS_32.FieldByName('ZDAmount').AsString;
        FieldByName('C_ColorNo').AsString := CDS_32.FieldByName('C_ColorNo').AsString;
        FieldByName('ZDPrice').AsString := CDS_32.FieldByName('Price').AsString;
        FieldByName('OrdUnit').AsString := CDS_32.FieldByName('qtyUnit').AsString;
        FieldByName('ZDTime').AsString := CDS_32.FieldByName('iotime').AsString;
        FieldByName('Piece').AsString := CDS_32.FieldByName('Piece').AsString;
        FieldByName('Meter').AsString := CDS_32.FieldByName('Meter').AsString;
        FieldByName('GrossWeight').AsString := CDS_32.FieldByName('GrossWeight').AsString;
        FieldByName('Yardage').AsString := CDS_32.FieldByName('Yardage').AsString;
        FieldByName('NetWeight').AsString := CDS_32.FieldByName('NetWeight').AsString;
        if CDS_32.FieldByName('IOType').AsString = '加工出库' then
          FieldByName('SDefNote').AsString := ' 加工转单'
        else if CDS_32.FieldByName('IOType').AsString = '回修出库' then
          FieldByName('SDefNote').AsString := ' 回修转单';
        CDS_32.Next;
      end;
      post;
    end;
  end;
 //  ToolButton2.Click;
 end;
 procedure TfrmPlanProfitDetails.N1Click(Sender: TObject);
 begin
  Clipboard.SetTextBuf(PChar(Trim(CDS_HZ.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
 end;
 procedure TfrmPlanProfitDetails.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
  inherited;
  Action := caFree;
 end;
 procedure TfrmPlanProfitDetails.FormResize(Sender: TObject);
 begin
  inherited;
  cxGrid4.Width := ClientWidth div 2;
  cxGrid2.Width := ClientWidth div 2;
 end;
 procedure TfrmPlanProfitDetails.TBCloseClick(Sender: TObject);
 begin
  Close;
 end;
 procedure TfrmPlanProfitDetails.FormShow(Sender: TObject);
 begin
  inherited;
 //  cxGrid4.Width := 981;
 //  CxSplitter2.Left := cxGrid4.Width;
  ReadCxGrid(trim(self.Caption), Tv1, '利润明细');
 //  Enddate.DateTime := SGetServerDate(ADOQueryTemp);
 ////  begdate.DateTime := StartOfTheMonth(Enddate.DateTime);
 //  begdate.DateTime := EndDate.DateTime - 365;
  InitGrid();
  InitYFFGrid();
  InItZD();
 end;
 procedure TfrmPlanProfitDetails.TBRafreshClick(Sender: TObject);
 begin
  InitGrid();
  InitYFFGrid();
  InitZD();
 end;
 procedure TfrmPlanProfitDetails.ToolButton1Click(Sender: TObject);
 begin
  WriteCxGrid(trim(self.Caption), Tv1, '利润明细');
 end;
 procedure TfrmPlanProfitDetails.ToolButton2Click(Sender: TObject);
 var
  fsj: string;
 begin
  if ADOQueryMain.Active = False then
    Exit;
  SDofilter(ADOQueryMain, Trim(SGetFilters(Panel1, 1, 2)));
  SCreateCDS(ADOQueryMain, CDS_HZ);
  SInitCDSData(ADOQueryMain, CDS_HZ);
  SDofilter(ADOQuery5, Trim(SGetFilters(Panel1, 1, 2)));
  SCreateCDS(ADOQuery5, ClientDataSet1);
  SInitCDSData(ADOQuery5, ClientDataSet1);
 end;
 procedure TfrmPlanProfitDetails.OrderNoChange(Sender: TObject);
 begin
  ToolButton2.Click;
 end;
 procedure TfrmPlanProfitDetails.ToolButton4Click(Sender: TObject);
 var
  filepath: string;
  mBegdate, mEnddate: string;
 begin
  mBegdate := FormatDateTime('yyyy-MM-dd', begdate.Date);
  mEnddate := FormatDateTime('yyyy-MM-dd', enddate.Date);
  if CDS_HZ.IsEmpty then
    exit;
  with ADOQueryPrint do
  begin
    Close;
    SQL.Clear;
    with ADOQueryPrint do
    begin
      Close;
      SQL.Clear;
      Filtered := False;
      sql.Add(' exec P_YSSK_List @begdate=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', begdate.DateTime))) + ',@Enddate=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1))) + ',@flag=''已审核''');
      Open;
    end;
    Open;
  end;
  try
    filepath := ExtractFilePath(Application.ExeName) + 'report\应收账款.rmf';
    if not FileExists(Pchar(filepath)) then
    begin
      application.MessageBox(pchar('文件[' + filepath + ']不存在！'), '提示信息', MB_IConError);
      exit;
    end;
    RmVariables['begDate'] := FormatDateTime('yyyy-mm-dd', begDate.Date);
    RmVariables['enddate'] := FormatDateTime('yyyy-mm-dd', enddate.Date);
    RMVariables['ZDR'] := trim(DName);
    RM1.LoadFromFile(filepath);
    RM1.ShowReport;
  finally
  end;
 end;
 procedure TfrmPlanProfitDetails.cxTabControl1Change(Sender: TObject);
 begin
  InitGrid();
  InitYFFGrid();
 end;
 end.
--- a/A09财务通用管理/U_ReceivableList.dfm
+++ b/A09财务通用管理/U_ReceivableList.dfm
@ -176,8 +176,8 @@ inherited frmReceivableList: TfrmReceivableList
      Caption = #19978#32423#21333#20301
    end
    object Label1: TLabel
-      Left = 630
+      Left = 627
-      Top = 15
+      Top = 13
      Width = 48
      Height = 12
      Caption = #35745#21010#21333#21495
@ -228,7 +228,7 @@ inherited frmReceivableList: TfrmReceivableList
      State = cbChecked
      TabOrder = 4
    end
-    object P_Code: TEdit
+    object F_Code: TEdit
      Tag = 1
      Left = 359
      Top = 35
@ -607,6 +607,8 @@ inherited frmReceivableList: TfrmReceivableList
        Caption = #25163#32493#36153
        DataBinding.FieldName = 'JHSXF'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCalcEditProperties'
        Properties.DisplayFormat = '0.00'
        HeaderAlignmentHorz = taCenter
        Width = 73
      end
@ -614,6 +616,8 @@ inherited frmReceivableList: TfrmReceivableList
        Caption = #23454#25910#37329#39069
        DataBinding.FieldName = 'SSAmount'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCalcEditProperties'
        Properties.DisplayFormat = '0.00'
        HeaderAlignmentHorz = taCenter
        Width = 90
      end
@ -621,6 +625,8 @@ inherited frmReceivableList: TfrmReceivableList
        Caption = #23454#25910#20154#27665#24065
        DataBinding.FieldName = 'SSCNYAmount'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCalcEditProperties'
        Properties.DisplayFormat = '0.00'
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
--- a/A09财务通用管理/U_ReceivableList.pas
+++ b/A09财务通用管理/U_ReceivableList.pas
@ -15,7 +15,7 @@ uses
  cxTextEdit, cxPC, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters,
  cxNavigator, dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters,
  dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd, dxSkinWXI,
-  dxScrollbarAnnotations;
+  dxScrollbarAnnotations, cxCalc;
 type
  TfrmReceivableList = class(TfrmBaseList)
@ -46,7 +46,7 @@ type
    Label4: TLabel;
    CheckBox1: TCheckBox;
    Label6: TLabel;
-    P_Code: TEdit;
+    F_Code: TEdit;
    v2OrderNo: TcxGridDBColumn;
    cxTabControl1: TcxTabControl;
    Label10: TLabel;
@ -281,6 +281,21 @@ begin
    application.MessageBox('ÇëÑ¡ÔñÊý¾Ý', 'ÌáÊ¾');
    Exit;
  end;
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法删除', '提示');
    Exit;
  end;
  with CDS_1 do
  begin
    DisableControls;
@ -518,6 +533,20 @@ begin
    Exit;
  end;
 //
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，单价无法修改', '提示');
    Exit;
  end;
  MFFIDS := '';
  with CDS_1 do
  begin
@ -614,6 +643,20 @@ end;
 procedure TfrmReceivableList.btnEditClick(Sender: TObject);
 begin
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法修改', '提示');
    Exit;
  end;
  try
    with ADOQueryCmd do
    begin
--- a/A09财务通用管理/U_TaxInput.dfm
+++ b/A09财务通用管理/U_TaxInput.dfm
@ -2,7 +2,7 @@ object frmTaxInput: TfrmTaxInput
  Left = 261
  Top = 149
  Caption = #31246#36153#30331#35760
-  ClientHeight = 280
+  ClientHeight = 352
  ClientWidth = 1135
  Color = clWhite
  Font.Charset = GB2312_CHARSET
@ -26,7 +26,7 @@ object frmTaxInput: TfrmTaxInput
    Height = 38
    AutoSize = True
    ButtonHeight = 38
-    ButtonWidth = 75
+    ButtonWidth = 115
    Caption = 'ToolBar1'
    Color = clWhite
    DisabledImages = DataLink_Financial.ImageList_new32
@ -43,10 +43,19 @@ object frmTaxInput: TfrmTaxInput
      ImageIndex = 16
      OnClick = ToolButton3Click
    end
-    object TBClose: TToolButton
+    object ToolButton1: TToolButton
      Left = 71
      Top = 0
      AutoSize = True
      Caption = #35774#32622#40664#35748#31246#29575
      ImageIndex = 4
      Visible = False
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
      Left = 190
      Top = 0
      AutoSize = True
      Caption = #20851#38381
      ImageIndex = 7
      OnClick = TBCloseClick
@ -56,7 +65,7 @@ object frmTaxInput: TfrmTaxInput
    Left = 0
    Top = 38
    Width = 1135
-    Height = 242
+    Height = 314
    Align = alClient
    BevelInner = bvNone
    BevelOuter = bvNone
@ -74,7 +83,7 @@ object frmTaxInput: TfrmTaxInput
    TabOrder = 1
    object Label7: TLabel
      Left = 30
-      Top = 163
+      Top = 243
      Width = 41
      Height = 15
      Caption = #22791'     '#27880
@ -151,8 +160,8 @@ object frmTaxInput: TfrmTaxInput
      ParentFont = False
    end
    object Label6: TLabel
-      Left = 30
+      Left = 31
-      Top = 38
+      Top = 36
      Width = 78
      Height = 15
      Caption = #22806#24065#26680#38144#37329#39069
@ -204,7 +213,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object Label11: TLabel
      Left = 917
-      Top = 37
+      Top = 36
      Width = 52
      Height = 15
      Caption = #21046#21333#26085#26399
@ -217,10 +226,10 @@ object frmTaxInput: TfrmTaxInput
    end
    object Label12: TLabel
      Left = 31
-      Top = 66
+      Top = 84
      Width = 78
      Height = 15
-      Caption = #22806#24065#23454#26680#21333#20301
+      Caption = #22806#24065#23454#26680#37329#39069
      Font.Charset = ANSI_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
@ -230,7 +239,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object Label13: TLabel
      Left = 261
-      Top = 67
+      Top = 85
      Width = 78
      Height = 15
      Caption = #22806#24065#23454#26680#27719#29575
@ -243,7 +252,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object Label14: TLabel
      Left = 482
-      Top = 67
+      Top = 86
      Width = 91
      Height = 15
      Caption = #20154#27665#24065#23454#25910#37329#39069
@ -256,7 +265,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object Label15: TLabel
      Left = 715
-      Top = 67
+      Top = 86
      Width = 52
      Height = 15
      Caption = #36864#31246#25910#30410
@ -269,7 +278,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object Label16: TLabel
      Left = 917
-      Top = 66
+      Top = 86
      Width = 78
      Height = 15
      Caption = #25104#21697#24320#31080#37329#39069
@ -282,7 +291,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object Label17: TLabel
      Left = 31
-      Top = 99
+      Top = 119
      Width = 52
      Height = 15
      Caption = #22269#22320#31246#29575
@ -295,7 +304,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object Label18: TLabel
      Left = 261
-      Top = 99
+      Top = 118
      Width = 52
      Height = 15
      Caption = #22686#20540#31246#29575
@ -308,7 +317,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object Label19: TLabel
      Left = 482
-      Top = 99
+      Top = 119
      Width = 52
      Height = 15
      Caption = #20854#20182#31246#29575
@ -321,7 +330,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object Label22: TLabel
      Left = 31
-      Top = 125
+      Top = 166
      Width = 87
      Height = 15
      Caption = #22806#24065#25910#30410'(RMB)'
@ -334,7 +343,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object Label23: TLabel
      Left = 261
-      Top = 125
+      Top = 166
      Width = 78
      Height = 15
      Caption = #36864#31246#29702#35770#25910#30410
@ -346,8 +355,8 @@ object frmTaxInput: TfrmTaxInput
      ParentFont = False
    end
    object Label24: TLabel
-      Left = 482
+      Left = 483
-      Top = 127
+      Top = 166
      Width = 39
      Height = 15
      Caption = #22269#22320#31246
@ -360,7 +369,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object Label25: TLabel
      Left = 715
-      Top = 128
+      Top = 165
      Width = 52
      Height = 15
      Caption = #20854#20182#31246#36153
@ -371,26 +380,41 @@ object frmTaxInput: TfrmTaxInput
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label20: TLabel
      Left = 31
      Top = 61
      Width = 39
      Height = 15
      Caption = #25163#32493#36153
      Font.Charset = ANSI_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
      Font.Name = 'Times New Roman'
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Note: TMemo
-      Left = 93
+      Left = 102
-      Top = 155
+      Top = 225
      Width = 1020
      Height = 57
      ScrollBars = ssVertical
      TabOrder = 0
    end
    object CBusiness_unit: TEdit
-      Left = 129
+      Left = 128
      Top = 6
      Width = 121
      Height = 18
      ReadOnly = True
      TabOrder = 1
    end
    object CCustomer: TEdit
-      Left = 577
+      Left = 578
      Top = 5
      Width = 121
      Height = 18
      ReadOnly = True
      TabOrder = 2
    end
    object CC_Name: TEdit
@ -398,10 +422,11 @@ object frmTaxInput: TfrmTaxInput
      Top = 5
      Width = 121
      Height = 18
      ReadOnly = True
      TabOrder = 3
    end
    object Csalesman: TEdit
-      Left = 1001
+      Left = 1002
      Top = 5
      Width = 121
      Height = 18
@ -409,9 +434,10 @@ object frmTaxInput: TfrmTaxInput
    end
    object C_WBHXJE: TEdit
      Left = 128
-      Top = 37
+      Top = 38
      Width = 121
      Height = 18
      ReadOnly = True
      TabOrder = 5
    end
    object C_HXrate: TEdit
@ -419,6 +445,7 @@ object frmTaxInput: TfrmTaxInput
      Top = 37
      Width = 121
      Height = 18
      ReadOnly = True
      TabOrder = 6
    end
    object C_RMBHXJE: TEdit
@ -426,46 +453,48 @@ object frmTaxInput: TfrmTaxInput
      Top = 37
      Width = 121
      Height = 18
      ReadOnly = True
      TabOrder = 7
    end
    object SFHS: TEdit
      Left = 775
-      Top = 37
+      Top = 36
      Width = 121
      Height = 18
      ReadOnly = True
      TabOrder = 8
    end
    object CWBSHJE: TEdit
      Left = 128
-      Top = 66
+      Top = 85
      Width = 121
      Height = 18
      TabOrder = 9
    end
    object CWBSHrate: TEdit
      Left = 346
-      Top = 66
+      Top = 85
      Width = 121
      Height = 18
      TabOrder = 10
    end
    object CRMBSSJE: TEdit
      Left = 579
-      Top = 67
+      Top = 85
      Width = 121
      Height = 18
      TabOrder = 11
    end
    object CTSSY: TEdit
      Left = 775
-      Top = 66
+      Top = 85
      Width = 121
      Height = 18
      TabOrder = 12
    end
    object CCPKPJE: TEdit
      Left = 1002
-      Top = 66
+      Top = 85
      Width = 121
      Height = 18
      TabOrder = 13
@ -473,7 +502,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object CGDSL: TEdit
      Left = 128
-      Top = 96
+      Top = 118
      Width = 121
      Height = 18
      TabOrder = 14
@ -481,7 +510,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object CRate: TEdit
      Left = 346
-      Top = 96
+      Top = 118
      Width = 121
      Height = 18
      TabOrder = 15
@ -489,7 +518,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object COrtherRate: TEdit
      Left = 579
-      Top = 99
+      Top = 117
      Width = 121
      Height = 18
      TabOrder = 16
@ -497,35 +526,35 @@ object frmTaxInput: TfrmTaxInput
    end
    object CWBSY: TEdit
      Left = 128
-      Top = 125
+      Top = 165
      Width = 121
      Height = 18
      TabOrder = 17
    end
    object TSLLSY: TEdit
      Left = 346
-      Top = 125
+      Top = 165
      Width = 121
      Height = 18
      TabOrder = 18
    end
    object GDS: TEdit
-      Left = 578
+      Left = 579
-      Top = 127
+      Top = 163
      Width = 121
      Height = 18
      TabOrder = 19
    end
    object COrderSF: TEdit
      Left = 773
-      Top = 127
+      Top = 164
      Width = 121
      Height = 18
      TabOrder = 20
    end
    object CZDDate: TDateTimePicker
-      Left = 1004
+      Left = 1002
-      Top = 36
+      Top = 33
      Width = 121
      Height = 20
      BevelInner = bvNone
@ -536,7 +565,7 @@ object frmTaxInput: TfrmTaxInput
    end
    object COrderNo: TBtnEditC
      Left = 346
-      Top = 5
+      Top = 6
      Width = 121
      Height = 20
      Font.Charset = GB2312_CHARSET
@ -546,8 +575,17 @@ object frmTaxInput: TfrmTaxInput
      Font.Style = []
      ParentFont = False
      TabOrder = 22
      OnChange = COrderNoChange
      OnBtnUpClick = COrderNoBtnUpClick
    end
    object CSXF: TEdit
      Left = 128
      Top = 61
      Width = 121
      Height = 18
      ReadOnly = True
      TabOrder = 23
    end
  end
  object ADOQueryTemp: TADOQuery
    Connection = DataLink_Financial.ADOLink
@ -566,7 +604,7 @@ object frmTaxInput: TfrmTaxInput
    Connection = DataLink_Financial.ADOLink
    LockType = ltReadOnly
    Parameters = <>
-    Left = 709
+    Left = 669
-    Top = 129
+    Top = 241
  end
 end
--- a/A09财务通用管理/U_TaxInput.pas
+++ b/A09财务通用管理/U_TaxInput.pas
@ -71,6 +71,9 @@ type
    Label25: TLabel;
    CZDDate: TDateTimePicker;
    COrderNo: TBtnEditC;
    ToolButton1: TToolButton;
    CSXF: TEdit;
    Label20: TLabel;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
@ -91,6 +94,8 @@ type
    procedure CGDSLChange(Sender: TObject);
 //    procedure COrderSFChange(Sender: TObject);
    procedure COrtherRateChange(Sender: TObject);
    procedure COrderNoChange(Sender: TObject);
    procedure ToolButton1Click(Sender: TObject);
    //procedure ToolButton1Click(Sender: TObject);
    //procedure ToolButton2Click(Sender: TObject);
  private
@ -114,7 +119,7 @@ implementation
 uses
  U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel, U_BankSel, U_ZDYHelpFY,
-  U_TradePlanSel, U_FinFileUp, U_FtyFileUp, U_TaxSel;
+  U_TradePlanSel, U_FinFileUp, U_FtyFileUp, U_TaxSel, U_TaxSet;
 {$R *.dfm}
@ -260,14 +265,11 @@ end;
 //  end;
 //end;
 procedure TfrmTaxInput.FormDestroy(Sender: TObject);
 begin
  frmTaxInput := nil;
 end;
 procedure TfrmTaxInput.PayMentBtnUpClick(Sender: TObject);
 var
  fsj: string;
@ -336,16 +338,18 @@ begin
        COrderNo.Text := Trim(CDS_1.fieldbyname('OrderNo').AsString);
        CCustomer.Text := Trim(CDS_1.fieldbyname('CustName').AsString);
        CC_Name.Text := Trim(CDS_1.fieldbyname('C_Name').AsString);
        CZDDate.Date := CDS_1.fieldbyname('OrdDate').AsDateTime;
        C_WBHXJE.Text := Trim(CDS_1.fieldbyname('SumUSD').AsString);
        C_RMBHXJE.Text := Trim(CDS_1.fieldbyname('SumCNY').AsString);
        C_HXrate.Text := Trim(CDS_1.fieldbyname('HXHV').AsString);
        Csalesman.Text := Trim(CDS_1.fieldbyname('Saleser').AsString);
        SFHS.Text := Trim(CDS_1.fieldbyname('ISTax').AsString);
        CSXF.Text := Trim(CDS_1.fieldbyname('SXF').AsString);
        with ADOQueryTemp do
        begin
          close;
          sql.Clear;
          sql.Add(' SELECT STUFF(');
-          sql.Add('     (SELECT '','' + CAST(CAST(A.WoJHExchangeRate AS DECIMAL(18, 2)) AS VARCHAR)');
+          sql.Add('     (SELECT distinct '','' + CAST(CAST(A.WoJHExchangeRate AS DECIMAL(18, 2)) AS VARCHAR)');
          sql.Add('      FROM Finance_WriteOff A');
          sql.Add('      INNER JOIN Finance_Flow B ON A.FromId = B.FFID');
          sql.Add('      INNER JOIN Finance_Flow C ON A.ToId = C.FFID');
@ -354,7 +358,7 @@ begin
          sql.Add('1, 1, '''') AS WoJHExchangeRates');
          open;
        end;
-        C_HXrate.Text :=  ADOQueryTemp.FieldByName('WoJHExchangeRates').AsString;
+//        C_HXrate.Text := ADOQueryTemp.FieldByName('WoJHExchangeRates').AsString;
      end;
    end;
  finally
@ -362,8 +366,10 @@ begin
  end;
 end;
-
+procedure TfrmTaxInput.COrderNoChange(Sender: TObject);
-
+begin
  CalculateProduct4(Sender);
 end;
 procedure TfrmTaxInput.COrtherRateChange(Sender: TObject);
 begin
@ -383,8 +389,8 @@ end;
 procedure TfrmTaxInput.FormCreate(Sender: TObject);
 begin
-  C_HXrate.OnChange := CalculateProduct;
+  CWBSHJE.OnChange := CalculateProduct;
-  C_WBHXJE.OnChange := CalculateProduct;
+  CWBSHrate.OnChange := CalculateProduct;
 end;
 procedure TfrmTaxInput.TBCloseClick(Sender: TObject);
@ -407,9 +413,34 @@ begin
 //    OurCoName.Text := Trim(ADOQueryTemp.fieldbyname('CoAbbrName').AsString);
 //    OurCoName.TxtCode := Trim(ADOQueryTemp.fieldbyname('CoCode').AsString);
 //  end;
-  CGDSL.text := '0.028';
+  if PState = '新增' then
-  CRate.text := '0.13';
+    ToolButton1.Visible := True
-  COrtherRate.text := '0.07';
+  else
    ToolButton1.Visible := False;
  with ADOQueryTemp do
  begin
    Close;
    sql.Clear;
    sql.add('select * from SY_Tax');
    open;
    First;
    while not eof do
    begin
      if FieldByName('type').AsString = 'CGDSL' then
        CGDSL.text := FieldByName('value').AsString
      else if FieldByName('type').AsString = 'CRate' then
        CRate.text := FieldByName('value').AsString
      else if FieldByName('type').AsString = 'COrtherRate' then
        COrtherRate.text := FieldByName('value').AsString;
      Next;
    end;
  end;
 //  CGDSL.text := '0.028';
 //  CRate.text := '0.13';
 //  COrtherRate.text := '0.07';
  CZDDate.date := DServerDate;
  InitGrid();
 end;
@ -464,6 +495,7 @@ begin
 ////      FieldByName('OppBanKID
      FieldByName('CostMID').Value := Trim(MaxId);
      RTSetsavedata(ADOQueryCmd, 'Costing_table', ScrollBox1, 0);
      FieldByName('HYStatus').Value := 0;
      Post;
    end;
@ -525,10 +557,18 @@ end;
 procedure TfrmTaxInput.CalculateProduct(Sender: TObject);//计算外币收益
 var
  AValue, BValue, CValue: Double;
 begin
  if (PState = '新增') or (PState = '修改')  then
  begin
    try
-    AValue := StrToFloatDef(C_HXrate.Text, 0);
+      if (CWBSHrate.Text = '') or (CWBSHJE.Text = '') then
-    BValue := StrToFloatDef(C_WBHXJE.Text, 0);
+      begin
        CWBSY.Text := '';
        exit;
      end;
      AValue := StrToFloatDef(CWBSHrate.Text, 0);
      BValue := StrToFloatDef(CWBSHJE.Text, 0);
      CValue := AValue * BValue;
      CWBSY.Text := FormatFloat('0.00', CValue);
    except
@ -537,14 +577,23 @@ begin
    end;
  end;
 end;
 procedure TfrmTaxInput.CalculateProduct2(Sender: TObject);//计算退税理论收益
 var
  AValue, BValue, CValue, DValue: Double;
 begin
  if (PState = '新增') or (PState = '修改') then
  begin
    if (CCPKPJE.Text = '') or (CRate.Text = '') then
    begin
      TSLLSY.Text := '';
      exit;
    end;
    try
      AValue := StrToFloatDef(CCPKPJE.Text, 0);
      BValue := StrToFloatDef(CRate.Text, 0);
-    CValue := AValue/(1 + BValue) * BVALUE;
+      CValue := AValue / (1 + BValue) * BValue;
      TSLLSY.Text := FormatFloat('0.00', CValue);
    except
      on E: Exception do
@ -552,10 +601,19 @@ begin
    end;
  end;
 end;
 procedure TfrmTaxInput.CalculateProduct3(Sender: TObject); //计算国地税
 var
  AValue, BValue, CValue, DValue: Double;
 begin
  if (PState = '新增') or (PState = '修改')  then
  begin
    if (CCPKPJE.Text = '') or (CGDSL.Text = '') then
    begin
      GDS.Text := '';
      exit;
    end;
    try
      AValue := StrToFloatDef(CCPKPJE.Text, 0);
      BValue := StrToFloatDef(CGDSL.Text, 0);
@ -567,10 +625,20 @@ begin
    end;
  end;
 end;
 procedure TfrmTaxInput.CalculateProduct4(Sender: TObject); //计算其他税费
 var
  AValue, BValue, CValue, DValue: Double;
 begin
  if (PState = '新增') or (PState = '修改')  then
  begin
    if (COrtherRate.Text = '') or (CCPKPJE.Text = '') or (COrderNo.Text = '') then
    begin
      COrderSF.Text := '';
      exit;
    end;
    try
      AValue := StrToFloatDef(COrtherRate.Text, 0);
      BValue := 0;
@ -595,6 +663,7 @@ begin
    end;
  end;
 end;
 procedure TfrmTaxInput.CCPKPJEChange(Sender: TObject);
 begin
@ -608,6 +677,24 @@ begin
  CalculateProduct3(Sender);
 end;
 procedure TfrmTaxInput.ToolButton1Click(Sender: TObject);
 begin
  try
    frmTaxSet := TfrmTaxSet.Create(Application);
    with frmTaxSet do
    begin
      if ShowModal = 1 then
      begin
        Self.CGDSL.Text := CGDSL.Text;
        Self.CRate.Text := CRate.Text;
        Self.COrtherRate.Text := COrtherRate.Text;
      end;
    end;
  finally
    frmTaxSet.Free;
  end;
 end;
 procedure TfrmTaxInput.ToolButton3Click(Sender: TObject);
 begin
  ToolBar1.SetFocus;
--- a/A09财务通用管理/U_TaxList.dfm
+++ b/A09财务通用管理/U_TaxList.dfm
@ -6,6 +6,7 @@ inherited frmTaxList: TfrmTaxList
  ClientWidth = 1284
  FormStyle = fsMDIChild
  Visible = True
  ExplicitLeft = -433
  ExplicitWidth = 1300
  ExplicitHeight = 629
  PixelsPerInch = 96
@ -15,14 +16,14 @@ inherited frmTaxList: TfrmTaxList
    Left = 0
    Top = 0
    Width = 1284
-    Height = 38
+    Height = 60
    AutoSize = True
-    ButtonHeight = 38
+    ButtonHeight = 30
-    ButtonWidth = 91
+    ButtonWidth = 95
    Caption = 'ToolBar1'
    Color = clSkyBlue
    DisabledImages = DataLink_Financial.ImageList_new32
-    Images = DataLink_Financial.ImageList_new32
+    Images = DataLink_Financial.cxImageList_bar
    List = True
    ParentColor = False
    ShowCaptions = True
@ -35,8 +36,17 @@ inherited frmTaxList: TfrmTaxList
      ImageIndex = 1
      OnClick = TBRafreshClick
    end
    object ToolButton8: TToolButton
      Left = 63
      Top = 0
      AutoSize = True
      Caption = #36807#28388
      ImageIndex = 0
      Visible = False
      OnClick = ToolButton8Click
    end
    object btnAdd: TToolButton
-      Left = 71
+      Left = 126
      Top = 0
      AutoSize = True
      Caption = #26032#22686
@ -44,7 +54,7 @@ inherited frmTaxList: TfrmTaxList
      OnClick = btnAddClick
    end
    object btnEdit: TToolButton
-      Left = 142
+      Left = 189
      Top = 0
      AutoSize = True
      Caption = #20462#25913
@ -52,7 +62,7 @@ inherited frmTaxList: TfrmTaxList
      OnClick = btnEditClick
    end
    object ToolButton7: TToolButton
-      Left = 213
+      Left = 252
      Top = 0
      AutoSize = True
      Caption = #26597#30475
@ -60,7 +70,7 @@ inherited frmTaxList: TfrmTaxList
      OnClick = ToolButton7Click
    end
    object ToolButton3: TToolButton
-      Left = 284
+      Left = 315
      Top = 0
      AutoSize = True
      Caption = #22797#21046
@ -68,7 +78,7 @@ inherited frmTaxList: TfrmTaxList
      OnClick = ToolButton3Click
    end
    object btnDel: TToolButton
-      Left = 355
+      Left = 378
      Top = 0
      AutoSize = True
      Caption = #21024#38500
@ -76,7 +86,7 @@ inherited frmTaxList: TfrmTaxList
      OnClick = btnDelClick
    end
    object btnChk: TToolButton
-      Left = 426
+      Left = 441
      Top = 0
      AutoSize = True
      Caption = #23457#26680
@ -85,7 +95,7 @@ inherited frmTaxList: TfrmTaxList
      OnClick = btnChkClick
    end
    object btnReChk: TToolButton
-      Left = 497
+      Left = 504
      Top = 0
      AutoSize = True
      Caption = #25764#38144#23457#26680
@ -93,18 +103,35 @@ inherited frmTaxList: TfrmTaxList
      Visible = False
      OnClick = btnReChkClick
    end
    object ToolButton10: TToolButton
      Left = 591
      Top = 0
      AutoSize = True
      Caption = #24453#26680#39564
      ImageIndex = 12
      OnClick = ToolButton10Click
    end
    object ToolButton11: TToolButton
      Left = 666
      Top = 0
      AutoSize = True
      Caption = #21462#28040#24453#26680#39564
      ImageIndex = 5
      OnClick = ToolButton11Click
    end
    object ToolButton1: TToolButton
-      Left = 592
+      Left = 765
      Top = 0
      AutoSize = True
      Caption = #20184#27454
      ImageIndex = 12
      Wrap = True
      Visible = False
      OnClick = ToolButton1Click
    end
    object ToolButton2: TToolButton
-      Left = 663
+      Left = 0
-      Top = 0
+      Top = 30
      AutoSize = True
      Caption = #25764#38144#20184#27454
      ImageIndex = 11
@ -112,8 +139,8 @@ inherited frmTaxList: TfrmTaxList
      OnClick = ToolButton2Click
    end
    object ToolButton9: TToolButton
-      Left = 758
+      Left = 87
-      Top = 0
+      Top = 30
      AutoSize = True
      Caption = #38468#20214#19978#20256
      ImageIndex = 22
@ -121,8 +148,8 @@ inherited frmTaxList: TfrmTaxList
      OnClick = ToolButton9Click
    end
    object ToolButton4: TToolButton
-      Left = 853
+      Left = 174
-      Top = 0
+      Top = 30
      AutoSize = True
      Caption = #23548#20986
      ImageIndex = 20
@ -130,24 +157,24 @@ inherited frmTaxList: TfrmTaxList
      OnClick = ToolButton4Click
    end
    object ToolButton5: TToolButton
-      Left = 924
+      Left = 237
-      Top = 0
+      Top = 30
      AutoSize = True
      Caption = #20445#23384#26684#24335
      ImageIndex = 16
      OnClick = ToolButton5Click
    end
    object TBClose: TToolButton
-      Left = 1019
+      Left = 324
-      Top = 0
+      Top = 30
      AutoSize = True
      Caption = #20851#38381
      ImageIndex = 7
      OnClick = TBCloseClick
    end
    object ToolButton6: TToolButton
-      Left = 1090
+      Left = 387
-      Top = 0
+      Top = 30
      AutoSize = True
      Caption = #22270#29255#19978#20256
      ImageIndex = 19
@ -157,7 +184,7 @@ inherited frmTaxList: TfrmTaxList
  end
  object Panel1: TPanel [1]
    Left = 0
-    Top = 38
+    Top = 60
    Width = 1284
    Height = 43
    Align = alTop
@ -194,6 +221,13 @@ inherited frmTaxList: TfrmTaxList
      Height = 12
      Caption = #23458#25143
    end
    object Label4: TLabel
      Left = 739
      Top = 12
      Width = 48
      Height = 12
      Caption = #23458#25143#21333#21495
    end
    object begdate: TDateTimePicker
      Left = 77
      Top = 9
@ -213,7 +247,7 @@ inherited frmTaxList: TfrmTaxList
      TabOrder = 1
    end
    object CheckBox1: TCheckBox
-      Left = 5
+      Left = 0
      Top = 10
      Width = 71
      Height = 17
@ -249,16 +283,24 @@ inherited frmTaxList: TfrmTaxList
      TabOrder = 5
      OnKeyPress = OppCoNameKeyPress
    end
    object BuyConNo: TEdit
      Tag = 2
      Left = 793
      Top = 8
      Width = 87
      Height = 20
      TabOrder = 6
      OnKeyPress = OppCoNameKeyPress
    end
  end
  object cxGrid1: TcxGrid [2]
    Left = 0
-    Top = 81
+    Top = 103
    Width = 1284
-    Height = 509
+    Height = 487
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 2
    ExplicitTop = 73
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
@ -320,6 +362,7 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'CBusiness_unit'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column2: TcxGridDBColumn
@ -327,13 +370,23 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'COrderNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column26: TcxGridDBColumn
        Caption = #23458#25143#21333#21495
        DataBinding.FieldName = 'BuyConNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 78
      end
      object Tv1Column3: TcxGridDBColumn
        Caption = #23458#25143
        DataBinding.FieldName = 'CCustomer'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column4: TcxGridDBColumn
@ -341,6 +394,7 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'Csalesman'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column5: TcxGridDBColumn
@ -348,6 +402,7 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'C_WBHXJE'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 90
      end
      object Tv1Column6: TcxGridDBColumn
@ -355,6 +410,7 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'C_HXrate'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column7: TcxGridDBColumn
@ -362,6 +418,7 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'C_RMBHXJE'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 100
      end
      object Tv1Column8: TcxGridDBColumn
@ -369,6 +426,7 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'SFHS'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column9: TcxGridDBColumn
@ -376,13 +434,23 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'CZDDate'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column25: TcxGridDBColumn
        Caption = #19979#21333#26085#26399
        DataBinding.FieldName = 'OrdDate'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 84
      end
      object Tv1Column10: TcxGridDBColumn
        Caption = #22806#24065#23454#26680#37329#39069
        DataBinding.FieldName = 'CWBSHJE'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 90
      end
      object Tv1Column11: TcxGridDBColumn
@ -390,6 +458,7 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'CWBSHrate'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 90
      end
      object Tv1Column13: TcxGridDBColumn
@ -397,6 +466,7 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'CRMBSSJE'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 100
      end
      object Tv1Column14: TcxGridDBColumn
@ -404,6 +474,7 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'CTSSY'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column15: TcxGridDBColumn
@ -411,13 +482,15 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'CCPKPJE'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 90
      end
      object Tv1Column16: TcxGridDBColumn
-        Caption = #36807#22320#31246#29575
+        Caption = #22269#22320#31246#29575
        DataBinding.FieldName = 'CGDSL'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column17: TcxGridDBColumn
@ -425,6 +498,7 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'CRate'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column18: TcxGridDBColumn
@ -432,6 +506,7 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'COrtherRate'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column19: TcxGridDBColumn
@ -439,6 +514,7 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'CWBSY'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column20: TcxGridDBColumn
@ -446,13 +522,22 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'TSLLSY'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 90
      end
      object Tv1Column27: TcxGridDBColumn
        Caption = #25163#32493#36153
        DataBinding.FieldName = 'CSXF'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 72
      end
      object Tv1Column21: TcxGridDBColumn
        Caption = #22269#22320#31246
        DataBinding.FieldName = 'GDS'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column23: TcxGridDBColumn
@ -460,13 +545,23 @@ inherited frmTaxList: TfrmTaxList
        DataBinding.FieldName = 'COrderSF'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv1Column28: TcxGridDBColumn
        Caption = #24453#26680#39564
        DataBinding.FieldName = 'HYStatus'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 72
      end
      object Tv1Column24: TcxGridDBColumn
        Caption = #22791#27880
        DataBinding.FieldName = 'Note'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
    end
@ -634,6 +729,7 @@ inherited frmTaxList: TfrmTaxList
    Top = 280
  end
  object GPM_1: TcxGridPopupMenu
    Grid = cxGrid1
    PopupMenus = <>
    Left = 472
    Top = 360
--- a/A09财务通用管理/U_TaxList.pas
+++ b/A09财务通用管理/U_TaxList.pas
@ -111,6 +111,15 @@ type
    COrderNo: TEdit;
    CBusiness_unit: TEdit;
    CCustomer: TEdit;
    Tv1Column25: TcxGridDBColumn;
    BuyConNo: TEdit;
    Label4: TLabel;
    Tv1Column26: TcxGridDBColumn;
    ToolButton8: TToolButton;
    Tv1Column27: TcxGridDBColumn;
    ToolButton10: TToolButton;
    ToolButton11: TToolButton;
    Tv1Column28: TcxGridDBColumn;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure btnDelClick(Sender: TObject);
@ -138,9 +147,10 @@ type
    procedure Button4Click(Sender: TObject);
    procedure ToolButton6Click(Sender: TObject);
    procedure ToolButton7Click(Sender: TObject);
-    procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView;
+    procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
-      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
+    procedure ToolButton8Click(Sender: TObject);
-      var ADone: Boolean);
+    procedure ToolButton10Click(Sender: TObject);
    procedure ToolButton11Click(Sender: TObject);
  private
    procedure InitGrid();
    procedure SetStatus();
@ -156,18 +166,15 @@ uses
 {$R *.dfm}
 procedure TfrmTaxList.SetStatus();
 begin
-
+  ToolButton3.Visible := false;
 end;
 procedure TfrmTaxList.InitGrid();
 var
  WSql: string;
 begin
-  WSql := SGetFilters(Panel1, 1, 2);
+//  else
-  if Trim(WSql) <> '' then
+//    CheckBox1.Checked := True;
    WSql := ' and ' + WSql
  else
    CheckBox1.Checked := True;
  try
    ADOQueryMain.DisableControls;
@ -181,14 +188,15 @@ begin
 //      sql.Add('  Left join BS_Company_Bank B on A.OppBankID=B.CBID  ');
 //      sql.Add(' where (A.FFType=''付款登记'' Or ISNULL(A.RegType,'''')=''收款'')');
-      SQL.add('select * from Costing_Table');
+      SQL.add('select *, OrdDate = (select OrdDate from Trade_Plan_Main x where x.OrderNo = a.COrderNo) ');
      SQL.Add(' ,BuyConNo = (select BuyConNo from V_Trade_Plan_Single_2 X where COrderNo = X.OrderNo )');
      SQL.Add(' from Costing_Table a ');
      SQL.add('where 1=1');
      if CheckBox1.Checked then
      begin
        sql.Add(' and CZDDate>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' ');
        sql.Add(' and CZDDate<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' ');
      end;
      sql.Add(WSql);
 //      showmessage(sql.text);
      Open;
    end;
@ -293,6 +301,24 @@ begin
    Application.MessageBox('请选择数据', '提示', MB_OK);
    Exit;
  end;
  if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
    Exit;
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('COrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法删除', '提示');
    Exit;
  end;
  with CDS_1 do
  begin
    DisableControls;
@ -338,7 +364,6 @@ begin
    Application.MessageBox('删除成功', '提示', MB_OK);
 end;
 procedure TfrmTaxList.FormShow(Sender: TObject);
 begin
  inherited;
@ -402,10 +427,10 @@ begin
  begin
    Close;
    SQL.Clear;
-    sql.Add('update Finance_Flow set ' + FFieldName + '=' + Trim(mvalue));
+    SQL.Add('update Finance_Flow set ' + FFieldName + '=' + Trim(mvalue));
    if Trim(FFieldName) <> 'Money' then
-      sql.Add(' ,Money=' + FloatToStr(FMoney));
+      SQL.Add(' ,Money=' + FloatToStr(FMoney));
-    sql.Add('where FFID=' + quotedstr(Trim(CDS_1.fieldbyname('FFID').AsString)));
+    SQL.Add('where FFID=' + quotedstr(Trim(CDS_1.fieldbyname('FFID').AsString)));
    ExecSQL;
  end;
@ -445,13 +470,13 @@ begin
    with ADOQueryCmd do
    begin
      Close;
-      sql.Clear;
+      SQL.Clear;
-      sql.Add(' exec P_Fin_Flow_SetStatus_1 ');
+      SQL.Add(' exec P_Fin_Flow_SetStatus_1 ');
-      sql.Add(' @FFIDS=' + QuotedStr(FFFIDS));
+      SQL.Add(' @FFIDS=' + QuotedStr(FFFIDS));
-      sql.Add(',@Operation=''ÉóºË'' ');
+      SQL.Add(',@Operation=''审核'' ');
-      Sql.Add(',@SetDate=''' + FormatDateTime('yyyy-MM-dd', Setdate1.DateTime) + ''' ');
+      SQL.Add(',@SetDate=''' + FormatDateTime('yyyy-MM-dd', Setdate1.DateTime) + ''' ');
-      Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
+      SQL.Add(',@DCode=' + quotedstr(Trim(DCode)));
-      Sql.Add(',@DName=' + quotedstr(Trim(DName)));
+      SQL.Add(',@DName=' + quotedstr(Trim(DName)));
      open;
    end;
    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
@ -510,13 +535,13 @@ begin
    with ADOQueryCmd do
    begin
      Close;
-      sql.Clear;
+      SQL.Clear;
-      sql.Add(' exec P_Fin_Flow_SetStatus_1 ');
+      SQL.Add(' exec P_Fin_Flow_SetStatus_1 ');
-      sql.Add(' @FFIDS=' + QuotedStr(FFFIDS));
+      SQL.Add(' @FFIDS=' + QuotedStr(FFFIDS));
-      sql.Add(',@Operation=''³·ÏúÉóºË'' ');
+      SQL.Add(',@Operation=''撤销审核'' ');
-      Sql.Add(',@SetDate=''' + FormatDateTime('yyyy-MM-dd', Setdate1.DateTime) + ''' ');
+      SQL.Add(',@SetDate=''' + FormatDateTime('yyyy-MM-dd', Setdate1.DateTime) + ''' ');
-      Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
+      SQL.Add(',@DCode=' + quotedstr(Trim(DCode)));
-      Sql.Add(',@DName=' + quotedstr(Trim(DName)));
+      SQL.Add(',@DName=' + quotedstr(Trim(DName)));
      open;
    end;
    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
@ -573,13 +598,13 @@ begin
    with ADOQueryCmd do
    begin
      Close;
-      sql.Clear;
+      SQL.Clear;
-      sql.Add(' exec P_Fin_Flow_SetStatus_1 ');
+      SQL.Add(' exec P_Fin_Flow_SetStatus_1 ');
-      sql.Add(' @FFIDS=' + QuotedStr(FFFIDS));
+      SQL.Add(' @FFIDS=' + QuotedStr(FFFIDS));
-      sql.Add(',@Operation=''ÉóºË'' ');
+      SQL.Add(',@Operation=''审核'' ');
-      Sql.Add(',@SetDate=''' + FormatDateTime('yyyy-MM-dd', Setdate1.DateTime) + ''' ');
+      SQL.Add(',@SetDate=''' + FormatDateTime('yyyy-MM-dd', Setdate1.DateTime) + ''' ');
-      Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
+      SQL.Add(',@DCode=' + quotedstr(Trim(DCode)));
-      Sql.Add(',@DName=' + quotedstr(Trim(DName)));
+      SQL.Add(',@DName=' + quotedstr(Trim(DName)));
      open;
    end;
    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
@ -638,13 +663,13 @@ begin
    with ADOQueryCmd do
    begin
      Close;
-      sql.Clear;
+      SQL.Clear;
-      sql.Add(' exec P_Fin_Flow_SetStatus_1 ');
+      SQL.Add(' exec P_Fin_Flow_SetStatus_1 ');
-      sql.Add(' @FFIDS=' + QuotedStr(FFFIDS));
+      SQL.Add(' @FFIDS=' + QuotedStr(FFFIDS));
-      sql.Add(',@Operation=''¸¶¿î'' ');
+      SQL.Add(',@Operation=''付款'' ');
-      Sql.Add(',@SetDate=''' + FormatDateTime('yyyy-MM-dd', Setdate2.DateTime) + ''' ');
+      SQL.Add(',@SetDate=''' + FormatDateTime('yyyy-MM-dd', Setdate2.DateTime) + ''' ');
-      Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
+      SQL.Add(',@DCode=' + quotedstr(Trim(DCode)));
-      Sql.Add(',@DName=' + quotedstr(Trim(DName)));
+      SQL.Add(',@DName=' + quotedstr(Trim(DName)));
      open;
    end;
    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
@ -653,11 +678,11 @@ begin
    with ADOQueryCmd do
    begin
      Close;
-      sql.Clear;
+      SQL.Clear;
-      sql.Add(' exec P_Fin_In_Bank_Flow ');
+      SQL.Add(' exec P_Fin_In_Bank_Flow ');
-      sql.Add(' @FFIDS=' + QuotedStr(FFFIDS));
+      SQL.Add(' @FFIDS=' + QuotedStr(FFFIDS));
-      Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
+      SQL.Add(',@DCode=' + quotedstr(Trim(DCode)));
-      Sql.Add(',@DName=' + quotedstr(Trim(DName)));
+      SQL.Add(',@DName=' + quotedstr(Trim(DName)));
      open;
    end;
    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
@ -693,6 +718,7 @@ begin
    frmTaxInput := TfrmTaxInput.Create(Application);
    with frmTaxInput do
    begin
      PState := '新增';
      FFFID := '';
      if ShowModal = 1 then
      begin
@ -704,6 +730,32 @@ begin
  end;
 end;
 procedure TfrmTaxList.ToolButton10Click(Sender: TObject);
 begin
  inherited;
  with ADOQueryCmd do
  begin
    close;
    SQL.Clear;
    SQL.add(' update Costing_Table set HYStatus = 1 where CostMid = ' + quotedstr(CDS_1.FieldByName('CostMid').AsString));
    ExecSQL;
  end;
  InitGrid();
 end;
 procedure TfrmTaxList.ToolButton11Click(Sender: TObject);
 begin
  inherited;
  with ADOQueryCmd do
  begin
    close;
    SQL.Clear;
    SQL.add(' update Costing_Table set HYStatus = 0 where CostMid = ' + quotedstr(CDS_1.FieldByName('CostMid').AsString));
    ExecSQL;
  end;
  InitGrid();
 end;
 procedure TfrmTaxList.ToolButton1Click(Sender: TObject);
 begin
  Panel4.Left := (self.width - Panel4.width) div 2;
@ -831,8 +883,7 @@ begin
    frmTaxInput := TfrmTaxInput.Create(Application);
    with frmTaxInput do
    begin
-      FFFID := Trim(SELF.CDS_1.fieldbyname('FFID').AsString);
+      FFFID := Trim(SELF.CDS_1.fieldbyname('CostMID').AsString);
      ToolButton3.visible:=False;
      if ShowModal = 1 then
      begin
        InitGrid();
@ -844,6 +895,17 @@ begin
 end;
 procedure TfrmTaxList.ToolButton8Click(Sender: TObject);
 begin
  inherited;
  if CDS_1.Active then
  begin
    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
    SCreateCDS(ADOQueryMain, CDS_1);
    SInitCDSData(ADOQueryMain, CDS_1);
  end;
 end;
 procedure TfrmTaxList.btnEditClick(Sender: TObject);
 begin
 //  try
@ -864,11 +926,26 @@ begin
 //    Exit;
 //  end;
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('COrderNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法修改', '提示');
    Exit;
  end;
  try
    frmTaxInput := TfrmTaxInput.Create(Application);
    with frmTaxInput do
    begin
      FFFID := Trim(SELF.CDS_1.fieldbyname('CostMID').AsString);
      PState := '修改';
      if ShowModal = 1 then
      begin
        InitGrid();
@ -902,22 +979,33 @@ begin
 end;
-procedure TfrmTaxList.Tv1CustomDrawCell(Sender: TcxCustomGridTableView;
+procedure TfrmTaxList.Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
-  ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
+var
-  var ADone: Boolean);
+  mColumn: TcxGridDBColumn;
  mvalue: Variant;
 begin
  if AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('RegType').Index] = '收款' then
  begin
    ACanvas.Brush.Color := $00FF8080;
-   end
+  end;
  mColumn := Tv1.GetColumnByFieldName('HYStatus');
  if mColumn = nil then
    exit;
  mvalue := AViewInfo.GridRecord.Values[mColumn.index];
  if mvalue = true then
  begin
    ACanvas.Font.Color := clBlue;
    Exit;
  end;
 end;
 procedure TfrmTaxList.OppCoNameKeyPress(Sender: TObject; var Key: Char);
 begin
  if Key = #13 then
  begin
-    InitGrid();
+//    InitGrid();
    ToolButton8.Click;
  end;
 end;
--- a/A09财务通用管理/U_TaxSel.dfm
+++ b/A09财务通用管理/U_TaxSel.dfm
@ -3,14 +3,15 @@ inherited frmTaxSel: TfrmTaxSel
  Top = 106
  Caption = #35745#21010#21333#21495#36873#25321
  ClientHeight = 558
-  ClientWidth = 893
+  ClientWidth = 1149
  Color = clWhite
  Font.Charset = GB2312_CHARSET
  Font.Height = -12
  Font.Name = #23435#20307
  Position = poScreenCenter
  OnClose = FormClose
-  ExplicitWidth = 909
+  ExplicitLeft = -298
  ExplicitWidth = 1165
  ExplicitHeight = 597
  PixelsPerInch = 96
  TextHeight = 12
@ -18,7 +19,7 @@ inherited frmTaxSel: TfrmTaxSel
    Tag = 1
    Left = 0
    Top = 0
-    Width = 893
+    Width = 1149
    Height = 38
    AutoSize = True
    ButtonHeight = 38
@ -64,38 +65,53 @@ inherited frmTaxSel: TfrmTaxSel
  object Panel1: TPanel [1]
    Left = 0
    Top = 38
-    Width = 893
+    Width = 1149
    Height = 44
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
    TabOrder = 1
    object Label1: TLabel
-      Left = 18
+      Left = 14
-      Top = 17
+      Top = 15
      Width = 48
      Height = 12
      Caption = #35745#21010#21333#21495
    end
    object Label2: TLabel
      Left = 263
      Top = 15
      Width = 48
      Height = 12
      Caption = #23458#25143#21333#21495
    end
    object OrderNo: TEdit
      Tag = 2
-      Left = 71
+      Left = 69
-      Top = 12
+      Top = 10
      Width = 169
      Height = 20
      TabOrder = 0
      OnChange = OrderNoChange
    end
    object BuyConNo: TEdit
      Tag = 2
      Left = 317
      Top = 10
      Width = 169
      Height = 20
      TabOrder = 1
      OnChange = OrderNoChange
    end
  end
  object cxGrid2: TcxGrid [2]
    Left = 0
    Top = 82
-    Width = 893
+    Width = 1149
    Height = 476
    Align = alClient
    PopupMenu = PM_1
    TabOrder = 2
    ExplicitLeft = 8
    ExplicitTop = 76
    object Tv1: TcxGridDBTableView
      OnDblClick = TV1DblClick
      Navigator.Buttons.CustomButtons = <>
@ -139,7 +155,9 @@ inherited frmTaxSel: TfrmTaxSel
        end>
      DataController.Summary.SummaryGroups = <>
      OptionsCustomize.ColumnFiltering = False
-      OptionsSelection.CellSelect = False
+      OptionsSelection.MultiSelect = True
      OptionsSelection.CellMultiSelect = True
      OptionsSelection.InvertSelect = False
      OptionsView.GroupByBox = False
      object v1Column1: TcxGridDBColumn
        Caption = #37319#36141#21512#21516#21495
@ -156,13 +174,23 @@ inherited frmTaxSel: TfrmTaxSel
        DataBinding.FieldName = 'OrderNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 79
      end
      object Tv1Column7: TcxGridDBColumn
        Caption = #23458#25143#21333#21495
        DataBinding.FieldName = 'BuyConNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 91
      end
      object Tv1Column1: TcxGridDBColumn
        Caption = #32463#33829#21333#20301
        DataBinding.FieldName = 'OurCoName'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 78
      end
      object v2Column1: TcxGridDBColumn
@ -177,6 +205,7 @@ inherited frmTaxSel: TfrmTaxSel
            Kind = bkEllipsis
          end>
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 85
      end
      object Tv1Column3: TcxGridDBColumn
@ -184,6 +213,7 @@ inherited frmTaxSel: TfrmTaxSel
        DataBinding.FieldName = 'ISTax'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
      end
      object v1Column8: TcxGridDBColumn
        Tag = 2
@ -192,6 +222,7 @@ inherited frmTaxSel: TfrmTaxSel
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        HeaderGlyphAlignmentHorz = taCenter
        Options.Editing = False
        Width = 65
      end
      object v1Column10: TcxGridDBColumn
@ -217,18 +248,21 @@ inherited frmTaxSel: TfrmTaxSel
        DataBinding.FieldName = 'OrdDate'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
      end
      object Tv1Column6: TcxGridDBColumn
        Caption = #19994#21153#21592
        DataBinding.FieldName = 'Saleser'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
      end
      object v1Column9: TcxGridDBColumn
        Caption = #32654#37329#26680#38144#37329#39069
        DataBinding.FieldName = 'SumUSD'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 90
      end
      object v1Column17: TcxGridDBColumn
@ -246,13 +280,59 @@ inherited frmTaxSel: TfrmTaxSel
        DataBinding.FieldName = 'SumCNY'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 90
      end
      object Tv1Column5: TcxGridDBColumn
        Caption = #26680#38144#27719#29575
        DataBinding.FieldName = 'HXHV'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCalcEditProperties'
        Properties.DisplayFormat = '#,##0.####'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
      end
      object Tv1Column12: TcxGridDBColumn
        Caption = #23454#25910#37329#39069
        DataBinding.FieldName = 'ssje'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 73
      end
      object Tv1Column13: TcxGridDBColumn
        Caption = #25163#32493#36153
        DataBinding.FieldName = 'SXF'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 74
      end
      object Tv1Column8: TcxGridDBColumn
        Caption = #24212#25910#37329#39069
        DataBinding.FieldName = 'YSJE'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
      object Tv1Column9: TcxGridDBColumn
        Caption = 'S1-'#38754#26009#25903#20986
        DataBinding.FieldName = 'S1JE'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
      object Tv1Column10: TcxGridDBColumn
        Caption = 'S2-'#21360#26579#25903#20986
        DataBinding.FieldName = 'S2JE'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
      object Tv1Column11: TcxGridDBColumn
        Caption = 'S3-'#21518#21152#24037#36153#29992
        DataBinding.FieldName = 'S3JE'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
    end
    object cxGrid2Level1: TcxGridLevel
@ -4685,4 +4765,12 @@ inherited frmTaxSel: TfrmTaxSel
      TextColor = clRed
    end
  end
  object PM_1: TPopupMenu
    Left = 568
    Top = 336
    object MenuItem1: TMenuItem
      Caption = #22797#21046
      OnClick = N1Click
    end
  end
 end
--- a/A09财务通用管理/U_TaxSel.pas
+++ b/A09财务通用管理/U_TaxSel.pas
@ -11,7 +11,8 @@ uses
  cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
  dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit,
-  cxDropDownEdit, dxSkinWXI, dxScrollbarAnnotations;
+  cxDropDownEdit, dxSkinWXI, dxScrollbarAnnotations, Vcl.Menus, Vcl.Clipbrd,
  cxCalc;
 type
  TfrmTaxSel = class(TfrmBaseHelp)
@ -62,6 +63,17 @@ type
    Tv1Column4: TcxGridDBColumn;
    Tv1Column5: TcxGridDBColumn;
    Tv1Column6: TcxGridDBColumn;
    BuyConNo: TEdit;
    Label2: TLabel;
    Tv1Column7: TcxGridDBColumn;
    PM_1: TPopupMenu;
    MenuItem1: TMenuItem;
    Tv1Column8: TcxGridDBColumn;
    Tv1Column9: TcxGridDBColumn;
    Tv1Column10: TcxGridDBColumn;
    Tv1Column11: TcxGridDBColumn;
    Tv1Column12: TcxGridDBColumn;
    Tv1Column13: TcxGridDBColumn;
    procedure FormCreate(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormShow(Sender: TObject);
@ -71,6 +83,7 @@ type
    procedure TV1DblClick(Sender: TObject);
    procedure TBCloseClick(Sender: TObject);
    procedure OrderNoChange(Sender: TObject);
    procedure N1Click(Sender: TObject);
  private
    procedure InitGrid();
    { Private declarations }
@ -157,6 +170,12 @@ begin
    ADOQueryMain.EnableControls;
  end;
 end;
 procedure TfrmTaxSel.N1Click(Sender: TObject);
 begin
  Clipboard.SetTextBuf(PChar(Trim(CDS_1.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
 end;
 //procedure TfrmTaxSel.InitGrid();
 //begin
 //  try
--- a/A09财务通用管理/U_TaxSet.dfm
+++ b/A09财务通用管理/U_TaxSet.dfm
@ -0,0 +1,89 @@
 object frmTaxSet: TfrmTaxSet
  Left = 0
  Top = 0
  Caption = #40664#35748#31246#29575
  ClientHeight = 204
  ClientWidth = 621
  Color = clBtnFace
  Font.Charset = DEFAULT_CHARSET
  Font.Color = clWindowText
  Font.Height = -11
  Font.Name = 'Tahoma'
  Font.Style = []
  OldCreateOrder = False
  PixelsPerInch = 96
  TextHeight = 13
  object CGDSL: TcxTextEdit
    Left = 60
    Top = 80
    TabOrder = 0
    Width = 121
  end
  object CRate: TcxTextEdit
    Left = 260
    Top = 79
    TabOrder = 1
    Width = 121
  end
  object COrtherRate: TcxTextEdit
    Left = 456
    Top = 80
    TabOrder = 2
    Width = 121
  end
  object cxLabel1: TcxLabel
    Left = 8
    Top = 81
    Caption = #22269#22320#31246#29575
  end
  object cxLabel2: TcxLabel
    Left = 204
    Top = 81
    Caption = #22686#20540#31246#29575
  end
  object cxLabel3: TcxLabel
    Left = 398
    Top = 81
    Caption = #20854#20182#31246#29575
  end
  object ToolBar1: TToolBar
    Tag = 1
    Left = 0
    Top = 0
    Width = 621
    Height = 38
    AutoSize = True
    ButtonHeight = 38
    ButtonWidth = 75
    Caption = 'ToolBar1'
    Color = clWhite
    DisabledImages = DataLink_Financial.ImageList_new32
    Images = DataLink_Financial.ImageList_new32
    List = True
    ParentColor = False
    ShowCaptions = True
    TabOrder = 6
    object ToolButton3: TToolButton
      Left = 0
      Top = 0
      AutoSize = True
      Caption = #20445#23384
      ImageIndex = 16
      OnClick = ToolButton3Click
    end
    object TBClose: TToolButton
      Left = 71
      Top = 0
      AutoSize = True
      Caption = #20851#38381
      ImageIndex = 7
      OnClick = TBCloseClick
    end
  end
  object ADOQuery1: TADOQuery
    Connection = DataLink_Financial.ADOLink
    Parameters = <>
    Left = 408
    Top = 152
  end
 end
--- a/A09财务通用管理/U_TaxSet.pas
+++ b/A09财务通用管理/U_TaxSet.pas
@ -0,0 +1,75 @@
 unit U_TaxSet;
 interface
 uses
  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants,
  System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics,
  cxControls, cxLookAndFeels, cxLookAndFeelPainters, cxContainer, cxEdit,
  dxSkinsCore, dxSkinWXI, Vcl.ComCtrls, Vcl.ToolWin, cxLabel, cxTextEdit,
  U_DataLink, Data.DB, Data.Win.ADODB;
 type
  TfrmTaxSet = class(TForm)
    CGDSL: TcxTextEdit;
    CRate: TcxTextEdit;
    COrtherRate: TcxTextEdit;
    cxLabel1: TcxLabel;
    cxLabel2: TcxLabel;
    cxLabel3: TcxLabel;
    ToolBar1: TToolBar;
    ToolButton3: TToolButton;
    TBClose: TToolButton;
    ADOQuery1: TADOQuery;
    procedure ToolButton3Click(Sender: TObject);
    procedure TBCloseClick(Sender: TObject);
  private
    { Private declarations }
  public
    { Public declarations }
  end;
 var
  frmTaxSet: TfrmTaxSet;
 implementation
 {$R *.dfm}
 procedure TfrmTaxSet.TBCloseClick(Sender: TObject);
 begin
  close;
 end;
 procedure TfrmTaxSet.ToolButton3Click(Sender: TObject);
 var
  value: Double;
 begin
  with ADOQuery1 do
  begin
    Close;
    sql.Clear;
    for var i := 0 to ControlCount - 1 do
    begin
      if Controls[i] is TcxTextEdit then
      begin
        if TcxTextEdit(Controls[i]).Text <> '' then
        begin
          if not TryStrToFloat(TcxTextEdit(Controls[i]).Text, value) then
          begin
            Application.MessageBox('ÇëÊäÈëÓÐÐ§µÄÊý×Ö', 'ÌáÊ¾', 0);
            Exit;
          end;
        end;
        SQL.Add(' update sy_tax set value=' + QuotedStr(TcxTextEdit(Controls[i]).Text) + ' where type =' + QuotedStr(TcxTextEdit(Controls[i]).Name));
      end;
    end;
    ExecSQL;
  end;
  ModalResult := 1;
 end;
 end.
--- a/A09财务通用管理/U_ZDPrice.dfm
+++ b/A09财务通用管理/U_ZDPrice.dfm
@ -0,0 +1,935 @@
 inherited frmZDPrice: TfrmZDPrice
  Left = 300
  Top = 189
  Caption = #24212#20184#24050#20184#27719#24635
  ClientHeight = 519
  ClientWidth = 1247
  FormStyle = fsMDIChild
  Visible = True
  ExplicitLeft = -396
  ExplicitTop = -115
  ExplicitWidth = 1263
  ExplicitHeight = 558
  PixelsPerInch = 96
  TextHeight = 12
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
    Top = 0
    Width = 1247
    Height = 30
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 83
    Caption = 'ToolBar1'
    Color = clWhite
    Images = DataLink_Financial.cxImageList_bar
    List = True
    ParentColor = False
    ShowCaptions = True
    TabOrder = 0
    object TBRafresh: TToolButton
      Left = 0
      Top = 0
      AutoSize = True
      Caption = #21047#26032
      ImageIndex = 1
      OnClick = TBRafreshClick
    end
    object ToolButton2: TToolButton
      Left = 63
      Top = 0
      AutoSize = True
      Caption = #36807#28388
      ImageIndex = 0
      Visible = False
      OnClick = ToolButton2Click
    end
    object ToolButton3: TToolButton
      Left = 126
      Top = 0
      AutoSize = True
      Caption = #26356#26032#20215#26684
      ImageIndex = 3
      OnClick = ToolButton3Click
    end
    object ToolButton4: TToolButton
      Left = 213
      Top = 0
      Caption = #26597#30475#26126#32454
      ImageIndex = 8
      OnClick = ToolButton4Click
    end
    object ToolButton5: TToolButton
      Left = 296
      Top = 0
      AutoSize = True
      Caption = #23457#26680
      ImageIndex = 12
      OnClick = ToolButton5Click
    end
    object ToolButton6: TToolButton
      Left = 359
      Top = 0
      AutoSize = True
      Caption = #25764#38144#23457#26680
      ImageIndex = 11
      OnClick = ToolButton6Click
    end
    object ToolButton1: TToolButton
      Left = 446
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
      ImageIndex = 16
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
      Left = 533
      Top = 0
      AutoSize = True
      Caption = #20851#38381
      ImageIndex = 7
      OnClick = TBCloseClick
    end
  end
  object Panel1: TPanel [1]
    Left = 0
    Top = 30
    Width = 1247
    Height = 46
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
    Color = clWhite
    ParentBackground = False
    TabOrder = 1
    object Label2: TLabel
      Left = 22
      Top = 13
      Width = 48
      Height = 12
      Caption = #26597#35810#26085#26399
    end
    object Label6: TLabel
      Left = 164
      Top = 13
      Width = 30
      Height = 12
      Caption = '-----'
    end
    object Label1: TLabel
      Left = 889
      Top = 113
      Width = 48
      Height = 12
      Caption = #25903#20184#21488#22836
    end
    object begdate: TDateTimePicker
      Left = 79
      Top = 9
      Width = 97
      Height = 20
      Date = 41256.000000000000000000
      Time = 0.918237847232376200
      TabOrder = 0
    end
    object Enddate: TDateTimePicker
      Left = 197
      Top = 9
      Width = 97
      Height = 20
      Date = 41256.000000000000000000
      Time = 0.918237847232376200
      TabOrder = 1
    end
    object ComTaiTou: TEdit
      Tag = 2
      Left = 938
      Top = 109
      Width = 89
      Height = 20
      TabOrder = 2
    end
    object FromOrdNo: TcxTextEdit
      Tag = 2
      Left = 381
      Top = 9
      TabOrder = 3
      OnKeyPress = FromOrdNoKeyPress
      Width = 121
    end
    object cxLabel1: TcxLabel
      Left = 311
      Top = 10
      Caption = #26469#33258#35745#21010#21333
    end
    object ToOrdNo: TcxTextEdit
      Tag = 2
      Left = 595
      Top = 9
      TabOrder = 5
      OnKeyPress = FromOrdNoKeyPress
      Width = 121
    end
    object cxLabel2: TcxLabel
      Left = 525
      Top = 10
      Caption = #20986#21040#35745#21010#21333
    end
  end
  object cxGrid2: TcxGrid [2]
    Left = 0
    Top = 110
    Width = 1247
    Height = 409
    Align = alClient
    PopupMenu = PM_2
    TabOrder = 2
    object Tv2: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
      Navigator.Buttons.Delete.Visible = False
      ScrollbarAnnotations.CustomAnnotations = <>
      OnCustomDrawCell = Tv2CustomDrawCell
      DataController.DataSource = DS_1
      DataController.Summary.DefaultGroupSummaryItems = <>
      DataController.Summary.FooterSummaryItems = <
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
        end
        item
          Kind = skSum
          Column = Tv2Column8
        end
        item
          Kind = skSum
          Column = Tv2Column10
        end>
      DataController.Summary.SummaryGroups = <>
      OptionsData.Deleting = False
      OptionsData.DeletingConfirmation = False
      OptionsView.Footer = True
      OptionsView.GroupByBox = False
      OptionsView.IndicatorWidth = 50
      object Tv2Column5: TcxGridDBColumn
        Caption = #36873#25321
        DataBinding.FieldName = 'ssel'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 63
      end
      object Tv2Column13: TcxGridDBColumn
        Caption = #20986#20837#24211#21333#21495
        DataBinding.FieldName = 'BCIOID'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 89
      end
      object Tv2Column2: TcxGridDBColumn
        Caption = #20986#20837#24211#26102#38388
        DataBinding.FieldName = 'IOTime'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 91
      end
      object Tv2Column7: TcxGridDBColumn
        Caption = #26469#33258#35745#21010#21333
        DataBinding.FieldName = 'FromOrdNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 95
      end
      object Tv2Column6: TcxGridDBColumn
        Caption = #20986#21040#35745#21010#21333
        DataBinding.FieldName = 'ToOrdNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 87
      end
      object Tv2Column3: TcxGridDBColumn
        Caption = #20135#21697#32534#21495
        DataBinding.FieldName = 'C_Code'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 88
      end
      object Tv2Column4: TcxGridDBColumn
        Caption = #20013#25991#21697#21517
        DataBinding.FieldName = 'C_Name'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 88
      end
      object Tv2Column9: TcxGridDBColumn
        Caption = #39068#33394
        DataBinding.FieldName = 'C_Color'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 78
      end
      object Tv2Column11: TcxGridDBColumn
        Caption = #33394#21495
        DataBinding.FieldName = 'C_ColorNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 78
      end
      object Tv2Column12: TcxGridDBColumn
        Caption = #33457#22411
        DataBinding.FieldName = 'C_Pattern'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 79
      end
      object Tv2Column14: TcxGridDBColumn
        Caption = #21333#20301
        DataBinding.FieldName = 'QtyUnit'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 74
      end
      object Tv2Column1: TcxGridDBColumn
        Caption = #20215#26684
        DataBinding.FieldName = 'Price'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 75
      end
      object Tv2Column15: TcxGridDBColumn
        Caption = #21305#25968
        DataBinding.FieldName = 'Piece'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 72
      end
      object Tv2Column10: TcxGridDBColumn
        Caption = #25968#37327
        DataBinding.FieldName = 'Qty'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 77
      end
      object Tv2Column8: TcxGridDBColumn
        Caption = #36716#21333#37329#39069
        DataBinding.FieldName = 'ZDAmount'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 84
      end
      object Tv2Column16: TcxGridDBColumn
        AlternateCaption = #23457#26680#20154
        Caption = #23457#26680#20154
        DataBinding.FieldName = 'Chker'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
      object Tv2Column17: TcxGridDBColumn
        AlternateCaption = #23457#26680#20154
        Caption = #23457#26680#26102#38388
        DataBinding.FieldName = 'ChkTime'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
    end
    object Tv3: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
      OnCustomDrawCell = Tv3CustomDrawCell
      DataController.DataSource = DS_2
      DataController.Filter.OnChanged = Tv3DataControllerFilterChanged
      DataController.Summary.DefaultGroupSummaryItems = <>
      DataController.Summary.FooterSummaryItems = <
        item
          Kind = skSum
          Column = Tv3Column13
        end
        item
          Kind = skSum
          Column = Tv3Column17
        end
        item
          Kind = skSum
          Column = Tv3Column11
        end
        item
          Kind = skSum
          Column = Tv3Column10
        end
        item
          Kind = skSum
          Column = Tv3Column9
        end
        item
          Kind = skCount
          Column = Tv3Column14
        end>
      DataController.Summary.SummaryGroups = <>
      OptionsView.Footer = True
      OptionsView.GroupByBox = False
      object Tv3Column4: TcxGridDBColumn
        Caption = #36873#25321
        DataBinding.FieldName = 'ssel'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 53
      end
      object Tv3Column1: TcxGridDBColumn
        Caption = #20986#20837#24211#21333#21495
        DataBinding.FieldName = 'BCIOID'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 93
      end
      object Tv3Column2: TcxGridDBColumn
        Caption = #26469#33258#35745#21010#21333
        DataBinding.FieldName = 'FromOrdNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 95
      end
      object Tv3Column12: TcxGridDBColumn
        Caption = #20986#20837#24211#26102#38388
        DataBinding.FieldName = 'ZDTime'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 78
      end
      object Tv3Column5: TcxGridDBColumn
        Caption = #20986#21040#35745#21010#21333
        DataBinding.FieldName = 'ToOrdNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 90
      end
      object Tv3Column6: TcxGridDBColumn
        Caption = #20135#21697#32534#21495
        DataBinding.FieldName = 'C_Code'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv3Column7: TcxGridDBColumn
        Caption = #20013#25991#21697#21517
        DataBinding.FieldName = 'C_Name'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 92
      end
      object Tv3Column14: TcxGridDBColumn
        Caption = #21367#21495
        DataBinding.FieldName = 'PieceNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 75
      end
      object Tv3Column9: TcxGridDBColumn
        Caption = #31859#25968
        DataBinding.FieldName = 'StkMeter'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
      end
      object Tv3Column10: TcxGridDBColumn
        Caption = #30721#25968
        DataBinding.FieldName = 'StkYardage'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 72
      end
      object Tv3Column11: TcxGridDBColumn
        Caption = #27611#37325
        DataBinding.FieldName = 'StkGrossWeight'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 74
      end
      object Tv3Column17: TcxGridDBColumn
        Caption = #20928#37325
        DataBinding.FieldName = 'StkNetWeight'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 75
      end
      object Tv3Column18: TcxGridDBColumn
        Caption = #21333#20301
        DataBinding.FieldName = 'QtyUnit'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 70
      end
      object Tv3Column8: TcxGridDBColumn
        Caption = #39068#33394
        DataBinding.FieldName = 'C_Color'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 81
      end
      object Tv3Column15: TcxGridDBColumn
        Caption = #33457#22411
        DataBinding.FieldName = 'C_Pattern'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 76
      end
      object Tv3Column16: TcxGridDBColumn
        Caption = #33394#21495
        DataBinding.FieldName = 'C_ColorNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 71
      end
      object Tv3Column3: TcxGridDBColumn
        Caption = #21333#20215
        DataBinding.FieldName = 'ZDPrice'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 88
      end
      object Tv3Column13: TcxGridDBColumn
        Caption = #36716#21333#37329#39069
        DataBinding.FieldName = 'ZDAmount'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 101
      end
      object Tv3Column19: TcxGridDBColumn
        Caption = #23457#26680#20154
        DataBinding.FieldName = 'ConMID'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
      object Tv3Column20: TcxGridDBColumn
        Caption = #23457#26680#26102#38388
        DataBinding.FieldName = 'ConSID'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
    end
    object Tv4: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
      OnCustomDrawCell = Tv4CustomDrawCell
      DataController.DataSource = DS_3
      DataController.Summary.DefaultGroupSummaryItems = <>
      DataController.Summary.FooterSummaryItems = <>
      DataController.Summary.SummaryGroups = <>
      OptionsView.GroupByBox = False
      object Tv4Column1: TcxGridDBColumn
        AlternateCaption = #36873#25321
        Caption = #36873#25321
        DataBinding.FieldName = 'ssel'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
      object Tv4Column2: TcxGridDBColumn
        AlternateCaption = #20986#20837#24211#21333#21495
        Caption = #20986#20837#24211#21333#21495
        DataBinding.FieldName = 'IOID'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
      object Tv4Column3: TcxGridDBColumn
        Caption = #26469#33258#35745#21010#21333
        DataBinding.FieldName = 'FromOrdNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column4: TcxGridDBColumn
        Caption = #21457#36135#26102#38388
        DataBinding.FieldName = 'IOTime'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column5: TcxGridDBColumn
        Caption = #20986#21333#35745#21010#21333
        DataBinding.FieldName = 'ToOrdNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column6: TcxGridDBColumn
        Caption = #20135#21697#32534#21495
        DataBinding.FieldName = 'C_Code'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column7: TcxGridDBColumn
        Caption = #20013#25991#21697#21517
        DataBinding.FieldName = 'C_Name'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column8: TcxGridDBColumn
        Caption = #21367#21495
        DataBinding.FieldName = 'PieceNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column9: TcxGridDBColumn
        Caption = #31859#25968
        DataBinding.FieldName = 'StkMeter'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column10: TcxGridDBColumn
        Caption = #30721#25968
        DataBinding.FieldName = 'StkYardage'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column11: TcxGridDBColumn
        Caption = #27611#37325
        DataBinding.FieldName = 'StkGrossWeight'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column12: TcxGridDBColumn
        Caption = #20928#37325
        DataBinding.FieldName = 'StkNetWeight'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column13: TcxGridDBColumn
        Caption = #21333#20301
        DataBinding.FieldName = 'QtyUnit'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column14: TcxGridDBColumn
        Caption = #39068#33394
        DataBinding.FieldName = 'C_Color'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column15: TcxGridDBColumn
        Caption = #33457#22411
        DataBinding.FieldName = 'C_Pattern'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column16: TcxGridDBColumn
        Caption = #33394#21495
        DataBinding.FieldName = 'C_ColorNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column17: TcxGridDBColumn
        Caption = #21333#20215
        DataBinding.FieldName = 'Price'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column18: TcxGridDBColumn
        Caption = #37329#39069
        DataBinding.FieldName = 'ZDAmount'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column19: TcxGridDBColumn
        Caption = #23457#26680#20154
        DataBinding.FieldName = 'ConMid'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
      object Tv4Column20: TcxGridDBColumn
        Caption = #23457#26680#26102#38388
        DataBinding.FieldName = 'ConSid'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
      end
    end
    object cxGridLevel1: TcxGridLevel
      GridView = Tv2
    end
    object cxGridLevel2: TcxGridLevel
      GridView = Tv3
    end
    object cxGridLevel3: TcxGridLevel
      GridView = Tv4
    end
  end
  object cxTabControl1: TcxTabControl [3]
    Left = 0
    Top = 76
    Width = 1247
    Height = 34
    Align = alTop
    Font.Charset = ANSI_CHARSET
    Font.Color = clWindowText
    Font.Height = -21
    Font.Name = 'Arial'
    Font.Style = [fsBold]
    ParentFont = False
    TabOrder = 3
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 2
    Properties.TabIndex = 0
    Properties.Tabs.Strings = (
      #22383#24067
      #24453#26816#24067
      #25104#21697#36716#21333
      #21152#24037#36716#21333)
    OnChange = cxTabControl1Change
    ClientRectBottom = 36
    ClientRectRight = 1247
    ClientRectTop = 36
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = DataLink_Financial.ADOLink
    Left = 81
    Top = 232
  end
  inherited ADOQueryBaseTemp: TADOQuery
    Connection = DataLink_Financial.ADOLink
    Left = 81
    Top = 177
  end
  object ADOQueryTemp: TADOQuery
    Connection = DataLink_Financial.ADOLink
    LockType = ltReadOnly
    Parameters = <>
    Left = 253
    Top = 177
  end
  object ADOQueryCmd: TADOQuery
    Connection = DataLink_Financial.ADOLink
    Parameters = <>
    Left = 325
    Top = 177
  end
  object ADOQueryMain: TADOQuery
    Connection = DataLink_Financial.ADOLink
    LockType = ltReadOnly
    Parameters = <>
    Left = 398
    Top = 180
  end
  object RM1: TRMGridReport
    ThreadPrepareReport = True
    InitialZoom = pzDefault
    PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbExport, rmpbNavigator]
    DefaultCollate = False
    SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\'
    PreviewOptions.RulerUnit = rmutScreenPixels
    PreviewOptions.RulerVisible = False
    PreviewOptions.DrawBorder = False
    PreviewOptions.BorderPen.Color = clGray
    PreviewOptions.BorderPen.Style = psDash
    Dataset = RMDB_Main
    CompressLevel = rmzcFastest
    CompressThread = False
    LaterBuildEvents = True
    OnlyOwnerDataSet = False
    Left = 386
    Top = 321
    ReportData = {}
  end
  object RMDB_Main: TRMDBDataSet
    Visible = True
    DataSet = CDS_1
    Left = 261
    Top = 334
  end
  object cxGridPopupMenu2: TcxGridPopupMenu
    Grid = cxGrid2
    PopupMenus = <>
    Left = 193
    Top = 265
  end
  object DS_1: TDataSource
    DataSet = CDS_1
    Left = 372
    Top = 233
  end
  object CDS_1: TClientDataSet
    Aggregates = <>
    Params = <>
    Left = 304
    Top = 240
  end
  object ADOQueryPrint: TADOQuery
    Connection = DataLink_Financial.ADOLink
    LockType = ltReadOnly
    Parameters = <>
    Left = 77
    Top = 313
  end
  object DS_2: TDataSource
    DataSet = CDS_2
    Left = 656
    Top = 272
  end
  object CDS_2: TClientDataSet
    Aggregates = <>
    Params = <>
    Left = 672
    Top = 416
  end
  object PM_2: TPopupMenu
    Left = 480
    Top = 384
    object N5: TMenuItem
      Caption = #20840#36873
      OnClick = N5Click
    end
    object N6: TMenuItem
      Caption = #20840#24323
      OnClick = N6Click
    end
    object N2: TMenuItem
      Caption = #22797#21046
      OnClick = N2Click
    end
  end
  object CDS_3: TClientDataSet
    Aggregates = <>
    Params = <>
    Left = 560
    Top = 232
  end
  object DS_3: TDataSource
    DataSet = CDS_3
    Left = 624
    Top = 192
  end
 end
--- a/A09财务通用管理/U_ZDPrice.pas
+++ b/A09财务通用管理/U_ZDPrice.pas
@ -0,0 +1,969 @@
 unit U_ZDPrice;
 interface
 uses
  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB,
  cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls,
  cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient,
  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls,
  cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid,
  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
  cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
  dxBarBuiltInMenu, cxPC, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
  U_BaseList, Vcl.Menus, Vcl.Clipbrd, DateUtils, dxSkinWXI,
  dxScrollbarAnnotations, cxContainer, cxProgressBar, cxLabel;
 type
  TfrmZDPrice = class(TfrmBaseList)
    ToolBar1: TToolBar;
    TBRafresh: TToolButton;
    TBClose: TToolButton;
    ADOQueryTemp: TADOQuery;
    ADOQueryCmd: TADOQuery;
    Panel1: TPanel;
    ADOQueryMain: TADOQuery;
    RM1: TRMGridReport;
    RMDB_Main: TRMDBDataSet;
    cxGrid2: TcxGrid;
    Tv2: TcxGridDBTableView;
    cxGridLevel1: TcxGridLevel;
    Label2: TLabel;
    Label6: TLabel;
    begdate: TDateTimePicker;
    Enddate: TDateTimePicker;
    cxGridPopupMenu2: TcxGridPopupMenu;
    DS_1: TDataSource;
    CDS_1: TClientDataSet;
    Label1: TLabel;
    ComTaiTou: TEdit;
    ADOQueryPrint: TADOQuery;
    cxTabControl1: TcxTabControl;
    ToolButton1: TToolButton;
    Tv2Column2: TcxGridDBColumn;
    Tv2Column3: TcxGridDBColumn;
    Tv2Column4: TcxGridDBColumn;
    Tv2Column9: TcxGridDBColumn;
    Tv2Column1: TcxGridDBColumn;
    Tv2Column10: TcxGridDBColumn;
    Tv2Column5: TcxGridDBColumn;
    ToolButton3: TToolButton;
    Tv2Column6: TcxGridDBColumn;
    Tv2Column7: TcxGridDBColumn;
    ToolButton4: TToolButton;
    cxGridLevel2: TcxGridLevel;
    Tv3: TcxGridDBTableView;
    Tv3Column1: TcxGridDBColumn;
    Tv3Column2: TcxGridDBColumn;
    Tv3Column3: TcxGridDBColumn;
    DS_2: TDataSource;
    CDS_2: TClientDataSet;
    ToolButton2: TToolButton;
    Tv3Column4: TcxGridDBColumn;
    Tv3Column5: TcxGridDBColumn;
    Tv3Column6: TcxGridDBColumn;
    Tv3Column7: TcxGridDBColumn;
    Tv3Column8: TcxGridDBColumn;
    Tv3Column9: TcxGridDBColumn;
    Tv3Column10: TcxGridDBColumn;
    Tv3Column11: TcxGridDBColumn;
    Tv3Column12: TcxGridDBColumn;
    Tv3Column13: TcxGridDBColumn;
    Tv2Column8: TcxGridDBColumn;
    FromOrdNo: TcxTextEdit;
    cxLabel1: TcxLabel;
    PM_2: TPopupMenu;
    N2: TMenuItem;
    Tv3Column14: TcxGridDBColumn;
    Tv2Column11: TcxGridDBColumn;
    Tv2Column12: TcxGridDBColumn;
    Tv3Column15: TcxGridDBColumn;
    Tv3Column16: TcxGridDBColumn;
    Tv2Column13: TcxGridDBColumn;
    ToOrdNo: TcxTextEdit;
    cxLabel2: TcxLabel;
    Tv3Column17: TcxGridDBColumn;
    Tv3Column18: TcxGridDBColumn;
    Tv2Column14: TcxGridDBColumn;
    Tv2Column15: TcxGridDBColumn;
    N5: TMenuItem;
    N6: TMenuItem;
    ToolButton5: TToolButton;
    ToolButton6: TToolButton;
    Tv4: TcxGridDBTableView;
    cxGridLevel3: TcxGridLevel;
    Tv4Column1: TcxGridDBColumn;
    Tv4Column2: TcxGridDBColumn;
    Tv4Column3: TcxGridDBColumn;
    Tv4Column4: TcxGridDBColumn;
    Tv4Column5: TcxGridDBColumn;
    Tv4Column6: TcxGridDBColumn;
    Tv4Column7: TcxGridDBColumn;
    Tv4Column8: TcxGridDBColumn;
    Tv4Column9: TcxGridDBColumn;
    Tv4Column10: TcxGridDBColumn;
    Tv4Column11: TcxGridDBColumn;
    Tv4Column12: TcxGridDBColumn;
    Tv4Column13: TcxGridDBColumn;
    Tv4Column14: TcxGridDBColumn;
    Tv4Column15: TcxGridDBColumn;
    Tv4Column16: TcxGridDBColumn;
    Tv4Column17: TcxGridDBColumn;
    Tv4Column18: TcxGridDBColumn;
    CDS_3: TClientDataSet;
    DS_3: TDataSource;
    Tv2Column16: TcxGridDBColumn;
    Tv2Column17: TcxGridDBColumn;
    Tv3Column19: TcxGridDBColumn;
    Tv3Column20: TcxGridDBColumn;
    Tv4Column19: TcxGridDBColumn;
    Tv4Column20: TcxGridDBColumn;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBRafreshClick(Sender: TObject);
    procedure ToolButton4Click(Sender: TObject);
    procedure cxTabControl1Change(Sender: TObject);
    procedure ToolButton1Click(Sender: TObject);
    procedure ToolButton3Click(Sender: TObject);
    procedure ToolButton2Click(Sender: TObject);
    procedure FromOrdNoKeyPress(Sender: TObject; var Key: Char);
    procedure N2Click(Sender: TObject);
    procedure N5Click(Sender: TObject);
    procedure N6Click(Sender: TObject);
    procedure Tv3DataControllerFilterChanged(Sender: TObject);
    procedure ToolButton5Click(Sender: TObject);
    procedure Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
    procedure ToolButton6Click(Sender: TObject);
    procedure Tv3CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
    procedure Tv4CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
  private
    { Private declarations }
    procedure InitGrid();
  public
    fmanage, FZKType: string;
    { Public declarations }
    RKFlag, FCYID: string;
  end;
 implementation
 uses
  U_DataLink, U_RtFun, U_BatchEdit, U_ZDPriceDetails, U_PlanProfitDetails;
 {$R *.dfm}
 procedure TfrmZDPrice.InitGrid();
 begin
  try
 //    Tv2.BeginUpdate;
 //    Tv3.BeginUpdate;
    with ADOQueryMain do
    begin
      ADOQueryMain.Filtered := false;
      Close;
      SQL.Clear;
      case cxTabControl1.TabIndex of
        0:
          begin
            sql.Add(' select BCIOID,IOTime,FromOrdNo, C_Code, C_Name, C_Color, Price, QtyUnit, qty, Piece, ToOrdNo = (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)),ZDAmount = (isnull(price, 0) * qty) ');
            sql.Add(' ,stkName, QtyUnit, FromMainId, C_ColorNo, C_Pattern, Chker, ChkTime');
            sql.Add(' from Bs_Cloth_IO A');
            sql.Add(' where IOTime >= ' + quotedStr(FormatDateTime('yyyy-MM-dd', begdate.DateTime)));
            sql.Add(' and IOTime <= ' + quotedStr(FormatDateTime('yyyy-MM-dd', enddate.DateTime)));
            sql.Add(' and STKName = ''贸易坯布'' and FromOrdNo <> (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo))');
            sql.Add(' order by iotime desc');
            Open;
            SCreateCDS(ADOQueryMain, CDS_1);
            SInitCDSData(ADOQueryMain, CDS_1);
            cxGrid2.ActiveLevel := cxGridLevel1;
          end;
        1:
          begin
            sql.Add(' select BCIOID,IOTime,FromOrdNo, C_Code, C_Name, C_Color, Price, QtyUnit, qty, Piece, ToOrdNo = (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)),ZDAmount = (isnull(price, 0) * qty) ');
            sql.Add(' ,stkName, QtyUnit, FromMainId, C_ColorNo, C_Pattern, Chker, ChkTime ');
            sql.Add(' from Bs_Cloth_IO A');
            sql.Add(' where IOTime >= ' + quotedStr(FormatDateTime('yyyy-MM-dd', begdate.DateTime)));
            sql.Add(' and IOTime <= ' + quotedStr(FormatDateTime('yyyy-MM-dd', enddate.DateTime)));
            sql.Add(' and STKName = ''贸易待检布'' and FromOrdNo <> (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)) ');
            sql.Add(' order by iotime desc');
            Open;
            SCreateCDS(ADOQueryMain, CDS_1);
            SInitCDSData(ADOQueryMain, CDS_1);
            cxGrid2.ActiveLevel := cxGridLevel1;
          end;
        2:
          begin
            sql.Add(' select *,A.OrderNo as FromOrdNo, B.OrderNo as ToOrdNo, DlyDate = (select DlyDate from Trade_Cloth_DR_Main X where X.DRMID = B.DRMID) ');
            sql.Add(' ,ZDAmount = (case when QtyUnit = ''M'' then isnull(ZDPrice, 0) * StkMeter when QtyUnit = ''Y'' then isnull(ZDPrice, 0) * StkYardage when QtyUnit = ''Kg'' then isnull(ZDPrice, 0) * StkNetWeight else 0 end) ');
            sql.Add(' from Trade_Cloth_Stock_ZD A join Trade_Cloth_DR_Sub B on A.DRSID=B.DRSID ');
            sql.Add(' where (select DlyDate from Trade_Cloth_DR_Main X where X.DRMID = B.DRMID) >= ' + quotedStr(FormatDateTime('yyyy-MM-dd', begdate.DateTime)));
            sql.Add(' and (select DlyDate from Trade_Cloth_DR_Main X where X.DRMID = B.DRMID) <= ' + quotedStr(FormatDateTime('yyyy-MM-dd', enddate.DateTime)));
            sql.add(' order by ZDTime desc ');
            Open;
            SCreateCDS(ADOQueryMain, CDS_2);
            SInitCDSData(ADOQueryMain, CDS_2);
            cxGrid2.ActiveLevel := cxGridLevel2;
          end;
        3:
          begin
            sql.Add(' select B.stkid,B.ConMid,B.ConSid,B.OrderNo fromordno,A.IOID,A.IOTime,B.C_Code,B.C_Name,B.PieceNo,B.StkMeter,B.StkYardage,B.StkGrossWeight,');
            SQL.Add(' B.StkNetWeight,B.C_Color,B.C_Pattern,B.C_ColorNo,B.MainID,');
            SQL.Add(' iif(A.price is null, (select top 1 price from Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO), A.price) price, ');
            sql.Add('    (SELECT TOP 1 QtyUnit FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) AS QtyUnit, ');
            sql.Add(' cast (case when (SELECT TOP 1 QtyUnit FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO)  = ''M'' ');
            sql.Add(' then iif(A.price is null, (select top 1 price from Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO), A.price) * StkMeter');
            SQL.Add(' when (SELECT TOP 1 QtyUnit FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) = ''Kg'' ');
            SQL.Add(' 		then iif(A.price is null, (select top 1 price from Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO), A.price) * StkNetWeight');
            SQL.Add(' 	when (SELECT TOP 1 QtyUnit FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) = ''Y'' ');
            sql.add(' 		then iif(A.price is null, (select top 1 price from Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO), A.price) * StkYardage');
            SQL.Add(' 	end as DECIMAL(18,2)) as zdamount,');
            sql.Add('    STUFF(');
            sql.Add('        (SELECT DISTINCT '', '' + OrderNo ');
            sql.Add('         FROM Trade_Cloth_DR_Sub X ');
            sql.Add('         WHERE X.DRMID = A.IONO ');
            sql.Add('         FOR XML PATH('''')), ');
            sql.Add('        1, 2, '''') AS ToOrdNo ');
            sql.Add('FROM ');
            sql.Add('    Trade_Cloth_IO A ');
            sql.Add('JOIN ');
            sql.Add('    Trade_Cloth_Stock B ');
            sql.Add('    ON A.StkID = B.StkID ');
            sql.Add('WHERE ');
            sql.Add('    B.OrderNo <> STUFF(');
            sql.Add('        (SELECT DISTINCT '', '' + OrderNo ');
            sql.Add('         FROM Trade_Cloth_DR_Sub X ');
            sql.Add('         WHERE X.DRMID = A.IONO ');
            sql.Add('         FOR XML PATH('''')), ');
            sql.Add('        1, 2, '''') ');
            sql.Add('    AND A.IOType IN (''加工出库'', ''回修出库'')');
            sql.Add('    order by iotime desc');
 //            ShowMessage(sql.Text);
            Open;
            SCreateCDS(ADOQueryMain, CDS_3);
            SInitCDSData(ADOQueryMain, CDS_3);
            cxGrid2.ActiveLevel := cxGridLevel3;
          end;
      end;
    end;
  finally
 //    Tv2.EndUpdate;
 //    Tv3.EndUpdate;
  end;
 end;
 procedure TfrmZDPrice.N2Click(Sender: TObject);
 begin
  inherited;
  if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
    Clipboard.SetTextBuf(PChar(Trim(CDS_1.fieldbyname(TV2.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)))
  else if cxTabControl1.TabIndex = 2 then
    Clipboard.SetTextBuf(PChar(Trim(CDS_2.fieldbyname(TV3.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)))
  else if cxTabControl1.TabIndex = 3 then
    Clipboard.SetTextBuf(PChar(Trim(CDS_3.fieldbyname(TV4.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)))
 end;
 procedure TfrmZDPrice.N5Click(Sender: TObject);
 begin
  inherited;
  if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
    SelOKNo(CDS_1, true)
  else if cxTabControl1.TabIndex = 2 then
    SelOKNo(CDS_2, true)
  else if cxTabControl1.TabIndex = 3 then
    SelOKNo(CDS_3, true);
 end;
 procedure TfrmZDPrice.N6Click(Sender: TObject);
 begin
  inherited;
  if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
    SelOKNo(CDS_1, false)
  else if cxTabControl1.TabIndex = 2 then
    SelOKNo(CDS_2, false)
  else if cxTabControl1.TabIndex = 3 then
    SelOKNo(CDS_3, false);
 end;
 procedure TfrmZDPrice.FromOrdNoKeyPress(Sender: TObject; var Key: Char);
 begin
  inherited;
  if Key = #13 then
  begin
    ToolButton2.Click;
  end;
 end;
 procedure TfrmZDPrice.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
  inherited;
  Action := caFree;
 end;
 procedure TfrmZDPrice.TBCloseClick(Sender: TObject);
 begin
  Close;
 end;
 procedure TfrmZDPrice.FormShow(Sender: TObject);
 begin
  inherited;
  ReadCxGrid(trim(self.Caption), Tv2, '转单价格管理');
  ReadCxGrid(trim(self.Caption), Tv3, '转单价格管理');
  Enddate.DateTime := SGetServerDate(ADOQueryTemp);
 //  begdate.DateTime := StartOfTheMonth(Enddate.DateTime);
  begdate.DateTime := EndDate.DateTime - 365;
  cxTabControl1.TabIndex := 0;
  InitGrid();
 end;
 procedure TfrmZDPrice.TBRafreshClick(Sender: TObject);
 begin
  InitGrid();
 end;
 procedure TfrmZDPrice.ToolButton1Click(Sender: TObject);
 begin
  WriteCxGrid(trim(self.Caption), Tv2, '转单价格管理');
  WriteCxGrid(trim(self.Caption), Tv3, '转单价格管理');
 end;
 procedure TfrmZDPrice.ToolButton2Click(Sender: TObject);
 begin
  inherited;
  if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
  begin
    if ADOQueryMain.Active then
    begin
      SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
      SCreateCDS(ADOQueryMain, CDS_1);
      SInitCDSData(ADOQueryMain, CDS_1);
    end;
  end
  else if cxTabControl1.TabIndex = 2 then
  begin
    if ADOQueryMain.Active then
    begin
      SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
      SCreateCDS(ADOQueryMain, CDS_2);
      SInitCDSData(ADOQueryMain, CDS_2);
    end;
  end;
 end;
 procedure TfrmZDPrice.ToolButton3Click(Sender: TObject);
 var
  PBCIOID, PStkId, PIOID: string;
  Bookmark: TBookmark;
 begin
  inherited;
  with ADOQueryTemp do
  begin
    Close;
    SQL.Clear;
    if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
      sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('FromOrdNo').AsString) + ' and status = ''10'' ')
    else if cxTabControl1.TabIndex = 2 then
      sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_2.FieldByName('FromOrdNo').AsString) + ' and status = ''10'' ')
    else if cxTabControl1.TabIndex = 3 then
      sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_3.FieldByName('FromOrdNo').AsString) + ' and status = ''10'' ');
    open;
  end;
  if not ADOQueryTemp.IsEmpty then
  begin
    application.MessageBox('计划单已完成，无法删除', '提示');
    Exit;
  end;
  if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
    Bookmark := CDS_1.GetBookmark
  else if cxTabControl1.TabIndex = 2 then
    Bookmark := CDS_2.GetBookmark
  else if cxTabControl1.TabIndex = 3 then
    Bookmark := CDS_3.GetBookmark;
  PBCIOID := '';
  PStkId := '';
  if cxGrid2.ActiveLevel = cxGridLevel1 then
  begin
    if CDS_1.locate('ssel', true, []) = false then
    begin
      Application.MessageBox('请选择数据', '提示信息', 0);
      exit;
    end;
    CDS_1.DisableConstraints;
    Tv2.BeginUpdate;
    with CDS_1 do
    begin
      first;
      while not eof do
      begin
        if FieldByName('ssel').AsBoolean = true then
        begin
          if PBCIOID = '' then
          begin
            PBCIOID := PBCIOID + '''' + FieldByName('BCIOID').AsString + '''';
          end
          else
          begin
            PBCIOID := PBCIOID + ',''' + FieldByName('BCIOID').AsString + '''';
          end;
        end;
        Next;
      end;
    end;
    CDS_1.EnableConstraints;
    Tv2.EndUpdate;
  end
  else if cxGrid2.ActiveLevel = cxGridLevel2 then
  begin
    if CDS_2.locate('ssel', true, []) = false then
    begin
      Application.MessageBox('请选择数据', '提示信息', 0);
      exit;
    end;
    CDS_2.DisableConstraints;
    Tv3.BeginUpdate;
    with CDS_2 do
    begin
      first;
      while not eof do
      begin
        if FieldByName('ssel').AsBoolean = true then
        begin
          if PStkId = '' then
          begin
            PStkId := PStkId + '''' + FieldByName('StkId').AsString + '''';
          end
          else
          begin
            PStkId := PStkId + ',''' + FieldByName('StkId').AsString + '''';
          end;
        end;
        Next;
      end;
    end;
    CDS_2.EnableControls;
    Tv3.endUpdate;
  end
  else if cxGrid2.ActiveLevel = cxGridLevel3 then
  begin
    if CDS_3.locate('ssel', true, []) = false then
    begin
      Application.MessageBox('请选择数据', '提示信息', 0);
      exit;
    end;
    CDS_3.DisableConstraints;
    Tv4.BeginUpdate;
    with CDS_3 do
    begin
      first;
      while not eof do
      begin
        if FieldByName('ssel').AsBoolean = true then
        begin
          if PIOID = '' then
          begin
            PIOID := PIOID + '''' + FieldByName('IOID').AsString + '''';
          end
          else
          begin
            PIOID := PIOID + ',''' + FieldByName('IOID').AsString + '''';
          end;
        end;
        Next;
      end;
    end;
    CDS_3.EnableControls;
    Tv4.endUpdate;
  end;
  try
    frmBatchEdit := TfrmBatchEdit.Create(Application);
    with frmBatchEdit do
    begin
      FBCIOID := PBCIOID;
      FStkId := PStkId;
      FIOID := PIOID;
      Fflag := cxTabControl1.TabIndex;
      if ShowModal = mrOk then
      begin
        self.InitGrid();
      end;
      if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
      begin
        if CDS_1.BookmarkValid(Bookmark) then
        begin
          CDS_1.GotoBookmark(Bookmark);
        end;
      end
      else if cxTabControl1.TabIndex = 2 then
      begin
        if CDS_2.BookmarkValid(Bookmark) then
        begin
          CDS_2.GotoBookmark(Bookmark);
        end;
      end
      else if cxTabControl1.TabIndex = 3 then
      begin
        if CDS_3.BookmarkValid(Bookmark) then
        begin
          CDS_3.GotoBookmark(Bookmark);
        end;
      end;
    end;
  finally
    frmBatchEdit.Free;
  end;
 end;
 procedure TfrmZDPrice.ToolButton4Click(Sender: TObject);
 begin
 //  with ADOQueryCmd do
 //  begin
 //    Close;
 //    sql.Clear;
 //    sql.Add('select Top 1 OrdUnit from Trade_Plan_Sub A left join Trade_Plan_Main B on A.MainID=B.MainID ');
 //    SQL.Add('where OrderNO=''' + Trim(CDS_1.fieldbyname('FromOrdNo').AsString) + '''');
 //    open;
 //  end;
  try
    frmPlanProfitDetails := TfrmPlanProfitDetails.Create(Application);
    with frmPlanProfitDetails do
    begin
 //      begdate.DateTime := self.begdate.DateTime;
 //      enddate.DateTime := self.Enddate.DateTime;
      if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
      begin
        FMainID := self.CDS_1.fieldbyname('FromMainID').AsString;
        OrderNo.Text := self.CDS_1.fieldbyname('FromOrdNo').AsString;
        FOrderNo := self.CDS_1.fieldbyname('FromOrdNo').AsString;
        FUnit := Self.CDS_1.FieldByName('QtyUnit').ASString;
        FOrderNo2 := self.CDS_1.fieldbyname('ToOrdNo').AsString;
      end
      else if cxTabControl1.TabIndex = 2 then
      begin
        FMainID := self.CDS_2.fieldbyname('MainID').AsString;
        OrderNo.Text := self.CDS_2.fieldbyname('fromOrdNo').AsString;
        FOrderNo := self.CDS_2.fieldbyname('fromOrdNo').AsString;
        FUnit := Self.CDS_2.FieldByName('QtyUnit').ASString;
      end
      else if cxTabControl1.TabIndex = 3 then
      begin
        FMainID := self.CDS_3.fieldbyname('MainID').AsString;
        OrderNo.Text := self.CDS_3.fieldbyname('fromOrdNo').AsString;
        FOrderNo := self.CDS_3.fieldbyname('fromOrdNo').AsString;
        FUnit := Self.CDS_3.FieldByName('QtyUnit').ASString;
      end;
      if ShowModal = 1 then
      begin
      end;
    end;
  finally
    frmPlanProfitDetails.Free;
  end;
 end;
 procedure TfrmZDPrice.ToolButton5Click(Sender: TObject);
 var
  PBCIOID, PStkId: string;
  Bookmark: TBookmark;
 begin
  inherited;
  if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
    Bookmark := CDS_1.GetBookmark
  else if cxTabControl1.TabIndex = 2 then
    Bookmark := CDS_2.GetBookmark
  else if cxTabControl1.TabIndex = 3 then
    Bookmark := CDS_3.GetBookmark;
  PBCIOID := '';
  PStkId := '';
  if cxGrid2.ActiveLevel = cxGridLevel1 then
  begin
    if CDS_1.locate('ssel', true, []) = false then
    begin
      Application.MessageBox('请选择数据', '提示信息', 0);
      exit;
    end;
    Tv2.BeginUpdate;
    with CDS_1 do
    begin
      first;
      while not eof do
      begin
        if FieldByName('ssel').AsBoolean = true then
        begin
          if PBCIOID = '' then
          begin
            PBCIOID := PBCIOID + '''' + FieldByName('BCIOID').AsString + '''';
          end
          else
          begin
            PBCIOID := PBCIOID + ',''' + FieldByName('BCIOID').AsString + '''';
          end;
        end;
        Next;
      end;
    end;
    with ADOQueryCmd do
    begin
      close;
      SQL.Clear;
      sql.add('update bs_cloth_io set chker = ' + QuotedStr(DName) + 'where bcioid in (' + PBCIOID + ')');
      sql.add('update bs_cloth_io set Chktime = getdate() where bcioid in (' + PBCIOID + ')');
      ExecSQL;
 //      ShowMessage(sql.text);
    end;
    Tv2.EndUpdate;
  end
  else if cxGrid2.ActiveLevel = cxGridLevel2 then
  begin
    if CDS_2.locate('ssel', true, []) = false then
    begin
      Application.MessageBox('请选择数据', '提示信息', 0);
      exit;
    end;
    Tv3.BeginUpdate;
    with CDS_2 do
    begin
      first;
      while not eof do
      begin
        if FieldByName('ssel').AsBoolean = true then
        begin
          if PStkId = '' then
          begin
            PStkId := PStkId + '''' + FieldByName('StkId').AsString + '''';
          end
          else
          begin
            PStkId := PStkId + ',''' + FieldByName('StkId').AsString + '''';
          end;
        end;
        Next;
      end;
    end;
    with ADOQueryCmd do
    begin
      close;
      SQL.Clear;
      sql.add('update Trade_Cloth_Stock_ZD set ConMID = ' + QuotedStr(DName) + 'where stkid in (' + PStkId + ')');
      sql.add('update Trade_Cloth_Stock_ZD set ConSID = CONVERT(VARCHAR(10), GETDATE(), 23) where stkid in (' + PStkId + ')');
 //      ShowMessage(sql.text);
      ExecSQL;
    end;
    Tv3.endUpdate;
  end
  else if cxGrid2.ActiveLevel = cxGridLevel3 then
  begin
    if CDS_3.locate('ssel', true, []) = false then
    begin
      Application.MessageBox('请选择数据', '提示信息', 0);
      exit;
    end;
    Tv4.BeginUpdate;
    with CDS_3 do
    begin
      first;
      while not eof do
      begin
        if FieldByName('ssel').AsBoolean = true then
        begin
          if PStkId = '' then
          begin
            PStkId := PStkId + '''' + FieldByName('StkId').AsString + '''';
          end
          else
          begin
            PStkId := PStkId + ',''' + FieldByName('StkId').AsString + '''';
          end;
        end;
        Next;
      end;
    end;
    with ADOQueryCmd do
    begin
      close;
      SQL.Clear;
      sql.add('update Trade_Cloth_Stock set ConMID = ' + QuotedStr(DName) + 'where stkid in (' + PStkId + ')');
      sql.add('update Trade_Cloth_Stock set ConSID = CONVERT(VARCHAR(10), GETDATE(), 23) where stkid in (' + PStkId + ')');
 //      ShowMessage(sql.text);
      ExecSQL;
    end;
    Tv4.endUpdate;
  end;
  InitGrid();
  if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
  begin
    if CDS_1.BookmarkValid(Bookmark) then
    begin
      CDS_1.GotoBookmark(Bookmark);
    end
  end
  else if cxTabControl1.TabIndex = 2 then
  begin
    if CDS_2.BookmarkValid(Bookmark) then
    begin
      CDS_2.GotoBookmark(Bookmark);
    end
  end
  else if cxTabControl1.TabIndex = 3 then
  begin
    if CDS_3.BookmarkValid(Bookmark) then
    begin
      CDS_3.GotoBookmark(Bookmark);
    end
  end;
 end;
 procedure TfrmZDPrice.ToolButton6Click(Sender: TObject);
 var
  PBCIOID, PStkId: string;
  Bookmark: TBookmark;
 begin
  inherited;
  if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
    Bookmark := CDS_1.GetBookmark
  else if cxTabControl1.TabIndex = 2 then
    Bookmark := CDS_2.GetBookmark
  else if cxTabControl1.TabIndex = 3 then
    Bookmark := CDS_2.GetBookmark;
  PBCIOID := '';
  PStkId := '';
  if cxGrid2.ActiveLevel = cxGridLevel1 then
  begin
    if CDS_1.locate('ssel', true, []) = false then
    begin
      Application.MessageBox('请选择数据', '提示信息', 0);
      exit;
    end;
    Tv2.BeginUpdate;
    with CDS_1 do
    begin
      first;
      while not eof do
      begin
        if FieldByName('ssel').AsBoolean = true then
        begin
          if PBCIOID = '' then
          begin
            PBCIOID := PBCIOID + '''' + FieldByName('BCIOID').AsString + '''';
          end
          else
          begin
            PBCIOID := PBCIOID + ',''' + FieldByName('BCIOID').AsString + '''';
          end;
        end;
        Next;
      end;
    end;
    with ADOQueryCmd do
    begin
      close;
      SQL.Clear;
      sql.add('update bs_cloth_io set chker = null where bcioid in (' + PBCIOID + ')');
      sql.add('update bs_cloth_io set Chktime = null where bcioid in (' + PBCIOID + ')');
      ExecSQL;
 //      ShowMessage(sql.text);
    end;
    Tv2.EndUpdate;
  end
  else if cxGrid2.ActiveLevel = cxGridLevel2 then
  begin
    if CDS_2.locate('ssel', true, []) = false then
    begin
      Application.MessageBox('请选择数据', '提示信息', 0);
      exit;
    end;
    Tv3.BeginUpdate;
    with CDS_2 do
    begin
      first;
      while not eof do
      begin
        if FieldByName('ssel').AsBoolean = true then
        begin
          if PStkId = '' then
          begin
            PStkId := PStkId + '''' + FieldByName('StkId').AsString + '''';
          end
          else
          begin
            PStkId := PStkId + ',''' + FieldByName('StkId').AsString + '''';
          end;
        end;
        Next;
      end;
    end;
    with ADOQueryCmd do
    begin
      close;
      SQL.Clear;
      sql.add('update Trade_Cloth_Stock_ZD set ConMID = null where stkid in (' + PStkId + ')');
      sql.add('update Trade_Cloth_Stock_ZD set ConSID = null where stkid in (' + PStkId + ')');
      ExecSQL;
    end;
    Tv3.endUpdate;
  end
  else if cxGrid2.ActiveLevel = cxGridLevel3 then
  begin
    if CDS_3.locate('ssel', true, []) = false then
    begin
      Application.MessageBox('请选择数据', '提示信息', 0);
      exit;
    end;
    Tv4.BeginUpdate;
    with CDS_3 do
    begin
      first;
      while not eof do
      begin
        if FieldByName('ssel').AsBoolean = true then
        begin
          if PStkId = '' then
          begin
            PStkId := PStkId + '''' + FieldByName('StkId').AsString + '''';
          end
          else
          begin
            PStkId := PStkId + ',''' + FieldByName('StkId').AsString + '''';
          end;
        end;
        Next;
      end;
    end;
    with ADOQueryCmd do
    begin
      close;
      SQL.Clear;
      sql.add('update Trade_Cloth_Stock set ConMID = null where stkid in (' + PStkId + ')');
      sql.add('update Trade_Cloth_Stock set ConSID = null where stkid in (' + PStkId + ')');
      ExecSQL;
    end;
    Tv4.endUpdate;
  end;
  InitGrid();
  if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
  begin
    if CDS_1.BookmarkValid(Bookmark) then
    begin
      CDS_1.GotoBookmark(Bookmark);
    end
  end
  else if cxTabControl1.TabIndex = 2 then
  begin
    if CDS_2.BookmarkValid(Bookmark) then
    begin
      CDS_2.GotoBookmark(Bookmark);
    end
  end
  else if cxTabControl1.TabIndex = 3 then
  begin
    if CDS_3.BookmarkValid(Bookmark) then
    begin
      CDS_3.GotoBookmark(Bookmark);
    end
  end;
 end;
 procedure TfrmZDPrice.Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
 var
  mColumn: TcxGridDBColumn;
  mvalue: Variant;
 begin
  inherited;
  mColumn := Tv2.GetColumnByFieldName('chker');
  if mColumn = nil then
    exit;
  mvalue := AViewInfo.GridRecord.Values[mColumn.index];
  if (mvalue <> null) and (mvalue <> '') then
  begin
    ACanvas.Font.Color := clBlue;
    Exit;
  end;
 end;
 procedure TfrmZDPrice.Tv3CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
 var
  mColumn: TcxGridDBColumn;
  mvalue: Variant;
 begin
  inherited;
  mColumn := Tv3.GetColumnByFieldName('ConMID');
  if mColumn = nil then
    exit;
  mvalue := AViewInfo.GridRecord.Values[mColumn.index];
  if (mvalue <> null) and (mvalue <> '') then
  begin
    ACanvas.Font.Color := clBlue;
    Exit;
  end;
 end;
 procedure TfrmZDPrice.Tv3DataControllerFilterChanged(Sender: TObject);
 begin
  inherited;
  CDS_2.Filtered := false;
  CDS_2.Filter := TV3.DataController.Filter.FilterText;
  CDS_2.Filtered := true;
 end;
 procedure TfrmZDPrice.Tv4CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
 var
  mColumn: TcxGridDBColumn;
  mvalue: Variant;
 begin
  inherited;
  mColumn := Tv4.GetColumnByFieldName('ConMID');
  if mColumn = nil then
    exit;
  mvalue := AViewInfo.GridRecord.Values[mColumn.index];
  if (mvalue <> null) and (mvalue <> '') then
  begin
    ACanvas.Font.Color := clBlue;
    Exit;
  end;
 end;
 procedure TfrmZDPrice.cxTabControl1Change(Sender: TObject);
 begin
  InitGrid();
 end;
 end.
--- a/A09财务通用管理/U_ZDPriceDetails.dfm
+++ b/A09财务通用管理/U_ZDPriceDetails.dfm
@ -0,0 +1,592 @@
 inherited frmZDPriceDetails: TfrmZDPriceDetails
  Left = 300
  Top = 189
  Caption = #26126#32454#26597#35810
  ClientHeight = 572
  ClientWidth = 981
  WindowState = wsMaximized
  ExplicitLeft = -136
  ExplicitWidth = 997
  ExplicitHeight = 611
  PixelsPerInch = 96
  TextHeight = 13
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
    Top = 0
    Width = 981
    Height = 30
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 83
    Caption = 'ToolBar1'
    Color = clWhite
    DisabledImages = DataLink_Financial.ImageList_new32
    Images = DataLink_Financial.cxImageList_bar
    List = True
    ParentColor = False
    ShowCaptions = True
    TabOrder = 0
    object ToolButton1: TToolButton
      Left = 0
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
      ImageIndex = 16
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
      Left = 87
      Top = 0
      AutoSize = True
      Caption = #20851#38381
      ImageIndex = 7
      OnClick = TBCloseClick
    end
  end
  object cxGrid4: TcxGrid [1]
    Left = 0
    Top = 30
    Width = 981
    Height = 542
    Align = alClient
    PopupMenu = PM_1
    TabOrder = 1
    object TV4: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
      Navigator.Buttons.Delete.Visible = False
      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_1
      DataController.Filter.AutoDataSetFilter = True
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
      DataController.Summary.FooterSummaryItems = <>
      DataController.Summary.SummaryGroups = <>
      OptionsBehavior.GoToNextCellOnEnter = True
      OptionsCustomize.ColumnFiltering = False
      OptionsData.Appending = True
      OptionsData.Deleting = False
      OptionsData.DeletingConfirmation = False
      OptionsView.Footer = True
      OptionsView.GroupByBox = False
      Styles.IncSearch = DataLink_Financial.SHuangSe
      Styles.Footer = DataLink_Financial.Default
      Styles.Header = DataLink_Financial.Default
      Styles.Inactive = DataLink_Financial.SHuangSe
      Styles.Selection = DataLink_Financial.SHuangSe
      object cxGridDBColumn1: TcxGridDBColumn
        Tag = 7
        Caption = #20986#20837#24211#21333#21495
        DataBinding.FieldName = 'BCIOID'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxDateEditProperties'
        Properties.SaveTime = False
        Properties.ShowTime = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 82
      end
      object cxGridDBColumn2: TcxGridDBColumn
        Caption = #20986#20837#24211#26102#38388
        DataBinding.FieldName = 'IOTIme'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 79
      end
      object cxGridDBColumn3: TcxGridDBColumn
        Caption = #23545#36134#26085#26399
        DataBinding.FieldName = 'ReconciliationDate'
        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 76
      end
      object cxGridDBColumn4: TcxGridDBColumn
        Caption = #20986#20837#24211#31867#22411
        DataBinding.FieldName = 'IOType'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 78
      end
      object cxGridDBColumn5: TcxGridDBColumn
        Caption = #20135#21697#32534#21495
        DataBinding.FieldName = 'C_Code'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
      end
      object cxGridDBColumn6: TcxGridDBColumn
        Caption = #20013#25991#21697#21517
        DataBinding.FieldName = 'C_Name'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 76
      end
      object cxGridDBColumn7: TcxGridDBColumn
        Caption = #25104#20998
        DataBinding.FieldName = 'C_Composition'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 57
      end
      object cxGridDBColumn8: TcxGridDBColumn
        Tag = 7
        Caption = #35268#26684
        DataBinding.FieldName = 'C_Spec'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
      end
      object cxGridDBColumn9: TcxGridDBColumn
        Caption = #38376#24133
        DataBinding.FieldName = 'C_Width'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
      end
      object cxGridDBColumn11: TcxGridDBColumn
        Caption = #20811#37325
        DataBinding.FieldName = 'C_GramWeight'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 79
      end
      object cxGridDBColumn16: TcxGridDBColumn
        Caption = #39068#33394
        DataBinding.FieldName = 'C_Color'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
      end
      object cxGridDBColumn17: TcxGridDBColumn
        Caption = #33394#21495
        DataBinding.FieldName = 'C_ColorNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 74
      end
      object cxGridDBColumn18: TcxGridDBColumn
        Caption = #33457#22411
        DataBinding.FieldName = 'C_Pattern'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
      end
      object cxGridDBColumn19: TcxGridDBColumn
        Caption = #26469#33258#21333#20301
        DataBinding.FieldName = 'FromCoName'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 77
      end
      object cxGridDBColumn20: TcxGridDBColumn
        Caption = #20986#21040#21333#20301
        DataBinding.FieldName = 'ToCoName'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 78
      end
      object cxGridDBColumn21: TcxGridDBColumn
        Caption = #23384#25918#21333#20301
        DataBinding.FieldName = 'StkCoName'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 82
      end
      object cxGridDBColumn22: TcxGridDBColumn
        Caption = #26469#33258#35745#21010#21333
        DataBinding.FieldName = 'FromOrdNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 85
      end
      object cxGridDBColumn23: TcxGridDBColumn
        Caption = #20986#21040#35745#21010#21333
        DataBinding.FieldName = 'ToOrdNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 85
      end
      object cxGridDBColumn24: TcxGridDBColumn
        Caption = #21305#25968
        DataBinding.FieldName = 'Piece'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
      end
      object cxGridDBColumn25: TcxGridDBColumn
        Caption = #25968#37327
        DataBinding.FieldName = 'Qty'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 58
      end
      object cxGridDBColumn26: TcxGridDBColumn
        Caption = #21305#25968
        DataBinding.FieldName = 'Piece'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
      end
      object cxGridDBColumn27: TcxGridDBColumn
        Caption = #21333#20215
        DataBinding.FieldName = 'Price'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
      end
      object cxGridDBColumn28: TcxGridDBColumn
        Caption = #21333#20301
        DataBinding.FieldName = 'QtyUnit'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
      end
      object cxGridDBColumn29: TcxGridDBColumn
        Caption = #30331#35760#20154
        DataBinding.FieldName = 'Filler'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
      end
      object cxGridDBColumn30: TcxGridDBColumn
        Caption = #30331#35760#26102#38388
        DataBinding.FieldName = 'Filltime'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
      end
      object cxGridDBColumn31: TcxGridDBColumn
        Caption = #20462#25913#20154
        DataBinding.FieldName = 'Editer'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
      end
      object cxGridDBColumn32: TcxGridDBColumn
        Caption = #20462#25913#26102#38388
        DataBinding.FieldName = 'Edittime'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 58
      end
      object TV4Column1: TcxGridDBColumn
        DataBinding.FieldName = 'FFFlag'
        DataBinding.IsNullValueType = True
        Visible = False
      end
      object TV4Column2: TcxGridDBColumn
        Caption = #22806#24065#25910#30410'RMB'
        DataBinding.FieldName = 'WBSJRMB'
        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object TV4Column3: TcxGridDBColumn
        Caption = #20154#27665#24065#23454#25910#37329#39069
        DataBinding.FieldName = 'RMBSHJE'
        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object TV4Column4: TcxGridDBColumn
        Caption = #36864#31246#25910#30410
        DataBinding.FieldName = 'TSSJ'
        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
        Width = 90
      end
    end
    object Tv5: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_2
      DataController.Summary.DefaultGroupSummaryItems = <>
      DataController.Summary.FooterSummaryItems = <>
      DataController.Summary.SummaryGroups = <>
      OptionsView.GroupByBox = False
      object Tv5Column1: TcxGridDBColumn
        Caption = #20986#20837#24211#21333#21495
        DataBinding.FieldName = 'BCIOID'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 107
      end
      object Tv5Column2: TcxGridDBColumn
        Caption = #26469#33258#35745#21010#21333
        DataBinding.FieldName = 'FromOrdNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 122
      end
      object Tv5Column22: TcxGridDBColumn
        Caption = #20986#21040#35745#21010#21333
        DataBinding.FieldName = 'ToOrdNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 96
      end
      object Tv5Column3: TcxGridDBColumn
        Caption = #21333#20215
        DataBinding.FieldName = 'ZDPrice'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 104
      end
      object Tv5Column21: TcxGridDBColumn
        Caption = #21457#36135#26102#38388
        DataBinding.FieldName = 'Dlydate'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 78
      end
      object Tv5Column4: TcxGridDBColumn
        Caption = #23384#25918#21333#20301
        DataBinding.FieldName = 'StkPosition'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column5: TcxGridDBColumn
        Caption = #27611#37325
        DataBinding.FieldName = 'StkGrossWeight'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column6: TcxGridDBColumn
        Caption = #30382#37325
        DataBinding.FieldName = 'StkTare'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column7: TcxGridDBColumn
        Caption = #20928#37325
        DataBinding.FieldName = 'StkNetWeight'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column8: TcxGridDBColumn
        Caption = #31859#25968
        DataBinding.FieldName = 'StkMeter'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column9: TcxGridDBColumn
        Caption = #30721#25968
        DataBinding.FieldName = 'StkYardage'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column10: TcxGridDBColumn
        Caption = #31561#32423
        DataBinding.FieldName = 'Grade'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column11: TcxGridDBColumn
        Caption = #20135#21697#32534#21495
        DataBinding.FieldName = 'C_Code'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column12: TcxGridDBColumn
        Caption = #20013#25991#21697#21517
        DataBinding.FieldName = 'C_Name'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column13: TcxGridDBColumn
        Caption = #35268#26684
        DataBinding.FieldName = 'C_Spec'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column14: TcxGridDBColumn
        Caption = #25104#20998
        DataBinding.FieldName = 'C_Composition'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column15: TcxGridDBColumn
        Caption = #39068#33394
        DataBinding.FieldName = 'C_Color'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column16: TcxGridDBColumn
        Caption = #38376#24133
        DataBinding.FieldName = 'C_Width'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column17: TcxGridDBColumn
        Caption = #20811#37325
        DataBinding.FieldName = 'C_GramWeight'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column18: TcxGridDBColumn
        Caption = #33457#22411
        DataBinding.FieldName = 'C_Pattern'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column19: TcxGridDBColumn
        Caption = #33394#21495
        DataBinding.FieldName = 'C_ColorNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv5Column20: TcxGridDBColumn
        Caption = #27454#21495
        DataBinding.FieldName = 'C_StyleNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
    end
    object cxGridLevel4: TcxGridLevel
      GridView = TV4
    end
    object cxGridLevel5: TcxGridLevel
      GridView = Tv5
    end
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = DataLink_Financial.ADOLink
    Left = 81
    Top = 232
  end
  inherited ADOQueryBaseTemp: TADOQuery
    Connection = DataLink_Financial.ADOLink
    Left = 81
    Top = 177
  end
  object ADOQueryTemp: TADOQuery
    Connection = DataLink_Financial.ADOLink
    LockType = ltReadOnly
    Parameters = <>
    Left = 253
    Top = 177
  end
  object ADOQueryCmd: TADOQuery
    Connection = DataLink_Financial.ADOLink
    Parameters = <>
    Left = 341
    Top = 169
  end
  object ADOQueryMain: TADOQuery
    Connection = DataLink_Financial.ADOLink
    LockType = ltReadOnly
    Parameters = <>
    Left = 430
    Top = 172
  end
  object RM1: TRMGridReport
    ThreadPrepareReport = True
    InitialZoom = pzDefault
    PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbExport, rmpbNavigator]
    DefaultCollate = False
    SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\'
    PreviewOptions.RulerUnit = rmutScreenPixels
    PreviewOptions.RulerVisible = False
    PreviewOptions.DrawBorder = False
    PreviewOptions.BorderPen.Color = clGray
    PreviewOptions.BorderPen.Style = psDash
    Dataset = RMDB_Main
    CompressLevel = rmzcFastest
    CompressThread = False
    LaterBuildEvents = True
    OnlyOwnerDataSet = False
    Left = 370
    Top = 145
    ReportData = {}
  end
  object RMDB_Main: TRMDBDataSet
    Visible = True
    DataSet = CDS_1
    Left = 261
    Top = 334
  end
  object cxGridPopupMenu2: TcxGridPopupMenu
    PopupMenus = <>
    Left = 193
    Top = 265
  end
  object DS_1: TDataSource
    DataSet = CDS_1
    Left = 404
    Top = 233
  end
  object CDS_1: TClientDataSet
    Aggregates = <>
    Params = <>
    Left = 304
    Top = 240
  end
  object ADOQueryPrint: TADOQuery
    Connection = DataLink_Financial.ADOLink
    LockType = ltReadOnly
    Parameters = <>
    Left = 77
    Top = 313
  end
  object PM_1: TPopupMenu
    Left = 568
    Top = 336
    object N1: TMenuItem
      Caption = #22797#21046
      OnClick = N1Click
    end
  end
  object DS_2: TDataSource
    DataSet = CDS_2
    Left = 624
    Top = 273
  end
  object CDS_2: TClientDataSet
    Aggregates = <>
    Params = <>
    Left = 696
    Top = 240
  end
 end
--- a/A09财务通用管理/U_ZDPriceDetails.pas
+++ b/A09财务通用管理/U_ZDPriceDetails.pas
@ -0,0 +1,193 @@
 unit U_ZDPriceDetails;
 interface
 uses
  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB,
  cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls,
  cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient,
  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls,
  cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid,
  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
  cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
  dxBarBuiltInMenu, cxPC, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
  U_BaseHelp, Vcl.Menus, Vcl.Clipbrd, DateUtils, dxSkinWXI,
  dxScrollbarAnnotations, U_BaseList, System.ImageList, Vcl.ImgList;
 type
  TfrmZDPriceDetails = class(TfrmBaseHelp)
    ToolBar1: TToolBar;
    TBClose: TToolButton;
    ADOQueryTemp: TADOQuery;
    ADOQueryCmd: TADOQuery;
    ADOQueryMain: TADOQuery;
    RM1: TRMGridReport;
    RMDB_Main: TRMDBDataSet;
    cxGridPopupMenu2: TcxGridPopupMenu;
    DS_1: TDataSource;
    CDS_1: TClientDataSet;
    ADOQueryPrint: TADOQuery;
    ToolButton1: TToolButton;
    PM_1: TPopupMenu;
    N1: TMenuItem;
    cxGrid4: TcxGrid;
    TV4: TcxGridDBTableView;
    cxGridDBColumn1: TcxGridDBColumn;
    cxGridDBColumn2: TcxGridDBColumn;
    cxGridDBColumn3: TcxGridDBColumn;
    cxGridDBColumn4: TcxGridDBColumn;
    cxGridDBColumn5: TcxGridDBColumn;
    cxGridDBColumn6: TcxGridDBColumn;
    cxGridDBColumn7: TcxGridDBColumn;
    cxGridDBColumn8: TcxGridDBColumn;
    cxGridDBColumn9: TcxGridDBColumn;
    cxGridDBColumn11: TcxGridDBColumn;
    cxGridDBColumn16: TcxGridDBColumn;
    cxGridDBColumn17: TcxGridDBColumn;
    cxGridDBColumn18: TcxGridDBColumn;
    cxGridDBColumn19: TcxGridDBColumn;
    cxGridDBColumn20: TcxGridDBColumn;
    cxGridDBColumn21: TcxGridDBColumn;
    cxGridDBColumn22: TcxGridDBColumn;
    cxGridDBColumn23: TcxGridDBColumn;
    cxGridDBColumn24: TcxGridDBColumn;
    cxGridDBColumn25: TcxGridDBColumn;
    cxGridDBColumn26: TcxGridDBColumn;
    cxGridDBColumn27: TcxGridDBColumn;
    cxGridDBColumn28: TcxGridDBColumn;
    cxGridDBColumn29: TcxGridDBColumn;
    cxGridDBColumn30: TcxGridDBColumn;
    cxGridDBColumn31: TcxGridDBColumn;
    cxGridDBColumn32: TcxGridDBColumn;
    cxGridLevel4: TcxGridLevel;
    TV4Column1: TcxGridDBColumn;
    TV4Column2: TcxGridDBColumn;
    TV4Column3: TcxGridDBColumn;
    TV4Column4: TcxGridDBColumn;
    cxGridLevel5: TcxGridLevel;
    Tv5: TcxGridDBTableView;
    Tv5Column1: TcxGridDBColumn;
    Tv5Column2: TcxGridDBColumn;
    Tv5Column3: TcxGridDBColumn;
    DS_2: TDataSource;
    CDS_2: TClientDataSet;
    Tv5Column4: TcxGridDBColumn;
    Tv5Column5: TcxGridDBColumn;
    Tv5Column6: TcxGridDBColumn;
    Tv5Column7: TcxGridDBColumn;
    Tv5Column8: TcxGridDBColumn;
    Tv5Column9: TcxGridDBColumn;
    Tv5Column10: TcxGridDBColumn;
    Tv5Column11: TcxGridDBColumn;
    Tv5Column12: TcxGridDBColumn;
    Tv5Column13: TcxGridDBColumn;
    Tv5Column14: TcxGridDBColumn;
    Tv5Column15: TcxGridDBColumn;
    Tv5Column16: TcxGridDBColumn;
    Tv5Column17: TcxGridDBColumn;
    Tv5Column18: TcxGridDBColumn;
    Tv5Column19: TcxGridDBColumn;
    Tv5Column20: TcxGridDBColumn;
    Tv5Column21: TcxGridDBColumn;
    Tv5Column22: TcxGridDBColumn;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBRafreshClick(Sender: TObject);
    procedure ToolButton1Click(Sender: TObject);
    procedure N1Click(Sender: TObject);
  private
    { Private declarations }
    procedure InitGrid();
  public
    FBCIOID, FStkId: string;
    FType: Integer;
    { Public declarations }
  end;
 var
  frmZDPriceDetails: TfrmZDPriceDetails;
 implementation
 uses
  U_DataLink, U_RtFun;
 {$R *.dfm}
 procedure TfrmZDPriceDetails.InitGrid();
 begin
  try
    ADOQueryMain.DisableControls;
    with ADOQueryMain do
    begin
      Filtered := False;
      Close;
      SQL.Clear;
      case FType of
        0:
          begin
            sql.Add('Select * from bs_cloth_io where BCIOID in (' + FBCIOID + ')' );
            Open;
            SCreateCDS(ADOQueryMain, CDS_1);
            SInitCDSData(ADOQueryMain, CDS_1);
            cxGrid4.ActiveLevel := cxGridLevel4;
          end;
        1:
          begin
            sql.Add('Select *, A.OrderNo as ToOrdNo, B.OrderNo as FromOrdNo, DlyDate = (select DlyDate from Trade_Cloth_DR_Main X where X.DRMID = B.DRMID) from Trade_Cloth_Stock_ZD A join Trade_Cloth_DR_Sub B on A.DRSID=B.DRSID where StkId in (' + FStkId + ')' );
            Open;
            SCreateCDS(ADOQueryMain, CDS_2);
            SInitCDSData(ADOQueryMain, CDS_2);
            cxGrid4.ActiveLevel := cxGridLevel5;
          end;
      end;
    end;
  finally
    ADOQueryMain.EnableControls;
  end;
 end;
 procedure TfrmZDPriceDetails.N1Click(Sender: TObject);
 begin
  Clipboard.SetTextBuf(PChar(Trim(CDS_1.fieldbyname(TV4.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
 end;
 procedure TfrmZDPriceDetails.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
  inherited;
  Action := caFree;
 end;
 procedure TfrmZDPriceDetails.TBCloseClick(Sender: TObject);
 begin
  Close;
 end;
 procedure TfrmZDPriceDetails.FormShow(Sender: TObject);
 begin
  inherited;
  ReadCxGrid(trim(self.Caption), Tv4, '转单价格信息明细');
  InitGrid();
 end;
 procedure TfrmZDPriceDetails.TBRafreshClick(Sender: TObject);
 begin
  InitGrid();
 end;
 procedure TfrmZDPriceDetails.ToolButton1Click(Sender: TObject);
 begin
  WriteCxGrid(trim(self.Caption), Tv4, '转单价格信息明细');
 end;
 end.
--- a/A09财务通用管理/testDll.identcache
+++ b/A09财务通用管理/testDll.identcache
--- a/B01基础合同管理/Contract.dproj
+++ b/B01基础合同管理/Contract.dproj
@ -4,7 +4,7 @@
        <MainSource>Contract.dpr</MainSource>
        <Base>True</Base>
        <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>38017</TargetedPlatforms>
+        <TargetedPlatforms>1</TargetedPlatforms>
        <AppType>Library</AppType>
        <FrameworkType>VCL</FrameworkType>
        <ProjectVersion>19.2</ProjectVersion>
@ -13,16 +13,6 @@
    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
        <Base_Android64>true</Base_Android64>
        <CfgParent>Base</CfgParent>
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
        <Base_iOSDevice64>true</Base_iOSDevice64>
        <CfgParent>Base</CfgParent>
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
        <Base_Win32>true</Base_Win32>
        <CfgParent>Base</CfgParent>
@ -43,24 +33,6 @@
        <CfgParent>Base</CfgParent>
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Android64)'!=''">
        <Cfg_2_Android64>true</Cfg_2_Android64>
        <CfgParent>Cfg_2</CfgParent>
        <Cfg_2>true</Cfg_2>
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
        <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
        <CfgParent>Cfg_2</CfgParent>
        <Cfg_2>true</Cfg_2>
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX64)'!=''">
        <Cfg_2_OSX64>true</Cfg_2_OSX64>
        <CfgParent>Cfg_2</CfgParent>
        <Cfg_2>true</Cfg_2>
        <Base>true</Base>
    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
        <Cfg_2_Win32>true</Cfg_2_Win32>
        <CfgParent>Cfg_2</CfgParent>
@ -84,13 +56,6 @@
        <VerInfo_Locale>2052</VerInfo_Locale>
        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Base_Android64)'!=''">
        <Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
        <EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
        <iOS_AppStore1024>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png</iOS_AppStore1024>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Base_Win32)'!=''">
        <DCC_Namespace>System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
        <BT_BuildType>Debug</BT_BuildType>
@ -113,18 +78,9 @@
        <DCC_Optimize>false</DCC_Optimize>
        <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_Android64)'!=''">
        <BT_BuildType>Debug</BT_BuildType>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
        <BT_BuildType>Debug</BT_BuildType>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_OSX64)'!=''">
        <BT_BuildType>Debug</BT_BuildType>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\B01基础合同管理\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
@ -240,10 +196,6 @@
                </Source>
            </Delphi.Personality>
            <Platforms>
                <Platform value="Android64">True</Platform>
                <Platform value="iOSDevice64">True</Platform>
                <Platform value="Linux64">True</Platform>
                <Platform value="OSX64">True</Platform>
                <Platform value="Win32">True</Platform>
                <Platform value="Win64">False</Platform>
            </Platforms>
--- a/B01基础合同管理/Contract.dproj.local
+++ b/B01基础合同管理/Contract.dproj.local
@ -25,7 +25,7 @@
    <Transaction>1899-12-30 00:00:00.000.063,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.345,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.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.514,D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_ZDYHelp_KH.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.802,D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_ZDYHelp_KH.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
@ -36,21 +36,21 @@
    <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.709,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=</Transaction>
    <Transaction>1899-12-30 00:00:00.000.217,=D:\Dp10Repo\项目代码\骉骐\B01基础合同管理\U_SalesConInPutCopy.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.802,D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_ZDYHelp_KH.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_ZDYHelp_KH.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.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=</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.726,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.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.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.620,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\Contract.dproj</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.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.734,=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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.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.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm</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.348,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=</Transaction>
@ -72,16 +72,16 @@
    <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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
    <Transaction>1899-12-30 00:00:00.000.415,D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_ZDYHelp_KH.pas=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.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.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.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.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas=</Transaction>
    <Transaction>1899-12-30 00:00:00.000.322,=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_BaoguanInPut.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.582,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.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="..\..\D10zzbiaoqi"/>
@ -100,7 +100,7 @@
    <File Path="..\A00通用窗体\U_PictureUpload.dfm"/>
    <File Path="..\A00通用窗体\U_UserSel.pas"/>
    <File Path="..\A00通用窗体\U_UserSel.dfm"/>
-    <File Path="D:\Dp10Repo"/>
+    <File Path="..\..\..\..\Dp10Repo"/>
    <File Path="..\..\..\public10"/>
    <File Path="..\..\..\public10\design"/>
    <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
--- a/B01基础合同管理/Contract.identcache
+++ b/B01基础合同管理/Contract.identcache
--- a/B01基础合同管理/Contract.skincfg
+++ b/B01基础合同管理/Contract.skincfg
@ -1,5 +1,5 @@
 [ExpressSkins]
-Default=0
+Default=1
 ShowNotifications=1
 Enabled=1
 dxSkinBasic=0
--- a/B01基础合同管理/ProjectGroup1.groupproj.local
+++ b/B01基础合同管理/ProjectGroup1.groupproj.local
@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10zzbiaoqi\B01基础合同管理\testDll.dproj"/>
+		<Projects ActiveProject="E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\B01基础合同管理\Contract.dproj"/>
 	</Default.Personality>
 </BorlandProject>
--- a/B01基础合同管理/U_ContractList.dfm
+++ b/B01基础合同管理/U_ContractList.dfm
@ -6,7 +6,6 @@ inherited frmContractList: TfrmContractList
  ClientWidth = 1525
  FormStyle = fsMDIChild
  Visible = True
  ExplicitLeft = -383
  ExplicitWidth = 1541
  ExplicitHeight = 775
  PixelsPerInch = 96
@ -217,8 +216,6 @@ inherited frmContractList: TfrmContractList
    Align = alClient
    PopupMenu = pm1
    TabOrder = 3
    ExplicitTop = 161
    ExplicitHeight = 305
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
@ -226,6 +223,7 @@ inherited frmContractList: TfrmContractList
      OnCustomDrawCell = Tv1CustomDrawCell
      OnFocusedRecordChanged = Tv1FocusedRecordChanged
      DataController.DataSource = DS_1
      DataController.Filter.OnChanged = Tv1DataControllerFilterChanged
      DataController.Filter.AutoDataSetFilter = True
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -613,7 +611,6 @@ inherited frmContractList: TfrmContractList
    Color = 16242829
    ParentBackground = False
    TabOrder = 1
    ExplicitTop = 82
    object Label4: TLabel
      Left = 435
      Top = 18
@ -889,7 +886,6 @@ inherited frmContractList: TfrmContractList
      #24050#21462#28040
      #20840#37096)
    OnChange = cxTabControl1Change
    ExplicitTop = 137
    ClientRectBottom = 22
    ClientRectRight = 1525
    ClientRectTop = 19
--- a/B01基础合同管理/U_ContractList.pas
+++ b/B01基础合同管理/U_ContractList.pas
@ -189,6 +189,7 @@ type
    procedure N6Click(Sender: TObject);
    procedure ToolButton3Click(Sender: TObject);
    procedure ToolButton4Click(Sender: TObject);
    procedure Tv1DataControllerFilterChanged(Sender: TObject);
  private
    fFlileFlag: string;
    procedure InitGrid();
@ -1188,6 +1189,23 @@ begin
  end;
 end;
 procedure TfrmContractList.Tv1DataControllerFilterChanged(Sender: TObject);
 var
  FZMQty, FZKg, FCNYAmount, FUSDAmount: Double;
 begin
  if ADOQueryMain.IsEmpty = False then
  begin
    FZMQty := tv1.DataController.Summary.FooterSummaryValues[2];
    FZKg := tv1.DataController.Summary.FooterSummaryValues[3];
    FCNYAmount := tv1.DataController.Summary.FooterSummaryValues[4];
    FUSDAmount := tv1.DataController.Summary.FooterSummaryValues[5];
    Label1.Caption := '总米数：' + FloatToStr(FZMQty) + '    总公斤数：' + FloattoStr(FZKg) + '    CNY金额：' + FloattoStr(FCNYAmount)+ '    USD金额：' + FloattoStr(FUSDAmount);
  end;
 end;
 procedure TfrmContractList.btnTijiaoClick(Sender: TObject);
 var
  MConMIDS: string;
--- a/B01基础合同管理/testDll.identcache
+++ b/B01基础合同管理/testDll.identcache
--- a/B04采购计划管理/ProjectGroup1.groupproj.local
+++ b/B04采购计划管理/ProjectGroup1.groupproj.local
@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10zzbiaoqi\B04采购计划管理\PurchasePlan.dproj"/>
+		<Projects ActiveProject="E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\B04采购计划管理\PurchasePlan.dproj"/>
 	</Default.Personality>
 </BorlandProject>
--- a/B04采购计划管理/PurchasePlan.dproj
+++ b/B04采购计划管理/PurchasePlan.dproj
@ -80,7 +80,7 @@
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10zzbiaoqi\B04采购计划管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\B04采购计划管理\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
--- a/B04采购计划管理/PurchasePlan.dproj.local
+++ b/B04采购计划管理/PurchasePlan.dproj.local
@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_RSTradePlanSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_RSTradePlanSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.857,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothHJGPlanPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.857,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothHJGPlanPut.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.123,=D:\Dp10Repo\public10\design\U_globalVar.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.339,=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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.020,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.020,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.953,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.953,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.891,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanList.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.891,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanList.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanList.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.954,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.954,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.910,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.910,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.458,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_GXSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.458,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_GXSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.910,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanPut.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.910,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanPut.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanPut.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.891,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanList.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.891,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothPurchasePlanList.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanList.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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.488,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.488,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothStainPlanList.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.869,D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.869,D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.450,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.450,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.110,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothHJGPlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.110,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothHJGPlanList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.059,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.059,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_ClothRSPlanPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.985,=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_CLNoteEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.985,=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_CLNoteEdit.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.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.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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.458,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_GXSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.458,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.pas=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_GXSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.781,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_HJGTradePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.781,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_HJGTradePlanSel.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.020,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.020,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsList.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.564,=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_UserSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.564,=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_UserSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.606,=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_TradeDefectKCListSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.606,=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_TradeDefectKCListSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.869,D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.869,D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.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.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.961,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.961,=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_EmpSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_RSTradePlanSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_RSTradePlanSel.dfm=D:\Dp10Repo\项目代码\骉骐\B04采购计划管理\U_PurTradePlanSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas=</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="..\..\D10zzbiaoqi"/>
@ -79,7 +79,7 @@
    <File Path="..\A00通用窗体\U_UserSel.dfm"/>
    <File Path="..\A00通用窗体\U_YarnInfoSel.pas"/>
    <File Path="..\A00通用窗体\U_YarnInfoSel.dfm"/>
-    <File Path="D:\Dp10Repo"/>
+    <File Path="..\..\..\..\Dp10Repo"/>
    <File Path="..\..\..\public10"/>
    <File Path="..\..\..\public10\design"/>
    <File Path="..\..\..\public10\design\U_BaseHelp.pas"/>
--- a/B04采购计划管理/PurchasePlan.identcache
+++ b/B04采购计划管理/PurchasePlan.identcache
--- a/B04采购计划管理/U_ClaimsList.dfm
+++ b/B04采购计划管理/U_ClaimsList.dfm
@ -162,7 +162,6 @@ inherited frmClaimsList: TfrmClaimsList
    Align = alClient
    PopupMenu = pm1
    TabOrder = 3
    ExplicitTop = 121
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
@ -440,14 +439,14 @@ inherited frmClaimsList: TfrmClaimsList
      Time = 0.464761099538009100
      TabOrder = 1
    end
-    object BuyName: TEdit
+    object OurCoName: TEdit
      Tag = 2
      Left = 296
      Top = 31
      Width = 78
      Height = 20
      TabOrder = 2
-      OnKeyPress = PurNoKeyPress
+      OnKeyPress = ClaNoKeyPress
    end
    object MPRTCodeName: TEdit
      Tag = 2
@ -458,14 +457,14 @@ inherited frmClaimsList: TfrmClaimsList
      TabOrder = 6
      OnChange = BuyNameChange
    end
-    object PurNo: TEdit
+    object ClaNo: TEdit
      Tag = 2
      Left = 296
      Top = 7
      Width = 77
      Height = 20
      TabOrder = 3
-      OnKeyPress = PurNoKeyPress
+      OnKeyPress = ClaNoKeyPress
    end
    object MPRTKZ: TEdit
      Tag = 2
@ -485,14 +484,14 @@ inherited frmClaimsList: TfrmClaimsList
      TabOrder = 7
      OnChange = BuyNameChange
    end
-    object SellName: TEdit
+    object OppCoName: TEdit
      Tag = 2
      Left = 448
      Top = 7
      Width = 77
      Height = 20
      TabOrder = 4
-      OnKeyPress = PurNoKeyPress
+      OnKeyPress = ClaNoKeyPress
    end
    object IsJYTime: TCheckBox
      Left = 23
--- a/B04采购计划管理/U_ClaimsList.pas
+++ b/B04采购计划管理/U_ClaimsList.pas
@ -65,9 +65,9 @@ type
    Label13: TLabel;
    BegDate: TDateTimePicker;
    EndDate: TDateTimePicker;
-    BuyName: TEdit;
+    OurCoName: TEdit;
    MPRTCodeName: TEdit;
-    PurNo: TEdit;
+    ClaNo: TEdit;
    MPRTKZ: TEdit;
    MPRTMF: TEdit;
    cxTabControl1: TcxTabControl;
@ -84,7 +84,7 @@ type
    btnCXTijiao: TToolButton;
    v1Column13: TcxGridDBColumn;
    Label3: TLabel;
-    SellName: TEdit;
+    OppCoName: TEdit;
    Tv1Column2: TcxGridDBColumn;
    Tv1Column3: TcxGridDBColumn;
    Tv1Column5: TcxGridDBColumn;
@ -158,7 +158,7 @@ type
    procedure N2Click(Sender: TObject);
    procedure btnWCClick(Sender: TObject);
    procedure btnWCCXClick(Sender: TObject);
-    procedure PurNoKeyPress(Sender: TObject; var Key: Char);
+    procedure ClaNoKeyPress(Sender: TObject; var Key: Char);
    procedure ToolButton7Click(Sender: TObject);
    procedure N3Click(Sender: TObject);
    procedure N4Click(Sender: TObject);
@ -540,7 +540,7 @@ begin
  TBRafresh.Click;
 end;
-procedure TfrmClaimsList.PurNoKeyPress(Sender: TObject; var Key: Char);
+procedure TfrmClaimsList.ClaNoKeyPress(Sender: TObject; var Key: Char);
 begin
  if Key = #13 then
  begin
--- a/B04采购计划管理/testDll.identcache
+++ b/B04采购计划管理/testDll.identcache
--- a/T01贸易生产计划/ProjectGroup1.groupproj.local
+++ b/T01贸易生产计划/ProjectGroup1.groupproj.local
@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\TradePlan.dproj"/>
+		<Projects ActiveProject="E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\TradePlan.dproj"/>
 	</Default.Personality>
 </BorlandProject>
--- a/T01贸易生产计划/TradePlan.dproj
+++ b/T01贸易生产计划/TradePlan.dproj
@ -80,7 +80,7 @@
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
--- a/T01贸易生产计划/TradePlan.dproj.local
+++ b/T01贸易生产计划/TradePlan.dproj.local
@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
    <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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</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.370,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.305,=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfitDetails.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.332,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.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.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.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.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.905,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanSchedule.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.895,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.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.332,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.305,=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfitDetails.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.357,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfit.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.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.983,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.672,D:\Dp10Repo\public10\design\U_BaseDataLink.pas=</Transaction>
    <Transaction>1899-12-30 00:00:00.000.833,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.357,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfit.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.832,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradePlanList.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.514,D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\TradePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\InformationBase.dproj</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.905,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanSchedule.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.497,=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_ZDYHelp_P.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.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.357,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfit.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.926,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanScheduleDetail.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.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.357,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfit.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.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.pas=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.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.329,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradeInspSet.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.497,=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_ZDYHelp_P.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.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.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.dfm=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.dfm</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.895,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="..\..\D10zzbiaoqi"/>
@ -69,7 +69,7 @@
    <File Path="..\T00贸易通用窗体\U_TradePlanSel.dfm"/>
    <File Path="..\T00贸易通用窗体\U_TradeSalesContractSel.pas"/>
    <File Path="..\T00贸易通用窗体\U_TradeSalesContractSel.dfm"/>
-    <File Path="D:\Dp10Repo"/>
+    <File Path="..\..\..\..\Dp10Repo"/>
    <File Path="..\..\..\public10"/>
    <File Path="..\..\..\public10\design"/>
    <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
--- a/T01贸易生产计划/TradePlan.identcache
+++ b/T01贸易生产计划/TradePlan.identcache
--- a/T01贸易生产计划/U_GetDllForm.pas
+++ b/T01贸易生产计划/U_GetDllForm.pas
@ -70,10 +70,15 @@ begin
  if trim(DataBaseStr) = '' then
  begin
-    server := '101.132.143.144,7781';
+//    server := '101.132.143.144,7781';
 //    dtbase := 'BiaoqiData';
 //    user := 'rtsa';
 //    pswd := 'rightsoft@5740';
    server := '127.0.0.1';
    dtbase := 'BiaoqiData';
-    user := 'rtsa';
+    user := 'sa';
-    pswd := 'rightsoft@5740';
+    pswd := 'root';
    DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
 //    Parameters1 := 'Â¼Èë';
--- a/T01贸易生产计划/U_PlanProfit.dfm
+++ b/T01贸易生产计划/U_PlanProfit.dfm
@ -269,6 +269,19 @@ inherited frmPlanProfit: TfrmPlanProfit
      ParentFont = False
      Visible = False
    end
    object Label5: TLabel
      Left = 646
      Top = 20
      Width = 52
      Height = 12
      Caption = #23458#25143#21333#21495
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object BegDate: TDateTimePicker
      Left = 128
      Top = 16
@ -308,7 +321,7 @@ inherited frmPlanProfit: TfrmPlanProfit
      OnChange = OrderNoMChange
    end
    object ComboBox1: TComboBox
-      Left = 49
+      Left = 51
      Top = 16
      Width = 71
      Height = 20
@ -316,8 +329,7 @@ inherited frmPlanProfit: TfrmPlanProfit
      Text = #21046#21333#26085#26399
      OnChange = ComboBox1Change
      Items.Strings = (
-        #21046#21333#26085#26399
+        #21046#21333#26085#26399)
        #20132#36135#26085#26399)
    end
    object CustName: TEdit
      Tag = 2
@ -349,14 +361,21 @@ inherited frmPlanProfit: TfrmPlanProfit
      OnChange = OrderNoChange
    end
    object CheckBox1: TCheckBox
-      Left = 28
+      Left = 26
-      Top = 18
+      Top = 17
      Width = 19
      Height = 17
      Checked = True
      State = cbChecked
      TabOrder = 8
    end
    object BuyConNo: TEdit
      Tag = 2
      Left = 704
      Top = 16
      Width = 80
      Height = 20
      TabOrder = 9
      OnKeyPress = OrderNoKeyPress
    end
  end
  object cxGrid1: TcxGrid [2]
    Left = 0
@ -382,6 +401,54 @@ inherited frmPlanProfit: TfrmPlanProfit
        item
          Kind = skSum
          Column = Tv1Column10
        end
        item
          Kind = skSum
          Column = Tv1Column12
        end
        item
          Kind = skSum
          Column = Tv1Column15
        end
        item
          Kind = skSum
          Column = Tv1Column16
        end
        item
          Kind = skSum
          Column = Tv1Column18
        end
        item
          Kind = skSum
          Column = v1Column11
        end
        item
          Kind = skSum
          Column = Tv1Column1
        end
        item
          Kind = skSum
          Column = Tv1Column5
        end
        item
          Kind = skSum
          Column = Tv1Column6
        end
        item
          Kind = skSum
          Column = Tv1Column8
        end
        item
          Kind = skSum
          Column = Tv1Column9
        end
        item
          Kind = skSum
          Column = Tv1Column17
        end
        item
          Kind = skSum
          Column = Tv1Column7
        end>
      DataController.Summary.SummaryGroups = <>
      OptionsCustomize.ColumnFiltering = False
@ -413,6 +480,13 @@ inherited frmPlanProfit: TfrmPlanProfit
        Styles.Header = DataLink_TradePlan.Default
        Width = 80
      end
      object Tv1Column19: TcxGridDBColumn
        Caption = #23458#25143#21333#21495
        DataBinding.FieldName = 'BuyConNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 93
      end
      object Tv1Column4: TcxGridDBColumn
        Caption = #23458#25143
        DataBinding.FieldName = 'CustName'
@ -491,11 +565,18 @@ inherited frmPlanProfit: TfrmPlanProfit
        Width = 72
      end
      object Tv1Column16: TcxGridDBColumn
-        Caption = #23454#25910#37329#39069
+        Caption = #23454#25910#26680#38144#37329#39069
        DataBinding.FieldName = 'HXAmount'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 92
      end
      object Tv1Column18: TcxGridDBColumn
        Caption = #22806#24065#23454#26680#37329#39069
        DataBinding.FieldName = 'WBSHJE'
        DataBinding.IsNullValueType = True
        Width = 75
      end
      object Tv1Column11: TcxGridDBColumn
        Caption = #26410#25910#37329#39069
@ -523,14 +604,6 @@ inherited frmPlanProfit: TfrmPlanProfit
        Options.Editing = False
        Width = 111
      end
      object Tv1Column6: TcxGridDBColumn
        Caption = #21033#28070
        DataBinding.FieldName = 'SJLRAMount'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 72
      end
      object Tv1Column1: TcxGridDBColumn
        Caption = #20854#20182#24212#20184
        DataBinding.FieldName = 'OtherYFAmount'
@ -548,7 +621,9 @@ inherited frmPlanProfit: TfrmPlanProfit
        Caption = #23454#25910#20154#27665#24065
        DataBinding.FieldName = 'SSCNYAmount'
        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
        VisibleForEditForm = bTrue
        Width = 86
      end
      object Tv1Column8: TcxGridDBColumn
@ -557,18 +632,33 @@ inherited frmPlanProfit: TfrmPlanProfit
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
      end
      object Tv1Column6: TcxGridDBColumn
        Caption = #21033#28070
        DataBinding.FieldName = 'SJLRAMount'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 72
      end
      object Tv1Column9: TcxGridDBColumn
-        Caption = #23454#38469#31246#25910
+        Caption = #23454#38469#24635#25910
-        DataBinding.FieldName = 'SJSS'
+        DataBinding.FieldName = 'SJZS'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
      end
      object Tv1Column17: TcxGridDBColumn
-        Caption = #31246#25910#25903#20986
+        Caption = #31246#36153#25903#20986
        DataBinding.FieldName = 'SFZC'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
      end
      object Tv1Column20: TcxGridDBColumn
        Caption = #24065#31181
        DataBinding.FieldName = 'Currency'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 70
      end
    end
    object cxGrid1Level1: TcxGridLevel
      GridView = Tv1
@ -636,7 +726,7 @@ inherited frmPlanProfit: TfrmPlanProfit
  object Order_Main: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 724
+    Left = 708
    Top = 432
  end
  object ADOQuerySub: TADOQuery
--- a/T01贸易生产计划/U_PlanProfit.pas
+++ b/T01贸易生产计划/U_PlanProfit.pas
@ -104,6 +104,11 @@ type
    ADOQuery1: TADOQuery;
    Tv1Column9: TcxGridDBColumn;
    Tv1Column17: TcxGridDBColumn;
    Tv1Column18: TcxGridDBColumn;
    BuyConNo: TEdit;
    Label5: TLabel;
    Tv1Column19: TcxGridDBColumn;
    Tv1Column20: TcxGridDBColumn;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
@ -116,7 +121,6 @@ type
    procedure OrderNoMChange(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBTPClick(Sender: TObject);
    procedure CheckBox1Click(Sender: TObject);
    procedure CheckBox2Click(Sender: TObject);
    procedure Tv1StylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
    procedure v1DeliveryDateCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
@ -279,8 +283,17 @@ begin
      SQL.Clear;
      Filtered := False;
      sql.Add(' exec  P_Trade_Profit_Plan  ');
      if CheckBox1.Checked = true then
      begin
        sql.Add('  @begdate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', begdate.DateTime))));
        sql.Add(' ,@Enddate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1))));
      end
      else
      begin
        sql.Add('  @begdate=' + QuotedStr(''));
        sql.Add(' ,@Enddate=' + QuotedStr(''));
      end;
      case cxTabControl1.TabIndex of
        0:
          begin
@ -648,10 +661,6 @@ var
 begin
 end;
 procedure TfrmPlanProfit.CheckBox1Click(Sender: TObject);
 begin
  InitGrid();
 end;
 procedure TfrmPlanProfit.CheckBox2Click(Sender: TObject);
 begin
@ -1134,10 +1143,21 @@ begin
 end;
 procedure TfrmPlanProfit.ToolButton3Click(Sender: TObject);
 var
  wsql: string;
 begin
  wsql := '';
  if CheckBox1.Checked = true then
  begin
    if SGetFilters(Panel1, 1, 2) <> '' then
      wsql := ' and ';
    wsql := wsql + ' (OrdDate >= ' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', begdate.DateTime)));
    wsql := wsql +  ' and OrdDate <= ' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime))) + ')';
  end;
  if ADOQueryMain.Active then
  begin
-    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2) + wsql);
    SCreateCDS(ADOQueryMain, Order_Main);
    SInitCDSData(ADOQueryMain, Order_Main);
  end;
--- a/T01贸易生产计划/U_PlanProfitDetails.dfm
+++ b/T01贸易生产计划/U_PlanProfitDetails.dfm
@ -4,6 +4,8 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
  Caption = #26126#32454#26597#35810
  ClientHeight = 572
  ClientWidth = 981
  WindowState = wsMaximized
  OnResize = FormResize
  ExplicitWidth = 997
  ExplicitHeight = 611
  PixelsPerInch = 96
@ -42,16 +44,24 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
      Visible = False
      OnClick = ToolButton2Click
    end
-    object ToolButton1: TToolButton
+    object ToolButton3: TToolButton
      Left = 142
      Top = 0
      AutoSize = True
      Caption = #25171#21360#26126#32454
      ImageIndex = 21
      OnClick = ToolButton3Click
    end
    object ToolButton1: TToolButton
      Left = 237
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
      ImageIndex = 16
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
-      Left = 237
+      Left = 332
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -106,6 +116,7 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
      Top = 12
      Width = 155
      Height = 21
      Enabled = False
      TabOrder = 2
      OnChange = OrderNoChange
    end
@ -140,14 +151,12 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
    end
  end
  object cxGrid1: TcxGrid [2]
-    Left = 546
+    Left = 508
    Top = 84
-    Width = 435
+    Width = 473
    Height = 292
-    Align = alRight
+    Align = alClient
    TabOrder = 2
    ExplicitLeft = 544
    ExplicitTop = 79
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
@ -465,15 +474,17 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
        Visible = False
      end
      object Tv1Column31: TcxGridDBColumn
-        Caption = #22269#22320#31246
+        Caption = #36807#22320#31246
-        DataBinding.FieldName = 'DDD'
+        DataBinding.FieldName = 'GDS'
        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
      end
      object Tv1Column32: TcxGridDBColumn
        Caption = #20854#20182#31246#36153
-        DataBinding.FieldName = 'EEE'
+        DataBinding.FieldName = 'QTSF'
        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
      end
    end
@ -573,6 +584,13 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
          Options.Editing = False
          Width = 79
        end
        object TV2Column10: TcxGridDBColumn
          Caption = #26085#26399
          DataBinding.FieldName = 'ZDTime'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 67
        end
        object TV2Column7: TcxGridDBColumn
          Caption = #20986#21040#35745#21010#21333
          DataBinding.FieldName = 'ToOrdNo'
@ -580,6 +598,13 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
          HeaderAlignmentHorz = taCenter
          Width = 81
        end
        object TV2Column8: TcxGridDBColumn
          Caption = #31867#22411
          DataBinding.FieldName = 'SDefNote'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 76
        end
        object cxGridDBColumn14: TcxGridDBColumn
          Caption = #33457#22411
          DataBinding.FieldName = 'C_Pattern'
@ -617,7 +642,7 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
          DataBinding.FieldName = 'NetWeight'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
-          Width = 64
+          Width = 65
        end
        object TV2Column2: TcxGridDBColumn
          Caption = #36716#20986#27611#37325
@ -640,6 +665,13 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
          HeaderAlignmentHorz = taCenter
          Width = 71
        end
        object TV2Column9: TcxGridDBColumn
          Caption = #21333#20301
          DataBinding.FieldName = 'OrdUnit'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 75
        end
        object TV2Column5: TcxGridDBColumn
          Caption = #21333#20215
          DataBinding.FieldName = 'ZDPrice'
@ -729,6 +761,12 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
          Options.Editing = False
          Width = 83
        end
        object TV3Column6: TcxGridDBColumn
          Caption = #26085#26399
          DataBinding.FieldName = 'ZDTime'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
        end
        object TV3Column3: TcxGridDBColumn
          Caption = #26469#33258#35745#21010#21333
          DataBinding.FieldName = 'FromOrdNo'
@ -736,6 +774,13 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
          HeaderAlignmentHorz = taCenter
          Width = 72
        end
        object TV3Column4: TcxGridDBColumn
          Caption = #31867#22411
          DataBinding.FieldName = 'SDefNote'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 71
        end
        object cxGridDBColumn46: TcxGridDBColumn
          Caption = #33457#22411
          DataBinding.FieldName = 'C_Pattern'
@ -800,10 +845,18 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
          Options.Editing = False
          Width = 66
        end
        object TV3Column5: TcxGridDBColumn
          Caption = #21333#20301
          DataBinding.FieldName = 'OrdUnit'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 71
        end
        object TV3Column1: TcxGridDBColumn
          Caption = #21333#20215
          DataBinding.FieldName = 'ZDPrice'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 48
        end
        object TV3Column2: TcxGridDBColumn
@ -829,9 +882,9 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
  object cxGrid4: TcxGrid [4]
    Left = 0
    Top = 84
-    Width = 538
+    Width = 500
    Height = 292
-    Align = alClient
+    Align = alLeft
    TabOrder = 4
    object TV4: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
@ -874,6 +927,7 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
      DataController.Summary.SummaryGroups = <>
      OptionsBehavior.GoToNextCellOnEnter = True
      OptionsCustomize.ColumnFiltering = False
      OptionsData.Appending = True
      OptionsData.Deleting = False
      OptionsData.DeletingConfirmation = False
      OptionsView.Footer = True
@ -1151,22 +1205,25 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
      end
      object TV4Column2: TcxGridDBColumn
        Caption = #22806#24065#25910#30410'RMB'
-        DataBinding.FieldName = 'AAA'
+        DataBinding.FieldName = 'WBSJRMB'
        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object TV4Column3: TcxGridDBColumn
        Caption = #20154#27665#24065#23454#25910#37329#39069
-        DataBinding.FieldName = 'BBB'
+        DataBinding.FieldName = 'RMBSHJE'
        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object TV4Column4: TcxGridDBColumn
        Caption = #36864#31246#25910#30410
-        DataBinding.FieldName = 'CCC'
+        DataBinding.FieldName = 'TSSJ'
        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
        Width = 90
      end
@ -1176,14 +1233,11 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
    end
  end
  object cxSplitter2: TcxSplitter [5]
-    Left = 538
+    Left = 500
    Top = 84
    Width = 8
    Height = 292
    HotZoneClassName = 'TcxMediaPlayer9Style'
    Control = cxGrid1
    ExplicitLeft = 544
    ExplicitTop = 90
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = DataLink_TradePlan.ADOLink
@ -1248,7 +1302,7 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
  end
  object DS_HZ: TDataSource
    DataSet = CDS_HZ
-    Left = 372
+    Left = 404
    Top = 233
  end
  object CDS_HZ: TClientDataSet
@ -1331,4 +1385,28 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
    Left = 638
    Top = 228
  end
  object CDS_31: TClientDataSet
    Aggregates = <>
    Params = <>
    Left = 528
    Top = 176
  end
  object CDS_21: TClientDataSet
    Aggregates = <>
    Params = <>
    Left = 584
    Top = 208
  end
  object CDS_32: TClientDataSet
    Aggregates = <>
    Params = <>
    Left = 520
    Top = 256
  end
  object CDS_22: TClientDataSet
    Aggregates = <>
    Params = <>
    Left = 592
    Top = 280
  end
 end
--- a/T01贸易生产计划/U_PlanProfitDetails.pas
+++ b/T01贸易生产计划/U_PlanProfitDetails.pas
@ -166,6 +166,17 @@ type
    TV4Column4: TcxGridDBColumn;
    Tv1Column31: TcxGridDBColumn;
    Tv1Column32: TcxGridDBColumn;
    CDS_31: TClientDataSet;
    CDS_21: TClientDataSet;
    TV2Column8: TcxGridDBColumn;
    TV3Column4: TcxGridDBColumn;
    TV2Column9: TcxGridDBColumn;
    TV3Column5: TcxGridDBColumn;
    TV2Column10: TcxGridDBColumn;
    TV3Column6: TcxGridDBColumn;
    ToolButton3: TToolButton;
    CDS_32: TClientDataSet;
    CDS_22: TClientDataSet;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
@ -176,6 +187,8 @@ type
    procedure cxTabControl1Change(Sender: TObject);
    procedure ToolButton1Click(Sender: TObject);
    procedure N1Click(Sender: TObject);
    procedure FormResize(Sender: TObject);
    procedure ToolButton3Click(Sender: TObject);
  private
    { Private declarations }
    procedure InitGrid();
@ -193,7 +206,7 @@ var
 implementation
 uses
-  U_DataLink, U_RtFun, U_ZDYHelp;
+  U_DataLink, U_RtFun, U_ZDYHelp, U_LabelPrint;
 {$R *.dfm}
@ -212,22 +225,47 @@ begin
 //      sql.Add(',SSCNYAmount=((Case when ISNULL(A.RegType,'''')=''收款'' then -1*Amount else Amount end) ');
 //      sql.Add('-ISNULL(A.SXFAmount,0))*ISNULL((Case when Currency=''CNY'' then 1 else A.JHExchangeRate end),1)');
-      sql.Add(',AAA = ISNULL((select CWBSY from Costing_Table where COrderNo = A.OrderNo), 0),');
+      sql.Add(',WBSJRMB = ISNULL((select sum(cast(CWBSY as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0),');
-      sql.Add('BBB = ISNULL((select CRMBSSJE from Costing_Table where COrderNo = A.OrderNo), 0),');
+      sql.Add('RMBSHJE = ISNULL((select sum(cast(CRMBSSJE as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0),');
-      sql.Add('CCC = ISNULL((select CTSSY from Costing_Table where COrderNo = A.OrderNo), 0)');
+      sql.Add('TSSJ = ISNULL((select sum(cast(CTSSY as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0)');
      SQL.Add(',BuyConNO=ISNULL(A.BuyConNo,(select TOP 1 BuyConNo from Trade_Plan_Sub X where X.MainID=A.OrdMainId ))');
      SQL.Add(',A.*,Saleser=(select Top 1 Saleser from BS_Company X where X.CoAbbrName=A.OppCoName)');
      sql.Add(' from Finance_Flow A where A.OrderNo= ' + QuotedStr(Trim(FOrderNo)));
-      sql.Add(' and FFFlag =  ''应收收'' ');
+      sql.Add(' and FFType =  ''应收款登记'' ');
 //      sql.Add(' and ISNULL(A.FFTime,A.SQDate)<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' ');
      //ShowMessage(sql.text);
      Open;
    end;
    SCreateCDS(ADOQueryMain, CDS_HZ);
    SInitCDSData(ADOQueryMain, CDS_HZ);
    if not CDS_HZ.IsEmpty then
    begin
      with CDS_HZ do
      begin
        for var i := 0 to 2 do
        begin
          append;
          if i = 0 then
          begin
            CDS_HZ.FieldByName('FFAbstract').Value := '外币收益RMB';
            CDS_HZ.FieldByName('Amount').Value := ADOQueryMain.FieldByName('WBSJRMB').Value;
          end
          else if i = 1 then
          begin
            CDS_HZ.FieldByName('FFAbstract').Value := '人民币实收金额';
            CDS_HZ.FieldByName('Amount').Value := ADOQueryMain.FieldByName('RMBSHJE').Value;
          end
          else if i = 2 then
          begin
            CDS_HZ.FieldByName('FFAbstract').Value := '退税收益';
            CDS_HZ.FieldByName('Amount').Value := ADOQueryMain.FieldByName('TSSJ').Value;
          end;
          post;
        end;
      end;
    end;
  finally
    ADOQueryMain.EnableControls;
    TV4.DataController.Filter.Clear;
@ -248,15 +286,13 @@ begin
 //      sql.Add(',SSAmount=(Case when ISNULL(A.RegType,'''')=''收款'' then -1*Amount else Amount end)-ISNULL(A.SXFAmount,0)');
 //      sql.Add(',SSCNYAmount=((Case when ISNULL(A.RegType,'''')=''收款'' then -1*Amount else Amount end) ');
 //      sql.Add('-ISNULL(A.SXFAmount,0))*ISNULL((Case when Currency=''CNY'' then 1 else A.JHExchangeRate end),1)');
-
+      sql.Add(',GDSs = ISNULL((select sum(cast(GDS as decimal(18, 2))) from Costing_Table where COrderNo = A.OrderNo), 0),');
-      sql.Add(',DDD = ISNULL((select GDS from Costing_Table where COrderNo = A.OrderNo), 0),');
+      sql.Add('QTSF = ISNULL((select sum(cast(COrderSF as decimal(18, 2))) from Costing_Table where COrderNo = A.OrderNo), 0),');
      sql.Add('EEE = ISNULL((select COrderSF from Costing_Table where COrderNo = A.OrderNo), 0),');
      SQL.Add('BuyConNO=ISNULL(A.BuyConNo,(select TOP 1 BuyConNo from Trade_Plan_Sub X where X.MainID=A.OrdMainId ))');
      SQL.Add(',A.*,Saleser=(select Top 1 Saleser from BS_Company X where X.CoAbbrName=A.OppCoName)');
      sql.Add(' from Finance_Flow A where A.OrderNo= ' + QuotedStr(Trim(FOrderNo)));
-      sql.Add(' and FFFlag =  ''应付付'' ');
+      sql.Add(' and (FFType =  ''应付款登记'' or FFType = ''其他应付款登记'' or FFType = ''手工费用登记'' ) ');
 //      sql.Add(' and ISNULL(A.FFTime,A.SQDate)>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' ');
 //      sql.Add(' and ISNULL(A.FFTime,A.SQDate)<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' ');
      //ShowMessage(sql.text);
@ -264,6 +300,28 @@ begin
    end;
    SCreateCDS(ADOQuery5, ClientDataSet1);
    SInitCDSData(ADOQuery5, ClientDataSet1);
    if not ClientDataSet1.IsEmpty then
    begin
      with ClientDataSet1 do
      begin
        for var i := 0 to 1 do
        begin
          append;
          if i = 0 then
          begin
            FieldByName('FFAbstract').Value := '国地税';
            FieldByName('Amount').Value := ADOQuery5.FieldByName('GDSs').Value;
          end
          else if i = 1 then
          begin
            FieldByName('FFAbstract').Value := '其他税费';
            FieldByName('Amount').Value := ADOQuery5.FieldByName('QTSF').Value;
          end;
          post;
        end;
      end;
    end;
  finally
    ADOQuery5.EnableControls;
    TV1.DataController.Filter.Clear;
@ -279,37 +337,169 @@ begin
    Filtered := False;
    Close;
    SQL.Clear;
-    sql.Add('select A.OrderNo,C.OrderNo TOOrdNO,A.C_Pattern,A.C_Color,A.C_ColorNo,ISNULL(A.ZDPrice,0) ZDPrice');
+    sql.Add('select A.OrderNo,C.OrderNo TOOrdNO,A.C_Pattern,A.C_Color,A.C_ColorNo, ISNULL(A.ZDPrice,0) ZDPrice, U.QtyUnit OrdUnit, A.ZDTime ');
-    if FUnit = 'M' then
+//    if FUnit = 'M' then
-    begin
+//    begin
-      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkMeter))')
+//      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkMeter))')
-    end
+//    end
-    else if FUnit = 'Y' then
+//    else if FUnit = 'Y' then
-    begin
+//    begin
-      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkYardage))')
+//      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkYardage))')
-    end
+//    end
-    else if FUnit = 'Kg' then
+//    else if FUnit = 'Kg' then
-    begin
+//    begin
-      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkGrossWeight))')
+//      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkNetWeight))')
-    end;
+//    end;
    SQL.Add(' ,ZDAmount = ISNULL(SUM(ISNULL(A.ZDPrice,0) *');
    SQL.Add(' CASE U.QtyUnit');
    sql.Add(' WHEN ''M'' THEN A.StkMeter');
    SQL.Add(' WHEN ''Y'' THEN A.StkYardage');
    SQL.Add(' ELSE A.StkNetWeight');
    sql.Add(' END), 0) ');
    SQL.Add(',COUNT(CIID) Piece,SUM(StkGrossWeight) GrossWeight');
    sql.Add(',SUM(StkNetWeight) NetWeight,SUM(StkMeter) Meter,SUM(StkYardage) Yardage');
    SQL.Add('from Trade_Cloth_Stock_ZD  A left join Trade_Plan_Sub B on A.ZDSubId=B.SubID');
    sql.Add('left join Trade_Plan_Main C on C.MainId=B.MainId');
    sql.add(' OUTER APPLY (SELECT TOP 1 QtyUnit ');
    sql.Add(' FROM Trade_Cloth_DR_Sub X');
    sql.add(' WHERE X.DRSID = A.DRSID) AS U');
    sql.Add(' where A.MainID= ' + QuotedStr(Trim(FMainID)));
-    Sql.Add('GROUP BY A.OrderNo,C.OrderNo,A.C_Pattern,A.C_Color,A.C_ColorNo,A.ZDPrice');
+    sql.Add(' and C.OrderNo <> '''' ');
    Sql.Add('GROUP BY A.OrderNo,C.OrderNo,A.C_Pattern,A.C_Color,A.C_ColorNo,A.ZDPrice,U.QtyUnit, A.ZDTime');
 //      ShowMessage(sql.text);
    Open;
  end;
  SCreateCDS(ADOQuery2, CDS_2);
  SInitCDSData(ADOQuery2, CDS_2);
  with CDS_2 do
  begin
    first;
    while not eof do
    begin
      Edit;
      FieldByName('SDefNote').AsString := '成品转单';
      post;
      Next;
    end;
  end;
  with ADOQuery2 do
  begin
    Filtered := False;
    Close;
    SQL.Clear;
    SQL.Add(' select FromOrdNo, stkName, C_Pattern, C_Color, C_ColorNo, sum(qty) as qty, price, sum(piece) as piece, qtyUnit, ZDAmount = (isnull(price, 0) * sum(qty)), qty = sum(qty), iotime, ');
    SQL.Add(' (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)) ToOrdNo ');
    SQL.Add(' from Bs_Cloth_IO A where STKName in (''贸易坯布'', ''贸易待检布'')');
    SQL.Add(' and FromOrdNo <> (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)) ');
    sql.Add(' and FromOrdNo = ' + quotedstr(FOrderNo));
    SQL.Add(' group by FromOrdNo, ToOrdNo, C_Pattern, C_Color, C_ColorNo, Price, stkName, qtyUnit, iotime ');
 //    ShowMessage(sql.text);
    Open;
  end;
  SCreateCDS(ADOQuery2, CDS_21);
  SInitCDSData(ADOQuery2, CDS_21);
  if not CDS_21.IsEmpty then
  begin
    CDS_21.First;
    with CDS_2 do
    begin
      for var i := 0 to CDS_21.RecordCount - 1 do
      begin
        append;
        FieldByName('OrderNo').AsString := CDS_21.FieldByName('FromOrdNo').AsString;
        FieldByName('ToOrdNo').AsString := CDS_21.FieldByName('ToOrdNo').AsString;
        FieldByName('C_Pattern').AsString := CDS_21.FieldByName('C_Pattern').AsString;
        FieldByName('C_Color').AsString := CDS_21.FieldByName('C_Color').AsString;
        FieldByName('ZDAmount').AsString := CDS_21.FieldByName('ZDAmount').AsString;
        FieldByName('C_ColorNo').AsString := CDS_21.FieldByName('C_ColorNo').AsString;
        FieldByName('ZDPrice').AsString := CDS_21.FieldByName('Price').AsString;
        FieldByName('OrdUnit').AsString := CDS_21.FieldByName('qtyUnit').AsString;
        FieldByName('Piece').AsString := CDS_21.FieldByName('Piece').AsString;
        FieldByName('ZDTime').AsString := CDS_21.FieldByName('iotime').AsString;
        if CDS_21.FieldByName('stkName').AsString = '贸易坯布' then
          FieldByName('SDefNote').AsString := '坯布转单'
        else if CDS_21.FieldByName('stkName').AsString = '贸易待检布' then
          FieldByName('SDefNote').AsString := '待检布转单';
        if LowerCase(CDS_21.FieldByName('QtyUnit').AsString) = 'kg' then
          FieldByName('NetWeight').AsString := CDS_21.FieldByName('qty').AsString
        else if LowerCase(CDS_21.FieldByName('QtyUnit').AsString) = 'm' then
          FieldByName('Meter').AsString := CDS_21.FieldByName('qty').AsString;
        CDS_21.Next;
      end;
      post;
    end;
  end;
  with ADOQuery2 do
  begin
    Filtered := False;
    Close;
    SQL.Clear;
    SQL.Add('SELECT ');
    SQL.Add('  B.OrderNo AS FromOrdNo, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, ISNULL(A.price, sub.price) price, sub.QtyUnit, A.IOTime,COUNT(*) Piece, A.IOType,');
    SQL.Add(' Sum(A.Meter) Meter, Sum(A.NetWeight) NetWeight, Sum(A.GrossWeight) GrossWeight, Sum(A.Yardage) Yardage,');
    SQL.Add('  (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO)  AS TOOrdNo,');
    SQL.Add('  CAST(ISNULL(Sum(');
    SQL.Add('  ISNULL(A.price, sub.price) * ');
    SQL.Add('  ISNULL( CASE sub.QtyUnit');
    SQL.Add(' WHEN ''M'' THEN  A.Meter');
    SQL.Add(' 	WHEN ''Kg'' THEN A.NetWeight  ');
    SQL.Add(' 				WHEN ''Y'' THEN A.Yardage');
    SQL.Add(' 	END, 0)),0) AS DECIMAL(18,2)) AS zdamount');
    SQL.Add('FROM Trade_Cloth_IO A ');
    SQL.Add('JOIN Trade_Cloth_Stock B ON A.StkID = B.StkID ');
    SQL.Add('CROSS APPLY (');
    SQL.Add('  SELECT TOP 1 QtyUnit, price ');
    SQL.Add('  FROM Trade_Cloth_DR_Sub X ');
    SQL.Add('  WHERE X.DRMID = A.IONO');
    SQL.Add(') sub');
    SQL.Add('WHERE B.OrderNo <> (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) ');
    SQL.Add('  AND A.IOType IN (''加工出库'', ''回修出库'')');
    SQL.Add(' AND B.OrderNo = ' + QuotedStr(FOrderNo));
    SQL.Add('GROUP BY B.OrderNo, A.IONO, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, sub.price, sub.QtyUnit, A.IOTime, A.price');
    Open;
  end;
  SCreateCDS(ADOQuery2, CDS_22);
  SInitCDSData(ADOQuery2, CDS_22);
  if not CDS_22.IsEmpty then
  begin
    CDS_22.First;
    with CDS_2 do
    begin
      for var i := 0 to CDS_22.RecordCount - 1 do
      begin
        append;
        FieldByName('OrderNo').AsString := CDS_22.FieldByName('FromOrdNo').AsString;
        FieldByName('ToOrdNo').AsString := CDS_22.FieldByName('ToOrdNo').AsString;
        FieldByName('C_Pattern').AsString := CDS_22.FieldByName('C_Pattern').AsString;
        FieldByName('C_Color').AsString := CDS_22.FieldByName('C_Color').AsString;
        FieldByName('ZDAmount').AsString := CDS_22.FieldByName('ZDAmount').AsString;
        FieldByName('C_ColorNo').AsString := CDS_22.FieldByName('C_ColorNo').AsString;
        FieldByName('ZDPrice').AsString := CDS_22.FieldByName('Price').AsString;
        FieldByName('OrdUnit').AsString := CDS_22.FieldByName('qtyUnit').AsString;
        FieldByName('Piece').AsString := CDS_22.FieldByName('Piece').AsString;
        FieldByName('ZDTime').AsString := CDS_22.FieldByName('iotime').AsString;
        FieldByName('Meter').AsString := CDS_22.FieldByName('Meter').AsString;
        FieldByName('GrossWeight').AsString := CDS_22.FieldByName('GrossWeight').AsString;
        FieldByName('Yardage').AsString := CDS_22.FieldByName('Yardage').AsString;
        FieldByName('NetWeight').AsString := CDS_22.FieldByName('NetWeight').AsString;
        if CDS_22.FieldByName('IOType').AsString = '加工出库' then
          FieldByName('SDefNote').AsString := ' 加工转单'
        else if CDS_22.FieldByName('IOType').AsString = '回修出库' then
          FieldByName('SDefNote').AsString := ' 回修转单';
        CDS_22.Next;
      end;
      post;
    end;
  end;
  with ADOQuery3 do
  begin
    Filtered := False;
    Close;
    SQL.Clear;
-    sql.Add('select A.OrderNo FromOrdNo,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,COUNT(CIID) Piece,ISNULL(A.ZDPrice,0) ZDPrice');
+    sql.Add('select A.OrderNo FromOrdNo,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,COUNT(CIID) Piece,ISNULL(A.ZDPrice,0) ZDPrice, B.OrdUnit, A.ZDTime');
    if FUnit = 'M' then
    begin
      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkMeter))')
@ -320,17 +510,140 @@ begin
    end
    else if FUnit = 'Kg' then
    begin
-      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkGrossWeight))')
+      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkNetWeight))')
    end;
    SQL.Add(',SUM(StkGrossWeight) GrossWeight,SUM(StkNetWeight) NetWeight,SUM(StkMeter) Meter,SUM(StkYardage) Yardage');
    SQL.Add('from Trade_Cloth_Stock_ZD  A left join Trade_Plan_Sub B on A.ZDSubId=B.SubID');
    sql.Add('left join Trade_Plan_Main C on C.MainId=B.MainId where A.ZDMainID= ' + QuotedStr(Trim(FMainID)));
-    Sql.Add('GROUP BY A.OrderNO,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,A.ZDPrice');
+    Sql.Add('GROUP BY A.OrderNO,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,A.ZDPrice, B.OrdUnit, A.ZDTime');
 //      ShowMessage(sql.text);
    Open;
  end;
  SCreateCDS(ADOQuery3, CDS_3);
  SInitCDSData(ADOQuery3, CDS_3);
  with CDS_3 do
  begin
    first;
    while not eof do
    begin
      Edit;
      FieldByName('SDefNote').AsString := '成品转单';
      post;
      Next;
    end;
  end;
  with ADOQuery3 do
  begin
    Filtered := False;
    Close;
    SQL.Clear;
    SQL.Add('select stkName, FromOrdNo, C_Pattern, C_Color, C_ColorNo, Price, qtyUnit, ZDAmount = (isnull(price, 0) * sum(qty)), qty = sum(qty), sum(piece) as piece, iotime, ');
    SQL.Add(' (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)) ToOrdNo ');
    SQL.Add(' from Bs_Cloth_IO A where STKName in (''贸易坯布'', ''贸易待检布'')');
    SQL.Add(' and FromOrdNo <> (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)) ');
    sql.Add(' and (select OrderNo from Trade_Plan_Main where MainID in(select MainID from Pur_ClothPlan_Main X where X.PurNo = A.ToOrdNo)) = ' + quotedstr(FOrderNo));
    SQL.Add(' group by FromOrdNo, ToOrdNo, C_Pattern, C_Color, C_ColorNo, Price, stkName, qtyUnit, iotime ');
 //      ShowMessage(sql.text);
    Open;
  end;
  SCreateCDS(ADOQuery3, CDS_31);
  SInitCDSData(ADOQuery3, CDS_31);
  if not CDS_31.IsEmpty then
  begin
    with CDS_3 do
    begin
      CDS_31.First;
      for var i := 0 to CDS_31.RecordCount - 1 do
      begin
        append;
        FieldByName('OrderNo').AsString := OrderNo.Text;
        FieldByName('FromOrdNo').AsString := CDS_31.FieldByName('FromOrdNo').AsString;
        FieldByName('C_Pattern').AsString := CDS_31.FieldByName('C_Pattern').AsString;
        FieldByName('C_Color').AsString := CDS_31.FieldByName('C_Color').AsString;
        FieldByName('ZDAmount').AsString := CDS_31.FieldByName('ZDAmount').AsString;
        FieldByName('C_ColorNo').AsString := CDS_31.FieldByName('C_ColorNo').AsString;
        FieldByName('ZDPrice').AsString := CDS_31.FieldByName('Price').AsString;
        FieldByName('OrdUnit').AsString := CDS_31.FieldByName('qtyUnit').AsString;
        FieldByName('ZDTime').AsString := CDS_31.FieldByName('iotime').AsString;
        FieldByName('Piece').AsString := CDS_31.FieldByName('Piece').AsString;
        if CDS_31.FieldByName('stkName').AsString = '贸易坯布' then
          FieldByName('SDefNote').AsString := '坯布转单'
        else if CDS_31.FieldByName('stkName').AsString = '贸易待检布' then
          FieldByName('SDefNote').AsString := '待检布转单';
        if LowerCase(CDS_31.FieldByName('QtyUnit').AsString) = 'kg' then
          FieldByName('NetWeight').AsString := CDS_31.FieldByName('qty').AsString
        else if LowerCase(CDS_31.FieldByName('QtyUnit').AsString) = 'm' then
          FieldByName('Meter').AsString := CDS_31.FieldByName('qty').AsString;
        CDS_31.Next;
      end;
      post;
    end;
  end;
  with ADOQuery3 do
  begin
    Filtered := False;
    Close;
    SQL.Clear;
    SQL.Add('SELECT ');
    SQL.Add('  B.OrderNo AS FromOrdNo, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, ISNULL(A.price, sub.price) price, sub.QtyUnit, A.IOTime,COUNT(*) Piece, A.IOType,');
    SQL.Add(' Sum(A.Meter) Meter, Sum(A.NetWeight) NetWeight, Sum(A.GrossWeight) GrossWeight, Sum(A.Yardage) Yardage,');
    SQL.Add('  (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO)  AS ToOrdNo,');
    SQL.Add('  CAST(ISNULL(Sum(');
    SQL.Add('  ISNULL(A.price, sub.price) * ');
    SQL.Add('  ISNULL( CASE sub.QtyUnit');
    SQL.Add(' WHEN ''M'' THEN  A.Meter');
    SQL.Add(' 	WHEN ''Kg'' THEN  A.NetWeight  ');
    SQL.Add(' 				WHEN ''Y'' THEN A.Yardage');
    SQL.Add(' 	END, 0)),0) AS DECIMAL(18,2)) AS zdamount');
    SQL.Add('FROM Trade_Cloth_IO A ');
    SQL.Add('JOIN Trade_Cloth_Stock B ON A.StkID = B.StkID ');
    SQL.Add('CROSS APPLY (');
    SQL.Add('  SELECT TOP 1 QtyUnit, price ');
    SQL.Add('  FROM Trade_Cloth_DR_Sub X ');
    SQL.Add('  WHERE X.DRMID = A.IONO');
    SQL.Add(') sub');
    SQL.Add('WHERE B.OrderNo <> (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) ');
    SQL.Add('  AND A.IOType IN (''加工出库'', ''回修出库'')');
    SQL.Add(' AND (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) = ' + QuotedStr(FOrderNo));
    SQL.Add('GROUP BY B.OrderNo, A.IONO, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, sub.price, sub.QtyUnit, A.IOTime, A.price');
    Open;
  end;
  SCreateCDS(ADOQuery3, CDS_32);
  SInitCDSData(ADOQuery3, CDS_32);
  if not CDS_32.IsEmpty then
  begin
    with CDS_3 do
    begin
      CDS_32.First;
      for var i := 0 to CDS_32.RecordCount - 1 do
      begin
        append;
        FieldByName('OrderNo').AsString := OrderNo.Text;
        FieldByName('FromOrdNo').AsString := CDS_32.FieldByName('FromOrdNo').AsString;
        FieldByName('C_Pattern').AsString := CDS_32.FieldByName('C_Pattern').AsString;
        FieldByName('C_Color').AsString := CDS_32.FieldByName('C_Color').AsString;
        FieldByName('ZDAmount').AsString := CDS_32.FieldByName('ZDAmount').AsString;
        FieldByName('C_ColorNo').AsString := CDS_32.FieldByName('C_ColorNo').AsString;
        FieldByName('ZDPrice').AsString := CDS_32.FieldByName('Price').AsString;
        FieldByName('OrdUnit').AsString := CDS_32.FieldByName('qtyUnit').AsString;
        FieldByName('ZDTime').AsString := CDS_32.FieldByName('iotime').AsString;
        FieldByName('Piece').AsString := CDS_32.FieldByName('Piece').AsString;
        FieldByName('Meter').AsString := CDS_32.FieldByName('Meter').AsString;
        FieldByName('GrossWeight').AsString := CDS_32.FieldByName('GrossWeight').AsString;
        FieldByName('Yardage').AsString := CDS_32.FieldByName('Yardage').AsString;
        FieldByName('NetWeight').AsString := CDS_32.FieldByName('NetWeight').AsString;
        if CDS_32.FieldByName('IOType').AsString = '加工出库' then
          FieldByName('SDefNote').AsString := ' 加工转单'
        else if CDS_32.FieldByName('IOType').AsString = '回修出库' then
          FieldByName('SDefNote').AsString := ' 回修转单';
        CDS_32.Next;
      end;
      post;
    end;
  end;
 //  ToolButton2.Click;
 end;
@ -348,6 +661,13 @@ begin
  Action := caFree;
 end;
 procedure TfrmPlanProfitDetails.FormResize(Sender: TObject);
 begin
  inherited;
  cxGrid4.Width := ClientWidth div 2;
  cxGrid2.Width := ClientWidth div 2;
 end;
 procedure TfrmPlanProfitDetails.TBCloseClick(Sender: TObject);
 begin
@ -357,6 +677,9 @@ end;
 procedure TfrmPlanProfitDetails.FormShow(Sender: TObject);
 begin
  inherited;
 //  cxGrid4.Width := 981;
 //  CxSplitter2.Left := cxGrid4.Width;
  ReadCxGrid(trim(self.Caption), Tv1, '利润明细');
 //  Enddate.DateTime := SGetServerDate(ADOQueryTemp);
 ////  begdate.DateTime := StartOfTheMonth(Enddate.DateTime);
@ -390,6 +713,25 @@ begin
  SInitCDSData(ADOQueryMain, CDS_HZ);
 end;
 procedure TfrmPlanProfitDetails.ToolButton3Click(Sender: TObject);
 begin
  inherited;
  try
    frmLabelPrint := TfrmLabelPrint.Create(Application);
    with frmLabelPrint do
    begin
      FLMType := 'TradePlanProfitPrint';
      FFiltration1 := FOrderNo + ',' + FMainID + ',' + FUnit;
      if ShowModal = 1 then
      begin
 //        Self.InitGrid();
      end;
    end;
  finally
    frmLabelPrint.Free;
  end;
 end;
 procedure TfrmPlanProfitDetails.OrderNoChange(Sender: TObject);
 begin
  ToolButton2.Click;
--- a/T01贸易生产计划/U_TradePlanInPut.dfm
+++ b/T01贸易生产计划/U_TradePlanInPut.dfm
@ -781,6 +781,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
      StyleDisabled.LookAndFeel.NativeStyle = True
      StyleFocused.LookAndFeel.NativeStyle = True
      StyleHot.LookAndFeel.NativeStyle = True
      StyleReadOnly.LookAndFeel.NativeStyle = True
      TabOrder = 3
      Visible = False
      OnDblClick = cxDBImage1DblClick
--- a/T01贸易生产计划/U_TradePlanInPut.pas
+++ b/T01贸易生产计划/U_TradePlanInPut.pas
@ -230,6 +230,7 @@ type
    function getOrderNo(fconNo: string): string;
    procedure InitImageHX();
    procedure LookImage(FileName: string);
    function CheckData():Boolean;
    { Private declarations }
  public
    PState, CopyInt, PriceFlag: Integer;
@ -772,6 +773,83 @@ begin
  end;
 end;
 function TfrmTradePlanInPut.CheckData():Boolean;
 begin
  Result := true;
  if CDS_1.IsEmpty then
  begin
    Application.MessageBox('明细不能为空!', '提示', 0);
    Result := false;
    exit;
  end;
  if ProcessingType.Text = '' then
  begin
    Application.MessageBox('加工类型不能为空!', '提示', 0);
    Result := false;
    exit;
  end;
  if OrdUnit.Text = '' then
  begin
    Application.MessageBox('单位不能为空!', '提示', 0);
    Result := false;
    exit;
  end;
  if ProcessingType.text = '大货生产' then
  begin
    if ConNo.Text = '' then
    begin
      Application.MessageBox('大货单合同号不能为空!', '提示', 0);
      Result := false;
      exit;
    end;
  end;
  if OurCoName.Text = '' then
  begin
    Application.MessageBox('经营单位不能为空!', '提示', 0);
    Result := false;
    exit;
  end;
  if CPMC.Text = '' then
  begin
    Application.MessageBox('成品米长不能为空!', '提示', 0);
    Result := false;
    exit;
  end;
  if OrderNo.Text = '' then
  begin
    Application.MessageBox('计划单号不能为空!', '提示', 0);
    Result := false;
    exit;
  end;
  if Currency.Text = '' then
  begin
    Application.MessageBox('币种不能为空!', '提示', 0);
    Result := false;
    exit;
  end;
  if IsTax.Text = '' then
  begin
    Application.MessageBox('是否含税不能为空!', '提示', 0);
    Result := false;
    exit;
  end;
  if CDS_1.Locate('OrdQty', null, []) then
  begin
    Application.MessageBox('数量不能为空!', '提示', 0);
    Result := false;
    exit;
  end;
 end;
 procedure TfrmTradePlanInPut.TBSaveClick(Sender: TObject);
 var
  MAXNO1: string;
@ -781,72 +859,15 @@ begin
    OrdDate.SetFocus;
  end;
-  if CDS_1.IsEmpty then
+  if CheckData() = false then
-  begin
+    exit;
    Application.MessageBox('明细不能为空!', '提示', 0);
    Exit;
  end;
  if ProcessingType.Text = '' then
  begin
    Application.MessageBox('加工类型不能为空!', '提示', 0);
    Exit;
  end;
  if OrdUnit.Text = '' then
  begin
    Application.MessageBox('单位不能为空!', '提示', 0);
    Exit;
  end;
  if ProcessingType.text = '大货生产' then
  begin
    if ConNo.Text = '' then
    begin
      Application.MessageBox('大货单合同号不能为空!', '提示', 0);
      Exit;
    end;
  end;
  if OurCoName.Text = '' then
  begin
    Application.MessageBox('经营单位不能为空!', '提示', 0);
    Exit;
  end;
  if OrderNo.Text = '' then
  begin
    Application.MessageBox('计划单号不能为空!', '提示', 0);
    Exit;
  end;
  if Currency.Text = '' then
  begin
    Application.MessageBox('币种不能为空!', '提示', 0);
    Exit;
  end;
  if IsTax.Text = '' then
  begin
    Application.MessageBox('是否含税不能为空!', '提示', 0);
    Exit;
  end;
  if CDS_1.Locate('OrdQty', null, []) then
  begin
    Application.MessageBox('数量不能为空!', '提示', 0);
    Exit;
  end;
 //  if CDS_1.Locate('C_Color', null, []) then
 //  begin
 //    Application.MessageBox('颜色不能为空!', '提示', 0);
 //    Exit;
 //  end;
  with ADOQuery1 do
  begin
  end;
  if SaveData() then
  begin
--- a/T01贸易生产计划/U_TradePlanSchedule.dfm
+++ b/T01贸易生产计划/U_TradePlanSchedule.dfm
@ -6,7 +6,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
  ClientWidth = 1540
  Position = poScreenCenter
  WindowState = wsMaximized
-  ExplicitLeft = -398
+  ExplicitLeft = -30
  ExplicitWidth = 1556
  ExplicitHeight = 663
  PixelsPerInch = 96
@ -111,7 +111,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
    end
    object Label7: TLabel
      Left = 176
-      Top = 36
+      Top = 35
      Width = 36
      Height = 12
      Caption = #35746#21333#21495
@ -124,11 +124,11 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
      Caption = #23458#25143#21333#21495
    end
    object Label9: TLabel
-      Left = 358
+      Left = 384
-      Top = 36
+      Top = 34
-      Width = 78
+      Width = 48
      Height = 12
-      Caption = #20135#21697#21517#31216'/'#24037#33402
+      Caption = #20135#21697#21517#31216
    end
    object Label1: TLabel
      Left = 603
@ -204,14 +204,14 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
      TabOrder = 0
    end
    object Enddate: TDateTimePicker
-      Left = 72
+      Left = 73
      Top = 32
      Width = 97
      Height = 20
      Date = 41256.000000000000000000
      Format = 'yyyy-MM-dd'
      Time = 0.918237847232376200
-      TabOrder = 1
+      TabOrder = 8
    end
    object CustName: TEdit
      Tag = 2
@ -219,35 +219,35 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
      Top = 6
      Width = 135
      Height = 20
-      TabOrder = 2
+      TabOrder = 1
-      OnChange = CustNameChange
+      OnKeyPress = CustNameKeyPress
    end
    object OrderNo: TEdit
      Tag = 2
-      Left = 221
+      Left = 219
      Top = 32
      Width = 135
      Height = 20
-      TabOrder = 3
+      TabOrder = 7
-      OnChange = CustNameChange
+      OnKeyPress = CustNameKeyPress
    end
    object BuyConNo: TEdit
      Tag = 2
-      Left = 436
+      Left = 440
-      Top = 7
+      Top = 4
      Width = 135
      Height = 20
-      TabOrder = 4
+      TabOrder = 2
-      OnChange = OrderNoChange
+      OnKeyPress = CustNameKeyPress
    end
-    object PMGY: TEdit
+    object C_Name: TEdit
      Tag = 2
-      Left = 438
+      Left = 440
-      Top = 34
+      Top = 30
      Width = 135
      Height = 20
-      TabOrder = 5
+      TabOrder = 3
-      OnChange = OrderNoChange
+      OnKeyPress = CustNameKeyPress
    end
    object Panel2: TPanel
      Left = 1112
@ -256,7 +256,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
      Height = 29
      Color = clYellow
      ParentBackground = False
-      TabOrder = 6
+      TabOrder = 4
    end
    object Panel3: TPanel
      Left = 1268
@ -265,7 +265,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
      Height = 29
      Color = 36095
      ParentBackground = False
-      TabOrder = 7
+      TabOrder = 5
    end
    object Panel4: TPanel
      Left = 1420
@ -274,7 +274,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
      Height = 29
      Color = 4678655
      ParentBackground = False
-      TabOrder = 8
+      TabOrder = 6
    end
  end
  object cxGrid1: TcxGrid [2]
@ -550,7 +550,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Width = 110
+        Width = 92
        Position.BandIndex = 0
        Position.ColIndex = 19
        Position.RowIndex = 0
@ -814,7 +814,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
        DataBinding.FieldName = 'FZR'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 43
+        Width = 61
        Position.BandIndex = 0
        Position.ColIndex = 18
        Position.RowIndex = 0
--- a/T01贸易生产计划/U_TradePlanSchedule.pas
+++ b/T01贸易生产计划/U_TradePlanSchedule.pas
@ -76,7 +76,7 @@ type
    TV1Column32: TcxGridDBBandedColumn;
    TV1Column33: TcxGridDBBandedColumn;
    Label9: TLabel;
-    PMGY: TEdit;
+    C_Name: TEdit;
    TV1Column27: TcxGridDBBandedColumn;
    TV1Column3: TcxGridDBBandedColumn;
    TV1Column2: TcxGridDBBandedColumn;
@ -129,13 +129,13 @@ type
    procedure MPRTCodeNameChange(Sender: TObject);
    procedure FormCreate(Sender: TObject);
    procedure ToolButton3Click(Sender: TObject);
    procedure CustNameChange(Sender: TObject);
    procedure OrderNoChange(Sender: TObject);
    procedure cxTabControl1Change(Sender: TObject);
    procedure TV1DblClick(Sender: TObject);
    procedure ToolButton5Click(Sender: TObject);
    procedure N1Click(Sender: TObject);
    procedure TV1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
    procedure CustNameKeyPress(Sender: TObject; var Key: Char);
  private
    { Private declarations }
@ -238,16 +238,23 @@ begin
  ToolButton2.Click;
 end;
 procedure TfrmTradePlanSchedule.CustNameKeyPress(Sender: TObject;
  var Key: Char);
 begin
  inherited;
  if Key = #13 then
  begin
    Key := #0;
    ToolButton2.Click;
  end;
 end;
 procedure TfrmTradePlanSchedule.cxTabControl1Change(Sender: TObject);
 begin
  InitGrid();
 end;
 procedure TfrmTradePlanSchedule.CustNameChange(Sender: TObject);
 begin
  ToolButton2.Click;
 end;
 procedure TfrmTradePlanSchedule.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
--- a/T01贸易生产计划/U_TradePlanScheduleDetail.dfm
+++ b/T01贸易生产计划/U_TradePlanScheduleDetail.dfm
@ -36,6 +36,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
      TabOrder = 0
      object TV1: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_1
        DataController.Summary.DefaultGroupSummaryItems = <
          item
@ -77,6 +78,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #26816#39564#26102#38388
          DataBinding.FieldName = 'ioTime'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxDateEditProperties'
          Properties.SaveTime = False
          Properties.ShowTime = False
@ -88,6 +90,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21697#21517
          DataBinding.FieldName = 'C_Name'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Buttons = <
            item
@ -101,6 +104,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn7: TcxGridDBColumn
          Caption = #21305#25968
          DataBinding.FieldName = 'JYPiece'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 65
@ -109,6 +113,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #31859#25968
          DataBinding.FieldName = 'JYMeter'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxTextEditProperties'
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
@ -117,12 +122,14 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object TV1Column1: TcxGridDBColumn
          Caption = #30721#25968
          DataBinding.FieldName = 'JYGrossWeight'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 73
        end
        object TV1Column2: TcxGridDBColumn
          Caption = #37325#37327
          DataBinding.FieldName = 'JYGrossWeight'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 66
        end
@ -140,6 +147,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
      TabOrder = 1
      object TV8: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_8
        DataController.Summary.DefaultGroupSummaryItems = <
          item
@ -180,6 +188,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn58: TcxGridDBColumn
          Caption = #20986#24211#21333#21495
          DataBinding.FieldName = 'IONo'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 83
@ -188,6 +197,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20986#24211#26102#38388
          DataBinding.FieldName = 'ioTime'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxDateEditProperties'
          Properties.SaveTime = False
          Properties.ShowTime = False
@ -199,6 +209,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20986#24211#31867#22411
          DataBinding.FieldName = 'IOType'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -213,6 +224,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21697#21517
          DataBinding.FieldName = 'C_Name'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Buttons = <
            item
@ -226,6 +238,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn63: TcxGridDBColumn
          Caption = #21305#25968
          DataBinding.FieldName = 'CPCKPiece'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 65
@ -234,6 +247,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #31859#25968
          DataBinding.FieldName = 'CPCKMeter'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxTextEditProperties'
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
@ -243,6 +257,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #30721#25968
          DataBinding.FieldName = 'CPCKYardage'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -256,6 +271,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object TV8Column1: TcxGridDBColumn
          Caption = #37325#37327
          DataBinding.FieldName = 'CPCKGrossWeight'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
        end
      end
@ -281,6 +297,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
      TabOrder = 0
      object TV3: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_3
        DataController.Summary.DefaultGroupSummaryItems = <
          item
@ -321,6 +338,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn1: TcxGridDBColumn
          Caption = #20837#24211#21333#21495
          DataBinding.FieldName = 'BCIOID'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 83
@ -329,6 +347,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20837#24211#26102#38388
          DataBinding.FieldName = 'ioTime'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxDateEditProperties'
          Properties.SaveTime = False
          Properties.ShowTime = False
@ -340,6 +359,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20837#24211#31867#22411
          DataBinding.FieldName = 'IOType'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -354,6 +374,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #26469#33258#21333#20301
          DataBinding.FieldName = 'FromCoName'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Alignment.Horz = taLeftJustify
          Properties.Buttons = <
@ -370,6 +391,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21697#21517
          DataBinding.FieldName = 'C_Name'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Buttons = <
            item
@ -383,6 +405,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object v1Column15: TcxGridDBColumn
          Caption = #21305#25968
          DataBinding.FieldName = 'Piece'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 65
@ -391,6 +414,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #25968#37327
          DataBinding.FieldName = 'Qty'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxTextEditProperties'
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
@ -400,6 +424,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21333#20301
          DataBinding.FieldName = 'QtyUnit'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -414,6 +439,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #22791#27880
          DataBinding.FieldName = 'Note'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 79
@ -432,6 +458,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
      TabOrder = 1
      object TV5: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_5
        DataController.Summary.DefaultGroupSummaryItems = <
          item
@ -472,6 +499,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn13: TcxGridDBColumn
          Caption = #20986#24211#21333#21495
          DataBinding.FieldName = 'BCIOID'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 83
@ -480,6 +508,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20986#24211#26102#38388
          DataBinding.FieldName = 'ioTime'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxDateEditProperties'
          Properties.SaveTime = False
          Properties.ShowTime = False
@ -491,6 +520,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20986#24211#31867#22411
          DataBinding.FieldName = 'IOType'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -505,6 +535,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20986#21040#21333#20301
          DataBinding.FieldName = 'ToCoName'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Alignment.Horz = taLeftJustify
          Properties.Buttons = <
@ -521,6 +552,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21697#21517
          DataBinding.FieldName = 'C_Name'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Buttons = <
            item
@ -534,6 +566,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn18: TcxGridDBColumn
          Caption = #21305#25968
          DataBinding.FieldName = 'Piece'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 65
@ -542,6 +575,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #25968#37327
          DataBinding.FieldName = 'Qty'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxTextEditProperties'
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
@ -551,6 +585,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21333#20301
          DataBinding.FieldName = 'QtyUnit'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -565,6 +600,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #22791#27880
          DataBinding.FieldName = 'Note'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 79
@ -864,6 +900,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
      TabOrder = 0
      object TV2: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_2
        DataController.Summary.DefaultGroupSummaryItems = <
          item
@ -904,6 +941,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn22: TcxGridDBColumn
          Caption = #20837#24211#21333#21495
          DataBinding.FieldName = 'BCIOID'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 83
@ -912,6 +950,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20837#24211#26102#38388
          DataBinding.FieldName = 'ioTime'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxDateEditProperties'
          Properties.SaveTime = False
          Properties.ShowTime = False
@ -923,6 +962,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20837#24211#31867#22411
          DataBinding.FieldName = 'IOType'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -937,6 +977,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #26469#33258#21333#20301
          DataBinding.FieldName = 'FromCoName'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Alignment.Horz = taLeftJustify
          Properties.Buttons = <
@ -953,6 +994,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21697#21517
          DataBinding.FieldName = 'C_Name'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Buttons = <
            item
@ -966,6 +1008,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn27: TcxGridDBColumn
          Caption = #21305#25968
          DataBinding.FieldName = 'Piece'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 65
@ -974,6 +1017,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #25968#37327
          DataBinding.FieldName = 'Qty'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxTextEditProperties'
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
@ -983,6 +1027,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21333#20301
          DataBinding.FieldName = 'QtyUnit'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -997,6 +1042,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #22791#27880
          DataBinding.FieldName = 'Note'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 79
@ -1015,6 +1061,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
      TabOrder = 1
      object TV6: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_6
        DataController.Summary.DefaultGroupSummaryItems = <
          item
@ -1055,6 +1102,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn39: TcxGridDBColumn
          Caption = #20986#24211#21333#21495
          DataBinding.FieldName = 'BCIOID'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 83
@ -1063,6 +1111,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20986#24211#26102#38388
          DataBinding.FieldName = 'ioTime'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxDateEditProperties'
          Properties.SaveTime = False
          Properties.ShowTime = False
@ -1074,6 +1123,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20986#24211#31867#22411
          DataBinding.FieldName = 'IOType'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -1088,6 +1138,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20986#21040#21333#20301
          DataBinding.FieldName = 'ToCoName'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Alignment.Horz = taLeftJustify
          Properties.Buttons = <
@ -1104,6 +1155,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21697#21517
          DataBinding.FieldName = 'C_Name'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Buttons = <
            item
@ -1117,6 +1169,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn44: TcxGridDBColumn
          Caption = #21305#25968
          DataBinding.FieldName = 'Piece'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 65
@ -1125,6 +1178,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #25968#37327
          DataBinding.FieldName = 'Qty'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxTextEditProperties'
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
@ -1134,6 +1188,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21333#20301
          DataBinding.FieldName = 'QtyUnit'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -1148,6 +1203,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #22791#27880
          DataBinding.FieldName = 'Note'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 79
@ -1175,6 +1231,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
      TabOrder = 0
      object TV4: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_4
        DataController.Summary.DefaultGroupSummaryItems = <
          item
@ -1215,6 +1272,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn28: TcxGridDBColumn
          Caption = #20837#24211#21333#21495
          DataBinding.FieldName = 'BCIOID'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 83
@ -1223,6 +1281,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20837#24211#26102#38388
          DataBinding.FieldName = 'ioTime'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxDateEditProperties'
          Properties.SaveTime = False
          Properties.ShowTime = False
@ -1234,6 +1293,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20837#24211#31867#22411
          DataBinding.FieldName = 'IOType'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -1248,6 +1308,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #26469#33258#21333#20301
          DataBinding.FieldName = 'FromCoName'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Alignment.Horz = taLeftJustify
          Properties.Buttons = <
@ -1264,6 +1325,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21697#21517
          DataBinding.FieldName = 'C_Name'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Buttons = <
            item
@ -1277,6 +1339,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn33: TcxGridDBColumn
          Caption = #21305#25968
          DataBinding.FieldName = 'Piece'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 65
@ -1285,6 +1348,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #25968#37327
          DataBinding.FieldName = 'Qty'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxTextEditProperties'
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
@ -1294,6 +1358,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21333#20301
          DataBinding.FieldName = 'QtyUnit'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -1308,6 +1373,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #22791#27880
          DataBinding.FieldName = 'Note'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 79
@ -1326,6 +1392,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
      TabOrder = 1
      object TV7: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_7
        DataController.Summary.DefaultGroupSummaryItems = <
          item
@ -1366,6 +1433,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn49: TcxGridDBColumn
          Caption = #20986#24211#21333#21495
          DataBinding.FieldName = 'BCIOID'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 83
@ -1374,6 +1442,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20986#24211#26102#38388
          DataBinding.FieldName = 'ioTime'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxDateEditProperties'
          Properties.SaveTime = False
          Properties.ShowTime = False
@ -1385,6 +1454,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20986#24211#31867#22411
          DataBinding.FieldName = 'IOType'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -1399,6 +1469,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #20986#21040#21333#20301
          DataBinding.FieldName = 'ToCoName'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Alignment.Horz = taLeftJustify
          Properties.Buttons = <
@ -1415,6 +1486,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21697#21517
          DataBinding.FieldName = 'C_Name'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxButtonEditProperties'
          Properties.Buttons = <
            item
@ -1428,6 +1500,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
        object cxGridDBColumn54: TcxGridDBColumn
          Caption = #21305#25968
          DataBinding.FieldName = 'Piece'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 65
@ -1436,6 +1509,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #25968#37327
          DataBinding.FieldName = 'Qty'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxTextEditProperties'
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
@ -1445,6 +1519,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #21333#20301
          DataBinding.FieldName = 'QtyUnit'
          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxComboBoxProperties'
          Properties.DropDownListStyle = lsFixedList
          Properties.Items.Strings = (
@ -1459,6 +1534,7 @@ object frmTradePlanScheduleDetail: TfrmTradePlanScheduleDetail
          Tag = 2
          Caption = #22791#27880
          DataBinding.FieldName = 'Note'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 79
--- a/Show More
+++ b/Show More