8.10

A00通用窗体/U_UserSel.dfm

@@ -24,8 +24,7 @@ inherited frmUserSel: TfrmUserSel
     ButtonWidth = 75
     Caption = 'ToolBar1'
     Color = clSkyBlue
-    DisabledImages = DataLink_Company.ImageList_new32
+    Images = DataLink_Financial.ImageList_new32
-    Images = DataLink_Company.ImageList_new32
     List = True
     ParentColor = False
     ShowCaptions = True
@@ -73,6 +72,7 @@ inherited frmUserSel: TfrmUserSel
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
+    ExplicitTop = 18
     object Label3: TLabel
       Left = 202
       Top = 13
@@ -115,11 +115,14 @@ inherited frmUserSel: TfrmUserSel
     Height = 445
     Align = alClient
     TabOrder = 2
+    ExplicitTop = 57
+    ExplicitHeight = 465
     object Tv1: TcxGridDBTableView
       OnDblClick = Tv1DblClick
       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 = <>
@@ -128,14 +131,10 @@ inherited frmUserSel: TfrmUserSel
       OptionsBehavior.GoToNextCellOnEnter = True
       OptionsCustomize.ColumnFiltering = False
       OptionsView.GroupByBox = False
-      Styles.IncSearch = DataLink_Company.SHuangSe
-      Styles.Footer = DataLink_Company.handBlack
-      Styles.Header = DataLink_Company.handBlack
-      Styles.Inactive = DataLink_Company.SHuangSe
-      Styles.Selection = DataLink_Company.SHuangSe
       object VC_SSel: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -144,6 +143,7 @@ inherited frmUserSel: TfrmUserSel
       object v2Column1: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'UserID'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 76
@@ -151,6 +151,7 @@ inherited frmUserSel: TfrmUserSel
       object v2Column2: TcxGridDBColumn
         Caption = #21517#31216
         DataBinding.FieldName = 'UserName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 171
@@ -158,6 +159,7 @@ inherited frmUserSel: TfrmUserSel
       object v2Column3: TcxGridDBColumn
         Caption = #37096#38376
         DataBinding.FieldName = 'Udept'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 71
@@ -168,30 +170,30 @@ inherited frmUserSel: TfrmUserSel
     end
   end
   inherited ADOQueryBaseCmd: TADOQuery
-    Connection = ADOConnection1
+    Connection = DataLink_Financial.ADOLink
     Left = 473
     Top = 184
   end
   inherited ADOQueryBaseTemp: TADOQuery
-    Connection = ADOConnection1
+    Connection = DataLink_Financial.ADOLink
     Left = 465
     Top = 105
   end
   object ADOQueryTemp: TADOQuery
-    Connection = ADOConnection1
+    Connection = DataLink_Financial.ADOLink
     LockType = ltReadOnly
     Parameters = <>
     Left = 68
     Top = 136
   end
   object ADOQueryCmd: TADOQuery
-    Connection = ADOConnection1
+    Connection = DataLink_Financial.ADOLink
     Parameters = <>
     Left = 188
     Top = 224
   end
   object ADOQueryMain: TADOQuery
-    Connection = ADOConnection1
+    Connection = DataLink_Financial.ADOLink
     LockType = ltReadOnly
     Parameters = <>
     Left = 54

A00通用窗体/U_UserSel.pas

@@ -14,7 +14,8 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters,
   dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, U_BaseHelp,
-  dxBarBuiltInMenu, System.ImageList, Vcl.ImgList;
+  dxBarBuiltInMenu, System.ImageList, Vcl.ImgList, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   FdDy = record

A01基础公司管理/Company.dproj.local

@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.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.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.481,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_SLT.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.433,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSel.dfm=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSelX.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas</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>
-    <Transaction>1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_EmpFileUp.pas=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustFileUp.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.670,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_YGDJInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.432,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_YGDJInput.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.433,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSel.pas=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSelX.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.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.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.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.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.559,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_Emp_Input.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.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.027,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInRC.pas=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.027,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInRC.dfm=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInput.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.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.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.027,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInput.pas=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInRC.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustFileUp.pas=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_EmpFileUp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.330,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustFileUp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.027,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInput.dfm=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInRC.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.559,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_Emp_Input.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.433,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSelX.pas=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.481,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_SLT.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.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustFileUp.dfm=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_EmpFileUp.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.433,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSelX.dfm=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSel.dfm</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -62,7 +62,7 @@
     <File Path="fmx.dex.jar"/>
     <File Path="google-play-billing.dex.jar"/>
     <File Path="google-play-licensing.dex.jar"/>
-    <File Path="..\..\骉骐"/>
+    <File Path="..\..\D10myBiaoqi"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>

A01基础公司管理/ProjectGroup1.groupproj

@@ -6,6 +6,9 @@
         <Projects Include="testDll.dproj">
             <Dependencies/>
         </Projects>
+        <Projects Include="Company.dproj">
+            <Dependencies/>
+        </Projects>
     </ItemGroup>
     <ProjectExtensions>
         <Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -23,14 +26,23 @@
     <Target Name="testDll:Make">
         <MSBuild Projects="testDll.dproj" Targets="Make"/>
     </Target>
+    <Target Name="Company">
+        <MSBuild Projects="Company.dproj"/>
+    </Target>
+    <Target Name="Company:Clean">
+        <MSBuild Projects="Company.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="Company:Make">
+        <MSBuild Projects="Company.dproj" Targets="Make"/>
+    </Target>
     <Target Name="Build">
-        <CallTarget Targets="testDll"/>
+        <CallTarget Targets="testDll;Company"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="testDll:Clean"/>
+        <CallTarget Targets="testDll:Clean;Company:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="testDll:Make"/>
+        <CallTarget Targets="testDll:Make;Company:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

A01基础公司管理/ProjectGroup1.groupproj.local

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Default.Personality>
-    <Projects ActiveProject="D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\testDll.dproj"/>
+		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\Company.dproj"/>
 	</Default.Personality>
 </BorlandProject>

A01基础公司管理/U_CustFileUp.dfm

@@ -25,6 +25,7 @@ object frmCustFileUp: TfrmCustFileUp
     TabOrder = 0
     object TV7: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource1
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <>
@@ -39,6 +40,7 @@ object frmCustFileUp: TfrmCustFileUp
         Tag = 1
         Caption = #25991#20214#21517#31216
         DataBinding.FieldName = 'FileName'
+        DataBinding.IsNullValueType = True
         FooterAlignmentHorz = taCenter
         HeaderAlignmentHorz = taCenter
         Width = 121
@@ -46,6 +48,7 @@ object frmCustFileUp: TfrmCustFileUp
       object TV7Column1: TcxGridDBColumn
         Caption = #33457#22411#21517#31216
         DataBinding.FieldName = 'HXName'
+        DataBinding.IsNullValueType = True
         Visible = False
         GroupSummaryAlignment = taCenter
         HeaderAlignmentHorz = taCenter
@@ -55,6 +58,7 @@ object frmCustFileUp: TfrmCustFileUp
         Tag = 1
         Caption = #19978#20256#26085#26399
         DataBinding.FieldName = 'TFDate'
+        DataBinding.IsNullValueType = True
         FooterAlignmentHorz = taCenter
         HeaderAlignmentHorz = taCenter
         Width = 104

A01基础公司管理/U_CustFileUp.pas

@@ -11,7 +11,7 @@ uses
   IdTCPConnection, IdTCPClient, IdFTP, StdCtrls, ADODB, jpeg, BtnEdit, IniFiles,
   strutils, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
   dxSkinsDefaultPainters, dxDateRanges, IdExplicitTLSClientServerBase,
-  Vcl.ExtDlgs;
+  Vcl.ExtDlgs, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmCustFileUp = class(TForm)

A01基础公司管理/U_Customer.dfm

@@ -258,6 +258,7 @@ inherited frmCustomer: TfrmCustomer
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnFocusedRecordChanged = Tv1FocusedRecordChanged
       DataController.DataSource = DS_1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -286,11 +287,13 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column1: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         Width = 42
       end
       object v2Column2: TcxGridDBColumn
         Caption = #23458#25143#32534#21495
         DataBinding.FieldName = 'CoCode'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -299,6 +302,7 @@ inherited frmCustomer: TfrmCustomer
       object v2Column6: TcxGridDBColumn
         Caption = #20844#21496#20840#31216
         DataBinding.FieldName = 'CoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -307,6 +311,7 @@ inherited frmCustomer: TfrmCustomer
       object v2Column15: TcxGridDBColumn
         Caption = #20844#21496#31616#31216
         DataBinding.FieldName = 'CoAbbrName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 100
@@ -314,6 +319,7 @@ inherited frmCustomer: TfrmCustomer
       object v2Column10: TcxGridDBColumn
         Caption = #19994#21153#21592
         DataBinding.FieldName = 'Saleser'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 84
@@ -321,6 +327,7 @@ inherited frmCustomer: TfrmCustomer
       object v2Column7: TcxGridDBColumn
         Caption = #20844#21496#22320#22336
         DataBinding.FieldName = 'CoAddress'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -329,18 +336,21 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column8: TcxGridDBColumn
         Caption = #38468#20214
         DataBinding.FieldName = 'IsFJ'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 40
       end
       object Tv1Column9: TcxGridDBColumn
         Caption = #22270#29255
         DataBinding.FieldName = 'ISImg'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 40
       end
       object v2Column1: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -349,6 +359,7 @@ inherited frmCustomer: TfrmCustomer
       object v2Column3: TcxGridDBColumn
         Caption = #22269#23478
         DataBinding.FieldName = 'cocountry'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 99
@@ -356,6 +367,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column2: TcxGridDBColumn
         Caption = #23458#25143#31561#32423
         DataBinding.FieldName = 'CoLevel'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -363,6 +375,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column3: TcxGridDBColumn
         Caption = #30331#35760#26102#38388
         DataBinding.FieldName = 'Filltime'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -370,6 +383,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column4: TcxGridDBColumn
         Caption = #30331#35760#20154
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -377,6 +391,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column5: TcxGridDBColumn
         Caption = #29702#21333
         DataBinding.FieldName = 'Tallyer'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 99
@@ -384,6 +399,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column7: TcxGridDBColumn
         Caption = #19978#32423#21333#20301
         DataBinding.FieldName = 'ParentCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 86
@@ -391,6 +407,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column6: TcxGridDBColumn
         Caption = #23458#25143#31867#22411
         DataBinding.FieldName = 'CoBusinessType'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -398,10 +415,12 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column10: TcxGridDBColumn
         Caption = #23458#25143#26469#28304
         DataBinding.FieldName = 'Source'
+        DataBinding.IsNullValueType = True
       end
       object Tv1Column11: TcxGridDBColumn
         Caption = #40664#35748#32852#31995#20154
         DataBinding.FieldName = 'Contacts'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 77
       end
@@ -429,6 +448,7 @@ inherited frmCustomer: TfrmCustomer
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
         Navigator.Buttons.Delete.Visible = False
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DS_3
         DataController.Summary.DefaultGroupSummaryItems = <>
         DataController.Summary.FooterSummaryItems = <
@@ -451,66 +471,77 @@ inherited frmCustomer: TfrmCustomer
         object TV3Column1: TcxGridDBColumn
           Caption = #31867#22411
           DataBinding.FieldName = 'Type'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 56
         end
         object TV3Column2: TcxGridDBColumn
           Caption = #21333#21495
           DataBinding.FieldName = 'DNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 62
         end
         object TV3Column3: TcxGridDBColumn
           Caption = #26085#26399
           DataBinding.FieldName = 'Date'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 58
         end
         object TV3Column4: TcxGridDBColumn
           Caption = #24065#31181
           DataBinding.FieldName = 'Currency'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 45
         end
         object TV3Column5: TcxGridDBColumn
           Caption = #24635#25968#37327
           DataBinding.FieldName = 'ZQty'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 57
         end
         object TV3Column6: TcxGridDBColumn
           Caption = #21333#20301
           DataBinding.FieldName = 'Unit'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 44
         end
         object TV3Column7: TcxGridDBColumn
           Caption = #24635#37329#39069
           DataBinding.FieldName = 'Amount'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 69
         end
         object TV3Column8: TcxGridDBColumn
           Caption = #32534#21495
           DataBinding.FieldName = 'CodeList'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 360
         end
         object TV3Column9: TcxGridDBColumn
           Caption = #21697#21517
           DataBinding.FieldName = 'NameList'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 360
         end
         object TV3Column10: TcxGridDBColumn
           Caption = #21046#21333#20154
           DataBinding.FieldName = 'Filler'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 69
         end
         object TV3Column11: TcxGridDBColumn
           Caption = #35760#24405#20869#23481
           DataBinding.FieldName = 'Note'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 113
         end
@@ -551,6 +582,7 @@ inherited frmCustomer: TfrmCustomer
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_2
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <
@@ -573,6 +605,7 @@ inherited frmCustomer: TfrmCustomer
       object cxGridDBColumn3: TcxGridDBColumn
         Caption = #40664#35748
         DataBinding.FieldName = 'IsDefault'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -581,6 +614,7 @@ inherited frmCustomer: TfrmCustomer
       object cxGridDBColumn6: TcxGridDBColumn
         Caption = #32852#31995#20154
         DataBinding.FieldName = 'Contacts'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.CharCase = ecUpperCase
         HeaderAlignmentHorz = taCenter
@@ -589,6 +623,7 @@ inherited frmCustomer: TfrmCustomer
       object cxGridDBColumn7: TcxGridDBColumn
         Caption = #32844#20301
         DataBinding.FieldName = 'position'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.CharCase = ecUpperCase
         HeaderAlignmentHorz = taCenter
@@ -597,6 +632,7 @@ inherited frmCustomer: TfrmCustomer
       object cxGridDBColumn8: TcxGridDBColumn
         Caption = #32852#31995#30005#35805
         DataBinding.FieldName = 'Telephone'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.CharCase = ecUpperCase
         HeaderAlignmentHorz = taCenter
@@ -605,6 +641,7 @@ inherited frmCustomer: TfrmCustomer
       object cxGridDBColumn9: TcxGridDBColumn
         Caption = #25163#26426#21495
         DataBinding.FieldName = 'PhoneNumber'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.CharCase = ecUpperCase
         HeaderAlignmentHorz = taCenter
@@ -613,6 +650,7 @@ inherited frmCustomer: TfrmCustomer
       object cxGridDBColumn10: TcxGridDBColumn
         Caption = 'EMAIL'
         DataBinding.FieldName = 'Email'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.CharCase = ecUpperCase
         HeaderAlignmentHorz = taCenter
@@ -621,6 +659,7 @@ inherited frmCustomer: TfrmCustomer
       object cxGridDBColumn11: TcxGridDBColumn
         Caption = #24494#20449#21495
         DataBinding.FieldName = 'WeChat'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 169
       end

A01基础公司管理/U_Customer.pas

@@ -14,7 +14,7 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  dxBarBuiltInMenu, cxPC, jpeg;
+  dxBarBuiltInMenu, cxPC, jpeg, dxSkinWXI, dxScrollbarAnnotations;
 
 var
   Mach: array of TfrmSlt;

A01基础公司管理/U_DataLink.pas

@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
   Windows, Messages, forms, OleCtnrs, DateUtils, cxClasses, dxSkinsCore,
-  dxSkinsDefaultPainters, System.ImageList, Vcl.ExtCtrls, SyncObjs;
+  dxSkinsDefaultPainters, System.ImageList, Vcl.ExtCtrls, SyncObjs, dxSkinWXI;
 
 type
   TMyThread = class(TThread)

A03基础价格管理/MarketValue.skincfg

@@ -0,0 +1,62 @@
+[ExpressSkins]
+Default=0
+ShowNotifications=1
+Enabled=1
+dxSkinBasic=1
+dxSkinBlack=1
+dxSkinBlue=1
+dxSkinBlueprint=1
+dxSkinCaramel=1
+dxSkinCoffee=1
+dxSkinDarkroom=1
+dxSkinDarkSide=1
+dxSkinDevExpressDarkStyle=1
+dxSkinDevExpressStyle=1
+dxSkinFoggy=1
+dxSkinGlassOceans=1
+dxSkinHighContrast=1
+dxSkiniMaginary=1
+dxSkinLilian=1
+dxSkinLiquidSky=1
+dxSkinLondonLiquidSky=1
+dxSkinMcSkin=1
+dxSkinMetropolis=1
+dxSkinMetropolisDark=1
+dxSkinMoneyTwins=1
+dxSkinOffice2007Black=1
+dxSkinOffice2007Blue=1
+dxSkinOffice2007Green=1
+dxSkinOffice2007Pink=1
+dxSkinOffice2007Silver=1
+dxSkinOffice2010Black=1
+dxSkinOffice2010Blue=1
+dxSkinOffice2010Silver=1
+dxSkinOffice2013DarkGray=1
+dxSkinOffice2013LightGray=1
+dxSkinOffice2013White=1
+dxSkinOffice2016Colorful=1
+dxSkinOffice2016Dark=1
+dxSkinOffice2019Black=1
+dxSkinOffice2019Colorful=1
+dxSkinOffice2019DarkGray=1
+dxSkinOffice2019White=1
+dxSkinPumpkin=1
+dxSkinSeven=1
+dxSkinSevenClassic=1
+dxSkinSharp=1
+dxSkinSharpPlus=1
+dxSkinSilver=1
+dxSkinSpringtime=1
+dxSkinStardust=1
+dxSkinSummer2008=1
+dxSkinTheAsphaltWorld=1
+dxSkinTheBezier=1
+dxSkinsDefaultPainters=1
+dxSkinValentine=1
+dxSkinVisualStudio2013Blue=1
+dxSkinVisualStudio2013Dark=1
+dxSkinVisualStudio2013Light=1
+dxSkinVS2010=1
+dxSkinWhiteprint=1
+dxSkinWXI=1
+dxSkinXmas2008Blue=1

A03基础价格管理/ProjectGroup1.groupproj.local

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Default.Personality>
-    <Projects ActiveProject="D:\Dp10Repo\项目代码\骉骐\A03基础价格管理\testDll.dproj"/>
+		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10myBiaoqi\A03基础价格管理\MarketValue.dproj"/>
 	</Default.Personality>
 </BorlandProject>

A09财务通用管理/Financial.dpr

@@ -33,7 +33,11 @@ uses
   U_OtherPayableInput in 'U_OtherPayableInput.pas' {frmOtherPayableInput},
   U_handPayableList in 'U_handPayableList.pas' {frmhandPayableList},
   U_HandPayableInPut in 'U_HandPayableInPut.pas' {frmHandPayableInPut},
-  U_HandPayableImport in 'U_HandPayableImport.pas' {frmHandPayableImport};
+  U_HandPayableImport in 'U_HandPayableImport.pas' {frmHandPayableImport},
+  U_UserSel in '..\A00通用窗体\U_UserSel.pas' {frmUserSel},
+  U_ProductInfoSel in '..\A00通用窗体\U_ProductInfoSel.pas' {frmProductInfoSel},
+  U_PictureUpload in '..\A00通用窗体\U_PictureUpload.pas' {frmPictureUpload},
+  U_FinFileUp in 'U_FinFileUp.pas' {frmFinFileUp};
 
 {$R *.res}
 

A09财务通用管理/Financial.dproj

@@ -218,6 +218,22 @@
             <Form>frmHandPayableImport</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="..\A00通用窗体\U_UserSel.pas">
+            <Form>frmUserSel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="..\A00通用窗体\U_ProductInfoSel.pas">
+            <Form>frmProductInfoSel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="..\A00通用窗体\U_PictureUpload.pas">
+            <Form>frmPictureUpload</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_FinFileUp.pas">
+            <Form>frmFinFileUp</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

A09财务通用管理/Financial.dproj.local

@@ -1,53 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.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.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.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm</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.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.064,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj</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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.715,=D:\Dp10Repo\public10\design\U_BaseDataLink.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.753,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.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.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.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.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.dfm</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.040,=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.345,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_FtyStatement.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.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.927,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableList.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.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>2024-08-06 09:44:01.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.pas</Transaction>
+    <Transaction>2024-08-10 14:27:36.318,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
-    <Transaction>2024-08-06 09:44:01.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.dfm</Transaction>
+    <Transaction>2024-08-10 14:28:06.349,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>2024-08-06 09:44:58.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.dfm</Transaction>
+    <Transaction>2024-08-10 14:32:22.072,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FinFileUp.pas</Transaction>
-    <Transaction>2024-08-06 09:44:58.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.pas</Transaction>
-    <Transaction>2024-08-06 14:37:23.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -92,6 +96,12 @@
     <File Path="..\A00通用窗体\U_LabelMapSet.dfm"/>
     <File Path="..\A00通用窗体\U_LabelPrint.pas"/>
     <File Path="..\A00通用窗体\U_LabelPrint.dfm"/>
+    <File Path="..\A00通用窗体\U_PictureUpload.pas"/>
+    <File Path="..\A00通用窗体\U_PictureUpload.dfm"/>
+    <File Path="..\A00通用窗体\U_ProductInfoSel.pas"/>
+    <File Path="..\A00通用窗体\U_ProductInfoSel.dfm"/>
+    <File Path="..\A00通用窗体\U_UserSel.pas"/>
+    <File Path="..\A00通用窗体\U_UserSel.dfm"/>
     <File Path="..\T00贸易通用窗体"/>
     <File Path="..\T00贸易通用窗体\U_TradePlanSel.pas"/>
     <File Path="..\T00贸易通用窗体\U_TradePlanSel.dfm"/>
@@ -134,5 +144,7 @@
     <File Path="U_HandPayableInPut.dfm"/>
     <File Path="U_HandPayableImport.pas"/>
     <File Path="U_HandPayableImport.dfm"/>
+    <File Path="U_FinFileUp.pas"/>
+    <File Path="U_FinFileUp.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

A09财务通用管理/U_CollectInput.pas

@@ -73,7 +73,6 @@ type
     { Private declarations }
     procedure InitGrid();
     function SaveData(): Boolean;
-
   public
     { Public declarations }
     FFFID: string;
@@ -276,10 +275,21 @@ begin
   MDKAmount := Strtofloatdef(DKAmount.Text, 0);
   MHL := Strtofloatdef(ExchangeRate.Text, 0);
 
+  if Currency.text = 'USD' then
+  begin
+    if MDKAmount / MHL >= 0 then
+    begin
+      MAmount := RoundFloat((MDKAmount / MHL), 2);
+    end;
+  end
+  else if Currency.text = 'CNY' then
+  begin
+
     if MDKAmount * MHL >= 0 then
     begin
       MAmount := RoundFloat((MDKAmount * MHL), 2);
     end;
+  end;
 //  Price.Text := FloatToStr(MPrice);
 //  Qty.Text := FloatToStr(MQty);
 //  OtherFee.Text := FloatToStr(MOtherFee);

A09财务通用管理/U_FinFileUp.dfm

@@ -0,0 +1,274 @@
+object frmFinFileUp: TfrmFinFileUp
+  Left = 612
+  Top = 236
+  Caption = #19978#20256#22270#29255
+  ClientHeight = 595
+  ClientWidth = 929
+  Color = clBtnFace
+  Font.Charset = GB2312_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -12
+  Font.Name = #23435#20307
+  Font.Style = []
+  OldCreateOrder = False
+  Position = poMainFormCenter
+  OnCreate = FormCreate
+  OnShow = FormShow
+  PixelsPerInch = 96
+  TextHeight = 12
+  object cxGrid7: TcxGrid
+    Left = 0
+    Top = 41
+    Width = 858
+    Height = 554
+    Align = alClient
+    TabOrder = 0
+    object TV7: TcxGridDBTableView
+      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
+      DataController.DataSource = DataSource1
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <>
+      DataController.Summary.SummaryGroups = <>
+      OptionsBehavior.GoToNextCellOnEnter = True
+      OptionsBehavior.FocusCellOnCycle = True
+      OptionsCustomize.ColumnFiltering = False
+      OptionsData.Editing = False
+      OptionsView.GroupByBox = False
+      OptionsView.Indicator = True
+      object FileName: TcxGridDBColumn
+        Tag = 1
+        Caption = #25991#20214#21517#31216
+        DataBinding.FieldName = 'FileName'
+        DataBinding.IsNullValueType = True
+        FooterAlignmentHorz = taCenter
+        HeaderAlignmentHorz = taCenter
+        Width = 121
+      end
+      object TV7Column1: TcxGridDBColumn
+        Caption = #33457#22411#21517#31216
+        DataBinding.FieldName = 'HXName'
+        DataBinding.IsNullValueType = True
+        Visible = False
+        GroupSummaryAlignment = taCenter
+        HeaderAlignmentHorz = taCenter
+        Width = 91
+      end
+      object FileDate: TcxGridDBColumn
+        Tag = 1
+        Caption = #19978#20256#26085#26399
+        DataBinding.FieldName = 'TFDate'
+        DataBinding.IsNullValueType = True
+        FooterAlignmentHorz = taCenter
+        HeaderAlignmentHorz = taCenter
+        Width = 104
+      end
+    end
+    object cxGridLevel6: TcxGridLevel
+      GridView = TV7
+    end
+  end
+  object Panel16: TPanel
+    Left = 190
+    Top = 126
+    Width = 138
+    Height = 30
+    BevelInner = bvRaised
+    Caption = #27491#22312#19978#20256#12290#12290#12290
+    Color = clSkyBlue
+    TabOrder = 1
+    Visible = False
+  end
+  object ToolBar6: TToolBar
+    Left = 858
+    Top = 41
+    Width = 71
+    Height = 554
+    Align = alRight
+    AutoSize = True
+    ButtonHeight = 38
+    ButtonWidth = 75
+    Caption = 'ToolBar1'
+    Images = DataLink_Financial.ImageList_new32
+    List = True
+    ShowCaptions = True
+    TabOrder = 2
+    ExplicitLeft = 866
+    object FileUp: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #19978#20256
+      ImageIndex = 2
+      Wrap = True
+      OnClick = FileUpClick
+    end
+    object FileDel: TToolButton
+      Left = 0
+      Top = 38
+      AutoSize = True
+      Caption = #21024#38500
+      ImageIndex = 5
+      Wrap = True
+      OnClick = FileDelClick
+    end
+  end
+  object Panel1: TPanel
+    Left = 0
+    Top = 0
+    Width = 929
+    Height = 41
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    TabOrder = 3
+    object Label1: TLabel
+      Left = 8
+      Top = 15
+      Width = 72
+      Height = 17
+      Caption = #23458#25143#32534#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clRed
+      Font.Height = -17
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      Visible = False
+    end
+    object Image2: TImage
+      Left = 774
+      Top = 7
+      Width = 60
+      Height = 28
+      Visible = False
+    end
+    object Image1: TImage
+      Left = 861
+      Top = 7
+      Width = 60
+      Height = 28
+      Visible = False
+    end
+    object Label2: TLabel
+      Left = 336
+      Top = 14
+      Width = 36
+      Height = 17
+      Caption = #33457#22411
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clRed
+      Font.Height = -17
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      Visible = False
+    end
+    object Code: TEdit
+      Left = 78
+      Top = 11
+      Width = 211
+      Height = 25
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clBlue
+      Font.Height = -17
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      ReadOnly = True
+      TabOrder = 0
+      Visible = False
+    end
+    object HXName: TBtnEditC
+      Tag = 2
+      Left = 378
+      Top = 9
+      Width = 168
+      Height = 29
+      Hint = 'CYKZ/'#20811#37325
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 1
+      Visible = False
+      OnBtnUpClick = HXNameBtnUpClick
+      OnBtnDnClick = HXNameBtnDnClick
+    end
+  end
+  object ODPat: TOpenDialog
+    Filter = 
+      'All (*.svg;*.jpg;*.jpeg;*.gif;*.tif;*.tiff;*.png;*.gif;*.jpg;*.j' +
+      'peg;*.png;*.bmp;*.ico;*.emf;*.wmf;*.tif;*.tiff)|*.svg;*.jpg;*.jp' +
+      'eg;*.gif;*.tif;*.tiff;*.png;*.gif;*.jpg;*.jpeg;*.png;*.bmp;*.ico' +
+      ';*.emf;*.wmf;*.tif;*.tiff|SVG graphics from DevExpress (*.svg)|*' +
+      '.svg|JPEG graphics from DevExpress (*.jpg)|*.jpg|JPEG graphics f' +
+      'rom DevExpress (*.jpeg)|*.jpeg|GIF graphics from DevExpress (*.g' +
+      'if)|*.gif|TIFF graphics from DevExpress (*.tif)|*.tif|TIFF graph' +
+      'ics from DevExpress (*.tiff)|*.tiff|PNG graphics from DevExpress' +
+      ' (*.png)|*.png|GIF Image (*.gif)|*.gif|JPEG Image File (*.jpg)|*' +
+      '.jpg|JPEG Image File (*.jpeg)|*.jpeg|Portable Network Graphics (' +
+      '*.png)|*.png|Bitmaps (*.bmp)|*.bmp|Icons (*.ico)|*.ico|Enhanced ' +
+      'Metafiles (*.emf)|*.emf|Metafiles (*.wmf)|*.wmf|TIFF Images (*.t' +
+      'if)|*.tif|TIFF Images (*.tiff)|*.tiff'
+    Options = [ofHideReadOnly, ofAllowMultiSelect, ofEnableSizing]
+    Left = 380
+    Top = 333
+  end
+  object IdFTP1: TIdFTP
+    ConnectTimeout = 0
+    NATKeepAlive.UseKeepAlive = False
+    NATKeepAlive.IdleTimeMS = 0
+    NATKeepAlive.IntervalMS = 0
+    ProxySettings.ProxyType = fpcmNone
+    ProxySettings.Port = 0
+    ReadTimeout = 0
+    Left = 261
+    Top = 244
+  end
+  object SaveDialog1: TSaveDialog
+    Filter = 
+      'All (*.svg;*.jpg;*.jpeg;*.gif;*.tif;*.tiff;*.png;*.gif;*.jpg;*.j' +
+      'peg;*.png;*.bmp;*.ico;*.emf;*.wmf;*.tif;*.tiff)|*.svg;*.jpg;*.jp' +
+      'eg;*.gif;*.tif;*.tiff;*.png;*.gif;*.jpg;*.jpeg;*.png;*.bmp;*.ico' +
+      ';*.emf;*.wmf;*.tif;*.tiff|SVG graphics from DevExpress (*.svg)|*' +
+      '.svg|JPEG graphics from DevExpress (*.jpg)|*.jpg|JPEG graphics f' +
+      'rom DevExpress (*.jpeg)|*.jpeg|GIF graphics from DevExpress (*.g' +
+      'if)|*.gif|TIFF graphics from DevExpress (*.tif)|*.tif|TIFF graph' +
+      'ics from DevExpress (*.tiff)|*.tiff|PNG graphics from DevExpress' +
+      ' (*.png)|*.png|GIF Image (*.gif)|*.gif|JPEG Image File (*.jpg)|*' +
+      '.jpg|JPEG Image File (*.jpeg)|*.jpeg|Portable Network Graphics (' +
+      '*.png)|*.png|Bitmaps (*.bmp)|*.bmp|Icons (*.ico)|*.ico|Enhanced ' +
+      'Metafiles (*.emf)|*.emf|Metafiles (*.wmf)|*.wmf|TIFF Images (*.t' +
+      'if)|*.tif|TIFF Images (*.tiff)|*.tiff'
+    Left = 305
+    Top = 333
+  end
+  object ADOQueryFile: TADOQuery
+    Connection = DataLink_Financial.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 488
+    Top = 144
+  end
+  object DataSource1: TDataSource
+    DataSet = ADOQueryFile
+    Left = 376
+    Top = 136
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_Financial.ADOLink
+    Parameters = <>
+    Left = 584
+    Top = 256
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_Financial.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 432
+    Top = 224
+  end
+end

A09财务通用管理/U_FinFileUp.pas

@@ -0,0 +1,381 @@
+unit U_FinFileUp;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, ComCtrls, ToolWin, ExtCtrls, cxGridLevel,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
+  cxControls, cxGridCustomView, cxGrid, IdBaseComponent, IdComponent,
+  IdTCPConnection, IdTCPClient, IdFTP, StdCtrls, ADODB, jpeg, BtnEdit, IniFiles,
+  strutils, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
+  dxSkinsDefaultPainters, dxDateRanges, IdExplicitTLSClientServerBase,
+  Vcl.ExtDlgs, dxSkinWXI, dxScrollbarAnnotations;
+
+type
+  TfrmFinFileUp = class(TForm)
+    cxGrid7: TcxGrid;
+    TV7: TcxGridDBTableView;
+    FileName: TcxGridDBColumn;
+    FileDate: TcxGridDBColumn;
+    cxGridLevel6: TcxGridLevel;
+    Panel16: TPanel;
+    ToolBar6: TToolBar;
+    FileUp: TToolButton;
+    FileDel: TToolButton;
+    Panel1: TPanel;
+    Label1: TLabel;
+    Code: TEdit;
+    ODPat: TOpenDialog;
+    IdFTP1: TIdFTP;
+    SaveDialog1: TSaveDialog;
+    ADOQueryFile: TADOQuery;
+    DataSource1: TDataSource;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    Image2: TImage;
+    Image1: TImage;
+    TV7Column1: TcxGridDBColumn;
+    Label2: TLabel;
+    HXName: TBtnEditC;
+    procedure FileUpClick(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure FileDelClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure HXNameBtnUpClick(Sender: TObject);
+    procedure HXNameBtnDnClick(Sender: TObject);
+  private
+    lstPat: TStringList;
+    AJpeg: TJPEGImage;
+    procedure CreThumb(Image1, Image2: TImage; Width, Height: Integer);
+    procedure SaveImageOther(FTFID: string);
+    procedure ReadINIFile10();
+    procedure InitTP();
+    { Private declarations }
+  public
+    FBCIID: string;
+    FWidth, FHeight:Integer
+    { Public declarations }
+  end;
+
+var
+  frmFinFileUp: TfrmFinFileUp;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_ZDYHelp;
+
+{$R *.dfm} procedure TfrmFinFileUp.InitTP();
+begin
+  with ADOQueryFile do
+  begin
+    Close;
+    SQL.Clear;
+    SQL.Add('select TFID,WBID,TFDate,Files,Filler,FillTime,FileName,HXName from TP_File where WBID=''' + Trim(FBCIID) + '''');
+    SQL.Add(' and FileType=''FG''');
+    Open;
+  end;
+end;
+
+procedure TfrmFinFileUp.ReadINIFile10();
+var
+  programIni: Tinifile;  //配置文件名
+  FileName: string;
+begin
+  FileName := ExtractFilePath(Paramstr(0)) + 'SYSTEMSET.INI';
+  programIni := Tinifile.create(FileName);
+  server := programIni.ReadString('SERVER', '服务器地址', '127.0.0.1');
+  programIni.Free;
+end;
+
+procedure TfrmFinFileUp.FileUpClick(Sender: TObject);
+var
+  i, j, ii: Integer;
+  PatFile: string;
+  FTPPath, FConNo, MaxNo: string;
+  AJpeg: TJPEGImage;
+  myStream: TADOBlobStream;
+  f: file of Byte;
+  size: Longint;
+  S: Double;
+begin
+//  if Trim(Code.Text) = '' then
+//  begin
+//    Application.MessageBox('编号不能为空！', '提示', 0);
+//    Exit;
+//  end;
+//  if Trim(HXName.Text) = '' then
+//  begin
+//    if Application.MessageBox('花型确认为空吗？', '提示', 32 + 4) <> IDYES then
+//      Exit;
+//  end;
+
+  lstPat.Clear;
+  if ODPat.Execute then
+  begin
+    lstPat.AddStrings(ODPat.Files);
+  end;
+  if lstPat.Count > 0 then
+  begin
+    try
+      IdFTP1.Host := PicSvr;
+      IdFTP1.Username := 'three';
+      IdFTP1.Password := '641010';
+      IdFTP1.Connect();
+    except
+      IdFTP1.Quit;
+      Application.MessageBox('无法连接到文件服务器，请检查！', '提示', MB_ICONWARNING);
+      Exit;
+    end;
+  end;
+
+  Panel16.Visible := True;
+  Panel16.Refresh;
+
+  try
+    AJpeg := TJpegImage.Create();
+    ADOQueryCmd.Connection.BeginTrans;
+    ii := 0;
+    for i := 0 to lstPat.Count - 1 do
+    begin
+      with ADOQueryTemp do
+      begin
+        Close;
+        sql.Clear;
+        sql.Add('select isnull(max(abs(cast(right(left(FileName,charindex(''.'',FileName)-1),2) as int))),0)+1 as BH from TP_File');
+        sql.Add('where FileType =''FG'' and WBID=''' + trim(FBCIID) + ''' ');
+        open;
+      end;
+      PatFile := trim(FBCIID) + '-' + inttostr(ADOQueryTemp.fieldbyname('BH').AsInteger) + '.' + Copy(ExtractFileName(lstPat[i]), (Pos('.', ExtractFileName(lstPat[i])) + 1), (Length(ExtractFileName(lstPat[i])) - Pos('.', ExtractFileName(lstPat[i]))));
+      image1.Picture.LoadFromFile((lstPat[i]));
+      CreThumb(Image1, Image2, FWidth, FHeight);
+
+
+
+      if IdFTP1.Connected then
+      begin
+        try
+          IdFTP1.Put(lstPat[i], Trim(UserDataFlag + 'YP' + '\' + Trim(PatFile)));
+
+          if GetLSNo(ADOQueryCmd, MaxNo, 'FG', 'TP_File', 4, 1) = False then
+            raise Exception.Create('取图片最大号失败！');
+
+          with ADOQueryCmd do
+          begin
+            close;
+            sql.Clear;
+            sql.Add(' select *  from TP_File where TFID=''' + Trim(MaxNo) + '''');
+            open;
+          end;
+          with ADOQueryCmd do
+          begin
+            if ADOQueryCmd.IsEmpty then
+            begin
+              Append;
+              FieldByName('Filler').Value := Trim(DName);
+              FieldByName('TFDate').Value := SGetServerDateTime(ADOQueryTemp);
+            end
+            else
+            begin
+              Edit;
+              FieldByName('Editer').Value := Trim(DName);
+              FieldByName('EditTime').Value := SGetServerDateTime(ADOQueryTemp);
+            end;
+            FieldByName('TFID').Value := Trim(MaxNo);
+            FieldByName('WBID').Value := Trim(FBCIID);
+            FieldByName('TFType').Value := '付款管理';
+            FieldByName('FileType').Value := 'FG';
+//            FieldByName('HXName').Value := trim(HXName.Text);
+            FieldByName('filename').Value := Trim(PatFile);
+            myStream := TADOBlobStream.Create(TBlobField(ADOQueryCmd.FieldByName('FilesOther')), bmWrite);
+            AJpeg.Assign(Image2.Picture.Graphic);
+            AJpeg.SaveToStream(myStream);
+            myStream.Free;
+            Post;
+          end;
+        except
+          raise Exception.Create('上传图片失败！');
+        end;
+      end;
+    end;
+
+    ADOQueryCmd.Connection.CommitTrans;
+    AJpeg.Free;
+  except
+    AJpeg.Free;
+    ADOQueryCmd.Connection.RollbackTrans;
+    Application.MessageBox('图片上传失败！', '提示', 0);
+  end;
+  if IdFTP1.Connected then
+    IdFTP1.Quit;
+  InitTP();
+  Panel16.Visible := False;
+
+  if ii > 0 then
+    Application.MessageBox(PChar(inttostr(ii) + '个文件大于2MB，上传失败！'), '提示', 0);
+  if i > 0 then
+    Application.MessageBox(PChar(inttostr(i-ii) + '个文件上传成功！'), '提示', 0);
+
+  ModalResult := 1;
+end;
+
+procedure TfrmFinFileUp.CreThumb(Image1, Image2: TImage; Width, Height: Integer);
+var
+  Bitmap: TBitmap;
+  Ratio: Double;
+  ARect: TRect;
+  AHeight, AHeightOffset: Integer;
+  AWidth, AWidthOffset: Integer;
+begin
+  Bitmap := TBitmap.Create;
+  try
+    Ratio := Image1.Picture.Graphic.Width / Image1.Picture.Graphic.Height;
+    if Ratio > 1.333 then
+    begin
+      AHeight := Round(Width / Ratio);
+      AHeightOffset := (Height - AHeight) div 2;
+      AWidth := Width;
+      AWidthOffset := 0;
+    end
+    else
+    begin
+      AWidth := Round(Height * Ratio);
+      AWidthOffset := (Width - AWidth) div 2;
+      AHeight := Height;
+      AHeightOffset := 0;
+    end;
+    Bitmap.Width := Width;
+    Bitmap.Height := Height;
+    Bitmap.Canvas.Brush.Color := clBtnFace;
+    Bitmap.Canvas.FillRect(Rect(0, 0, Width, Height));
+    ARect := Rect(AWidthOffset, AHeightOffset, AWidth + AWidthOffset, AHeight + AHeightOffset);
+    Bitmap.Canvas.StretchDraw(ARect, Image1.Picture.Graphic);
+    Image2.Picture.Assign(Bitmap);
+  finally
+    Bitmap.Free;
+  end;
+end;
+
+procedure TfrmFinFileUp.SaveImageOther(FTFID: string);
+var
+  AJpeg: TJPEGImage;
+  myStream: TADOBlobStream;
+  ImgMaxNo: string;
+  i, j: Integer;
+  PatFile: string;
+  FConNo, MaxNo: string;
+begin
+  if Image2.Picture = nil then
+    Exit;
+  AJpeg := TJpegImage.Create();
+  with ADOQueryCmd do
+  begin
+    close;
+    sql.Clear;
+    sql.Add(' select *  from TP_File where TFID=''' + Trim(FTFID) + '''');
+    open;
+  end;
+  with ADOQueryCmd do
+  begin
+    if Trim(FTFID) = '' then
+    begin
+      Append;
+      FieldByName('Filler').Value := Trim(DName);
+    end
+    else
+    begin
+      Edit;
+      FieldByName('Editer').Value := Trim(DName);
+      FieldByName('EditTime').Value := SGetServerDateTime(ADOQueryTemp);
+    end;
+    FieldByName('TFID').Value := Trim(FTFID);
+    FieldByName('WBID').Value := Trim(FBCIID);
+    FieldByName('TFType').Value := '样品';
+    AJpeg.Assign(Image2.Picture.Graphic);
+    myStream := TADOBlobStream.Create(TBlobField(ADOQueryCmd.FieldByName('FilesOther')), bmWrite);
+    AJpeg.Assign(Image2.Picture.Graphic);
+    AJpeg.SaveToStream(myStream);
+    myStream.Free;
+    Post;
+  end;
+end;
+
+procedure TfrmFinFileUp.FormCreate(Sender: TObject);
+begin
+  lstPat := TStringList.Create;
+  if FWidth = 0 then
+    FWidth := 160;
+  if FHeight = 0 then
+    FHeight := 120;
+end;
+
+procedure TfrmFinFileUp.FileDelClick(Sender: TObject);
+begin
+  with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    SQL.Add(' Delete TP_File where TFID=''' + Trim(ADOQueryFile.fieldbyname('TFID').AsString) + '''');
+    ExecSQL;
+  end;
+
+  with ADOQueryFile do
+  begin
+    Close;
+    SQL.Clear;
+    SQL.Add('select TFID,WBID,TFDate,Files,Filler,FillTime,FileName from TP_File where WBID=''' + Trim(FBCIID) + '''');
+    SQL.Add(' and FileType=''FG''');
+    Open;
+  end;
+//  if ADOQueryFile.IsEmpty then
+//  begin
+//    with ADOQueryCmd do
+//    begin
+//      Close;
+//      sql.Clear;
+//      sql.Add('Update CP_YDang Set TPFlag=0 where FBCIID=''' + Trim(FBCIID) + '''');
+//      ExecSQL;
+//    end;
+//  end;
+end;
+
+procedure TfrmFinFileUp.FormShow(Sender: TObject);
+begin
+  with ADOQueryFile do
+  begin
+    Close;
+    SQL.Clear;
+    SQL.Add('select TFID,WBID,TFDate,Files,Filler,FillTime,FileName from TP_File where WBID=''' + Trim(FBCIID) + '''');
+    SQL.Add(' and FileType=''FG''');
+    Open;
+  end;
+end;
+
+procedure TfrmFinFileUp.HXNameBtnDnClick(Sender: TObject);
+begin
+  TBtnEditC(Sender).Text := '';
+  TBtnEditC(Sender).TxtCode := '';
+end;
+
+procedure TfrmFinFileUp.HXNameBtnUpClick(Sender: TObject);
+begin
+  try
+    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    with frmZDYHelp do
+    begin
+      flag := 'HX' + Trim(Code.Text);
+      flagname := '花型';
+      if ShowModal = 1 then
+      begin
+        TEdit(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+      end;
+    end;
+  finally
+    frmZDYHelp.Free;
+  end;
+end;
+
+end.
+

A09财务通用管理/U_HandPayableImport.dfm

@@ -19,7 +19,7 @@ inherited frmHandPayableImport: TfrmHandPayableImport
     Height = 38
     AutoSize = True
     ButtonHeight = 38
-    ButtonWidth = 91
+    ButtonWidth = 103
     Caption = 'ToolBar1'
     Color = clSkyBlue
     DisabledImages = ImageList_new32
@@ -38,7 +38,7 @@ inherited frmHandPayableImport: TfrmHandPayableImport
       OnClick = TBRafreshClick
     end
     object ToolButton5: TToolButton
-      Left = 71
+      Left = 77
       Top = 0
       AutoSize = True
       Caption = #36873#25321#25991#20214
@@ -46,7 +46,7 @@ inherited frmHandPayableImport: TfrmHandPayableImport
       OnClick = ToolButton5Click
     end
     object ToolButton3: TToolButton
-      Left = 166
+      Left = 184
       Top = 0
       AutoSize = True
       Caption = #21024#38500
@@ -54,7 +54,7 @@ inherited frmHandPayableImport: TfrmHandPayableImport
       OnClick = ToolButton3Click
     end
     object ToolButton2: TToolButton
-      Left = 237
+      Left = 261
       Top = 0
       AutoSize = True
       Caption = #20445#23384#25968#25454
@@ -62,7 +62,7 @@ inherited frmHandPayableImport: TfrmHandPayableImport
       OnClick = ToolButton2Click
     end
     object ToolButton1: TToolButton
-      Left = 332
+      Left = 368
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -70,7 +70,7 @@ inherited frmHandPayableImport: TfrmHandPayableImport
       OnClick = ToolButton1Click
     end
     object TBClose: TToolButton
-      Left = 427
+      Left = 475
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -91,8 +91,6 @@ inherited frmHandPayableImport: TfrmHandPayableImport
     Font.Style = []
     ParentFont = False
     TabOrder = 1
-    ExplicitLeft = 104
-    ExplicitTop = -210
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
@@ -112,13 +110,6 @@ inherited frmHandPayableImport: TfrmHandPayableImport
       Styles.Header = DataLink_Financial.Default
       Styles.Inactive = DataLink_Financial.SHuangSe
       Styles.Selection = DataLink_Financial.SHuangSe
-      object Tv1Column11: TcxGridDBColumn
-        Caption = #27969#27700#21495
-        DataBinding.FieldName = 'FFID'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 78
-      end
       object Tv1Column1: TcxGridDBColumn
         Caption = #21457#29983#26085#26399
         DataBinding.FieldName = 'FFTime'

A09财务通用管理/U_HandPayableImport.pas

@@ -50,7 +50,6 @@ type
     Tv1Column12: TcxGridDBColumn;
     Tv1Column2: TcxGridDBColumn;
     Tv1Column10: TcxGridDBColumn;
-    Tv1Column11: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -142,6 +141,8 @@ begin
 end;
 
 procedure TfrmHandPayableImport.ToolButton2Click(Sender: TObject);
+var
+   MaxNo:string;
 begin
   try
     ADOQueryCmd.Connection.BeginTrans;
@@ -151,12 +152,14 @@ begin
       First;
       while not eof do
       begin
+        if GetLSNo(ADOQueryTemp, MaxNo, 'SG', 'Finance_Flow', 4, 1) = False then
+            raise Exception.Create('取最大号失败！');
 
         with ADOQueryCmd do
         begin
           Close;
           sql.Clear;
-          sql.Add('select top 1 * from Finance_Flow where FFID=' + quotedstr(Trim(CDS_1.fieldbyname('FFID').AsString)));
+          sql.Add('select top 1 * from Finance_Flow where FFID=' + quotedstr(Trim(MaxNo)));
           open;
         end;
         if not ADOQueryCmd.IsEmpty then
@@ -169,7 +172,7 @@ begin
           FieldByName('Fillid').Value := Trim(Dcode);
           FieldByName('Filler').Value := Trim(DName);
           RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'Bs_Cloth_Info', 0);
-//          FieldByName('BCIID').Value := Trim(CDS_1.fieldbyname('C_Code').AsString);
+          FieldByName('FFID').Value := Trim(MaxNo);
           FieldByName('FFType').Value := 'ÊÖ¹¤·ÑÓõǼÇ';
           Post;
         end;
@@ -180,7 +183,7 @@ begin
 
     CDS_1.EnableControls;
     ADOQueryCmd.Connection.CommitTrans;
-
+    application.MessageBox('导入成功！', '提示');
   except
     ADOQueryCmd.Connection.RollbackTrans;
     application.MessageBox(PChar(Exception(ExceptObject).Message), 'ÌáʾÐÅÏ¢', 0);

A09财务通用管理/U_HandPayableInPut.dfm

@@ -79,7 +79,6 @@ object frmHandPayableInPut: TfrmHandPayableInPut
     Height = 466
     Align = alClient
     TabOrder = 1
-    ExplicitTop = 44
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
@@ -112,6 +111,14 @@ object frmHandPayableInPut: TfrmHandPayableInPut
       OptionsView.Indicator = True
       Styles.Footer = DataLink_Financial.Default
       Styles.Header = DataLink_Financial.Default
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #27969#27700#21495
+        DataBinding.FieldName = 'FFID'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 91
+      end
       object Tv1Column5: TcxGridDBColumn
         Caption = #21457#29983#26085#26399
         DataBinding.FieldName = 'FFTime'
@@ -205,6 +212,13 @@ object frmHandPayableInPut: TfrmHandPayableInPut
         Caption = #35777#26126#20154
         DataBinding.FieldName = 'Certifier'
         DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.OnButtonClick = v1Column5PropertiesButtonClick
         HeaderAlignmentHorz = taCenter
         Width = 53
       end

A09财务通用管理/U_HandPayableInPut.pas

@@ -39,13 +39,13 @@ type
     Tv1Column1: TcxGridDBColumn;
     Tv1Column3: TcxGridDBColumn;
     Tv1Column4: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TSaveClick(Sender: TObject);
     procedure v1P_CodeNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure v1P_SpecPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure v1QtyUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-
     procedure FormDestroy(Sender: TObject);
     procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure Tv1Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
@@ -56,6 +56,8 @@ type
     procedure Tv1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure Tv1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure v1Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure v1Column5PropertiesButtonClick(Sender: TObject;
+      AButtonIndex: Integer);
   private
     procedure initGrid();
     procedure SaveDate();
@@ -72,7 +74,8 @@ var
 implementation
 
 uses
-  U_RTFun, U_ZDYHelp, U_CompanySel, U_dataLink, U_ClothInfoSel, U_TradePlanSel;
+  U_RTFun, U_ZDYHelp, U_CompanySel, U_dataLink, U_ClothInfoSel,
+  U_TradePlanSel,U_UserSel,U_ZDYHelpFY;
 {$R *.dfm}
 
 procedure TfrmHandPayableInPut.SaveDate();
@@ -143,11 +146,11 @@ begin
     sql.Clear;
     if PState = '复制' then
     begin
-      sql.Add('select '''' FFID,* from Finance_Flow where FFID=''' + trim(FFID) + '''');
+      sql.Add('select '''' FFID,0 Amount,* from Finance_Flow where FFID=''' + trim(FFID) + '''');
     end
     else
     begin
-      sql.Add('select 0 Amount,* from Finance_Flow where FFID=''' + trim(FFID) + '''');
+      sql.Add('select * from Finance_Flow where FFID=''' + trim(FFID) + '''');
     end;
     sql.add(' and isnull(status,''0'')=''0''');
 //    showmessage(sql.text);
@@ -200,25 +203,50 @@ end;
 procedure TfrmHandPayableInPut.v1Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try
-    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    frmZDYHelpFY := TfrmZDYHelpFY.Create(Application);
-    with frmZDYHelp do
+    with frmZDYHelpFY do
     begin
+      MainType := '手工费用';
       flag := 'FFAbstractDL';
       flagname := '费用类别';
       if ShowModal = 1 then
       begin
         Self.CDS_Invoice.Edit;
-        Self.CDS_Invoice.FieldByName('FFAbstractDL').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+        Self.CDS_Invoice.FieldByName('FFAbstract').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-//        Self.CDS_Invoice.FieldByName('F_Code').Value := Trim(ClientDataSet1.fieldbyname('ZDYNo').AsString);
+        Self.CDS_Invoice.FieldByName('FFAbstractDL').Value := Trim(ClientDataSet1.fieldbyname('Note2').AsString);
       end;
     end;
   finally
-    frmZDYHelp.Free;
+    frmZDYHelpFY.Free;
   end;
 
   tv1.Controller.EditingController.ShowEdit();
 end;
 
+procedure TfrmHandPayableInPut.v1Column5PropertiesButtonClick(Sender: TObject;
+  AButtonIndex: Integer);
+begin
+   try
+    frmUserSel := TfrmUserSel.Create(Application);
+    with frmUserSel do
+    begin
+//      FCoType := '客户';
+//      if Self.FAuthority = '录入' then
+//        FAuthority := '理单业务';
+      if ShowModal = 1 then
+      begin
+//        self.BuyName.TxtCode := Trim(frmUserSel.CDS_1.fieldbyname('CoCode').AsString);
+//        self.BuyName.Text := Trim(frmUserSel.CDS_1.fieldbyname('CoAbbrName').AsString);
+        Self.CDS_Invoice.Edit;
+        Self.CDS_Invoice.FieldByName('Certifier').Value := Trim(CDS_1.fieldbyname('UserName').AsString);
+      end;
+    end;
+
+  finally
+    frmUserSel.Free;
+  end;
+end;
+
 procedure TfrmHandPayableInPut.v1P_CodeNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try
@@ -279,7 +307,6 @@ begin
   end;
 end;
 
-
 procedure TfrmHandPayableInPut.FormDestroy(Sender: TObject);
 begin
   frmHandPayableInPut := nil;

A09财务通用管理/U_OtherPayableInput.dfm

@@ -325,7 +325,7 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       ParentFont = False
     end
     object Label22: TLabel
-      Left = 244
+      Left = 245
       Top = 49
       Width = 52
       Height = 15
@@ -338,7 +338,7 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       ParentFont = False
     end
     object Label23: TLabel
-      Left = 27
+      Left = 28
       Top = 49
       Width = 52
       Height = 15
@@ -364,7 +364,7 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       ParentFont = False
     end
     object Label18: TLabel
-      Left = 458
+      Left = 455
       Top = 172
       Width = 52
       Height = 15
@@ -434,7 +434,7 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object OppCoName: TBtnEditC
-      Left = 297
+      Left = 299
       Top = 17
       Width = 140
       Height = 20
@@ -490,7 +490,7 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       Width = 101
     end
     object Price: TcxCurrencyEdit
-      Left = 513
+      Left = 512
       Top = 133
       Properties.AssignedValues.DisplayFormat = True
       TabOrder = 9
@@ -506,7 +506,7 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       Width = 101
     end
     object Piece: TcxCurrencyEdit
-      Left = 84
+      Left = 82
       Top = 133
       Properties.AssignedValues.DisplayFormat = True
       TabOrder = 11
@@ -537,7 +537,7 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       Visible = False
     end
     object F_GramWeight: TEdit
-      Left = 298
+      Left = 299
       Top = 103
       Width = 140
       Height = 18
@@ -553,7 +553,7 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       Visible = False
     end
     object F_Color: TEdit
-      Left = 727
+      Left = 728
       Top = 77
       Width = 140
       Height = 18
@@ -569,7 +569,7 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       Visible = False
     end
     object OtherFee: TcxCurrencyEdit
-      Left = 727
+      Left = 728
       Top = 133
       Properties.AssignedValues.DisplayFormat = True
       TabOrder = 18
@@ -596,8 +596,8 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       Width = 140
     end
     object OrderNo: TBtnEditC
-      Left = 302
+      Left = 299
-      Top = 51
+      Top = 47
       Width = 140
       Height = 20
       Font.Charset = GB2312_CHARSET
@@ -611,7 +611,7 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object BuyConNo: TBtnEditC
-      Left = 81
+      Left = 82
       Top = 47
       Width = 140
       Height = 20
@@ -625,8 +625,8 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object FFAbstract: TBtnEditC
-      Left = 514
+      Left = 512
-      Top = 52
+      Top = 47
       Width = 140
       Height = 20
       Hint = 'FFAbstract/'#25688#35201
@@ -641,7 +641,7 @@ object frmOtherPayableInput: TfrmOtherPayableInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object IsInvoice: TComboBox
-      Left = 513
+      Left = 512
       Top = 169
       Width = 137
       Height = 20

A09财务通用管理/U_OtherPayableInput.pas

@@ -104,7 +104,7 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel, U_TradePlanSel;
+  U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel, U_TradePlanSel,U_ZDYHelpFY;
 
 {$R *.dfm}
 
@@ -276,9 +276,10 @@ var
 begin
   fsj := Trim(TEdit(Sender).Hint);
   FWZ := Pos('/', fsj);
+
   try
-    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    frmZDYHelpFY := TfrmZDYHelpFY.Create(Application);
-    with frmZDYHelp do
+    with frmZDYHelpFY do
     begin
       MainType := 'ÆäËûÓ¦¸¶¿î';
       flag := Copy(fsj, 1, FWZ - 1);
@@ -286,10 +287,11 @@ begin
       if ShowModal = 1 then
       begin
         TEdit(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+        TEdit(Sender).TextHint := Trim(ClientDataSet1.fieldbyname('Note2').AsString);
       end;
     end;
   finally
-    frmZDYHelp.Free;
+    frmZDYHelpFY.Free;
   end;
 end;
 
@@ -377,6 +379,7 @@ begin
       FieldByName('OppCoNo').Value := Trim(OppCoName.TxtCode);
       FieldByName('OurCoNo').Value := Trim(OurCoName.TxtCode);
       FieldByName('OppParentCoNo').Value := Trim(OppParentCoName.TxtCode);
+      FieldByName('FFAbstractDL').Value := Trim(FFAbstract.TextHint);
       FieldByName('FFID').Value := Trim(MaxId);
       RTSetsavedata(ADOQueryCmd, 'Finance_Flow', ScrollBox1, 0);
       Post;

A09财务通用管理/U_PayInput.dfm

@@ -2,8 +2,8 @@ object frmPayInput: TfrmPayInput
   Left = 261
   Top = 149
   Caption = #20184#27454#30331#35760
-  ClientHeight = 439
+  ClientHeight = 394
-  ClientWidth = 749
+  ClientWidth = 745
   Color = clWhite
   Font.Charset = GB2312_CHARSET
   Font.Color = clWindowText
@@ -21,7 +21,7 @@ object frmPayInput: TfrmPayInput
     Tag = 1
     Left = 0
     Top = 0
-    Width = 749
+    Width = 745
     Height = 38
     AutoSize = True
     ButtonHeight = 38
@@ -34,6 +34,7 @@ object frmPayInput: TfrmPayInput
     ParentColor = False
     ShowCaptions = True
     TabOrder = 0
+    ExplicitWidth = 749
     object ToolButton3: TToolButton
       Left = 0
       Top = 0
@@ -54,8 +55,8 @@ object frmPayInput: TfrmPayInput
   object ScrollBox1: TScrollBox
     Left = 0
     Top = 38
-    Width = 749
+    Width = 745
-    Height = 401
+    Height = 356
     Align = alClient
     BevelInner = bvNone
     BevelOuter = bvNone
@@ -71,9 +72,10 @@ object frmPayInput: TfrmPayInput
     ParentCtl3D = False
     ParentFont = False
     TabOrder = 1
+    ExplicitTop = 44
     object Label2: TLabel
       Left = 32
-      Top = 69
+      Top = 102
       Width = 52
       Height = 15
       Caption = #23545#26041#21333#20301
@@ -85,8 +87,8 @@ object frmPayInput: TfrmPayInput
       ParentFont = False
     end
     object Label7: TLabel
-      Left = 33
+      Left = 32
-      Top = 246
+      Top = 238
       Width = 41
       Height = 15
       Caption = #22791'     '#27880
@@ -99,7 +101,7 @@ object frmPayInput: TfrmPayInput
     end
     object Label8: TLabel
       Left = 486
-      Top = 111
+      Top = 144
       Width = 52
       Height = 15
       Caption = #20184#27454#26041#24335
@@ -125,7 +127,7 @@ object frmPayInput: TfrmPayInput
     end
     object Label9: TLabel
       Left = 259
-      Top = 69
+      Top = 102
       Width = 52
       Height = 15
       Caption = #19978#32423#21333#20301
@@ -138,7 +140,7 @@ object frmPayInput: TfrmPayInput
     end
     object Label3: TLabel
       Left = 486
-      Top = 184
+      Top = 190
       Width = 47
       Height = 15
       Caption = #37329'       '#39069
@@ -164,7 +166,7 @@ object frmPayInput: TfrmPayInput
     end
     object Label19: TLabel
       Left = 486
-      Top = 70
+      Top = 103
       Width = 52
       Height = 15
       Caption = #23545#26041#36134#25143
@@ -176,8 +178,8 @@ object frmPayInput: TfrmPayInput
       ParentFont = False
     end
     object Label20: TLabel
-      Left = 486
+      Left = 32
-      Top = 20
+      Top = 60
       Width = 65
       Height = 15
       Caption = #30003#35831#26085#26399#65306
@@ -190,7 +192,7 @@ object frmPayInput: TfrmPayInput
     end
     object Label22: TLabel
       Left = 32
-      Top = 113
+      Top = 146
       Width = 52
       Height = 15
       Caption = #35745#21010#21333#21495
@@ -203,7 +205,7 @@ object frmPayInput: TfrmPayInput
     end
     object Label23: TLabel
       Left = 259
-      Top = 113
+      Top = 146
       Width = 52
       Height = 15
       Caption = #23458#25143#21333#21495
@@ -216,7 +218,7 @@ object frmPayInput: TfrmPayInput
     end
     object Label24: TLabel
       Left = 259
-      Top = 184
+      Top = 190
       Width = 63
       Height = 15
       Caption = #25688'        '#35201#65306
@@ -229,7 +231,7 @@ object frmPayInput: TfrmPayInput
     end
     object Label1: TLabel
       Left = 32
-      Top = 184
+      Top = 190
       Width = 52
       Height = 15
       Caption = #36153#29992#31867#21035
@@ -240,17 +242,30 @@ object frmPayInput: TfrmPayInput
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label4: TLabel
+      Left = 259
+      Top = 62
+      Width = 65
+      Height = 15
+      Caption = #25490#27454#26085#26399#65306
+      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 = 87
+      Left = 92
-      Top = 245
+      Top = 237
       Width = 615
       Height = 57
       ScrollBars = ssVertical
       TabOrder = 0
     end
     object Currency: TComboBox
-      Left = 642
+      Left = 651
-      Top = 181
+      Top = 186
       Width = 37
       Height = 20
       Style = csDropDownList
@@ -269,7 +284,7 @@ object frmPayInput: TfrmPayInput
     end
     object PayMent: TBtnEditC
       Left = 544
-      Top = 110
+      Top = 143
       Width = 140
       Height = 20
       Hint = 'PayMent/'#20184#27454#26041#24335
@@ -284,8 +299,8 @@ object frmPayInput: TfrmPayInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object OppCoName: TBtnEditC
-      Left = 86
+      Left = 92
-      Top = 67
+      Top = 100
       Width = 140
       Height = 20
       Font.Charset = GB2312_CHARSET
@@ -300,7 +315,7 @@ object frmPayInput: TfrmPayInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object OurCoName: TBtnEditC
-      Left = 90
+      Left = 92
       Top = 18
       Width = 140
       Height = 20
@@ -317,7 +332,7 @@ object frmPayInput: TfrmPayInput
     end
     object OppParentCoName: TBtnEditC
       Left = 319
-      Top = 66
+      Top = 99
       Width = 140
       Height = 20
       Font.Charset = GB2312_CHARSET
@@ -332,14 +347,14 @@ object frmPayInput: TfrmPayInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object Amount: TcxCurrencyEdit
-      Left = 539
+      Left = 544
-      Top = 181
+      Top = 187
       Properties.AssignedValues.DisplayFormat = True
       TabOrder = 6
       Width = 101
     end
     object OurBankName: TBtnEditC
-      Left = 318
+      Left = 319
       Top = 18
       Width = 140
       Height = 20
@@ -355,7 +370,7 @@ object frmPayInput: TfrmPayInput
     end
     object OppBankName: TBtnEditC
       Left = 544
-      Top = 66
+      Top = 99
       Width = 140
       Height = 20
       Font.Charset = GB2312_CHARSET
@@ -369,9 +384,9 @@ object frmPayInput: TfrmPayInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object SQDate: TDateTimePicker
-      Left = 544
+      Left = 93
-      Top = 18
+      Top = 58
-      Width = 125
+      Width = 139
       Height = 20
       BevelInner = bvNone
       Date = 40916.000000000000000000
@@ -380,8 +395,8 @@ object frmPayInput: TfrmPayInput
       TabOrder = 9
     end
     object OrderNo: TBtnEditC
-      Left = 86
+      Left = 92
-      Top = 110
+      Top = 143
       Width = 140
       Height = 20
       Font.Charset = GB2312_CHARSET
@@ -396,7 +411,7 @@ object frmPayInput: TfrmPayInput
     end
     object BuyConNo: TBtnEditC
       Left = 319
-      Top = 110
+      Top = 143
       Width = 140
       Height = 20
       Font.Charset = GB2312_CHARSET
@@ -410,7 +425,7 @@ object frmPayInput: TfrmPayInput
     end
     object FFAbstract: TBtnEditC
       Left = 319
-      Top = 181
+      Top = 187
       Width = 140
       Height = 20
       Hint = 'FFAbstract/'#25688#35201
@@ -425,8 +440,8 @@ object frmPayInput: TfrmPayInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object FFAbstractDL: TBtnEditC
-      Left = 85
+      Left = 92
-      Top = 182
+      Top = 188
       Width = 140
       Height = 20
       Hint = 'FFAbstractDL/'#25688#35201#22823#31867
@@ -440,6 +455,17 @@ object frmPayInput: TfrmPayInput
       OnBtnUpClick = FFAbstractDLBtnUpClick
       OnBtnDnClick = PayMentBtnDnClick
     end
+    object PKDate: TDateTimePicker
+      Left = 319
+      Top = 58
+      Width = 139
+      Height = 20
+      BevelInner = bvNone
+      Date = 40916.000000000000000000
+      Format = 'yyyy-MM-dd'
+      Time = 0.670856296288548000
+      TabOrder = 14
+    end
   end
   object ADOQueryTemp: TADOQuery
     Connection = DataLink_Financial.ADOLink

A09财务通用管理/U_PayInput.pas

@@ -52,6 +52,8 @@ type
     FFAbstract: TBtnEditC;
     FFAbstractDL: TBtnEditC;
     Label1: TLabel;
+    Label4: TLabel;
+    PKDate: TDateTimePicker;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -112,6 +114,7 @@ begin
     else
     begin
       SQDate.DateTime := SGetServerDateTime(ADOQueryTemp);
+      PKDate.DateTime := SQDate.DateTime
     end;
 
     if PState='¸´ÖÆ' then

A09财务通用管理/U_PayList.dfm

@@ -105,6 +105,7 @@ inherited frmPayList: TfrmPayList
       AutoSize = True
       Caption = #38468#20214#19978#20256
       ImageIndex = 22
+      Visible = False
       OnClick = ToolButton9Click
     end
     object ToolButton4: TToolButton
@@ -131,6 +132,14 @@ inherited frmPayList: TfrmPayList
       ImageIndex = 7
       OnClick = TBCloseClick
     end
+    object ToolButton6: TToolButton
+      Left = 1019
+      Top = 0
+      AutoSize = True
+      Caption = #22270#29255#19978#20256
+      ImageIndex = 19
+      OnClick = ToolButton6Click
+    end
   end
   object Panel1: TPanel [1]
     Left = 0
@@ -282,6 +291,7 @@ inherited frmPayList: TfrmPayList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
+    ExplicitTop = 142
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
@@ -455,8 +465,8 @@ inherited frmPayList: TfrmPayList
         Width = 66
       end
       object Tv1Column5: TcxGridDBColumn
-        Caption = #38468#20214
+        Caption = #22270#29255
-        DataBinding.FieldName = 'ISFJ'
+        DataBinding.FieldName = 'ISTP'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 53

A09财务通用管理/U_PayList.pas

@@ -96,6 +96,7 @@ type
     ToolButton3: TToolButton;
     Button3: TButton;
     Button4: TButton;
+    ToolButton6: TToolButton;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure btnDelClick(Sender: TObject);
@@ -121,6 +122,7 @@ type
     procedure ToolButton3Click(Sender: TObject);
     procedure Button3Click(Sender: TObject);
     procedure Button4Click(Sender: TObject);
+    procedure ToolButton6Click(Sender: TObject);
   private
     procedure InitGrid();
     procedure SetStatus();
@@ -131,7 +133,7 @@ type
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_PayInput, U_ZDYHelp, U_AttachmentUpload;
+  U_DataLink, U_RTFun, U_PayInput, U_ZDYHelp, U_AttachmentUpload,U_FinFileUp;
 
 {$R *.dfm}
 procedure TfrmPayList.SetStatus();
@@ -226,7 +228,7 @@ begin
       Close;
       SQL.Clear;
       Filtered := False;
-      sql.Add(' select IsFJ=cast((case when (select COUNT(T.WBID) from FJ_File T where T.WBID=A.FFID)=0 then 0 else 1 end) as bit )  ');
+      sql.Add(' select IsTP=cast((case when (select COUNT(T.WBID) from TP_File T where T.WBID=A.FFID)=0 then 0 else 1 end) as bit )  ');
       sql.ADD(',A.*,B.account,B.OpenBank from Finance_Flow A');
       sql.Add('  Left join BS_Company_Bank B on A.OppBankID=B.CBID where A.FFType=''付款登记''  ');
       case cxTabControl1.TabIndex of
@@ -591,6 +593,7 @@ begin
 //      raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
     ADOQueryCmd.Connection.CommitTrans;
     application.MessageBox('审核成功', '提示');
+    Panel2.Visible := False;
   except
     ADOQueryCmd.Connection.RollbackTrans;
     application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
@@ -655,11 +658,12 @@ begin
       raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
     ADOQueryCmd.Connection.CommitTrans;
     application.MessageBox('付款成功', '提示');
+    Panel4.Visible := False;
   except
     ADOQueryCmd.Connection.RollbackTrans;
     application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
     InitGrid();
-    Panel2.Visible := False;
+    Panel4.Visible := False;
   end;
 
 end;
@@ -795,6 +799,26 @@ begin
   WriteCxGrid(trim(Self.Caption), Tv1, '财务管理');
 end;
 
+procedure TfrmPayList.ToolButton6Click(Sender: TObject);
+begin
+  try
+    frmFinFileUp := TfrmFinFileUp.Create(Application);
+    with frmFinFileUp do
+    begin
+//      Code.Text := Trim(Self.CDS_1.fieldbyname('CoCode').AsString);
+      FBCIID := Trim(Self.CDS_1.fieldbyname('FFID').AsString);
+      if ShowModal = 1 then
+      begin
+        Self.InitGrid();
+//        Self.CDS_1.Locate('BCIID', BCIID, []);
+      end;
+    end;
+  finally
+    frmFinFileUp.Free;
+  end;
+
+end;
+
 procedure TfrmPayList.btnEditClick(Sender: TObject);
 begin
   try

A09财务通用管理/U_ZDYHelpFY.dfm

@@ -23,6 +23,7 @@ inherited frmZDYHelpFY: TfrmZDYHelpFY
     TabOrder = 0
     object TV1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnCellDblClick = TV1CellDblClick
       DataController.DataSource = DataSource1
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -36,6 +37,7 @@ inherited frmZDYHelpFY: TfrmZDYHelpFY
       object V1Code: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'ZDYNo'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Width = 97
@@ -43,6 +45,7 @@ inherited frmZDYHelpFY: TfrmZDYHelpFY
       object V1OrderNo: TcxGridDBColumn
         Caption = #39034#24207#21495
         DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = V1OrderNoPropertiesEditValueChanged
         Visible = False
@@ -52,6 +55,9 @@ inherited frmZDYHelpFY: TfrmZDYHelpFY
       object TV1Column1: TcxGridDBColumn
         Caption = #25688#35201#22823#31867
         DataBinding.FieldName = 'Note2'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.OnEditValueChanged = TV1Column1PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
         Width = 109
       end
@@ -59,6 +65,7 @@ inherited frmZDYHelpFY: TfrmZDYHelpFY
         Tag = 2
         Caption = #25688#35201
         DataBinding.FieldName = 'ZDYName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = V1NamePropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -67,6 +74,7 @@ inherited frmZDYHelpFY: TfrmZDYHelpFY
       object V1Note: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = V1NotePropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -75,6 +83,7 @@ inherited frmZDYHelpFY: TfrmZDYHelpFY
       object V1ZdyFlag: TcxGridDBColumn
         Caption = #26631#24535
         DataBinding.FieldName = 'ZdyFlag'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = V1Column1PropertiesEditValueChanged
         Visible = False
@@ -84,6 +93,7 @@ inherited frmZDYHelpFY: TfrmZDYHelpFY
       object V1HelpType: TcxGridDBColumn
         Caption = #24110#21161#31867#27604
         DataBinding.FieldName = 'HelpType'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = V1HelpTypePropertiesEditValueChanged
         Visible = False
@@ -93,6 +103,7 @@ inherited frmZDYHelpFY: TfrmZDYHelpFY
       object V1note1: TcxGridDBColumn
         Caption = #22791#27880'1'
         DataBinding.FieldName = 'note1'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = V1Column1PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter

A09财务通用管理/U_ZDYHelpFY.pas

@@ -10,7 +10,8 @@ uses
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
   cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
-  dxDateRanges, dxBarBuiltInMenu, System.ImageList;
+  dxDateRanges, dxBarBuiltInMenu, System.ImageList, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmZDYHelpFY = class(TfrmBaseInput)
@@ -62,6 +63,7 @@ type
     procedure V1Column1PropertiesEditValueChanged(Sender: TObject);
     procedure V1HelpTypePropertiesEditValueChanged(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure TV1Column1PropertiesEditValueChanged(Sender: TObject);
   private
     procedure InitGrid();
     { Private declarations }
@@ -373,6 +375,153 @@ begin
   end;
 end;
 
+procedure TfrmZDYHelpFY.TV1Column1PropertiesEditValueChanged(Sender: TObject);
+var
+  maxno, mvalue: string;
+begin
+  mvalue := TcxTextEdit(Sender).EditingText;
+  if Trim(mvalue) = '' then
+  begin
+    //Application.MessageBox('名称不能为空！','提示',0);
+    Exit;
+  end;
+  with ClientDataSet1 do
+  begin
+    Edit;
+    FieldByName('Note2').Value := Trim(mvalue);
+    //Post;
+  end;
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    with ADOQueryTemp do
+    begin
+      Close;
+      SQL.Clear;
+      SQL.Add('select * from KH_ZDY where ZdyNo=''' + Trim(flag) + '''');
+      open;
+    end;
+    if ADOQueryTemp.IsEmpty then
+    begin
+      with ADOQueryCmd do
+      begin
+        close;
+        sql.Clear;
+        sql.Add('select * from KH_ZDY where 1=2');
+        open;
+        ADOQueryCmd.Append;
+        ADOQueryCmd.FieldByName('ZDYNo').Value := Trim(flag);
+        ADOQueryCmd.FieldByName('ZDYName').Value := trim(flagname);
+        ADOQueryCmd.FieldByName('Type').Value := 'Main';
+        ADOQueryCmd.FieldByName('MainType').Value := Trim(MainType);
+        ADOQueryCmd.Post;
+      end;
+    end;
+    with ADOQueryCmd do
+    begin
+      //ClientDataSet1.DisableControls;
+      //with ClientDataSet1 do
+      //begin
+        //First;
+        //while not eof do
+        //begin
+      if Trim(ClientDataSet1.FieldByName('ZDYNO').AsString) = '' then
+      begin
+        if GetLSNo(ADOQueryTemp, maxno, 'SY', 'KH_ZDY', 3, 1) = False then
+        begin
+          ADOQueryCmd.Connection.RollbackTrans;
+              //ClientDataSet1.EnableControls;
+          Application.MessageBox('取最大编号失败！', '提示', 0);
+          Exit;
+        end;
+      end
+      else
+      begin
+        maxno := Trim(ClientDataSet1.fieldbyname('ZDYNo').AsString);
+      end;
+      with ADOQueryTemp do
+      begin
+        Close;
+        sql.Clear;
+        sql.add('select * from KH_Zdy where Type=''' + Trim(flag) + '''');
+        if Trim(MainType) <> '' then
+          SQL.Add(' and MainType=''' + Trim(MainType) + '''');
+        sql.Add(' and ZdyName=''' + Trim(ClientDataSet1.fieldbyname('ZdyName').AsString) + '''');
+        sql.Add(' and note=''' + Trim(ClientDataSet1.fieldbyname('note').AsString) + '''');
+        sql.Add(' and note2=''' + Trim(ClientDataSet1.fieldbyname('note2').AsString) + '''');
+        Open;
+      end;
+      if ADOQueryTemp.IsEmpty = False then
+      begin
+        if ADOQueryTemp.RecordCount > 1 then
+        begin
+          ADOQueryCmd.Connection.RollbackTrans;
+
+              //ClientDataSet1.EnableControls;
+          Application.MessageBox('名称重复！', '提示', 0);
+          Exit;
+        end;
+        if Trim(ClientDataSet1.fieldbyname('ZdyNo').AsString) = '' then
+        begin
+          ADOQueryCmd.Connection.RollbackTrans;
+              //ClientDataSet1.EnableControls;
+          Application.MessageBox('名称重复！', '提示', 0);
+          Exit;
+        end
+        else
+        begin
+          if Trim(ADOQueryTemp.fieldbyname('ZdyNo').AsString) <> Trim(ClientDataSet1.fieldbyname('ZdyNo').AsString) then
+          begin
+            ADOQueryCmd.Connection.RollbackTrans;
+                //ClientDataSet1.EnableControls;
+            Application.MessageBox('名称重复！', '提示', 0);
+            Exit;
+          end;
+        end;
+      end;
+      with ADOQueryCmd do
+      begin
+        Close;
+        sql.Clear;
+        SQL.Add('delete KH_ZDY where ZDYNO=''' + Trim(ClientDataSet1.fieldbyname('ZDYNO').AsString) + '''');
+        ExecSQL;
+      end;
+      with ADOQueryCmd do
+      begin
+        Close;
+        sql.Clear;
+        sql.Add('select * from KH_ZDY where 1<>1');
+        Open;
+      end;
+      ADOQueryCmd.Append;
+      ADOQueryCmd.FieldByName('ZDYNo').Value := Trim(maxno);
+      ADOQueryCmd.FieldByName('ZDYName').Value := ClientDataSet1.fieldbyname('ZDYName').AsString;
+      ADOQueryCmd.FieldByName('note2').Value := ClientDataSet1.fieldbyname('note2').AsString;
+      ADOQueryCmd.FieldByName('note').Value := Trim(snote);
+          //ADOQueryCmd.FieldByName('orderno').Value:=ClientDataSet1.fieldbyname('Name').AsString;
+      ADOQueryCmd.FieldByName('Type').Value := flag;
+      ADOQueryCmd.FieldByName('valid').Value := 'Y';
+      if Trim(MainType) <> '' then
+        ADOQueryCmd.FieldByName('MainType').Value := Trim(MainType);
+          //ADOQueryCmd.FieldByName('sel').Value:=0;
+      ADOQueryCmd.Post;
+      ClientDataSet1.Edit;
+      ClientDataSet1.FieldByName('ZDYNo').Value := Trim(maxno);
+          //ClientDataSet1.Post;
+         // Next;
+        //end;
+      //end;
+     // ClientDataSet1.EnableControls;
+    end;
+    ADOQueryCmd.Connection.CommitTrans;
+    //Application.MessageBox('保存成功！','提示',0);
+    //TV1.OptionsData.Editing:=False;
+    //TV1.OptionsSelection.CellSelect:=False;
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    Application.MessageBox('保存失败！', '提示', 0);
+  end;
+end;
+
 procedure TfrmZDYHelpFY.ZDYNameChange(Sender: TObject);
 var
   fsj: string;
@@ -461,6 +610,7 @@ begin
           SQL.Add(' and MainType=''' + Trim(MainType) + '''');
         sql.Add(' and ZdyName=''' + Trim(ClientDataSet1.fieldbyname('ZdyName').AsString) + '''');
         sql.Add(' and note=''' + Trim(ClientDataSet1.fieldbyname('note').AsString) + '''');
+        sql.Add(' and note2=''' + Trim(ClientDataSet1.fieldbyname('note2').AsString) + '''');
         Open;
       end;
       if ADOQueryTemp.IsEmpty = False then

A09财务通用管理/U_handPayableList.dfm

@@ -27,7 +27,6 @@ inherited frmhandPayableList: TfrmhandPayableList
     ParentColor = False
     ShowCaptions = True
     TabOrder = 0
-    ExplicitTop = 3
     object TBRafresh: TToolButton
       Left = 0
       Top = 0
@@ -153,13 +152,12 @@ inherited frmhandPayableList: TfrmhandPayableList
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
-    ExplicitTop = 32
     object Label2: TLabel
       Left = 40
       Top = 13
       Width = 52
       Height = 12
-      Caption = #21457#31080#26085#26399
+      Caption = #21457#29983#26085#26399
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -12
@@ -249,7 +247,6 @@ inherited frmhandPayableList: TfrmhandPayableList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
-    ExplicitTop = 199
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
@@ -300,6 +297,7 @@ inherited frmhandPayableList: TfrmhandPayableList
         DataBinding.FieldName = 'FFID'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 68
       end
       object v1InvoiceDate: TcxGridDBColumn
@@ -326,6 +324,7 @@ inherited frmhandPayableList: TfrmhandPayableList
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 57
       end
       object v1Column13: TcxGridDBColumn
@@ -333,6 +332,7 @@ inherited frmhandPayableList: TfrmhandPayableList
         DataBinding.FieldName = 'OrderNo'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 63
       end
       object v1Column14: TcxGridDBColumn
@@ -342,6 +342,7 @@ inherited frmhandPayableList: TfrmhandPayableList
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 44
       end
       object v1Column17: TcxGridDBColumn
@@ -349,6 +350,7 @@ inherited frmhandPayableList: TfrmhandPayableList
         DataBinding.FieldName = 'FFAbstractDL'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 64
       end
       object v1Column18: TcxGridDBColumn
@@ -358,12 +360,14 @@ inherited frmhandPayableList: TfrmhandPayableList
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
       end
       object v1Column15: TcxGridDBColumn
         Caption = #37329#39069
         DataBinding.FieldName = 'Amount'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 54
       end
       object v1Column19: TcxGridDBColumn
@@ -373,6 +377,7 @@ inherited frmhandPayableList: TfrmhandPayableList
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
       end
       object v1note: TcxGridDBColumn
         Caption = #22791#27880
@@ -387,6 +392,7 @@ inherited frmhandPayableList: TfrmhandPayableList
         DataBinding.FieldName = 'handler'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 60
       end
     end

A09财务通用管理/U_handPayableList.pas

@@ -174,7 +174,7 @@ begin
     begin
       Close;
       SQL.Clear;
-      sql.Add(' select A.*  from Finance_Flow A ');
+      sql.Add(' select CONVERT(varchar,A.FFTime,23) FFTime,A.*  from Finance_Flow A ');
       sql.add(' where A.FFTime>=''' + formatdatetime('yyyy-MM-dd', begdate.datetime) + ''' ');
       sql.Add(' and A.FFTime<''' + formatdateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''' ');
       sql.Add(' and A.FFType=''手工费用登记'' ');
@@ -333,44 +333,86 @@ begin
 end;
 
 procedure TfrmhandPayableList.TCHKClick(Sender: TObject);
+Var
+   MFFIDS:String;
 begin
   if CDS_Invoice.IsEmpty then
     exit;
+
+  if not CDS_Invoice.Locate('SSel', True, []) then
+  begin
+    application.MessageBox('请选择数据', '提示');
+    Exit;
+  end;
+
+  with CDS_Invoice do
+  begin
+//    DisableControls;
+    while CDS_Invoice.Locate('SSel', True, []) do
+    begin
+      MFFIDS := MFFIDS + Trim(CDS_Invoice.fieldbyname('FFID').AsString) + ',';
+      CDS_Invoice.Delete;
+    end;
+//    EnableControls;
+  end;
+
   try
     with ADOQueryCmd do
     begin
       close;
       sql.Clear;
       sql.add('update Finance_Flow set Chker=''' + trim(DName) + ''',Chktime=getdate(),status=''9'' ');
-      sql.add('where  FFType=''手工费用登记'' and FFID=''' + trim(CDS_Invoice.fieldbyname('FFID').asstring) + ''' ');
+      sql.add('where  FFType=''手工费用登记'' and EXISTS (select *  from [dbo].[F_Tool_SplitString]( ''' + trim(MFFIDS) + '''');
+      sql.add(','','') X where X.RTValue=Finance_Flow.FFID) ');
+//       showmessage(sql.text);
 
       execsql;
     end;
     application.MessageBox('审核成功', '提示');
+//    InitGrid();
     CDS_Invoice.delete;
   except
-    ;
     application.MessageBox('审核失败', '提示');
   end;
 end;
 
 procedure TfrmhandPayableList.TNOCHKClick(Sender: TObject);
+var
+  MFFIDS:string;
 begin
   if CDS_Invoice.IsEmpty then
     exit;
 
+  if not CDS_Invoice.Locate('SSel', True, []) then
+  begin
+    application.MessageBox('请选择数据', '提示');
+    Exit;
+  end;
+
+  with CDS_Invoice do
+  begin
+//    DisableControls;
+    while CDS_Invoice.Locate('SSel', True, []) do
+    begin
+      MFFIDS := MFFIDS + Trim(CDS_Invoice.fieldbyname('FFID').AsString) + ',';
+      CDS_Invoice.Delete;
+    end;
+//    EnableControls;
+  end;
+
   try
     with ADOQueryCmd do
     begin
       close;
       sql.Clear;
       sql.add('update Finance_Flow set Chker=null,Chktime=null,status=''0'' ');
-      sql.add('where  FFType=''手工费用登记'' and FFID=''' + trim(CDS_Invoice.fieldbyname('FFID').asstring) + ''' ');
+      sql.add('where  FFType=''手工费用登记'' and EXISTS (select *  from [dbo].[F_Tool_SplitString]( ''' + trim(MFFIDS) + '''');
+      sql.add(','','') X where X.RTValue=Finance_Flow.FFID) ');
 
       execsql;
     end;
     application.MessageBox('撤销成功', '提示');
-    CDS_Invoice.delete;
+//    CDS_Invoice.delete;
   except
     application.MessageBox('撤销失败', '提示');
   end;

B01基础合同管理/Contract.dpr

@@ -27,7 +27,9 @@ uses
   U_LabelMapSet in '..\A00通用窗体\U_LabelMapSet.pas' {frmLabelMapSet},
   U_LabelPrint in '..\A00通用窗体\U_LabelPrint.pas' {frmLabelPrint},
   U_SalesConInPutCopy in 'U_SalesConInPutCopy.pas' {frmSalesConInPutCopy},
-  U_ContractList in 'U_ContractList.pas' {frmContractList};
+  U_ContractList in 'U_ContractList.pas' {frmContractList},
+  U_BaoguanList in 'U_BaoguanList.pas' {frmBaoguanList},
+  U_BaoguanInPut in 'U_BaoguanInPut.pas' {frmBaoguanInPut};
 
 {$R *.res}
 

B01基础合同管理/Contract.dproj

@@ -124,7 +124,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\项目代码\骉骐\B01基础合同管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -193,6 +193,14 @@
             <Form>frmContractList</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="U_BaoguanList.pas">
+            <Form>frmBaoguanList</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_BaoguanInPut.pas">
+            <Form>frmBaoguanInPut</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

B01基础合同管理/Contract.dproj.local

@@ -4,66 +4,68 @@
     <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.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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.950,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.114,=D:\Dp10Repo\项目代码\骉骐\B01基础合同管理\U_ContractList.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.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm</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.556,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.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.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.564,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.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.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.526,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.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.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.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.609,=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_BaoguanList.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.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.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\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.582,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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.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.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.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.123,=D:\Dp10Repo\public10\design\U_globalVar.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.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.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.575,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.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.dfm</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.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.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.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>2024-08-09 15:19:07.322,=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_BaoguanInPut.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -94,7 +96,7 @@
     <File Path="fmx.dex.jar"/>
     <File Path="google-play-billing.dex.jar"/>
     <File Path="google-play-licensing.dex.jar"/>
-    <File Path="..\..\骉骐"/>
+    <File Path="..\..\D10myBiaoqi"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_LabelMapSet.pas"/>
     <File Path="..\A00通用窗体\U_LabelMapSet.dfm"/>
@@ -137,5 +139,9 @@
     <File Path="U_SalesConInPutCopy.dfm"/>
     <File Path="U_ContractList.pas"/>
     <File Path="U_ContractList.dfm"/>
+    <File Path="U_BaoguanList.pas"/>
+    <File Path="U_BaoguanList.dfm"/>
+    <File Path="U_BaoguanInPut.pas"/>
+    <File Path="U_BaoguanInPut.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

B01基础合同管理/U_ContractList.dfm

@@ -6,7 +6,6 @@ inherited frmContractList: TfrmContractList
   ClientWidth = 1525
   FormStyle = fsMDIChild
   Visible = True
-  ExplicitLeft = -291
   ExplicitWidth = 1541
   ExplicitHeight = 775
   PixelsPerInch = 96
@@ -211,6 +210,7 @@ inherited frmContractList: TfrmContractList
     TabOrder = 3
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnCellDblClick = Tv1CellDblClick
       OnCustomDrawCell = Tv1CustomDrawCell
       OnFocusedRecordChanged = Tv1FocusedRecordChanged
@@ -238,6 +238,7 @@ inherited frmContractList: TfrmContractList
       object v1Column4: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         Properties.NullStyle = nssUnchecked
@@ -248,6 +249,7 @@ inherited frmContractList: TfrmContractList
       object v1OrdDate: TcxGridDBColumn
         Caption = #19979#21333#26085#26399
         DataBinding.FieldName = 'ConDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
@@ -259,6 +261,7 @@ inherited frmContractList: TfrmContractList
       object v1DeliveryDate: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
@@ -270,6 +273,7 @@ inherited frmContractList: TfrmContractList
       object v1ConNo: TcxGridDBColumn
         Caption = #21512#21516#21495
         DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -279,6 +283,7 @@ inherited frmContractList: TfrmContractList
       object v1Column1: TcxGridDBColumn
         Caption = #32463#33829#21333#20301
         DataBinding.FieldName = 'SellName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -288,6 +293,7 @@ inherited frmContractList: TfrmContractList
       object v1CustomerNoName: TcxGridDBColumn
         Caption = #23458#25143
         DataBinding.FieldName = 'BuyName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -297,6 +303,7 @@ inherited frmContractList: TfrmContractList
       object Tv1Column1: TcxGridDBColumn
         Caption = #20013#38388#21830
         DataBinding.FieldName = 'MiddleName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -306,6 +313,7 @@ inherited frmContractList: TfrmContractList
       object Tv1Column19: TcxGridDBColumn
         Caption = #20132#26399#35828#26126
         DataBinding.FieldName = 'ShippMent'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 271
@@ -313,6 +321,7 @@ inherited frmContractList: TfrmContractList
       object v1Column9: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'note'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -320,6 +329,7 @@ inherited frmContractList: TfrmContractList
       object Tv1Column14: TcxGridDBColumn
         Caption = #20215#26684#26415#35821
         DataBinding.FieldName = 'JiaGeSY'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -327,6 +337,7 @@ inherited frmContractList: TfrmContractList
       object Tv1Column7: TcxGridDBColumn
         Caption = #24065#31181
         DataBinding.FieldName = 'Currency'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -334,6 +345,7 @@ inherited frmContractList: TfrmContractList
       object v1Column8: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 86
@@ -341,6 +353,7 @@ inherited frmContractList: TfrmContractList
       object v1OrdPerson1: TcxGridDBColumn
         Caption = #38144#21806#21592
         DataBinding.FieldName = 'Saleser'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -349,6 +362,7 @@ inherited frmContractList: TfrmContractList
       end
       object v1Column10: TcxGridDBColumn
         DataBinding.FieldName = 'status'
+        DataBinding.IsNullValueType = True
         Visible = False
         Options.Editing = False
         VisibleForCustomization = False
@@ -356,6 +370,7 @@ inherited frmContractList: TfrmContractList
       object v1Column12: TcxGridDBColumn
         Caption = #21512#21516#38468#20214
         DataBinding.FieldName = 'ISFJ'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.NullStyle = nssUnchecked
         HeaderAlignmentHorz = taCenter
@@ -365,6 +380,7 @@ inherited frmContractList: TfrmContractList
       object v1Column13: TcxGridDBColumn
         Caption = #21046#21333#20154
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 78
@@ -372,18 +388,21 @@ inherited frmContractList: TfrmContractList
       object Tv1Column2: TcxGridDBColumn
         Caption = #26159#21542#21547#31246
         DataBinding.FieldName = 'IsTax'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
       end
       object Tv1Column9: TcxGridDBColumn
         Caption = #26159#21542#21547#36816
         DataBinding.FieldName = 'ISYF'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 69
       end
       object Tv1Column3: TcxGridDBColumn
         Caption = #36215#36816#28207
         DataBinding.FieldName = 'QiYun'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -391,6 +410,7 @@ inherited frmContractList: TfrmContractList
       object Tv1Column4: TcxGridDBColumn
         Caption = #30446#30340#28207
         DataBinding.FieldName = 'MuDi'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -399,6 +419,7 @@ inherited frmContractList: TfrmContractList
         Tag = 2
         Caption = #28322#30701#35013
         DataBinding.FieldName = 'QtyNote'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -406,6 +427,7 @@ inherited frmContractList: TfrmContractList
       object Tv1Column6: TcxGridDBColumn
         Caption = #27719#29575
         DataBinding.FieldName = 'huilv'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -413,6 +435,7 @@ inherited frmContractList: TfrmContractList
       object Tv1Column25: TcxGridDBColumn
         Caption = #31867#22411
         DataBinding.FieldName = 'SCMType'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -420,6 +443,7 @@ inherited frmContractList: TfrmContractList
       object Tv1Column27: TcxGridDBColumn
         Caption = #29702#21333
         DataBinding.FieldName = 'lidan'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 58
@@ -427,64 +451,75 @@ inherited frmContractList: TfrmContractList
       object Tv1Column8: TcxGridDBColumn
         Caption = #29366#24577
         DataBinding.FieldName = 'ZT'
+        DataBinding.IsNullValueType = True
         Width = 40
       end
       object Tv1Column10: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 72
       end
       object Tv1Column11: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
       object Tv1Column12: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 91
       end
       object Tv1Column13: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 61
       end
       object Tv1Column15: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 83
       end
       object Tv1Column16: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 90
       end
       object Tv1Column17: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'ConQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 56
       end
       object Tv1Column18: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'ConUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 52
       end
       object Tv1Column20: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'ConPrice'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object Tv1Column21: TcxGridDBColumn
         Caption = #37329#39069
         DataBinding.FieldName = 'ConTotalAmount'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
     end
@@ -790,6 +825,7 @@ inherited frmContractList: TfrmContractList
     Visible = False
     object TV2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_2
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -835,6 +871,7 @@ inherited frmContractList: TfrmContractList
       object v1XHNo: TcxGridDBColumn
         Caption = #24207#21495
         DataBinding.FieldName = 'SerialNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         SortIndex = 0
@@ -845,6 +882,7 @@ inherited frmContractList: TfrmContractList
       object VC_SCSCode: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -859,6 +897,7 @@ inherited frmContractList: TfrmContractList
       object cxGridDBColumn2: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -866,6 +905,7 @@ inherited frmContractList: TfrmContractList
       object cxGridDBColumn3: TcxGridDBColumn
         Caption = #20135#21697#33521#25991#21517
         DataBinding.FieldName = 'C_EName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -880,6 +920,7 @@ inherited frmContractList: TfrmContractList
       object v1Column5: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -888,6 +929,7 @@ inherited frmContractList: TfrmContractList
       object cxGridDBColumn4: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -895,6 +937,7 @@ inherited frmContractList: TfrmContractList
       object cxGridDBColumn5: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -902,6 +945,7 @@ inherited frmContractList: TfrmContractList
       object cxGridDBColumn6: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -910,6 +954,7 @@ inherited frmContractList: TfrmContractList
       object cxGridDBColumn7: TcxGridDBColumn
         Caption = #27454#21495
         DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -918,6 +963,7 @@ inherited frmContractList: TfrmContractList
       object cxGridDBColumn8: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -933,6 +979,7 @@ inherited frmContractList: TfrmContractList
       object v1Column6: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -946,6 +993,7 @@ inherited frmContractList: TfrmContractList
       object v1Column7: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -959,6 +1007,7 @@ inherited frmContractList: TfrmContractList
       object v1PRTOrderQty: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'ConQty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -968,6 +1017,7 @@ inherited frmContractList: TfrmContractList
       object v1OrderUnit: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'ConUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsEditFixedList
         Properties.Items.Strings = (
@@ -982,6 +1032,7 @@ inherited frmContractList: TfrmContractList
       object v1PRTPrice: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'ConPrice'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -992,6 +1043,7 @@ inherited frmContractList: TfrmContractList
       object cxGridDBColumn9: TcxGridDBColumn
         Caption = #37329#39069
         DataBinding.FieldName = 'ConTotalAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -1000,6 +1052,7 @@ inherited frmContractList: TfrmContractList
       object v1Column2: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'ConSNote'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -1007,12 +1060,14 @@ inherited frmContractList: TfrmContractList
       object TV2Column1: TcxGridDBColumn
         Caption = #39044#20272#25104#26412
         DataBinding.FieldName = 'Estimated'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
       object TV2Column2: TcxGridDBColumn
         Caption = #21033#28070#29575
         DataBinding.FieldName = 'ProfitRate'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 54
       end

B01基础合同管理/U_ContractList.pas

@@ -12,7 +12,8 @@ uses
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxPC, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,
   dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
-  U_BaseList, RM_e_Graphic, RM_e_Jpeg, RM_E_llPDF, Vcl.Clipbrd;
+  U_BaseList, RM_e_Graphic, RM_e_Jpeg, RM_E_llPDF, Vcl.Clipbrd, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmContractList = class(TfrmBaseList)

B01基础合同管理/U_DataLink.pas

@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
   Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
-  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList;
+  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList, dxSkinWXI;
 
 type
   TMyThread = class(TThread)

B01基础合同管理/U_GetDllForm.pas

@@ -15,7 +15,7 @@ function GetsysParam(muserId: pchar; fparam1: pchar): Boolean;
 implementation
 
 uses
-  U_DataLink, U_iniParam, U_SalesContractList, U_ContractList;
+  U_DataLink, U_iniParam, U_SalesContractList, U_ContractList,U_BaoguanList;
 
        /////////////////////////////////////////////////////////////////
       //         功能说明:取Dll中得窗体                              //
@@ -151,6 +151,18 @@ begin
         end;
       end;
 
+     211:  //±¨¹Ø¹ÜÀí
+      begin
+        with TfrmBaoguanList.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;
+
     10000:
       begin
         for i := 0 to application.MainForm.MDIChildCount - 1 do

T04贸易明细仓库/U_TradeClothOutListNew.dfm

@@ -7,7 +7,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
-  ExplicitLeft = -306
+  ExplicitTop = -28
   ExplicitWidth = 1556
   ExplicitHeight = 639
   PixelsPerInch = 96
@@ -109,6 +109,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 5
     OnChange = cxPageControl1Change
+    ExplicitTop = 44
     ClientRectBottom = 562
     ClientRectRight = 1540
     ClientRectTop = 32
@@ -523,10 +524,10 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         ParentFont = False
         PopupMenu = PM_2
         TabOrder = 1
-        ExplicitLeft = -1
         object TV2: TcxGridDBTableView
           OnDblClick = TV2DblClick
           Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
           OnCellDblClick = TV2CellDblClick
           DataController.DataSource = DS_2
           DataController.Filter.AutoDataSetFilter = True
@@ -598,6 +599,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn2: TcxGridDBColumn
             Caption = #20986#24211#26102#38388
             DataBinding.FieldName = 'IOTime'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -606,6 +608,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
             Tag = 11
             Caption = #20986#24211#21333#21495
             DataBinding.FieldName = 'IONO'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 78
@@ -613,6 +616,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn13: TcxGridDBColumn
             Caption = #20986#24211#31867#22411
             DataBinding.FieldName = 'IOType'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 75
@@ -620,6 +624,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn3: TcxGridDBColumn
             Caption = #35745#21010#21333#21495
             DataBinding.FieldName = 'OrderNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 77
@@ -627,6 +632,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn4: TcxGridDBColumn
             Caption = #20135#21697#21517#31216
             DataBinding.FieldName = 'C_Name'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 76
@@ -634,6 +640,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn5: TcxGridDBColumn
             Caption = #23458#25143
             DataBinding.FieldName = 'CustName'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -641,6 +648,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn7: TcxGridDBColumn
             Caption = #21367#25968
             DataBinding.FieldName = 'SumPieceNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -648,6 +656,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn8: TcxGridDBColumn
             Caption = #27611#37325
             DataBinding.FieldName = 'SumGrossWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -655,6 +664,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn9: TcxGridDBColumn
             Caption = #30382#37325
             DataBinding.FieldName = 'SumTare'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -662,6 +672,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn10: TcxGridDBColumn
             Caption = #20928#37325
             DataBinding.FieldName = 'SumNetWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -669,6 +680,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn11: TcxGridDBColumn
             Caption = #31859#25968
             DataBinding.FieldName = 'SumMeter'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -676,6 +688,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn12: TcxGridDBColumn
             Caption = #30721#25968
             DataBinding.FieldName = 'SumYardage'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -683,6 +696,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn14: TcxGridDBColumn
             Caption = #21697#36136
             DataBinding.FieldName = 'Grade'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -690,6 +704,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn15: TcxGridDBColumn
             Caption = #38376#24133
             DataBinding.FieldName = 'C_Width'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -697,6 +712,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object cxGridDBColumn16: TcxGridDBColumn
             Caption = #20811#37325
             DataBinding.FieldName = 'C_GramWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -704,6 +720,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column46: TcxGridDBColumn
             Caption = #26816#39564#26426#21488
             DataBinding.FieldName = 'CIMachNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -711,6 +728,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object TV2Column1: TcxGridDBColumn
             Caption = #39068#33394
             DataBinding.FieldName = 'C_Color'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -718,6 +736,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object TV2Column2: TcxGridDBColumn
             Caption = #26412#21378#32568#21495
             DataBinding.FieldName = 'BatchNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 72
@@ -725,6 +744,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object TV2Column3: TcxGridDBColumn
             Caption = #24211#20301
             DataBinding.FieldName = 'IOPosition'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -732,37 +752,44 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object TV2Column4: TcxGridDBColumn
             Caption = #33457#22411
             DataBinding.FieldName = 'C_Pattern'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 56
           end
           object TV2Column6: TcxGridDBColumn
             Caption = #19994#21153#21592
             DataBinding.FieldName = 'Saleser'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column7: TcxGridDBColumn
             Caption = #33394#21495
             DataBinding.FieldName = 'C_ColorNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column8: TcxGridDBColumn
             Caption = #21512#21516#21495
             DataBinding.FieldName = 'ConNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column9: TcxGridDBColumn
             Caption = #23458#25143#21333#21495
             DataBinding.FieldName = 'BuyConNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column10: TcxGridDBColumn
             Caption = #20135#21697#32534#21495
             DataBinding.FieldName = 'C_Code'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column11: TcxGridDBColumn
             Caption = #20986#24211#22791#27880
             DataBinding.FieldName = 'IONote'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 123
           end
@@ -775,9 +802,6 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
     object cxTabSheet2: TcxTabSheet
       Caption = '  '#20135#21697#26126#32454#20449#24687'  '
       ImageIndex = 1
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object Panel6: TPanel
         Left = 0
         Top = 67
@@ -1308,10 +1332,9 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         ParentFont = False
         PopupMenu = PM_1
         TabOrder = 2
-        ExplicitLeft = 16
-        ExplicitTop = 162
         object Tv1: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
           OnCellDblClick = Tv1CellDblClick
           DataController.DataSource = DS_1
           DataController.Filter.AutoDataSetFilter = True
@@ -1384,6 +1407,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column22: TcxGridDBColumn
             Caption = #36873#25321
             DataBinding.FieldName = 'SSel'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxCheckBoxProperties'
             Properties.ImmediatePost = True
             Properties.NullStyle = nssUnchecked
@@ -1394,6 +1418,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column21: TcxGridDBColumn
             Caption = #20986#24211#26102#38388
             DataBinding.FieldName = 'IOTime'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 103
@@ -1401,10 +1426,12 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object Tv1Column11: TcxGridDBColumn
             Caption = #20986#24211#31867#22411
             DataBinding.FieldName = 'IOType'
+            DataBinding.IsNullValueType = True
           end
           object Tv1Column9: TcxGridDBColumn
             Caption = #20986#24211#21333#21495
             DataBinding.FieldName = 'IONO'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 82
@@ -1412,6 +1439,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column32: TcxGridDBColumn
             Caption = #21512#21516#21495
             DataBinding.FieldName = 'ConNO'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 76
@@ -1419,6 +1447,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column1: TcxGridDBColumn
             Caption = #35745#21010#21333#21495
             DataBinding.FieldName = 'OrderNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 92
@@ -1426,6 +1455,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object Tv1Column4: TcxGridDBColumn
             Caption = #20135#21697#32534#21495
             DataBinding.FieldName = 'C_Code'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 74
@@ -1433,6 +1463,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column13: TcxGridDBColumn
             Caption = #20135#21697#21517#31216
             DataBinding.FieldName = 'C_Name'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1440,6 +1471,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column4: TcxGridDBColumn
             Caption = #39068#33394
             DataBinding.FieldName = 'C_Color'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1447,6 +1479,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column23: TcxGridDBColumn
             Caption = #21367#21495
             DataBinding.FieldName = 'PieceNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1454,6 +1487,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column8: TcxGridDBColumn
             Caption = #27611#37325
             DataBinding.FieldName = 'GrossWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1461,6 +1495,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column27: TcxGridDBColumn
             Caption = #30382#37325
             DataBinding.FieldName = 'Tare'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1468,6 +1503,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column28: TcxGridDBColumn
             Caption = #20928#37325
             DataBinding.FieldName = 'NetWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1475,6 +1511,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column10: TcxGridDBColumn
             Caption = #31859#25968
             DataBinding.FieldName = 'Meter'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1482,12 +1519,14 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object Tv1Column12: TcxGridDBColumn
             Caption = #24211#20301
             DataBinding.FieldName = 'IOPosition'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 71
           end
           object Tv1Column10: TcxGridDBColumn
             Caption = #30721#25968
             DataBinding.FieldName = 'Yardage'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1495,6 +1534,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column12: TcxGridDBColumn
             Caption = #21697#36136
             DataBinding.FieldName = 'Grade'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1502,6 +1542,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column42: TcxGridDBColumn
             Caption = #24635#35760#24405#25968
             DataBinding.FieldName = 'TotalCount'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1509,6 +1550,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column6: TcxGridDBColumn
             Caption = #21367#26465#30721
             DataBinding.FieldName = 'CIID'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1516,6 +1558,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object Tv1Column7: TcxGridDBColumn
             Caption = #23458#25143#33457#22411
             DataBinding.FieldName = 'C_CustPattern'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1523,6 +1566,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column3: TcxGridDBColumn
             Caption = #38376#24133
             DataBinding.FieldName = 'C_Width'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1530,6 +1574,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column5: TcxGridDBColumn
             Caption = #20811#37325
             DataBinding.FieldName = 'C_GramWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1537,6 +1582,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object v1Column40: TcxGridDBColumn
             Caption = #33457#22411
             DataBinding.FieldName = 'C_Pattern'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1544,6 +1590,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object Tv1Column5: TcxGridDBColumn
             Caption = #21253#21495
             DataBinding.FieldName = 'PacketNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1551,11 +1598,13 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object VC_BaoID: TcxGridDBColumn
             Caption = #21253#26465#30721
             DataBinding.FieldName = 'PacketId'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object Tv1Column8: TcxGridDBColumn
             Caption = #23458#25143#21333#21495
             DataBinding.FieldName = 'BuyConNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1563,6 +1612,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object Tv1Column3: TcxGridDBColumn
             Caption = #33394#21495
             DataBinding.FieldName = 'C_ColorNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1570,6 +1620,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object Tv1Column1: TcxGridDBColumn
             Caption = #27454#21495
             DataBinding.FieldName = 'C_StyleNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1577,6 +1628,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object Tv1Column2: TcxGridDBColumn
             Caption = #33521#25991#39068#33394
             DataBinding.FieldName = 'C_EColor'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1584,12 +1636,14 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           object Tv1Column6: TcxGridDBColumn
             Caption = #25209#21495
             DataBinding.FieldName = 'BatchNO'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 66
           end
           object Tv1Column13: TcxGridDBColumn
             Caption = #20986#24211#22791#27880
             DataBinding.FieldName = 'IONote'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 86
           end
@@ -1625,6 +1679,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
       TabOrder = 0
       object TV3: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         OnCellDblClick = TV2CellDblClick
         DataController.DataSource = DS_3
         DataController.Filter.AutoDataSetFilter = True
@@ -1696,6 +1751,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn1: TcxGridDBColumn
           Caption = #20986#24211#26102#38388
           DataBinding.FieldName = 'IOTime'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1704,6 +1760,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
           Tag = 11
           Caption = #20986#24211#21333#21495
           DataBinding.FieldName = 'IONO'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 78
@@ -1711,6 +1768,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn17: TcxGridDBColumn
           Caption = #20986#24211#31867#22411
           DataBinding.FieldName = 'IOType'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 75
@@ -1718,6 +1776,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn18: TcxGridDBColumn
           Caption = #35745#21010#21333#21495
           DataBinding.FieldName = 'OrderNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 77
@@ -1725,6 +1784,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn19: TcxGridDBColumn
           Caption = #20135#21697#21517#31216
           DataBinding.FieldName = 'C_Name'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 76
@@ -1732,6 +1792,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn20: TcxGridDBColumn
           Caption = #23458#25143
           DataBinding.FieldName = 'CustName'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1739,6 +1800,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn21: TcxGridDBColumn
           Caption = #21367#25968
           DataBinding.FieldName = 'SumPieceNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1746,6 +1808,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn22: TcxGridDBColumn
           Caption = #27611#37325
           DataBinding.FieldName = 'SumGrossWeight'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1753,6 +1816,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn23: TcxGridDBColumn
           Caption = #30382#37325
           DataBinding.FieldName = 'SumTare'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1760,6 +1824,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn24: TcxGridDBColumn
           Caption = #20928#37325
           DataBinding.FieldName = 'SumNetWeight'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1767,6 +1832,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn25: TcxGridDBColumn
           Caption = #31859#25968
           DataBinding.FieldName = 'SumMeter'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1774,6 +1840,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn26: TcxGridDBColumn
           Caption = #30721#25968
           DataBinding.FieldName = 'SumYardage'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1781,6 +1848,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn27: TcxGridDBColumn
           Caption = #21697#36136
           DataBinding.FieldName = 'Grade'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1788,6 +1856,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn28: TcxGridDBColumn
           Caption = #38376#24133
           DataBinding.FieldName = 'C_Width'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1795,6 +1864,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn29: TcxGridDBColumn
           Caption = #20811#37325
           DataBinding.FieldName = 'C_GramWeight'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1802,6 +1872,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn30: TcxGridDBColumn
           Caption = #26816#39564#26426#21488
           DataBinding.FieldName = 'CIMachNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1809,6 +1880,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn31: TcxGridDBColumn
           Caption = #39068#33394
           DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1816,6 +1888,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn32: TcxGridDBColumn
           Caption = #26412#21378#32568#21495
           DataBinding.FieldName = 'BatchNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 72
@@ -1823,6 +1896,7 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn33: TcxGridDBColumn
           Caption = #24211#20301
           DataBinding.FieldName = 'IOPosition'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -1830,37 +1904,44 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
         object cxGridDBColumn34: TcxGridDBColumn
           Caption = #33457#22411
           DataBinding.FieldName = 'C_Pattern'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 56
         end
         object cxGridDBColumn35: TcxGridDBColumn
           Caption = #19994#21153#21592
           DataBinding.FieldName = 'Saleser'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
         end
         object cxGridDBColumn36: TcxGridDBColumn
           Caption = #33394#21495
           DataBinding.FieldName = 'C_ColorNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
         end
         object cxGridDBColumn37: TcxGridDBColumn
           Caption = #21512#21516#21495
           DataBinding.FieldName = 'ConNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
         end
         object cxGridDBColumn38: TcxGridDBColumn
           Caption = #23458#25143#21333#21495
           DataBinding.FieldName = 'BuyConNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
         end
         object cxGridDBColumn39: TcxGridDBColumn
           Caption = #20135#21697#32534#21495
           DataBinding.FieldName = 'C_Code'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
         end
         object TV3Column1: TcxGridDBColumn
           Caption = #20986#24211#22791#27880
           DataBinding.FieldName = 'IONote'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 163
         end

T04贸易明细仓库/U_TradeClothOutListNew.pas

@@ -13,7 +13,7 @@ uses
   RM_System, RM_GridReport, Menus, cxCalendar, MovePanel, Math, Clipbrd,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, dxSkinsCore,
   dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC,
-  System.StrUtils;
+  System.StrUtils, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmTradeClothOutListNew = class(TfrmBaseList)
@@ -407,8 +407,15 @@ procedure TfrmTradeClothOutListNew.TBExportClick(Sender: TObject);
 begin
   if ADOQueryMain.IsEmpty then
     exit;
+  if cxPageControl1.ActivePageIndex = 0 then
+  begin
+     TcxGridToExcel(Self.Caption, cxGrid2);
+  end
+  else
+  begin
     TcxGridToExcel(Self.Caption, cxGrid1);
   end;
+end;
 
 procedure TfrmTradeClothOutListNew.orderNoKeyPress(Sender: TObject; var Key: Char);
 begin