0713

A02基础产品管理/ClothInfo.skincfg

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

A09财务通用管理/Financial.dpr

@@ -29,7 +29,8 @@ uses
   U_LabelMapSet in '..\A00通用窗体\U_LabelMapSet.pas' {frmLabelMapSet},
   U_LabelPrint in '..\A00通用窗体\U_LabelPrint.pas' {frmLabelPrint},
   U_TradePlanSel in '..\T00贸易通用窗体\U_TradePlanSel.pas' {frmTradePlanSel},
-  U_CompanySel in 'U_CompanySel.pas' {frmCompanySel};
+  U_CompanySel in 'U_CompanySel.pas' {frmCompanySel},
+  U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule};
 
 {$R *.res}
 

A09财务通用管理/Financial.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\项目代码\骉骐\A09财务通用管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -201,6 +201,11 @@
             <Form>frmCompanySel</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="..\..\..\public10\design\U_BaseDataLink.pas">
+            <Form>BaseDataLink</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TDataModule</DesignClass>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

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

@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
+    <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.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.103,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_BankSel.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.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.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.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.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.307,=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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -99,6 +100,8 @@
     <File Path="..\..\..\public10\design\U_cxGridCustomCss.pas"/>
     <File Path="..\..\..\public10\design\U_globalVar.pas"/>
     <File Path="..\..\..\public10\design\U_WindowFormdesign.pas"/>
+    <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
+    <File Path="..\..\..\public10\design\U_BaseDataLink.dfm"/>
     <File Path="..\..\..\public10\ThreeFun"/>
     <File Path="..\..\..\public10\ThreeFun\Form"/>
     <File Path="..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas"/>

A09财务通用管理/Financial.skincfg

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

A09财务通用管理/U_CustStatement.dfm

@@ -164,6 +164,7 @@ inherited frmCustStatement: TfrmCustStatement
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_HZ
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <
@@ -264,6 +265,7 @@ inherited frmCustStatement: TfrmCustStatement
       object v2Column6: TcxGridDBColumn
         Caption = #23545#26041#21333#20301
         DataBinding.FieldName = 'OppCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -273,6 +275,7 @@ inherited frmCustStatement: TfrmCustStatement
       object v2Column5: TcxGridDBColumn
         Caption = #19978#26399#27424#27454
         DataBinding.FieldName = 'SQJYAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -282,6 +285,7 @@ inherited frmCustStatement: TfrmCustStatement
       object v2Column1: TcxGridDBColumn
         Caption = #26412#26399#24212#25910
         DataBinding.FieldName = 'BQYSAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -291,6 +295,7 @@ inherited frmCustStatement: TfrmCustStatement
       object v2Column2: TcxGridDBColumn
         Caption = #26412#26399#25910#27454
         DataBinding.FieldName = 'BQSKAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -300,6 +305,7 @@ inherited frmCustStatement: TfrmCustStatement
       object v2Column3: TcxGridDBColumn
         Caption = #26412#26399#27424#27454
         DataBinding.FieldName = 'BQJYAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -309,6 +315,7 @@ inherited frmCustStatement: TfrmCustStatement
       object Tv2Column1: TcxGridDBColumn
         Caption = #26412#26399#27424#31080
         DataBinding.FieldName = 'BQWKTaxAmount'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 81
@@ -316,6 +323,7 @@ inherited frmCustStatement: TfrmCustStatement
       object Tv2Column2: TcxGridDBColumn
         Caption = #26412#26399#24320#31080
         DataBinding.FieldName = 'BQYKTaxAmount'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 77
@@ -340,7 +348,7 @@ inherited frmCustStatement: TfrmCustStatement
     TabOrder = 3
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 2
-    Properties.TabIndex = 0
+    Properties.TabIndex = 1
     Properties.Tabs.Strings = (
       '        USD          '
       '        CNY            ')

A09财务通用管理/U_CustStatement.pas

@@ -14,7 +14,8 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
   dxBarBuiltInMenu, cxPC, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  U_BaseList, Vcl.Menus, Vcl.Clipbrd, DateUtils;
+  U_BaseList, Vcl.Menus, Vcl.Clipbrd, DateUtils, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmCustStatement = class(TfrmBaseList)

A09财务通用管理/U_DataLink.dfm

@@ -1,9 +1,10 @@
-object DataLink_Financial: TDataLink_Financial
+inherited DataLink_Financial: TDataLink_Financial
-  OldCreateOrder = False
-  OnCreate = DataModuleCreate
   OnDestroy = DataModuleDestroy
   Height = 349
   Width = 482
+  inherited cxImageList_bar: TcxImageList
+    FormatVersion = 1
+  end
   object AdoDataLink: TADOQuery
     Connection = ADOLink
     Parameters = <>
@@ -10426,6 +10427,8 @@ object DataLink_Financial: TDataLink_Financial
   object ThreeLookAndFeelCol: TcxLookAndFeelController
     Kind = lfStandard
     NativeStyle = False
+    ScrollbarMode = sbmHybrid
+    SkinName = 'WXI'
     Left = 253
     Top = 12
   end

A09财务通用管理/U_DataLink.pas

@@ -5,7 +5,8 @@ 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,
+  U_BaseDataLink, dxCore, cxLocalization, cxImageList, cxGraphics, dxSkinsForm;
 
 type
   TMyThread = class(TThread)
@@ -37,7 +38,7 @@ var
   UserDataFlag: string;
 
 type
-  TDataLink_Financial = class(TDataModule)
+  TDataLink_Financial = class(TBaseDataLink)
     AdoDataLink: TADOQuery;
     ADOLink: TADOConnection;
     ThreeImgList: TImageList;
@@ -109,6 +110,7 @@ end;
 
 procedure TDataLink_Financial.DataModuleDestroy(Sender: TObject);
 begin
+  inherited;
   CriticalSection.Free;
   DataLink_Financial := nil;
 end;
@@ -120,6 +122,7 @@ end;
 
 procedure TDataLink_Financial.DataModuleCreate(Sender: TObject);
 begin
+  inherited;
   CriticalSection := TCriticalSection.Create;
 end;
 

A09财务通用管理/U_InvoiceInInPut.dfm

@@ -83,6 +83,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -117,6 +118,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object Tv1Column5: TcxGridDBColumn
         Caption = #21457#31080#26085#26399
         DataBinding.FieldName = 'IVDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 77
@@ -124,12 +126,14 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object Tv1Column1: TcxGridDBColumn
         Caption = #21457#31080#21495#30721
         DataBinding.FieldName = 'IVNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 77
       end
       object Tv1Column2: TcxGridDBColumn
         Caption = #25105#26041#21333#20301
         DataBinding.FieldName = 'OurCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -145,6 +149,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object Tv1Column4: TcxGridDBColumn
         Caption = #23545#26041#21333#20301
         DataBinding.FieldName = 'OppCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -160,6 +165,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object Tv1Column6: TcxGridDBColumn
         Caption = #19978#32423#21333#20301
         DataBinding.FieldName = 'OppParentCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -175,6 +181,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object Tv1Column3: TcxGridDBColumn
         Caption = #21457#31080#31867#22411
         DataBinding.FieldName = 'IVType'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -188,12 +195,14 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object v1Column1: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'F_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
       object v1P_CodeName: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'F_Name'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -207,12 +216,14 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object v1P_Spec: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'F_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 103
       end
       object v1Qty: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -221,6 +232,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object v1QtyUnit: TcxGridDBColumn
         Caption = #25968#37327#21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -234,6 +246,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object v1Price: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -242,6 +255,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object v1Money: TcxGridDBColumn
         Caption = #37329#39069
         DataBinding.FieldName = 'Amount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -250,6 +264,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object v1Column3: TcxGridDBColumn
         Caption = #31246#29575'(%)'
         DataBinding.FieldName = 'tax'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -258,6 +273,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object v1Column5: TcxGridDBColumn
         Caption = #31246#39069
         DataBinding.FieldName = 'TaxFee'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 53
@@ -265,6 +281,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object v1Column4: TcxGridDBColumn
         Caption = #21547#31246#37329#39069
         DataBinding.FieldName = 'TaxAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -273,6 +290,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object Tv1Column8: TcxGridDBColumn
         Caption = #24065#31181
         DataBinding.FieldName = 'Currency'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -283,6 +301,7 @@ object frmInvoiceInInPut: TfrmInvoiceInInPut
       object Tv1Column7: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end

A09财务通用管理/U_InvoiceInInPut.pas

@@ -10,7 +10,8 @@ uses
   cxGridDBTableView, cxGrid, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB,
   DBClient, ExtCtrls, StdCtrls, BtnEdit, cxButtonEdit, cxTextEdit,
   cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxCalendar,
-  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu;
+  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu,
+  dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmInvoiceInInPut = class(TForm)
@@ -76,7 +77,7 @@ var
 implementation
 
 uses
-  U_RTFun, U_ZDYHelp, U_CompanySel, U_dataLink;
+  U_RTFun, U_ZDYHelp, U_CompanySel, U_dataLink,U_ClothInfoSel;
 {$R *.dfm}
 
 procedure TfrmInvoiceInInPut.SaveDate();
@@ -195,23 +196,22 @@ end;
 
 procedure TfrmInvoiceInInPut.v1P_CodeNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
-  try
+  frmClothInfoSel := TfrmClothInfoSel.Create(self);
-    frmZDYHelp := TfrmZDYHelp.Create(Application);
+  with frmClothInfoSel do
-    with frmZDYHelp do
   begin
-      flag := 'MPRTCodeName';
+    if showmodal = 1 then
-      flagname := '产品名称';
-      if ShowModal = 1 then
     begin
-        Self.CDS_Invoice.Edit;
+      CDS_Invoice.Edit;
-        Self.CDS_Invoice.FieldByName('P_CodeName').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+      CDS_Invoice.fieldbyname('F_Code').Value := frmClothInfoSel.CDS_1.fieldbyname('C_Code').asstring;
-        Self.CDS_Invoice.FieldByName('P_Code').Value := Trim(ClientDataSet1.fieldbyname('ZDYNo').AsString);
+
+      CDS_Invoice.fieldbyname('F_Name').Value := frmClothInfoSel.CDS_1.fieldbyname('C_Name').asstring;
+
+      CDS_Invoice.Post;
     end;
+    free;
   end;
-  finally
+
-    frmZDYHelp.Free;
+  tv1.Controller.EditingController.ShowEdit();
-  end;
-  //self.tv1.Controller.EditingController.ShowEdit();
 end;
 
 procedure TfrmInvoiceInInPut.v1P_SpecPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);

A09财务通用管理/U_InvoiceInList.dfm

@@ -319,6 +319,7 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_Invoice
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <
@@ -366,6 +367,7 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       object v1Column3: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         HeaderAlignmentHorz = taCenter
         Width = 49
@@ -373,6 +375,7 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       object v1InvoiceNo: TcxGridDBColumn
         Caption = #21457#31080#21495#30721
         DataBinding.FieldName = 'IVNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 77
@@ -380,6 +383,7 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       object v1InvoiceDate: TcxGridDBColumn
         Caption = #21457#31080#26085#26399
         DataBinding.FieldName = 'IVDate'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 79
@@ -387,6 +391,7 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       object v1InvoiceType: TcxGridDBColumn
         Caption = #21457#31080#31867#22411
         DataBinding.FieldName = 'IVType'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 92
@@ -394,6 +399,7 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       object v1Column2: TcxGridDBColumn
         Caption = #25105#26041#21333#20301
         DataBinding.FieldName = 'OurCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_Financial.FontBlue
@@ -402,6 +408,7 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       object v1FactoryName: TcxGridDBColumn
         Caption = #23545#26041#21333#20301
         DataBinding.FieldName = 'OppCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_Financial.FoneClMaroon
@@ -410,6 +417,7 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       object v1Column1: TcxGridDBColumn
         Caption = #19978#32423#21333#20301
         DataBinding.FieldName = 'OppParentCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_Financial.FoneClMaroon
@@ -418,30 +426,35 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       object v1Column8: TcxGridDBColumn
         Caption = #25805#20316#21592
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 55
       end
       object v1Column9: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'F_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 71
       end
       object v1Column10: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'P_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 72
       end
       object v1Column11: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'F_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 65
       end
       object v1Column12: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -450,12 +463,14 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       object v1Column13: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 63
       end
       object v1Column14: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -464,18 +479,21 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       object v1Column15: TcxGridDBColumn
         Caption = #37329#39069
         DataBinding.FieldName = 'Amount'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 54
       end
       object v1Column17: TcxGridDBColumn
         Caption = #31246#39069
         DataBinding.FieldName = 'TaxFee'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 62
       end
       object v1Column18: TcxGridDBColumn
         Caption = #21547#31246#37329#39069
         DataBinding.FieldName = 'TaxAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -483,6 +501,7 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       object v1Column19: TcxGridDBColumn
         Caption = #31246#29575'(%)'
         DataBinding.FieldName = 'tax'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -490,6 +509,7 @@ inherited frmInvoiceInList: TfrmInvoiceInList
       object v1note: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'note'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 114

A09财务通用管理/U_InvoiceInList.pas

@@ -14,7 +14,8 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, cxPC, RM_e_Xls, Menus, cxLookAndFeels,
   cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, U_BaseList, Vcl.Clipbrd;
+  dxSkinsDefaultPainters, dxDateRanges, U_BaseList, Vcl.Clipbrd, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmInvoiceInList = class(TfrmBaseList)

A09财务通用管理/U_InvoiceOutInPut.dfm

@@ -83,6 +83,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -117,6 +118,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object Tv1Column5: TcxGridDBColumn
         Caption = #21457#31080#26085#26399
         DataBinding.FieldName = 'IVDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 77
@@ -124,12 +126,14 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object Tv1Column1: TcxGridDBColumn
         Caption = #21457#31080#21495#30721
         DataBinding.FieldName = 'IVNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 77
       end
       object Tv1Column2: TcxGridDBColumn
         Caption = #25105#26041#21333#20301
         DataBinding.FieldName = 'OurCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -145,6 +149,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object Tv1Column4: TcxGridDBColumn
         Caption = #23545#26041#21333#20301
         DataBinding.FieldName = 'OppCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -160,6 +165,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object Tv1Column6: TcxGridDBColumn
         Caption = #19978#32423#21333#20301
         DataBinding.FieldName = 'OppParentCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -175,6 +181,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object Tv1Column3: TcxGridDBColumn
         Caption = #21457#31080#31867#22411
         DataBinding.FieldName = 'IVType'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -188,12 +195,14 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object v1Column1: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'F_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
       object v1P_CodeName: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'F_Name'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -207,12 +216,14 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object v1P_Spec: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'F_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 103
       end
       object v1Qty: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -221,6 +232,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object v1QtyUnit: TcxGridDBColumn
         Caption = #25968#37327#21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -234,6 +246,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object v1Price: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -242,6 +255,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object v1Money: TcxGridDBColumn
         Caption = #37329#39069
         DataBinding.FieldName = 'Amount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -250,6 +264,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object v1Column3: TcxGridDBColumn
         Caption = #31246#29575'(%)'
         DataBinding.FieldName = 'tax'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -258,6 +273,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object v1Column5: TcxGridDBColumn
         Caption = #31246#39069
         DataBinding.FieldName = 'TaxFee'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 53
@@ -265,6 +281,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object v1Column4: TcxGridDBColumn
         Caption = #21547#31246#37329#39069
         DataBinding.FieldName = 'TaxAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1QtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -273,6 +290,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object Tv1Column8: TcxGridDBColumn
         Caption = #24065#31181
         DataBinding.FieldName = 'Currency'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -283,6 +301,7 @@ object frmInvoiceOutInPut: TfrmInvoiceOutInPut
       object Tv1Column7: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end

A09财务通用管理/U_InvoiceOutInPut.pas

@@ -10,7 +10,8 @@ uses
   cxGridDBTableView, cxGrid, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB,
   DBClient, ExtCtrls, StdCtrls, BtnEdit, cxButtonEdit, cxTextEdit,
   cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxCalendar,
-  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu;
+  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu,
+  dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmInvoiceOutInPut = class(TForm)
@@ -76,7 +77,7 @@ var
 implementation
 
 uses
-  U_RTFun, U_ZDYHelp, U_CompanySel, U_dataLink;
+  U_RTFun, U_ZDYHelp, U_CompanySel, U_dataLink,U_ClothInfoSel;
 {$R *.dfm}
 
 procedure TfrmInvoiceOutInPut.SaveDate();
@@ -195,23 +196,22 @@ end;
 
 procedure TfrmInvoiceOutInPut.v1P_CodeNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
-  try
+  frmClothInfoSel := TfrmClothInfoSel.Create(self);
-    frmZDYHelp := TfrmZDYHelp.Create(Application);
+  with frmClothInfoSel do
-    with frmZDYHelp do
   begin
-      flag := 'MPRTCodeName';
+    if showmodal = 1 then
-      flagname := '产品名称';
-      if ShowModal = 1 then
     begin
-        Self.CDS_Invoice.Edit;
+      CDS_Invoice.Edit;
-        Self.CDS_Invoice.FieldByName('P_CodeName').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+      CDS_Invoice.fieldbyname('F_Code').Value := frmClothInfoSel.CDS_1.fieldbyname('C_Code').asstring;
-        Self.CDS_Invoice.FieldByName('P_Code').Value := Trim(ClientDataSet1.fieldbyname('ZDYNo').AsString);
+
+      CDS_Invoice.fieldbyname('F_Name').Value := frmClothInfoSel.CDS_1.fieldbyname('C_Name').asstring;
+
+      CDS_Invoice.Post;
     end;
+    free;
   end;
-  finally
+
-    frmZDYHelp.Free;
+  tv1.Controller.EditingController.ShowEdit();
-  end;
-  //self.tv1.Controller.EditingController.ShowEdit();
 end;
 
 procedure TfrmInvoiceOutInPut.v1P_SpecPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);

A09财务通用管理/U_InvoiceOutList.dfm

@@ -3,10 +3,10 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
   Top = 202
   Caption = #38144#39033#21457#31080#31649#29702
   ClientHeight = 626
-  ClientWidth = 1558
+  ClientWidth = 1540
   FormStyle = fsMDIChild
   Visible = True
-  ExplicitWidth = 1574
+  ExplicitWidth = 1556
   ExplicitHeight = 665
   PixelsPerInch = 96
   TextHeight = 12
@@ -14,7 +14,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1558
+    Width = 1540
     Height = 38
     AutoSize = True
     ButtonHeight = 38
@@ -128,7 +128,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
   object Panel1: TPanel [1]
     Left = 0
     Top = 38
-    Width = 1558
+    Width = 1540
     Height = 67
     Align = alTop
     BevelInner = bvRaised
@@ -310,7 +310,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
   object cxGrid1: TcxGrid [2]
     Left = 0
     Top = 127
-    Width = 1558
+    Width = 1540
     Height = 499
     Align = alClient
     PopupMenu = PopupMenu1
@@ -319,6 +319,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_Invoice
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <
@@ -366,6 +367,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       object v1Column3: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         HeaderAlignmentHorz = taCenter
         Width = 49
@@ -373,6 +375,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       object v1InvoiceNo: TcxGridDBColumn
         Caption = #21457#31080#21495#30721
         DataBinding.FieldName = 'IVNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 77
@@ -380,6 +383,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       object v1InvoiceDate: TcxGridDBColumn
         Caption = #21457#31080#26085#26399
         DataBinding.FieldName = 'IVDate'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 79
@@ -387,6 +391,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       object v1InvoiceType: TcxGridDBColumn
         Caption = #21457#31080#31867#22411
         DataBinding.FieldName = 'IVType'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 92
@@ -394,6 +399,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       object v1Column2: TcxGridDBColumn
         Caption = #25105#26041#21333#20301
         DataBinding.FieldName = 'OurCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_Financial.FontBlue
@@ -402,6 +408,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       object v1FactoryName: TcxGridDBColumn
         Caption = #23545#26041#21333#20301
         DataBinding.FieldName = 'OppCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_Financial.FoneClMaroon
@@ -410,6 +417,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       object v1Column1: TcxGridDBColumn
         Caption = #19978#32423#21333#20301
         DataBinding.FieldName = 'OppParentCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_Financial.FoneClMaroon
@@ -418,30 +426,35 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       object v1Column8: TcxGridDBColumn
         Caption = #25805#20316#21592
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 55
       end
       object v1Column9: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'F_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 71
       end
       object v1Column10: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'P_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 72
       end
       object v1Column11: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'F_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 65
       end
       object v1Column12: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -450,12 +463,14 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       object v1Column13: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 63
       end
       object v1Column14: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -464,18 +479,21 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       object v1Column15: TcxGridDBColumn
         Caption = #37329#39069
         DataBinding.FieldName = 'Amount'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 54
       end
       object v1Column17: TcxGridDBColumn
         Caption = #31246#39069
         DataBinding.FieldName = 'TaxFee'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 62
       end
       object v1Column18: TcxGridDBColumn
         Caption = #21547#31246#37329#39069
         DataBinding.FieldName = 'TaxAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -483,6 +501,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       object v1Column19: TcxGridDBColumn
         Caption = #31246#29575'(%)'
         DataBinding.FieldName = 'tax'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -490,6 +509,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       object v1note: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'note'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 114
@@ -502,7 +522,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
   object cxTabControl1: TcxTabControl [3]
     Left = 0
     Top = 105
-    Width = 1558
+    Width = 1540
     Height = 22
     Align = alTop
     TabOrder = 2
@@ -515,7 +535,7 @@ inherited frmInvoiceOutList: TfrmInvoiceOutList
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 22
-    ClientRectRight = 1558
+    ClientRectRight = 1540
     ClientRectTop = 19
   end
   inherited ADOQueryBaseCmd: TADOQuery

A09财务通用管理/U_InvoiceOutList.pas

@@ -14,7 +14,8 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, cxPC, RM_e_Xls, Menus, cxLookAndFeels,
   cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, U_BaseList, Vcl.Clipbrd;
+  dxSkinsDefaultPainters, dxDateRanges, U_BaseList, Vcl.Clipbrd, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmInvoiceOutList = class(TfrmBaseList)

A09财务通用管理/U_PayInput.dfm

@@ -71,6 +71,7 @@ object frmPayInput: TfrmPayInput
     ParentCtl3D = False
     ParentFont = False
     TabOrder = 1
+    ExplicitTop = 44
     object Label2: TLabel
       Left = 32
       Top = 69
@@ -229,7 +230,7 @@ object frmPayInput: TfrmPayInput
     end
     object Label1: TLabel
       Left = 32
-      Top = 188
+      Top = 184
       Width = 52
       Height = 15
       Caption = #36153#29992#31867#21035
@@ -250,7 +251,7 @@ object frmPayInput: TfrmPayInput
     end
     object Currency: TComboBox
       Left = 642
-      Top = 180
+      Top = 181
       Width = 37
       Height = 20
       Style = csDropDownList
@@ -268,8 +269,8 @@ object frmPayInput: TfrmPayInput
         'USD')
     end
     object PayMent: TBtnEditC
-      Left = 539
+      Left = 544
-      Top = 108
+      Top = 110
       Width = 140
       Height = 20
       Hint = 'PayMent/'#20184#27454#26041#24335
@@ -300,8 +301,8 @@ object frmPayInput: TfrmPayInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object OurCoName: TBtnEditC
-      Left = 85
+      Left = 90
-      Top = 17
+      Top = 18
       Width = 140
       Height = 20
       Font.Charset = GB2312_CHARSET
@@ -354,8 +355,8 @@ object frmPayInput: TfrmPayInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object OppBankName: TBtnEditC
-      Left = 540
+      Left = 544
-      Top = 67
+      Top = 66
       Width = 140
       Height = 20
       Font.Charset = GB2312_CHARSET
@@ -426,7 +427,7 @@ object frmPayInput: TfrmPayInput
     end
     object FFAbstractDL: TBtnEditC
       Left = 85
-      Top = 186
+      Top = 182
       Width = 140
       Height = 20
       Hint = 'FFAbstractDL/'#25688#35201#22823#31867

A09财务通用管理/U_PayInput.pas

@@ -14,7 +14,7 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  dxBarBuiltInMenu, U_BaseList, cxContainer, cxCurrencyEdit;
+  dxBarBuiltInMenu, U_BaseList, cxContainer, cxCurrencyEdit, dxSkinWXI;
 
 type
   TfrmPayInput = class(TForm)
@@ -71,7 +71,6 @@ type
     { Private declarations }
     procedure InitGrid();
     function SaveData(): Boolean;
-
   public
     { Public declarations }
     FFFID: string;
@@ -83,7 +82,8 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel, U_BankSel,U_ZDYHelpFY, U_TradePlanSel;
+  U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel, U_BankSel, U_ZDYHelpFY,
+  U_TradePlanSel;
 
 {$R *.dfm}
 
@@ -107,6 +107,7 @@ begin
       OurCoName.TxtCode := Trim(ADOQueryMain.FieldByName('OurCoNo').AsString);
       OppParentCoName.TxtCode := Trim(ADOQueryMain.FieldByName('OppParentCoNo').AsString);
       OurBankName.TxtCode := Trim(ADOQueryMain.FieldByName('OurBankID').AsString);
+      OppBankName.TxtCode := Trim(ADOQueryMain.FieldByName('OppBankID').AsString);
     end
     else
     begin
@@ -422,6 +423,11 @@ begin
     Application.MessageBox('币种不能为空!', '提示', 0);
     Exit;
   end;
+  if Trim(FFAbstractDL.Text) = '' then
+  begin
+    Application.MessageBox('费用类别不能为空!', '提示', 0);
+    Exit;
+  end;
   if SaveData() then
   begin
     Application.MessageBox('保存成功!', '提示', 0);

A09财务通用管理/U_PayList.dfm

@@ -258,12 +258,11 @@ inherited frmPayList: TfrmPayList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitLeft = 1
-    ExplicitTop = 137
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -303,6 +302,7 @@ inherited frmPayList: TfrmPayList
       object Tv1Column22: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -312,6 +312,7 @@ inherited frmPayList: TfrmPayList
         Tag = 7
         Caption = #26085#26399
         DataBinding.FieldName = 'FFTime'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.SaveTime = False
         Properties.ShowTime = False
@@ -322,6 +323,7 @@ inherited frmPayList: TfrmPayList
       object v2Column2: TcxGridDBColumn
         Caption = #25105#26041#21333#20301
         DataBinding.FieldName = 'OurCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 78
@@ -329,6 +331,7 @@ inherited frmPayList: TfrmPayList
       object v2FactoryName: TcxGridDBColumn
         Caption = #23545#26041#21333#20301
         DataBinding.FieldName = 'OppCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 73
@@ -337,6 +340,7 @@ inherited frmPayList: TfrmPayList
         Tag = 7
         Caption = #19978#32423#21333#20301
         DataBinding.FieldName = 'OppParentCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 82
@@ -344,6 +348,7 @@ inherited frmPayList: TfrmPayList
       object Tv1Column1: TcxGridDBColumn
         Caption = #25105#26041#36134#25143
         DataBinding.FieldName = 'OurBankName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -351,6 +356,7 @@ inherited frmPayList: TfrmPayList
       object Tv1Column2: TcxGridDBColumn
         Caption = #23545#26041#36134#25143
         DataBinding.FieldName = 'OppBankName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 74
@@ -358,6 +364,7 @@ inherited frmPayList: TfrmPayList
       object Tv1Column3: TcxGridDBColumn
         Caption = #20184#27454#26041#24335
         DataBinding.FieldName = 'PayMent'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 69
@@ -365,6 +372,7 @@ inherited frmPayList: TfrmPayList
       object Tv1Column19: TcxGridDBColumn
         Caption = #21512#21516#21495
         DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -372,6 +380,7 @@ inherited frmPayList: TfrmPayList
       object Tv1Column20: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 75
@@ -379,12 +388,14 @@ inherited frmPayList: TfrmPayList
       object Tv1Column21: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 74
       end
       object Tv1Column4: TcxGridDBColumn
         Caption = #25688#35201
         DataBinding.FieldName = 'FFAbstract'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 72
@@ -392,6 +403,7 @@ inherited frmPayList: TfrmPayList
       object Tv1Column17: TcxGridDBColumn
         Caption = #37329#39069
         DataBinding.FieldName = 'Amount'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -399,6 +411,7 @@ inherited frmPayList: TfrmPayList
       object Tv1Column18: TcxGridDBColumn
         Caption = #24065#31181
         DataBinding.FieldName = 'Currency'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -406,29 +419,34 @@ inherited frmPayList: TfrmPayList
       object Tv1Column5: TcxGridDBColumn
         Caption = #38468#20214
         DataBinding.FieldName = 'ISFJ'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 53
       end
       object Tv1Column6: TcxGridDBColumn
         Caption = #23545#26041#36134#21495
         DataBinding.FieldName = 'account'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object Tv1Column7: TcxGridDBColumn
         Caption = #23545#26041#24320#25143#34892
         DataBinding.FieldName = 'OpenBank'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 95
       end
       object Tv1Column8: TcxGridDBColumn
         Caption = #36153#29992#31867#21035
         DataBinding.FieldName = 'FFAbstractDL'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 76
       end
       object Tv1Column9: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
     end

A09财务通用管理/U_PayList.pas

@@ -14,7 +14,8 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxPC, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters,
-  dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd;
+  dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmPayList = class(TfrmBaseList)

A09财务通用管理/U_PayableInput.pas

@@ -14,7 +14,7 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  dxBarBuiltInMenu, U_BaseList, cxContainer, cxCurrencyEdit;
+  dxBarBuiltInMenu, U_BaseList, cxContainer, cxCurrencyEdit, dxSkinWXI;
 
 type
   TfrmPayableInput = class(TForm)
@@ -140,8 +140,8 @@ begin
       Filtered := False;
       Close;
       SQL.Clear;
-      sql.Add(' select * from Finance_Flow where FFID=''' + Trim(FFFID) + '''');
+      sql.Add(' select BuyConNo=(ISNULL(A.BuyConNo,(select TOP 1 BuyConNo from Trade_Plan_Sub X where X.MainID=A.OrdMainId))),A.* from Finance_Flow A where A.FFID=''' + Trim(FFFID) + '''');
-
+//      showmessage(sql.text);
       Open;
     end;
     if not ADOQueryMain.IsEmpty then

A09财务通用管理/U_PayableList.dfm

@@ -6,7 +6,6 @@ inherited frmPayableList: TfrmPayableList
   ClientWidth = 1540
   FormStyle = fsMDIChild
   Visible = True
-  ExplicitTop = -20
   ExplicitWidth = 1556
   ExplicitHeight = 629
   PixelsPerInch = 96
@@ -259,11 +258,11 @@ inherited frmPayableList: TfrmPayableList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitLeft = 1
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnCustomDrawCell = Tv1CustomDrawCell
       DataController.DataSource = DS_1
       DataController.Filter.AutoDataSetFilter = True
@@ -308,6 +307,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column22: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -317,6 +317,7 @@ inherited frmPayableList: TfrmPayableList
         Tag = 7
         Caption = #21457#29983#26085#26399
         DataBinding.FieldName = 'FFTime'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.SaveTime = False
         Properties.ShowTime = False
@@ -327,6 +328,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column23: TcxGridDBColumn
         Caption = #23545#36134#26085#26399
         DataBinding.FieldName = 'ReconciliationDate'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -335,6 +337,7 @@ inherited frmPayableList: TfrmPayableList
       object v2Column2: TcxGridDBColumn
         Caption = #25105#26041#21333#20301
         DataBinding.FieldName = 'OurCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -342,6 +345,7 @@ inherited frmPayableList: TfrmPayableList
       object v2FactoryName: TcxGridDBColumn
         Caption = #23545#26041#21333#20301
         DataBinding.FieldName = 'OppCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 76
@@ -350,6 +354,7 @@ inherited frmPayableList: TfrmPayableList
         Tag = 7
         Caption = #19978#32423#21333#20301
         DataBinding.FieldName = 'OppParentCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -357,6 +362,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column3: TcxGridDBColumn
         Caption = #20184#27454#26041#24335
         DataBinding.FieldName = 'PayMent'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -364,6 +370,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column19: TcxGridDBColumn
         Caption = #21512#21516#21495
         DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 77
@@ -371,6 +378,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column24: TcxGridDBColumn
         Caption = #25688#35201
         DataBinding.FieldName = 'FFAbstract'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 79
@@ -378,6 +386,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column20: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -385,12 +394,14 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column21: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 74
       end
       object Tv1Column4: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'F_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -398,6 +409,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column5: TcxGridDBColumn
         Caption = #21697#21517
         DataBinding.FieldName = 'F_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -405,6 +417,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column6: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'F_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -412,6 +425,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column7: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'F_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -419,6 +433,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column8: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'F_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -426,6 +441,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column9: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'F_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -433,6 +449,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column10: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'F_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -440,6 +457,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column11: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -447,6 +465,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column12: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -454,6 +473,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column13: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -461,6 +481,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column14: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -468,6 +489,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column15: TcxGridDBColumn
         Caption = #20854#20182#36153
         DataBinding.FieldName = 'OtherFee'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -475,6 +497,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column16: TcxGridDBColumn
         Caption = #20943#20813
         DataBinding.FieldName = 'Deduction'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -482,12 +505,14 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column2: TcxGridDBColumn
         Caption = #26159#21542#21547#31246
         DataBinding.FieldName = 'IsInvoice'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
       end
       object Tv1Column17: TcxGridDBColumn
         Caption = #37329#39069
         DataBinding.FieldName = 'Amount'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -495,6 +520,7 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column18: TcxGridDBColumn
         Caption = #24065#31181
         DataBinding.FieldName = 'Currency'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -502,12 +528,14 @@ inherited frmPayableList: TfrmPayableList
       object Tv1Column1: TcxGridDBColumn
         Caption = #26469#28304
         DataBinding.FieldName = 'FromID1'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
       end
       object Tv1Column25: TcxGridDBColumn
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         Visible = False
       end
     end

A09财务通用管理/U_PayableList.pas

@@ -14,7 +14,8 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxPC, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters,
-  dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd;
+  dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmPayableList = class(TfrmBaseList)
@@ -173,7 +174,7 @@ begin
       Close;
       SQL.Clear;
       Filtered := False;
-      sql.Add(' select BuyConNO=(select TOP 1 BuyConNo from Trade_Plan_Sub X where X.MainID=A.OrdMainId),A.*  ');
+      sql.Add(' select BuyConNO=ISNULL(A.BuyConNo,(select TOP 1 BuyConNo from Trade_Plan_Sub X where X.MainID=A.OrdMainId )),A.*  ');
       sql.Add('from Finance_Flow A where A.FFType=''Ó¦¸¶¿îµÇ¼Ç''  ');
       case cxTabControl1.TabIndex of
         0:

A09财务通用管理/U_SingleCustStatement.dfm

@@ -198,9 +198,9 @@ object frmSingleCustStatement: TfrmSingleCustStatement
     Height = 542
     Align = alClient
     TabOrder = 2
-    ExplicitLeft = 1
     object TV1: TcxGridDBBandedTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_HZ
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <
@@ -261,6 +261,7 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column2: TcxGridDBBandedColumn
         Caption = #21457#29983#26085#26399
         DataBinding.FieldName = 'ReconciliationDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -273,11 +274,12 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column4: TcxGridDBBandedColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'F_Code'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 87
+        Width = 78
         Position.BandIndex = 3
         Position.ColIndex = 3
         Position.RowIndex = 0
@@ -285,11 +287,12 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column5: TcxGridDBBandedColumn
         Caption = #21697#21517
         DataBinding.FieldName = 'F_Name'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 91
+        Width = 82
         Position.BandIndex = 3
         Position.ColIndex = 4
         Position.RowIndex = 0
@@ -297,11 +300,12 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column6: TcxGridDBBandedColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'F_Spec'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 92
+        Width = 83
         Position.BandIndex = 3
         Position.ColIndex = 5
         Position.RowIndex = 0
@@ -309,11 +313,12 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column7: TcxGridDBBandedColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 77
+        Width = 69
         Position.BandIndex = 3
         Position.ColIndex = 8
         Position.RowIndex = 0
@@ -321,18 +326,20 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column8: TcxGridDBBandedColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 84
+        Width = 77
         Position.BandIndex = 3
-        Position.ColIndex = 10
+        Position.ColIndex = 11
         Position.RowIndex = 0
       end
       object V1Column9: TcxGridDBBandedColumn
         Caption = #24212#25910#37329#39069
         DataBinding.FieldName = 'BQYSAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -345,6 +352,7 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column12: TcxGridDBBandedColumn
         Caption = #25910#27454#37329#39069
         DataBinding.FieldName = 'BQSKAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -357,6 +365,7 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column15: TcxGridDBBandedColumn
         Caption = #32047#35745#20313#39069
         DataBinding.FieldName = 'BQJYAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -370,17 +379,19 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column3: TcxGridDBBandedColumn
         Caption = #25688#35201
         DataBinding.FieldName = 'FFAbstract'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 129
+        Width = 116
         Position.BandIndex = 3
         Position.ColIndex = 1
         Position.RowIndex = 0
       end
       object V1Column10: TcxGridDBBandedColumn
         DataBinding.FieldName = 'CWID'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         Visible = False
@@ -396,6 +407,7 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column14: TcxGridDBBandedColumn
         Caption = #24207#21495
         DataBinding.FieldName = 'keyNO'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -408,6 +420,7 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column16: TcxGridDBBandedColumn
         Caption = #24320#31080#37329#39069
         DataBinding.FieldName = 'BQKPAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -420,6 +433,7 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column17: TcxGridDBBandedColumn
         Caption = #32047#35745#27424#31080
         DataBinding.FieldName = 'BQWKPAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -433,6 +447,7 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column20: TcxGridDBBandedColumn
         Caption = #31080#21495
         DataBinding.FieldName = 'IVNo'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -445,12 +460,13 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column21: TcxGridDBBandedColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = cxStyle1
-        Width = 68
+        Width = 61
         Position.BandIndex = 3
         Position.ColIndex = 2
         Position.RowIndex = 0
@@ -458,11 +474,12 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column22: TcxGridDBBandedColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 71
+        Width = 64
         Position.BandIndex = 3
         Position.ColIndex = 7
         Position.RowIndex = 0
@@ -470,11 +487,12 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column23: TcxGridDBBandedColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'P_Color'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 64
+        Width = 58
         Position.BandIndex = 3
         Position.ColIndex = 6
         Position.RowIndex = 0
@@ -482,6 +500,7 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column25: TcxGridDBBandedColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'MxNote'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
@@ -494,28 +513,31 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object V1Column26: TcxGridDBBandedColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'YMxNote'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 58
+        Width = 55
         Position.BandIndex = 3
-        Position.ColIndex = 9
+        Position.ColIndex = 10
         Position.RowIndex = 0
       end
       object V1Column33: TcxGridDBBandedColumn
         Caption = #20854#20182#36153
         DataBinding.FieldName = 'OtherFee'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 83
+        Width = 77
         Position.BandIndex = 3
-        Position.ColIndex = 11
+        Position.ColIndex = 12
         Position.RowIndex = 0
       end
       object V1Column34: TcxGridDBBandedColumn
         Caption = #36135#27454
         DataBinding.FieldName = 'HKMONEY'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Moving = False
@@ -527,16 +549,18 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object TV1Column1: TcxGridDBBandedColumn
         Caption = #20943#20813#37329#39069
         DataBinding.FieldName = 'Deduction'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 78
+        Width = 72
         Position.BandIndex = 3
-        Position.ColIndex = 12
+        Position.ColIndex = 13
         Position.RowIndex = 0
       end
       object TV1Column2: TcxGridDBBandedColumn
         Caption = #19994#21153#21592
         DataBinding.FieldName = 'Saleser'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 53
         Position.BandIndex = 0
@@ -546,6 +570,7 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object TV1Column3: TcxGridDBBandedColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 68
         Position.BandIndex = 0
@@ -555,12 +580,23 @@ object frmSingleCustStatement: TfrmSingleCustStatement
       object TV1Column4: TcxGridDBBandedColumn
         Caption = #24212#25910#26085#26399
         DataBinding.FieldName = 'YSDate'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 79
         Position.BandIndex = 0
         Position.ColIndex = 2
         Position.RowIndex = 0
       end
+      object TV1Column5: TcxGridDBBandedColumn
+        Caption = #21333#20301
+        DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 49
+        Position.BandIndex = 3
+        Position.ColIndex = 9
+        Position.RowIndex = 0
+      end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = TV1

A09财务通用管理/U_SingleCustStatement.pas

@@ -15,7 +15,7 @@ uses
   cxTextEdit, cxDropDownEdit, RM_e_Xls, cxGridBandedTableView,
   cxGridDBBandedTableView, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  dxBarBuiltInMenu;
+  dxBarBuiltInMenu, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmSingleCustStatement = class(TForm)
@@ -79,6 +79,7 @@ type
     TV1Column4: TcxGridDBBandedColumn;
     cxStyleRepository1: TcxStyleRepository;
     cxStyle1: TcxStyle;
+    TV1Column5: TcxGridDBBandedColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);

B01基础合同管理/Contract.skincfg

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

B04采购计划管理/PurchasePlan.skincfg

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

T01贸易生产计划/TradePlan.skincfg

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

T04贸易明细仓库/TradeClothStk.dpr

@@ -33,7 +33,8 @@ uses
   U_TradeClothStkListNew in 'U_TradeClothStkListNew.pas' {frmTradeClothStkListNew},
   U_ZDYHelp in '..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp},
   U_TradeKCListSel in 'U_TradeKCListSel.pas' {frmTradeKCListSel},
-  U_DeliTradePlanSel in 'U_DeliTradePlanSel.pas' {frmDeliTradePlanSel};
+  U_DeliTradePlanSel in 'U_DeliTradePlanSel.pas' {frmDeliTradePlanSel},
+  U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule};
 
 {$R *.res}
 

T04贸易明细仓库/TradeClothStk.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\项目代码\骉骐\T04贸易明细仓库\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10myBiaoqi\T04贸易明细仓库\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -216,6 +216,11 @@
             <Form>frmDeliTradePlanSel</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="..\..\..\public10\design\U_BaseDataLink.pas">
+            <Form>BaseDataLink</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TDataModule</DesignClass>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

T04贸易明细仓库/TradeClothStk.dproj.local

@@ -1,54 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.527,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_DeliTradePlanSel.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.355,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeKCListSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.684,D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\TradeClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\InformationBase.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.760,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.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.890,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeClothInListNew.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.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.355,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeKCListSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.163,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.572,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.520,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeClothOutListNew.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.760,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.527,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_DeliTradePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.890,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeClothInListNew.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.572,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.649,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\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.733,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeStockListSel.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.097,D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.900,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.059,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.900,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.097,D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.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.630,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.572,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.649,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.572,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.868,=D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\U_TradeClothWaitStorage.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.434,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.497,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeClothStkListNew.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\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.903,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.952,D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.434,=D:\Dp10Repo\项目代码\华府\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.793,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.997,=D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\U_TradeClothOutEdit.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.684,D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\TradeClothStk.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.868,=D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\U_TradeClothWaitStorage.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.123,=D:\Dp10Repo\public10\design\U_globalVar.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.928,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.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.370,D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\Unit1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.952,D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.163,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.903,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.520,=D:\Dp10Repo\项目代码\骉骐\T04贸易明细仓库\U_TradeClothOutListNew.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.928,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>2024-07-10 14:44:44.808,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -79,7 +80,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"/>
@@ -101,6 +102,8 @@
     <File Path="D:\Dp10Repo"/>
     <File Path="..\..\..\public10"/>
     <File Path="..\..\..\public10\design"/>
+    <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
+    <File Path="..\..\..\public10\design\U_BaseDataLink.dfm"/>
     <File Path="..\..\..\public10\design\U_BaseHelp.pas"/>
     <File Path="..\..\..\public10\design\U_BaseHelp.dfm"/>
     <File Path="..\..\..\public10\design\U_BaseInput.pas"/>

T04贸易明细仓库/TradeClothStk.skincfg

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

T04贸易明细仓库/U_DataLink.dfm

@@ -1,9 +1,10 @@
-object DataLink_TradeClothStk: TDataLink_TradeClothStk
+inherited DataLink_TradeClothStk: TDataLink_TradeClothStk
-  OldCreateOrder = False
-  OnCreate = DataModuleCreate
   OnDestroy = DataModuleDestroy
   Height = 349
   Width = 482
+  inherited cxImageList_bar: TcxImageList
+    FormatVersion = 1
+  end
   object AdoDataLink: TADOQuery
     Connection = ADOLink
     Parameters = <>
@@ -10426,6 +10427,8 @@ object DataLink_TradeClothStk: TDataLink_TradeClothStk
   object ThreeLookAndFeelCol: TcxLookAndFeelController
     Kind = lfStandard
     NativeStyle = False
+    ScrollbarMode = sbmHybrid
+    SkinName = 'WXI'
     Left = 253
     Top = 12
   end

T04贸易明细仓库/U_DataLink.pas

@@ -5,7 +5,8 @@ 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,
+  U_BaseDataLink, dxCore, cxLocalization, cxImageList, cxGraphics, dxSkinsForm;
 
 type
   TMyThread = class(TThread)
@@ -37,7 +38,7 @@ var
   UserDataFlag: string;
 
 type
-  TDataLink_TradeClothStk = class(TDataModule)
+  TDataLink_TradeClothStk = class(TBaseDataLink)
     AdoDataLink: TADOQuery;
     ADOLink: TADOConnection;
     ThreeImgList: TImageList;
@@ -109,6 +110,7 @@ end;
 
 procedure TDataLink_TradeClothStk.DataModuleDestroy(Sender: TObject);
 begin
+  inherited;
   CriticalSection.Free;
   DataLink_TradeClothStk := nil;
 end;
@@ -120,6 +122,7 @@ end;
 
 procedure TDataLink_TradeClothStk.DataModuleCreate(Sender: TObject);
 begin
+  inherited;
   CriticalSection := TCriticalSection.Create;
 end;
 

T04贸易明细仓库/U_TradeClothDROutEdit.dfm

@@ -167,7 +167,7 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
     end
     object Button1: TButton
       Left = 544
-      Top = 21
+      Top = 18
       Width = 100
       Height = 76
       Caption = #36873#21333
@@ -250,8 +250,6 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
     Align = alClient
     Caption = 'Panel1'
     TabOrder = 1
-    ExplicitTop = 185
-    ExplicitHeight = 508
     object cxGrid3: TcxGrid
       Left = 1
       Top = 214
@@ -259,10 +257,9 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       Height = 356
       Align = alClient
       TabOrder = 0
-      ExplicitLeft = 2
-      ExplicitHeight = 300
       object Tv3: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DS_MainSel
         DataController.Summary.DefaultGroupSummaryItems = <>
         DataController.Summary.FooterSummaryItems = <
@@ -304,6 +301,7 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
         object VC_MJXH: TcxGridDBColumn
           Caption = #21367#21495
           DataBinding.FieldName = 'PieceNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 95
@@ -311,6 +309,7 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
         object v3Column2: TcxGridDBColumn
           Caption = #26465#30721
           DataBinding.FieldName = 'CIID'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           Properties.ReadOnly = True
           HeaderAlignmentHorz = taCenter
@@ -319,29 +318,34 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
         object Tv3Column2: TcxGridDBColumn
           Caption = #21253#21495
           DataBinding.FieldName = 'PacketNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
         end
         object Tv3Column3: TcxGridDBColumn
           Caption = #21253#26465#30721
           DataBinding.FieldName = 'PacketId'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 92
         end
         object cv3Column3: TcxGridDBColumn
           Caption = #25209#21495
           DataBinding.FieldName = 'BatchNO'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 98
         end
         object cv3Column4: TcxGridDBColumn
           Caption = #39068#33394
           DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 92
         end
         object v3Column1: TcxGridDBColumn
           Caption = #27611#37325
           DataBinding.FieldName = 'GrossWeight'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 75
@@ -349,6 +353,7 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
         object Tv3Column1: TcxGridDBColumn
           Caption = #31859#25968
           DataBinding.FieldName = 'Meter'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 72
@@ -356,6 +361,7 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
         object Tv3Column4: TcxGridDBColumn
           Caption = #30721#25968
           DataBinding.FieldName = 'Yardage'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 79
@@ -363,30 +369,35 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
         object Tv3Column5: TcxGridDBColumn
           Caption = #33394#21495
           DataBinding.FieldName = 'C_ColorNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 82
         end
         object Tv3Column6: TcxGridDBColumn
           Caption = #33457#22411
           DataBinding.FieldName = 'C_Pattern'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 86
         end
         object Tv3Column7: TcxGridDBColumn
           Caption = #21407#21333#21495
           DataBinding.FieldName = 'OrderNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 83
         end
         object Tv3Column8: TcxGridDBColumn
           Caption = #21407#21697#21517
           DataBinding.FieldName = 'C_Name'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 91
         end
         object Tv3Column9: TcxGridDBColumn
           Caption = #21407#32534#21495
           DataBinding.FieldName = 'C_Code'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 84
         end
@@ -405,6 +416,7 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       object TV4: TcxGridDBTableView
         OnMouseDown = TV4MouseDown
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = ds2
         DataController.Summary.DefaultGroupSummaryItems = <>
         DataController.Summary.FooterSummaryItems = <
@@ -431,28 +443,33 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
         object cCXCONNO: TcxGridDBColumn
           Caption = #21512#21516#21495
           DataBinding.FieldName = 'ConNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 119
         end
         object TV4Column7: TcxGridDBColumn
           Caption = #35745#21010#21333#21495
           DataBinding.FieldName = 'OrderNo'
+          DataBinding.IsNullValueType = True
           Width = 106
         end
         object TV4Column1: TcxGridDBColumn
           Caption = #21697#21517
           DataBinding.FieldName = 'C_Name'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 98
         end
         object TV4Column4: TcxGridDBColumn
           Caption = #33457#22411
           DataBinding.FieldName = 'C_Pattern'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
         end
         object cCXCOLOR: TcxGridDBColumn
           Caption = #39068#33394
           DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 95
@@ -460,23 +477,27 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
         object TV4Column6: TcxGridDBColumn
           Caption = #33394#21495
           DataBinding.FieldName = 'C_ColorNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
         end
         object cV4Column1: TcxGridDBColumn
           Caption = #25209#21495
           DataBinding.FieldName = 'BatchNO'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 91
         end
         object TV4Column2: TcxGridDBColumn
           Caption = #30003#35831#21305#25968
           DataBinding.FieldName = 'Piece'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 113
         end
         object VC_SQQTY: TcxGridDBColumn
           Caption = #30003#35831#25968#37327
           DataBinding.FieldName = 'Qty'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 111
@@ -484,18 +505,21 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
         object TV4Column5: TcxGridDBColumn
           Caption = #21333#20301
           DataBinding.FieldName = 'QtyUnit'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 109
         end
         object TV4Column3: TcxGridDBColumn
           Caption = #21457#36135#21305#25968
           DataBinding.FieldName = 'DlyPiece'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 123
         end
         object cCXFHPS: TcxGridDBColumn
           Caption = #21457#36135#25968#37327
           DataBinding.FieldName = 'DlyQty'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           Properties.ReadOnly = True
           HeaderAlignmentHorz = taCenter
@@ -532,14 +556,14 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
   end
   object DS_MainSel: TDataSource
     DataSet = CDS_MainSel
-    Left = 840
+    Left = 832
-    Top = 558
+    Top = 534
   end
   object CDS_MainSel: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 902
+    Left = 894
-    Top = 561
+    Top = 521
   end
   object GPM_1: TcxGridPopupMenu
     Grid = cxGrid1
@@ -615,13 +639,13 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
   object ds1: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 897
+    Left = 649
-    Top = 315
+    Top = 163
   end
   object ds2: TDataSource
     DataSet = ds1
-    Left = 826
+    Left = 706
-    Top = 315
+    Top = 171
   end
   object GPM_2: TcxGridPopupMenu
     Grid = cxGrid3

T04贸易明细仓库/U_TradeClothDROutEdit.pas

@@ -11,7 +11,8 @@ uses
   cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls, BtnEdit, ShellAPI, cxTextEdit,
   RM_Common, RM_Class, RM_GridReport, RM_System, RM_Dataset, RM_e_Xls,
   cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
-  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmTradeClothDROutEdit = class(TfrmBaseList)
@@ -706,6 +707,8 @@ begin
         sql.Add(' from Trade_Cloth_Stock_ZD A inner join Trade_Cloth_IO B on A.STKID=B.StkId ');
 //        sql.Add('left join Trade_Plan_Sub C on C.SubID=A.Subid');
         sql.Add(' where A.DRSid=''' + Trim(DRSid.Text) + '''');
+        sql.Add(' and B.IONO=''' + Trim(OutNo.Text) + '''');
+//        showmessage(sql.text);
         Open;
       end;
       SCreateCDS(ADOQuery1, CDS_MainSel);