0819

A00通用窗体/U_CoBankSel.pas

@@ -0,0 +1,181 @@
+unit U_CoBankSel;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, ToolWin, ComCtrls, U_BaseHelp, cxGridCustomTableView,
+  cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
+  cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
+  cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
+  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit,
+  cxDropDownEdit;
+
+type
+  TfrmBankSel = class(TfrmBaseHelp)
+    ToolBar1: TToolBar;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    DS_1: TDataSource;
+    CDS_1: TClientDataSet;
+    TBSave: TToolButton;
+    TBClose: TToolButton;
+    ToolButton1: TToolButton;
+    ADOConnection1: TADOConnection;
+    Panel1: TPanel;
+    Label1: TLabel;
+    BankName: TEdit;
+    GPM_1: TcxGridPopupMenu;
+    ImageList1: TImageList;
+    ThreeColorBase: TcxStyleRepository;
+    SHuangSe: TcxStyle;
+    SkyBlue: TcxStyle;
+    Default: TcxStyle;
+    QHuangSe: TcxStyle;
+    Red: TcxStyle;
+    FontBlue: TcxStyle;
+    TextSHuangSe: TcxStyle;
+    FonePurple: TcxStyle;
+    FoneClMaroon: TcxStyle;
+    FoneRed: TcxStyle;
+    RowColor: TcxStyle;
+    handBlack: TcxStyle;
+    cxBlue: TcxStyle;
+    SHuangSeCu: TcxStyle;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    v2Column1: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1Column1: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    procedure FormCreate(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormShow(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure TBSaveClick(Sender: TObject);
+    procedure TV1DblClick(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure BankNameChange(Sender: TObject);
+  private
+    procedure InitGrid();
+    { Private declarations }
+  public
+    FCoType, FAuthority: string;
+    { Public declarations }
+  end;
+
+var
+  frmBankSel: TfrmBankSel;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun;
+
+{$R *.dfm}
+
+procedure TfrmBankSel.FormCreate(Sender: TObject);
+begin
+  inherited;
+  try
+    with ADOConnection1 do
+    begin
+      Connected := false;
+      ConnectionString := DConString;
+      Connected := true;
+    end;
+    ADOQueryBaseCmd.Connection := ADOConnection1;
+    ADOQueryBaseTemp.Connection := ADOConnection1;
+  except
+    application.MessageBox('网络连接失败！', '提示信息');
+  end;
+end;
+
+procedure TfrmBankSel.BankNameChange(Sender: TObject);
+begin
+  if ADOQueryMain.Active then
+  begin
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  end;
+
+end;
+
+procedure TfrmBankSel.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+
+  BankName.SetFocus;
+
+  Action := cahide;
+end;
+
+procedure TfrmBankSel.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      sql.Clear;
+
+      sql.Add(' select * from  BS_Bank  order by SerialNo ');
+
+      Open;
+    end;
+
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmBankSel.FormShow(Sender: TObject);
+begin
+  inherited;
+
+  InitGrid();
+
+  ReadCxGrid('单位名称' + Trim(FCoType), TV1, '自定义数据');
+
+end;
+
+procedure TfrmBankSel.TBCloseClick(Sender: TObject);
+begin
+  inherited;
+  Close;
+end;
+
+procedure TfrmBankSel.TBSaveClick(Sender: TObject);
+begin
+  WriteCxGrid('单位名称' + Trim(FCoType), TV1, '自定义数据');
+
+end;
+
+procedure TfrmBankSel.ToolButton1Click(Sender: TObject);
+begin
+  BankName.SetFocus;
+  ModalResult := 1;
+end;
+
+procedure TfrmBankSel.TV1DblClick(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
+procedure TfrmBankSel.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmBankSel := nil;
+end;
+
+end.
+

A01基础公司管理/Company.dpr

@@ -34,7 +34,8 @@ uses
   U_Emp_Input in 'U_Emp_Input.pas' {frmEmp_Input},
   U_LabelPrint in '..\A00通用窗体\U_LabelPrint.pas' {frmLabelPrint},
   U_PictureUpload in '..\A00通用窗体\U_PictureUpload.pas' {frmPictureUpload},
-  U_EmpFileUp in 'U_EmpFileUp.pas' {frmEmpFileUp};
+  U_EmpFileUp in 'U_EmpFileUp.pas' {frmEmpFileUp},
+  U_CoBankSel in 'U_CoBankSel.pas' {frmCoBankSel};
 
 {$R *.res}
 

A01基础公司管理/Company.dproj

@@ -123,7 +123,7 @@
         <BT_BuildType>Debug</BT_BuildType>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <Debugger_HostApplication>D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\testDll.exe</Debugger_HostApplication>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
     </PropertyGroup>
     <ItemGroup>
@@ -216,6 +216,10 @@
             <Form>frmEmpFileUp</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="U_CoBankSel.pas">
+            <Form>frmCoBankSel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

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

@@ -1,34 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
+    <Transaction>1899-12-30 00:00:00.000.481,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_SLT.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.212,=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_PictureUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.670,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_YGDJInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.432,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_YGDJInput.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.212,=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.167,=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.432,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_YGDJInput.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.027,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInRC.pas=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.027,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInRC.dfm=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustInput.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.559,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_Emp_Input.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustFileUp.pas=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_EmpFileUp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.330,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustFileUp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.559,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_Emp_Input.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.433,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSelX.pas=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.560,D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_CoBankSel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.481,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_SLT.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.560,D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_CoBankSel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.328,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_YGRZInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustFileUp.dfm=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_EmpFileUp.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.433,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSelX.dfm=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSel.dfm</Transaction>
@@ -118,5 +121,7 @@
     <File Path="U_Emp_Input.dfm"/>
     <File Path="U_EmpFileUp.pas"/>
     <File Path="U_EmpFileUp.dfm"/>
+    <File Path="U_CoBankSel.pas"/>
+    <File Path="U_CoBankSel.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

A01基础公司管理/U_CoBankSel.pas

@@ -0,0 +1,181 @@
+unit U_CoBankSel;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, ToolWin, ComCtrls, U_BaseHelp, cxGridCustomTableView,
+  cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
+  cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
+  cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
+  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit,
+  cxDropDownEdit, dxSkinWXI, dxScrollbarAnnotations;
+
+type
+  TfrmCoBankSel = class(TfrmBaseHelp)
+    ToolBar1: TToolBar;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    DS_1: TDataSource;
+    CDS_1: TClientDataSet;
+    TBSave: TToolButton;
+    TBClose: TToolButton;
+    ToolButton1: TToolButton;
+    ADOConnection1: TADOConnection;
+    Panel1: TPanel;
+    Label1: TLabel;
+    BankName: TEdit;
+    GPM_1: TcxGridPopupMenu;
+    ImageList1: TImageList;
+    ThreeColorBase: TcxStyleRepository;
+    SHuangSe: TcxStyle;
+    SkyBlue: TcxStyle;
+    Default: TcxStyle;
+    QHuangSe: TcxStyle;
+    Red: TcxStyle;
+    FontBlue: TcxStyle;
+    TextSHuangSe: TcxStyle;
+    FonePurple: TcxStyle;
+    FoneClMaroon: TcxStyle;
+    FoneRed: TcxStyle;
+    RowColor: TcxStyle;
+    handBlack: TcxStyle;
+    cxBlue: TcxStyle;
+    SHuangSeCu: TcxStyle;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    v2Column1: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1Column1: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    procedure FormCreate(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormShow(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure TBSaveClick(Sender: TObject);
+    procedure TV1DblClick(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure BankNameChange(Sender: TObject);
+  private
+    procedure InitGrid();
+    { Private declarations }
+  public
+    FCoType, FAuthority: string;
+    { Public declarations }
+  end;
+
+var
+  frmCoBankSel: TfrmCoBankSel;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun;
+
+{$R *.dfm}
+
+procedure TfrmCoBankSel.FormCreate(Sender: TObject);
+begin
+  inherited;
+  try
+    with ADOConnection1 do
+    begin
+      Connected := false;
+      ConnectionString := DConString;
+      Connected := true;
+    end;
+    ADOQueryBaseCmd.Connection := ADOConnection1;
+    ADOQueryBaseTemp.Connection := ADOConnection1;
+  except
+    application.MessageBox('网络连接失败！', '提示信息');
+  end;
+end;
+
+procedure TfrmCoBankSel.BankNameChange(Sender: TObject);
+begin
+  if ADOQueryMain.Active then
+  begin
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  end;
+
+end;
+
+procedure TfrmCoBankSel.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+
+  BankName.SetFocus;
+
+  Action := cahide;
+end;
+
+procedure TfrmCoBankSel.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      sql.Clear;
+
+      sql.Add(' select * from  BS_Bank  order by SerialNo ');
+
+      Open;
+    end;
+
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmCoBankSel.FormShow(Sender: TObject);
+begin
+  inherited;
+
+  InitGrid();
+
+  ReadCxGrid('单位名称' + Trim(FCoType), TV1, '自定义数据');
+
+end;
+
+procedure TfrmCoBankSel.TBCloseClick(Sender: TObject);
+begin
+  inherited;
+  Close;
+end;
+
+procedure TfrmCoBankSel.TBSaveClick(Sender: TObject);
+begin
+  WriteCxGrid('单位名称' + Trim(FCoType), TV1, '自定义数据');
+
+end;
+
+procedure TfrmCoBankSel.ToolButton1Click(Sender: TObject);
+begin
+  BankName.SetFocus;
+  ModalResult := 1;
+end;
+
+procedure TfrmCoBankSel.TV1DblClick(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
+procedure TfrmCoBankSel.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmCoBankSel := nil;
+end;
+
+end.
+

A01基础公司管理/U_Company.dfm

@@ -105,6 +105,7 @@ inherited frmCompany: TfrmCompany
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnFocusedRecordChanged = Tv1FocusedRecordChanged
       DataController.DataSource = DS_1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -125,6 +126,7 @@ inherited frmCompany: TfrmCompany
       object v2Column2: TcxGridDBColumn
         Caption = #20844#21496#32534#21495
         DataBinding.FieldName = 'CoCode'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 86
@@ -132,6 +134,7 @@ inherited frmCompany: TfrmCompany
       object v2Column6: TcxGridDBColumn
         Caption = #20844#21496#21517#31216
         DataBinding.FieldName = 'CoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Focusing = False
         Width = 127
@@ -139,12 +142,14 @@ inherited frmCompany: TfrmCompany
       object Tv1Column3: TcxGridDBColumn
         Caption = #20844#21496#33521#25991#21517#31216
         DataBinding.FieldName = 'CoEName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 132
       end
       object Tv1Column1: TcxGridDBColumn
         Caption = #20844#21496#31616#31216
         DataBinding.FieldName = 'CoAbbrName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 151
@@ -152,12 +157,14 @@ inherited frmCompany: TfrmCompany
       object v2Column10: TcxGridDBColumn
         Caption = #20844#21496#22320#22336
         DataBinding.FieldName = 'CoAddress'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 173
       end
       object Tv1Column2: TcxGridDBColumn
         Caption = #40664#35748#24065#31181
         DataBinding.FieldName = 'Currency'
+        DataBinding.IsNullValueType = True
       end
     end
     object cxGridLevel1: TcxGridLevel
@@ -225,6 +232,7 @@ inherited frmCompany: TfrmCompany
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
         Navigator.Buttons.Delete.Visible = False
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DS_3
         DataController.Summary.DefaultGroupSummaryItems = <>
         DataController.Summary.FooterSummaryItems = <
@@ -248,20 +256,24 @@ inherited frmCompany: TfrmCompany
         object cxGridDBColumn2: TcxGridDBColumn
           Caption = #40664#35748
           DataBinding.FieldName = 'IsDefault'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxCheckBoxProperties'
+          Visible = False
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 76
         end
         object TV3Column1: TcxGridDBColumn
           Caption = #36134#25143#21517#31216
-          DataBinding.FieldName = 'AcName'
+          DataBinding.FieldName = 'BankName'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 91
         end
         object cxGridDBColumn3: TcxGridDBColumn
           Caption = #38134#34892#36134#21495
-          DataBinding.FieldName = 'account'
+          DataBinding.FieldName = 'BankCardNo'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           Properties.CharCase = ecUpperCase
           HeaderAlignmentHorz = taCenter
@@ -269,7 +281,8 @@ inherited frmCompany: TfrmCompany
         end
         object cxGridDBColumn4: TcxGridDBColumn
           Caption = #24320#25143#34892
-          DataBinding.FieldName = 'OpenBank'
+          DataBinding.FieldName = 'BankDeposit'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 232

A01基础公司管理/U_Company.pas

@@ -14,7 +14,7 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  dxBarBuiltInMenu;
+  dxBarBuiltInMenu, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmCompany = class(TfrmBaseList)

A01基础公司管理/U_CustomerInput.dfm

@@ -34,7 +34,6 @@ object frmCustomerInput: TfrmCustomerInput
     ParentColor = False
     ShowCaptions = True
     TabOrder = 0
-    ExplicitWidth = 751
     object ToolButton3: TToolButton
       Left = 0
       Top = 0
@@ -72,8 +71,6 @@ object frmCustomerInput: TfrmCustomerInput
     ParentCtl3D = False
     ParentFont = False
     TabOrder = 1
-    ExplicitLeft = -1
-    ExplicitTop = 39
     object Label2: TLabel
       Left = 36
       Top = 20
@@ -259,8 +256,6 @@ object frmCustomerInput: TfrmCustomerInput
       Align = alBottom
       Caption = 'Panel1'
       TabOrder = 7
-      ExplicitTop = 280
-      ExplicitWidth = 955
       object ToolBar3: TToolBar
         Tag = 1
         Left = 1
@@ -284,6 +279,7 @@ object frmCustomerInput: TfrmCustomerInput
           AutoSize = True
           Caption = #35774#20026#40664#35748#36134#21495
           ImageIndex = 16
+          Visible = False
           OnClick = ToolButton12Click
         end
         object ToolButton13: TToolButton
@@ -311,11 +307,11 @@ object frmCustomerInput: TfrmCustomerInput
         Align = alClient
         BorderStyle = cxcbsNone
         TabOrder = 1
-        ExplicitTop = 40
         object TV2: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           Navigator.Buttons.Delete.Enabled = False
           Navigator.Buttons.Delete.Visible = False
+          ScrollbarAnnotations.CustomAnnotations = <>
           DataController.DataSource = DS_Bank
           DataController.Summary.DefaultGroupSummaryItems = <>
           DataController.Summary.FooterSummaryItems = <
@@ -339,20 +335,24 @@ object frmCustomerInput: TfrmCustomerInput
           object cxGridDBColumn10: TcxGridDBColumn
             Caption = #40664#35748
             DataBinding.FieldName = 'IsDefault'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxCheckBoxProperties'
+            Visible = False
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 59
           end
           object TV2Column1: TcxGridDBColumn
             Caption = #36134#25143#21517#31216
-            DataBinding.FieldName = 'AcName'
+            DataBinding.FieldName = 'BankName'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 118
           end
           object cxGridDBColumn11: TcxGridDBColumn
             Caption = #38134#34892#36134#21495
-            DataBinding.FieldName = 'account'
+            DataBinding.FieldName = 'BankCardNo'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxTextEditProperties'
             Properties.CharCase = ecUpperCase
             HeaderAlignmentHorz = taCenter
@@ -360,7 +360,8 @@ object frmCustomerInput: TfrmCustomerInput
           end
           object cxGridDBColumn12: TcxGridDBColumn
             Caption = #24320#25143#34892
-            DataBinding.FieldName = 'OpenBank'
+            DataBinding.FieldName = 'BankDeposit'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 286
           end

A01基础公司管理/U_CustomerInput.pas

@@ -15,7 +15,7 @@ uses
   cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
   dxBarBuiltInMenu, U_BaseList, cxContainer, dxCore, cxDateUtils, cxImage,
-  cxDBEdit, IdExplicitTLSClientServerBase;
+  cxDBEdit, IdExplicitTLSClientServerBase, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmCustomerInput = class(TForm)
@@ -83,7 +83,7 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, getpic, U_YWYSel;
+  U_DataLink, U_RTFun, U_ZDYHelp, getpic, U_YWYSel, U_CoBankSel;
 
 {$R *.dfm}
 
@@ -160,7 +160,7 @@ end;
 
 function TfrmCustomerInput.SaveData(): Boolean;
 var
-  MaxId, MaxSubId, MaxSubId1, FCoCode, FCCID, MaxCFID,FCBID: string;
+  MaxId, MaxSubId, MaxSubId1, FCoCode, FCCID, MaxCFID, FCBID: string;
 begin
   try
     ADOQueryCmd.Connection.BeginTrans;
@@ -214,6 +214,7 @@ begin
       FieldByName('COID').Value := Trim(MaxId);
       RTSetsavedata(ADOQueryCmd, 'BS_Company', ScrollBox1, 2);
       FieldByName('CoType').Value := '我司';
+
       Post;
     end;
 
@@ -304,6 +305,7 @@ begin
             FieldByName('CBID').Value := Trim(MaxSubId1);
             FieldByName('COID').Value := Trim(MaxId);
             RTSetSaveDataCDS(ADOQuery1, Tv2, CDS_Bank, 'BS_Company_Bank', 0);
+            FieldByName('BKID').Value := CDS_Bank.FieldByName('BKID').ASString;
             Post;
           end;
           with CDS_Bank do
@@ -363,31 +365,53 @@ begin
     Application.MessageBox('银行账户最大ID失败!', '提示', 0);
     Exit;
   end;
-  if CDS_Bank.IsEmpty then
+
+  try
+    frmCoBankSel := TfrmCoBankSel.Create(Application);
+    with frmCoBankSel do
+    begin
+      if ShowModal = 1 then
       begin
         with CDS_Bank do
         begin
+//        Currency.Text := Trim(CDS_1.fieldbyname('Currency').AsString);
           Append;
           fieldbyname('CBID').Value := trim(Maxbno);
-      fieldbyname('IsDefault').Value := true;
+          fieldbyname('BankName').Value := Trim(CDS_1.fieldbyname('BankName').AsString);
-      Post;
+          fieldbyname('BankCardNo').Value := Trim(CDS_1.fieldbyname('BankCardNo').AsString);
-    end;
+          fieldbyname('BankDeposit').Value := Trim(CDS_1.fieldbyname('BankDeposit').AsString);
-  end
+          fieldbyname('BkID').Value := Trim(CDS_1.fieldbyname('BkID').AsString);
-  else
+          post;
-  begin
-    with CDS_Bank do
-    begin
-      Append;
-      fieldbyname('CBID').Value := trim(Maxbno);
-      fieldbyname('IsDefault').Value := false;
-      Post;
         end;
       end;
+    end;
+  finally
+    frmCoBankSel.Free;
+  end;
+//  if CDS_Bank.IsEmpty then
+//  begin
+//    with CDS_Bank do
+//    begin
+//      Append;
+//      fieldbyname('CBID').Value := trim(Maxbno);
+//      fieldbyname('IsDefault').Value := true;
+//      Post;
+//    end;
+//  end
+//  else
+//  begin
+//    with CDS_Bank do
+//    begin
+//      Append;
+//      fieldbyname('CBID').Value := trim(Maxbno);
+//      fieldbyname('IsDefault').Value := false;
+//      Post;
+//    end;
+//  end;
 
 end;
 
 procedure TfrmCustomerInput.ToolButton14Click(Sender: TObject);
-
 begin
   if CDS_Bank.IsEmpty then
     Exit;
@@ -415,7 +439,6 @@ begin
   end;
 end;
 
-
 procedure TfrmCustomerInput.ToolButton3Click(Sender: TObject);
 begin
   if Trim(CoAbbrName.Text) = '' then

A02基础产品管理/U_CloInfoFileUp.dfm

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

A02基础产品管理/U_CloInfoFileUp.pas

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

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

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.487,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.064,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.pas</Transaction>
@@ -30,28 +30,28 @@
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.dfm=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.072,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FinFileUp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.345,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_FtyStatement.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.061,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.927,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.318,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.061,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.927,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.349,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_PictureUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>2024-08-10 14:27:36.318,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
-    <Transaction>2024-08-10 14:28:06.349,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>2024-08-10 14:32:22.072,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FinFileUp.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>

A09财务通用管理/SYSTEMSET.ini

@@ -1,6 +1,8 @@
 [SERVER]
 服务器地址=101.132.143.144
-服务器地址类型=2002
+服务器地址类型=576
 是否自动更新=1
-软件名称=睿特版本库
+软件名称=骉骐贸易
 登陆标题=sss
+[窗口设置]
+字体大小=9

A09财务通用管理/U_CollectInput.dfm

@@ -71,6 +71,7 @@ object frmCollectInput: TfrmCollectInput
     ParentCtl3D = False
     ParentFont = False
     TabOrder = 1
+    ExplicitTop = 44
     object Label2: TLabel
       Left = 245
       Top = 20
@@ -262,8 +263,8 @@ object frmCollectInput: TfrmCollectInput
       TabOrder = 0
     end
     object Currency: TComboBox
-      Left = 404
+      Left = 409
-      Top = 130
+      Top = 127
       Width = 37
       Height = 20
       Style = csDropDownList
@@ -366,8 +367,8 @@ object frmCollectInput: TfrmCollectInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object OppBankName: TBtnEditC
-      Left = 301
+      Left = 303
-      Top = 44
+      Top = 43
       Width = 140
       Height = 20
       Font.Charset = GB2312_CHARSET
@@ -388,7 +389,7 @@ object frmCollectInput: TfrmCollectInput
       BevelInner = bvNone
       Date = 40916.000000000000000000
       Format = 'yyyy-MM-dd'
-      Time = 0.670856296288548100
+      Time = 0.670856296288548000
       TabOrder = 9
     end
     object OrderNo: TBtnEditC
@@ -437,16 +438,16 @@ object frmCollectInput: TfrmCollectInput
       OnBtnDnClick = PayMentBtnDnClick
     end
     object DKAmount: TcxCurrencyEdit
-      Left = 88
+      Left = 86
-      Top = 105
+      Top = 104
       Properties.AssignedValues.DisplayFormat = True
       TabOrder = 13
       OnExit = DKAmountExit
       Width = 138
     end
     object ExchangeRate: TcxCurrencyEdit
-      Left = 302
+      Left = 298
-      Top = 101
+      Top = 103
       Properties.AssignedValues.DisplayFormat = True
       TabOrder = 14
       OnExit = DKAmountExit

A09财务通用管理/U_CollectInput.pas

@@ -225,6 +225,8 @@ begin
       begin
         OurCoName.Text := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
         OurCoName.TxtCode := Trim(CDS_1.fieldbyname('CoCode').AsString);
+        OurBankName.Text := Trim(CDS_1.fieldbyname('BankName').AsString);
+        OurBankName.TxtCode := Trim(CDS_1.fieldbyname('BkID').AsString);
       end;
     end;
   finally
@@ -271,6 +273,11 @@ procedure TfrmCollectInput.DKAmountExit(Sender: TObject);
 var
   MDKAmount, MHL, MAmount: double;
 begin
+  if Currency.text = '' then
+  begin
+    Application.MessageBox('币种不能为空!', '提示', 0);
+    Exit;
+  end;
 
   MDKAmount := Strtofloatdef(DKAmount.Text, 0);
   MHL := Strtofloatdef(ExchangeRate.Text, 0);

A09财务通用管理/U_CollectList.pas

@@ -364,7 +364,7 @@ begin
     begin
       Close;
       sql.Clear;
-      sql.Add(' exec P_Fin_Flow_SetStatus ');
+      sql.Add(' exec P_Fin_Flow_SetStatus_SK ');
       sql.Add(' @FFIDS=' + QuotedStr(FFFIDS));
       sql.Add(',@Operation=''ÉóºË'' ');
       Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
@@ -426,7 +426,7 @@ begin
     begin
       Close;
       sql.Clear;
-      sql.Add(' exec P_Fin_Flow_SetStatus ');
+      sql.Add(' exec P_Fin_Flow_SetStatus_SK ');
       sql.Add(' @FFIDS=' + QuotedStr(FFFIDS));
       sql.Add(',@Operation=''³·ÏúÉóºË'' ');
       Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));

A09财务通用管理/U_CompanySel.dfm

@@ -21,10 +21,11 @@ inherited frmCompanySel: TfrmCompanySel
     Height = 476
     Align = alClient
     TabOrder = 0
-    ExplicitLeft = -1
+    ExplicitTop = 88
     object TV1: TcxGridDBTableView
       OnDblClick = TV1DblClick
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <>
@@ -39,6 +40,7 @@ inherited frmCompanySel: TfrmCompanySel
       object TV1Column1: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'CoCode'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 151
@@ -46,6 +48,7 @@ inherited frmCompanySel: TfrmCompanySel
       object TV1Column2: TcxGridDBColumn
         Caption = #21517#31216
         DataBinding.FieldName = 'CoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 253
@@ -53,29 +56,34 @@ inherited frmCompanySel: TfrmCompanySel
       object TV1Column3: TcxGridDBColumn
         Caption = #31616#31216
         DataBinding.FieldName = 'CoAbbrName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 159
       end
       object TV1Column4: TcxGridDBColumn
         Caption = #20379#24212#21830#31867#22411
         DataBinding.FieldName = 'CoBusinessType'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 121
       end
       object TV1Column5: TcxGridDBColumn
         Caption = #36134#25143
-        DataBinding.FieldName = 'AcName'
+        DataBinding.FieldName = 'BankName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object TV1Column6: TcxGridDBColumn
         Caption = #24320#25143#34892
-        DataBinding.FieldName = 'OpenBank'
+        DataBinding.FieldName = 'BankDeposit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 113
       end
       object TV1Column7: TcxGridDBColumn
         Caption = #38134#34892#36134#21495
-        DataBinding.FieldName = 'account'
+        DataBinding.FieldName = 'BankCardNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 116
       end

A09财务通用管理/U_CompanySel.pas

@@ -10,7 +10,8 @@ uses
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
   cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
-  dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput;
+  dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmCompanySel = class(TfrmBaseHelp)

A09财务通用管理/U_FinFileUp.dfm

@@ -26,6 +26,7 @@ object frmFinFileUp: TfrmFinFileUp
     object TV7: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
+      OnCellDblClick = TV7CellDblClick
       DataController.DataSource = DataSource1
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <>
@@ -93,7 +94,6 @@ object frmFinFileUp: TfrmFinFileUp
     List = True
     ShowCaptions = True
     TabOrder = 2
-    ExplicitLeft = 866
     object FileUp: TToolButton
       Left = 0
       Top = 0

A09财务通用管理/U_FinFileUp.pas

@@ -11,7 +11,7 @@ uses
   IdTCPConnection, IdTCPClient, IdFTP, StdCtrls, ADODB, jpeg, BtnEdit, IniFiles,
   strutils, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
   dxSkinsDefaultPainters, dxDateRanges, IdExplicitTLSClientServerBase,
-  Vcl.ExtDlgs, dxSkinWXI, dxScrollbarAnnotations;
+  Vcl.ExtDlgs, dxSkinWXI, dxScrollbarAnnotations, URLMon, ShellAPI;
 
 type
   TfrmFinFileUp = class(TForm)
@@ -45,6 +45,7 @@ type
     procedure FormShow(Sender: TObject);
     procedure HXNameBtnUpClick(Sender: TObject);
     procedure HXNameBtnDnClick(Sender: TObject);
+    procedure TV7CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
   private
     lstPat: TStringList;
     AJpeg: TJPEGImage;
@@ -152,8 +153,6 @@ begin
       image1.Picture.LoadFromFile((lstPat[i]));
       CreThumb(Image1, Image2, FWidth, FHeight);
 
-
-
       if IdFTP1.Connected then
       begin
         try
@@ -216,7 +215,7 @@ begin
   if ii > 0 then
     Application.MessageBox(PChar(inttostr(ii) + '个文件大于2MB，上传失败！'), '提示', 0);
   if i > 0 then
-    Application.MessageBox(PChar(inttostr(i-ii) + '个文件上传成功！'), '提示', 0);
+    Application.MessageBox(PChar(inttostr(i - ii) + '个文件上传成功！'), '提示', 0);
 
   ModalResult := 1;
 end;
@@ -302,6 +301,45 @@ begin
   end;
 end;
 
+procedure TfrmFinFileUp.TV7CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+var
+  IdFTP1: TIdFTP;
+  FPath, FFName, FileName: string;
+  FInt: integer;
+begin
+  FileName := ADOQueryFile.FieldByName('FileName').AsString;
+  try
+    IdFTP1 := TIdFTP.Create(self);
+    IdFTP1.Host := PicSvr;
+    IdFTP1.Username := 'three';
+    IdFTP1.Password := '641010';
+    IdFTP1.Connect();
+  except
+    IdFTP1.Quit;
+    IdFTP1.Free;
+    Application.MessageBox('无法连接到文件服务器，请检查！', '提示', MB_ICONWARNING);
+    Exit;
+  end;
+  FPath := 'D:\Right1209\';
+  if not DirectoryExists(ExtractFileDir(FPath)) then
+    CreateDir(ExtractFileDir(FPath));
+  FFName := Trim(FileName);
+  FFName := FPath + FFName;
+  if FileExists(FFName) then
+  begin
+    FInt := 1;
+  end;
+  if FInt <> 1 then
+    IdFTP1.Get(UserDataFlag + 'YP\' + FileName, pchar(FFName));
+  if IdFTP1.Connected then
+  begin
+    IdFTP1.Quit;
+    IdFTP1.Free;
+  end;
+  ShellExecute(Handle, 'open', PChar(FFName), '', '', SW_SHOWNORMAL);
+
+end;
+
 procedure TfrmFinFileUp.FormCreate(Sender: TObject);
 begin
   lstPat := TStringList.Create;

A09财务通用管理/U_PayInput.dfm

@@ -25,7 +25,7 @@ object frmPayInput: TfrmPayInput
     Height = 38
     AutoSize = True
     ButtonHeight = 38
-    ButtonWidth = 75
+    ButtonWidth = 91
     Caption = 'ToolBar1'
     Color = clWhite
     DisabledImages = DataLink_Financial.ImageList_new32
@@ -34,7 +34,6 @@ object frmPayInput: TfrmPayInput
     ParentColor = False
     ShowCaptions = True
     TabOrder = 0
-    ExplicitWidth = 749
     object ToolButton3: TToolButton
       Left = 0
       Top = 0
@@ -51,6 +50,14 @@ object frmPayInput: TfrmPayInput
       ImageIndex = 7
       OnClick = TBCloseClick
     end
+    object ToolButton1: TToolButton
+      Left = 142
+      Top = 0
+      AutoSize = True
+      Caption = #26597#30475#22270#29255
+      ImageIndex = 8
+      OnClick = ToolButton1Click
+    end
   end
   object ScrollBox1: TScrollBox
     Left = 0
@@ -354,7 +361,7 @@ object frmPayInput: TfrmPayInput
       Width = 101
     end
     object OurBankName: TBtnEditC
-      Left = 319
+      Left = 317
       Top = 18
       Width = 140
       Height = 20

A09财务通用管理/U_PayInput.pas

@@ -54,6 +54,7 @@ type
     Label1: TLabel;
     Label4: TLabel;
     PKDate: TDateTimePicker;
+    ToolButton1: TToolButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -69,6 +70,7 @@ type
     procedure OppBankNameBtnUpClick(Sender: TObject);
     procedure FFAbstractDLBtnUpClick(Sender: TObject);
     procedure OrderNoBtnUpClick(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
   private
     { Private declarations }
     procedure InitGrid();
@@ -85,7 +87,7 @@ implementation
 
 uses
   U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel, U_BankSel, U_ZDYHelpFY,
-  U_TradePlanSel;
+  U_TradePlanSel,U_FinFileUp;
 
 {$R *.dfm}
 
@@ -245,6 +247,8 @@ begin
       begin
         OurCoName.Text := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
         OurCoName.TxtCode := Trim(CDS_1.fieldbyname('CoCode').AsString);
+        OurBankName.Text := Trim(CDS_1.fieldbyname('BankName').AsString);
+        OurBankName.TxtCode := Trim(CDS_1.fieldbyname('BkID').AsString);
       end;
     end;
   finally
@@ -409,6 +413,25 @@ begin
   end;
 end;
 
+procedure TfrmPayInput.ToolButton1Click(Sender: TObject);
+begin
+   try
+    frmFinFileUp := TfrmFinFileUp.Create(Application);
+    with frmFinFileUp do
+    begin
+//      Code.Text := Trim(Self.CDS_1.fieldbyname('CoCode').AsString);
+      FBCIID := FFFID;
+      if ShowModal = 1 then
+      begin
+        Self.InitGrid();
+//        Self.CDS_1.Locate('BCIID', BCIID, []);
+      end;
+    end;
+  finally
+    frmFinFileUp.Free;
+  end;
+end;
+
 procedure TfrmPayInput.ToolButton3Click(Sender: TObject);
 begin
   ToolBar1.SetFocus;

A09财务通用管理/U_PayList.dfm

@@ -51,16 +51,24 @@ inherited frmPayList: TfrmPayList
       ImageIndex = 3
       OnClick = btnEditClick
     end
-    object ToolButton3: TToolButton
+    object ToolButton7: TToolButton
       Left = 213
       Top = 0
       AutoSize = True
+      Caption = #26597#30475
+      ImageIndex = 9
+      OnClick = ToolButton7Click
+    end
+    object ToolButton3: TToolButton
+      Left = 284
+      Top = 0
+      AutoSize = True
       Caption = #22797#21046
       ImageIndex = 13
       OnClick = ToolButton3Click
     end
     object btnDel: TToolButton
-      Left = 284
+      Left = 355
       Top = 0
       AutoSize = True
       Caption = #21024#38500
@@ -68,7 +76,7 @@ inherited frmPayList: TfrmPayList
       OnClick = btnDelClick
     end
     object btnChk: TToolButton
-      Left = 355
+      Left = 426
       Top = 0
       AutoSize = True
       Caption = #23457#26680
@@ -76,7 +84,7 @@ inherited frmPayList: TfrmPayList
       OnClick = btnChkClick
     end
     object btnReChk: TToolButton
-      Left = 426
+      Left = 497
       Top = 0
       AutoSize = True
       Caption = #25764#38144#23457#26680
@@ -84,7 +92,7 @@ inherited frmPayList: TfrmPayList
       OnClick = btnReChkClick
     end
     object ToolButton1: TToolButton
-      Left = 521
+      Left = 592
       Top = 0
       AutoSize = True
       Caption = #20184#27454
@@ -92,7 +100,7 @@ inherited frmPayList: TfrmPayList
       OnClick = ToolButton1Click
     end
     object ToolButton2: TToolButton
-      Left = 592
+      Left = 663
       Top = 0
       AutoSize = True
       Caption = #25764#38144#20184#27454
@@ -100,7 +108,7 @@ inherited frmPayList: TfrmPayList
       OnClick = ToolButton2Click
     end
     object ToolButton9: TToolButton
-      Left = 687
+      Left = 758
       Top = 0
       AutoSize = True
       Caption = #38468#20214#19978#20256
@@ -109,7 +117,7 @@ inherited frmPayList: TfrmPayList
       OnClick = ToolButton9Click
     end
     object ToolButton4: TToolButton
-      Left = 782
+      Left = 853
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -117,7 +125,7 @@ inherited frmPayList: TfrmPayList
       OnClick = ToolButton4Click
     end
     object ToolButton5: TToolButton
-      Left = 853
+      Left = 924
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -125,7 +133,7 @@ inherited frmPayList: TfrmPayList
       OnClick = ToolButton5Click
     end
     object TBClose: TToolButton
-      Left = 948
+      Left = 1019
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -133,7 +141,7 @@ inherited frmPayList: TfrmPayList
       OnClick = TBCloseClick
     end
     object ToolButton6: TToolButton
-      Left = 1019
+      Left = 1090
       Top = 0
       AutoSize = True
       Caption = #22270#29255#19978#20256
@@ -291,7 +299,6 @@ inherited frmPayList: TfrmPayList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitTop = 142
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
@@ -517,7 +524,7 @@ inherited frmPayList: TfrmPayList
     TabOrder = 3
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 2
-    Properties.TabIndex = 2
+    Properties.TabIndex = 1
     Properties.Tabs.Strings = (
       #26410#23457#26680
       #24050#23457#26680

A09财务通用管理/U_PayList.pas

@@ -97,6 +97,7 @@ type
     Button3: TButton;
     Button4: TButton;
     ToolButton6: TToolButton;
+    ToolButton7: TToolButton;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure btnDelClick(Sender: TObject);
@@ -123,6 +124,7 @@ type
     procedure Button3Click(Sender: TObject);
     procedure Button4Click(Sender: TObject);
     procedure ToolButton6Click(Sender: TObject);
+    procedure ToolButton7Click(Sender: TObject);
   private
     procedure InitGrid();
     procedure SetStatus();
@@ -410,49 +412,50 @@ begin
 end;
 
 procedure TfrmPayList.btnChkClick(Sender: TObject);
-begin
-  Panel2.Left := (self.width - Panel2.width) div 2;
-  Panel2.Visible := True;
-end;
-//var
-//  FFFIDS: string;
 //begin
-//  if CDS_1.IsEmpty then
+//  Panel2.Left := (self.width - Panel2.width) div 2;
-//    exit;
+//  Panel2.Visible := True;
-//
+//end;
-//  if not CDS_1.Locate('SSel', True, []) then
+var
-//  begin
+  FFFIDS: string;
-//    application.MessageBox('请选择数据', '提示');
+begin
-//    Exit;
+  if CDS_1.IsEmpty then
-//  end;
+    exit;
-//
+
-//  with CDS_1 do
+  if not CDS_1.Locate('SSel', True, []) then
-//  begin
+  begin
-//    DisableControls;
+    application.MessageBox('请选择数据', '提示');
-//    while CDS_1.Locate('SSel', True, []) do
+    Exit;
-//    begin
+  end;
-//      FFFIDS := FFFIDS + Trim(CDS_1.fieldbyname('FFID').AsString) + ',';
+
-//      CDS_1.Delete;
+  with CDS_1 do
-//    end;
+  begin
-//    EnableControls;
+    DisableControls;
-//  end;
+    while CDS_1.Locate('SSel', True, []) do
-//
+    begin
-//  try
+      FFFIDS := FFFIDS + Trim(CDS_1.fieldbyname('FFID').AsString) + ',';
-//    ADOQueryCmd.Connection.BeginTrans;
+      CDS_1.Delete;
-//    with ADOQueryCmd do
+    end;
-//    begin
+    EnableControls;
-//      Close;
+  end;
-//      sql.Clear;
+
-//      sql.Add(' exec P_Fin_Flow_SetStatus ');
+  try
-//      sql.Add(' @FFIDS=' + QuotedStr(FFFIDS));
+    ADOQueryCmd.Connection.BeginTrans;
-//      sql.Add(',@Operation=''审核'' ');
+    with ADOQueryCmd do
-//      Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
+    begin
-//      Sql.Add(',@DName=' + quotedstr(Trim(DName)));
+      Close;
-//      open;
+      sql.Clear;
-//    end;
+      sql.Add(' exec P_Fin_Flow_SetStatus_1 ');
-//    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
+      sql.Add(' @FFIDS=' + QuotedStr(FFFIDS));
-//      raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
+      sql.Add(',@Operation=''审核'' ');
-//
+      Sql.Add(',@SetDate=''' + FormatDateTime('yyyy-MM-dd', Setdate1.DateTime) + ''' ');
+      Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
+      Sql.Add(',@DName=' + quotedstr(Trim(DName)));
+      open;
+    end;
+    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
+      raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
+
 //    with ADOQueryCmd do
 //    begin
 //      Close;
@@ -465,15 +468,17 @@ end;
 //    end;
 //    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
 //      raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
-//    ADOQueryCmd.Connection.CommitTrans;
+    ADOQueryCmd.Connection.CommitTrans;
-//    application.MessageBox('审核成功', '提示');
+    application.MessageBox('审核成功', '提示');
-//  except
+    Panel2.Visible := False;
-//    ADOQueryCmd.Connection.RollbackTrans;
+  except
-//    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
+    ADOQueryCmd.Connection.RollbackTrans;
-//    InitGrid();
+    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
-//  end;
+    InitGrid();
-//
+//    Panel2.Visible := False;
-//end;
+  end;
+
+end;
 
 procedure TfrmPayList.btnReChkClick(Sender: TObject);
 var
@@ -819,6 +824,25 @@ begin
 
 end;
 
+procedure TfrmPayList.ToolButton7Click(Sender: TObject);
+begin
+  try
+    frmPayInput := TfrmPayInput.Create(Application);
+    with frmPayInput do
+    begin
+      FFFID := Trim(SELF.CDS_1.fieldbyname('FFID').AsString);
+      ToolButton3.visible:=False;
+      if ShowModal = 1 then
+      begin
+        InitGrid();
+      end;
+    end;
+  finally
+    frmPayInput.Free;
+  end;
+
+end;
+
 procedure TfrmPayList.btnEditClick(Sender: TObject);
 begin
   try

B01基础合同管理/Contract.dpr

@@ -29,7 +29,8 @@ uses
   U_SalesConInPutCopy in 'U_SalesConInPutCopy.pas' {frmSalesConInPutCopy},
   U_ContractList in 'U_ContractList.pas' {frmContractList},
   U_BaoguanList in 'U_BaoguanList.pas' {frmBaoguanList},
-  U_BaoguanInPut in 'U_BaoguanInPut.pas' {frmBaoguanInPut};
+  U_BaoguanInPut in 'U_BaoguanInPut.pas' {frmBaoguanInPut},
+  U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule};
 
 {$R *.res}
 

B01基础合同管理/Contract.dproj

@@ -201,6 +201,11 @@
             <Form>frmBaoguanInPut</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>

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

@@ -19,21 +19,21 @@
     <Transaction>1899-12-30 00:00:00.000.556,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.564,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.526,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.609,=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_BaoguanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
@@ -46,26 +46,27 @@
     <Transaction>1899-12-30 00:00:00.000.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.067,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.569,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.609,=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_BaoguanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.569,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>2024-08-09 15:19:07.322,=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_BaoguanInPut.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.322,=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_BaoguanInPut.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.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>2024-08-21 09:38:15.872,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -124,6 +125,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"/>

B01基础合同管理/U_BaoguanList.dfm

@@ -6,7 +6,6 @@ inherited frmBaoguanList: TfrmBaoguanList
   ClientWidth = 1525
   FormStyle = fsMDIChild
   Visible = True
-  ExplicitLeft = -77
   ExplicitWidth = 1541
   ExplicitHeight = 775
   PixelsPerInch = 96
@@ -128,6 +127,7 @@ inherited frmBaoguanList: TfrmBaoguanList
       AutoSize = True
       Caption = #23436#25104
       ImageIndex = 12
+      Visible = False
       OnClick = btnWCClick
     end
     object btnWCCX: TToolButton
@@ -136,6 +136,7 @@ inherited frmBaoguanList: TfrmBaoguanList
       AutoSize = True
       Caption = #25764#38144#23436#25104
       ImageIndex = 11
+      Visible = False
       OnClick = btnWCCXClick
     end
     object Tqx: TToolButton
@@ -179,8 +180,6 @@ inherited frmBaoguanList: TfrmBaoguanList
     Align = alClient
     PopupMenu = pm1
     TabOrder = 3
-    ExplicitTop = 161
-    ExplicitHeight = 305
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -438,7 +437,6 @@ inherited frmBaoguanList: TfrmBaoguanList
     Color = 16242829
     ParentBackground = False
     TabOrder = 1
-    ExplicitTop = 76
     object Label4: TLabel
       Left = 621
       Top = 23
@@ -704,7 +702,6 @@ inherited frmBaoguanList: TfrmBaoguanList
       #24050#21462#28040
       #20840#37096)
     OnChange = cxTabControl1Change
-    ExplicitTop = 137
     ClientRectBottom = 22
     ClientRectRight = 1525
     ClientRectTop = 19
@@ -725,7 +722,6 @@ inherited frmBaoguanList: TfrmBaoguanList
     Align = alBottom
     BorderStyle = cxcbsNone
     TabOrder = 5
-    ExplicitTop = 470
     object TV2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -901,7 +897,7 @@ inherited frmBaoguanList: TfrmBaoguanList
       end
       object v1PRTOrderQty: TcxGridDBColumn
         Caption = #25968#37327
-        DataBinding.FieldName = 'ConQty'
+        DataBinding.FieldName = 'BGQty'
         DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
@@ -911,7 +907,7 @@ inherited frmBaoguanList: TfrmBaoguanList
       end
       object v1OrderUnit: TcxGridDBColumn
         Caption = #21333#20301
-        DataBinding.FieldName = 'ConUnit'
+        DataBinding.FieldName = 'BGUnit'
         DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsEditFixedList
@@ -926,7 +922,7 @@ inherited frmBaoguanList: TfrmBaoguanList
       end
       object v1PRTPrice: TcxGridDBColumn
         Caption = #21333#20215
-        DataBinding.FieldName = 'ConPrice'
+        DataBinding.FieldName = 'BGPrice'
         DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
@@ -937,21 +933,13 @@ inherited frmBaoguanList: TfrmBaoguanList
       end
       object cxGridDBColumn9: TcxGridDBColumn
         Caption = #37329#39069
-        DataBinding.FieldName = 'ConTotalAmount'
+        DataBinding.FieldName = 'BGMoney'
         DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 84
       end
-      object v1Column2: TcxGridDBColumn
-        Caption = #22791#27880
-        DataBinding.FieldName = 'ConSNote'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 70
-      end
       object TV2Column1: TcxGridDBColumn
         Caption = #32455#36896#26041#27861
         DataBinding.FieldName = 'ZZFF'

B01基础合同管理/U_BaoguanList.pas

@@ -102,7 +102,6 @@ type
     v1OrderUnit: TcxGridDBColumn;
     v1PRTPrice: TcxGridDBColumn;
     cxGridDBColumn9: TcxGridDBColumn;
-    v1Column2: TcxGridDBColumn;
     cxGridLevel1: TcxGridLevel;
     N5: TMenuItem;
     N6: TMenuItem;
@@ -226,7 +225,7 @@ begin
     close;
     sql.Clear;
     sql.Add('select * from Baoguan_sub A  ');
-    sql.Add('where BGID =' + quotedstr((CDS_1.fieldbyname('ConMID').AsString)));
+    sql.Add('where BGMID =' + quotedstr((CDS_1.fieldbyname('BGMID').AsString)));
     open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_2);
@@ -485,7 +484,7 @@ begin
     with frmLabelPrint do
     begin
       FLMType := 'SalesConPrint';
-      FFiltration1 := QuotedStr(Trim(Self.CDS_1.fieldbyname('ConMID').AsString));
+      FFiltration1 := QuotedStr(Trim(Self.CDS_1.fieldbyname('BGMID').AsString));
       if ShowModal = 1 then
       begin
 //        Self.InitGrid();
@@ -513,7 +512,7 @@ begin
     with frmBaoguanInPut do
     begin
       PState := '修改';
-      FConMId := Trim(Self.CDS_1.fieldbyname('ConMID').AsString);
+      FBGMId := Trim(Self.CDS_1.fieldbyname('BGMID').AsString);
       FAuthority := self.FAuthority;
       FGSTT := self.FGSTT;
       fFlileFlag := self.fFlileFlag;
@@ -541,7 +540,7 @@ begin
     with frmBaoguanInPut do
     begin
       PState := '新增';
-      FConMId := '';
+      FBGMId := '';
       FAuthority := self.FAuthority;
       FGSTT := self.FGSTT;
       fFlileFlag := self.fFlileFlag;
@@ -601,9 +600,9 @@ begin
     with frmBaoguanInPut do
     begin
       PState := '查看';
-      FConMId := Trim(Self.CDS_1.fieldbyname('ConMID').AsString);
+      FBGMId := Trim(Self.CDS_1.fieldbyname('BGMID').AsString);
       FGSTT := self.FGSTT;
-      ToolBar2.Visible := False;
+//      ToolBar2.Visible := False;
       TBSave.Visible := False;
 //      ScrollBox1.Enabled := False;
       if ShowModal = 1 then
@@ -625,7 +624,7 @@ begin
     with frmBaoguanInPut do
     begin
       PState := '复制';
-      FConMId := Trim(Self.CDS_1.fieldbyname('ConMID').AsString);
+      FBGMId := Trim(Self.CDS_1.fieldbyname('BGMID').AsString);
       FAuthority := self.FAuthority;
       fFlileFlag := self.fFlileFlag;
       if ShowModal = 1 then
@@ -654,7 +653,7 @@ begin
     with frmSalesConInPut do
     begin
       PState := '成本预估';
-      FConMId := Trim(Self.CDS_1.fieldbyname('ConMID').AsString);
+      FConMId := Trim(Self.CDS_1.fieldbyname('BGMID').AsString);
       FAuthority := self.FAuthority;
       FGSTT := self.FGSTT;
       fFlileFlag := self.fFlileFlag;
@@ -674,7 +673,7 @@ end;
 
 procedure TfrmBaoguanList.btnWCClick(Sender: TObject);
 var
-  MConMIDS: string;
+  MBGMIDS: string;
 begin
   if CDS_1.IsEmpty then
     exit;
@@ -704,14 +703,14 @@ begin
 //    MConMIDS := copy(MConMIDS, 1, Length(MConMIDS) - 1);
 //    EnableControls;
 //  end;
-  MConMIDS := CDS_1.fieldbyname('ConMID').AsString;
+  MBGMIDS := CDS_1.fieldbyname('BGMID').AsString;
   try
     with ADOQueryCmd do
     begin
       Close;
       sql.Clear;
       sql.Add(' exec P_BS_Contract_SetStatus ');
-      sql.Add(' @ConMIDS=' + QuotedStr(MConMIDS));
+      sql.Add(' @ConMIDS=' + QuotedStr(MBGMIDS));
       sql.Add(',@Operation=''完成'' ');
       Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
       Sql.Add(',@DName=' + quotedstr(Trim(DName)));
@@ -721,7 +720,7 @@ begin
       sql.Add(',getdate() ');
       sql.Add(',' + quotedstr(trim(self.Caption)));
       sql.Add(',' + quotedstr(trim('合同完成')));
-      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MConMIDS))));
+      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MBGMIDS))));
       sql.Add(',' + quotedstr(trim('成功')));
       sql.Add(')');
       open;
@@ -748,11 +747,11 @@ end;
 
 procedure TfrmBaoguanList.tchkClick(Sender: TObject);
 var
-  MConMIDS: string;
+  MBGMIDS: string;
 begin
   if CDS_1.IsEmpty then
     exit;
-  MConMIDS := MConMIDS + CDS_1.fieldbyname('ConMID').AsString + ',';
+  MBGMIDS := MBGMIDS + CDS_1.fieldbyname('BGMID').AsString + ',';
 //  if not CDS_1.Locate('SSel', True, []) then
 //  begin
 //    application.MessageBox('请选择数据', '提示');
@@ -781,7 +780,7 @@ begin
       Close;
       sql.Clear;
       sql.Add(' exec P_BS_Contract_SetStatus ');
-      sql.Add(' @ConMIDS=' + QuotedStr(MConMIDS));
+      sql.Add(' @ConMIDS=' + QuotedStr(MBGMIDS));
       sql.Add(',@Operation=''审核'' ');
       Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
       Sql.Add(',@DName=' + quotedstr(Trim(DName)));
@@ -791,7 +790,7 @@ begin
       sql.Add(',getdate() ');
       sql.Add(',' + quotedstr(trim(self.Caption)));
       sql.Add(',' + quotedstr(trim('合同审核')));
-      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MConMIDS))));
+      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MBGMIDS))));
       sql.Add(',' + quotedstr(trim('成功')));
       sql.Add(')');
       open;
@@ -809,11 +808,11 @@ end;
 
 procedure TfrmBaoguanList.TnochkClick(Sender: TObject);
 var
-  MConMIDS: string;
+  MBGMIDS: string;
 begin
   if CDS_1.IsEmpty then
     exit;
-  MConMIDS := MConMIDS + CDS_1.fieldbyname('ConMID').AsString + ',';
+  MBGMIDS := MBGMIDS + CDS_1.fieldbyname('BGMID').AsString + ',';
 //  if not CDS_1.Locate('SSel', True, []) then
 //  begin
 //    application.MessageBox('请选择数据', '提示');
@@ -842,7 +841,7 @@ begin
       Close;
       sql.Clear;
       sql.Add(' exec P_BS_Contract_SetStatus ');
-      sql.Add(' @ConMIDS=' + QuotedStr(MConMIDS));
+      sql.Add(' @ConMIDS=' + QuotedStr(MBGMIDS));
       sql.Add(',@Operation=''撤销审核'' ');
       Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
       Sql.Add(',@DName=' + quotedstr(Trim(DName)));
@@ -852,7 +851,7 @@ begin
       sql.Add(',getdate() ');
       sql.Add(',' + quotedstr(trim(self.Caption)));
       sql.Add(',' + quotedstr(trim('合同撤销审核')));
-      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MConMIDS))));
+      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MBGMIDS))));
       sql.Add(',' + quotedstr(trim('成功')));
       sql.Add(')');
       open;
@@ -884,7 +883,7 @@ end;
 
 procedure TfrmBaoguanList.TqxClick(Sender: TObject);
 var
-  MConMIDS: string;
+  MBGMIDS: string;
 begin
   if CDS_1.IsEmpty then
     exit;
@@ -897,16 +896,16 @@ begin
   begin
     DisableControls;
     First;
-    MConMIDS := '';
+    MBGMIDS := '';
     while not eof do
     begin
       if fieldbyname('SSel').AsBoolean then
       begin
-        MConMIDS := MConMIDS + trim(fieldbyname('ConMID').AsString) + ',';
+        MBGMIDS := MBGMIDS + trim(fieldbyname('BGMID').AsString) + ',';
       end;
       next;
     end;
-    MConMIDS := copy(MConMIDS, 1, Length(MConMIDS) - 1);
+    MBGMIDS := copy(MBGMIDS, 1, Length(MBGMIDS) - 1);
     EnableControls;
   end;
 
@@ -916,7 +915,7 @@ begin
       Close;
       sql.Clear;
       sql.Add(' exec P_BS_Contract_SetStatus ');
-      sql.Add(' @ConMIDS=' + QuotedStr(MConMIDS));
+      sql.Add(' @ConMIDS=' + QuotedStr(MBGMIDS));
       sql.Add(',@Operation=''取消'' ');
       Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
       Sql.Add(',@DName=' + quotedstr(Trim(DName)));
@@ -926,7 +925,7 @@ begin
       sql.Add(',getdate() ');
       sql.Add(',' + quotedstr(trim(self.Caption)));
       sql.Add(',' + quotedstr(trim('合同取消')));
-      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MConMIDS))));
+      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MBGMIDS))));
       sql.Add(',' + quotedstr(trim('成功')));
       sql.Add(')');
       open;
@@ -944,7 +943,7 @@ end;
 
 procedure TfrmBaoguanList.TnoqxClick(Sender: TObject);
 var
-  MConMIDS: string;
+  MBGMIDS: string;
 begin
   if CDS_1.IsEmpty then
     exit;
@@ -957,16 +956,16 @@ begin
   begin
     DisableControls;
     First;
-    MConMIDS := '';
+    MBGMIDS := '';
     while not eof do
     begin
       if fieldbyname('SSel').AsBoolean then
       begin
-        MConMIDS := MConMIDS + trim(fieldbyname('ConMID').AsString) + ',';
+        MBGMIDS := MBGMIDS + trim(fieldbyname('BGMID').AsString) + ',';
       end;
       next;
     end;
-    MConMIDS := copy(MConMIDS, 1, Length(MConMIDS) - 1);
+    MBGMIDS := copy(MBGMIDS, 1, Length(MBGMIDS) - 1);
     EnableControls;
   end;
 
@@ -980,12 +979,12 @@ begin
       sql.Add(',getdate() ');
       sql.Add(',' + quotedstr(trim(self.Caption)));
       sql.Add(',' + quotedstr(trim('合同撤销取消')));
-      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MConMIDS))));
+      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MBGMIDS))));
       sql.Add(',' + quotedstr(trim('成功')));
       sql.Add(')');
 
       sql.Add(' exec P_BS_Contract_SetStatus ');
-      sql.Add(' @ConMIDS=' + QuotedStr(MConMIDS));
+      sql.Add(' @ConMIDS=' + QuotedStr(MBGMIDS));
       sql.Add(',@Operation=''撤销取消'' ');
       Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
       Sql.Add(',@DName=' + quotedstr(Trim(DName)));
@@ -1012,7 +1011,7 @@ begin
     with frmAttachmentUpload do
     begin
        FEditAuthority := True;
-      fkeyNO := Trim(Self.CDS_1.fieldbyname('ConMID').AsString);
+      fkeyNO := Trim(Self.CDS_1.fieldbyname('BGMID').AsString);
       fType := '合同';
       if ShowModal = 1 then
       begin
@@ -1032,7 +1031,7 @@ end;
 
 procedure TfrmBaoguanList.btnWCCXClick(Sender: TObject);
 var
-  MConMIDS: string;
+  MBGMIDS: string;
 begin
   if CDS_1.IsEmpty then
     exit;
@@ -1045,16 +1044,16 @@ begin
   begin
     DisableControls;
     First;
-    MConMIDS := '';
+    MBGMIDS := '';
     while not eof do
     begin
       if fieldbyname('SSel').AsBoolean then
       begin
-        MConMIDS := MConMIDS + trim(fieldbyname('ConMID').AsString) + ',';
+        MBGMIDS := MBGMIDS + trim(fieldbyname('BGMID').AsString) + ',';
       end;
       next;
     end;
-    MConMIDS := copy(MConMIDS, 1, Length(MConMIDS) - 1);
+    MBGMIDS := copy(MBGMIDS, 1, Length(MBGMIDS) - 1);
     EnableControls;
   end;
 
@@ -1064,7 +1063,7 @@ begin
       Close;
       sql.Clear;
       sql.Add(' exec P_BS_Contract_SetStatus ');
-      sql.Add(' @ConMIDS=' + QuotedStr(MConMIDS));
+      sql.Add(' @ConMIDS=' + QuotedStr(MBGMIDS));
       sql.Add(',@Operation=''撤销完成'' ');
       Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
       Sql.Add(',@DName=' + quotedstr(Trim(DName)));
@@ -1074,7 +1073,7 @@ begin
       sql.Add(',getdate() ');
       sql.Add(',' + quotedstr(trim(self.Caption)));
       sql.Add(',' + quotedstr(trim('合同撤销完成')));
-      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MConMIDS))));
+      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MBGMIDS))));
       sql.Add(',' + quotedstr(trim('成功')));
       sql.Add(')');
       open;
@@ -1103,7 +1102,7 @@ end;
 
 procedure TfrmBaoguanList.btnTijiaoClick(Sender: TObject);
 var
-  MConMIDS: string;
+  MBGMIDS: string;
   i:Integer;
 begin
   if CDS_1.IsEmpty then
@@ -1119,16 +1118,16 @@ begin
   begin
     DisableControls;
     First;
-    MConMIDS := '';
+    MBGMIDS := '';
     while not eof do
     begin
       if fieldbyname('SSel').AsBoolean then
       begin
-        MConMIDS := MConMIDS + trim(fieldbyname('ConMID').AsString) + ',';
+        MBGMIDS := MBGMIDS + trim(fieldbyname('BGMID').AsString) + ',';
       end;
       next;
     end;
-    MConMIDS := copy(MConMIDS, 1, Length(MConMIDS) - 1);
+    MBGMIDS := copy(MBGMIDS, 1, Length(MBGMIDS) - 1);
     EnableControls;
   end;
 
@@ -1138,7 +1137,7 @@ begin
       Close;
       sql.Clear;
       sql.Add(' exec P_BS_Contract_SetStatus ');
-      sql.Add(' @ConMIDS=' + QuotedStr(MConMIDS));
+      sql.Add(' @ConMIDS=' + QuotedStr(MBGMIDS));
       sql.Add(',@Operation=''提交'' ');
       Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
       Sql.Add(',@DName=' + quotedstr(Trim(DName)));
@@ -1148,7 +1147,7 @@ begin
       sql.Add(',getdate() ');
       sql.Add(',' + quotedstr(trim(self.Caption)));
       sql.Add(',' + quotedstr(trim('内销合同提交')));
-      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MConMIDS))));
+      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MBGMIDS))));
       sql.Add(',' + quotedstr(trim('成功')));
       sql.Add(')');
       open;
@@ -1166,7 +1165,7 @@ end;
 
 procedure TfrmBaoguanList.btnCXTijiaoClick(Sender: TObject);
 var
-  MConMIDS: string;
+  MBGMIDS: string;
 begin
   if CDS_1.IsEmpty then
     exit;
@@ -1179,16 +1178,16 @@ begin
   begin
     DisableControls;
     First;
-    MConMIDS := '';
+    MBGMIDS := '';
     while not eof do
     begin
       if fieldbyname('SSel').AsBoolean then
       begin
-        MConMIDS := MConMIDS + trim(fieldbyname('ConMID').AsString) + ',';
+        MBGMIDS := MBGMIDS + trim(fieldbyname('BGMID').AsString) + ',';
       end;
       next;
     end;
-    MConMIDS := copy(MConMIDS, 1, Length(MConMIDS) - 1);
+    MBGMIDS := copy(MBGMIDS, 1, Length(MBGMIDS) - 1);
     EnableControls;
   end;
 
@@ -1198,7 +1197,7 @@ begin
       Close;
       sql.Clear;
       sql.Add(' exec P_BS_Contract_SetStatus ');
-      sql.Add(' @ConMIDS=' + QuotedStr(MConMIDS));
+      sql.Add(' @ConMIDS=' + QuotedStr(MBGMIDS));
       sql.Add(',@Operation=''撤销提交'' ');
       Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
       Sql.Add(',@DName=' + quotedstr(Trim(DName)));
@@ -1208,7 +1207,7 @@ begin
       sql.Add(',getdate() ');
       sql.Add(',' + quotedstr(trim(self.Caption)));
       sql.Add(',' + quotedstr(trim('内销合同撤销提交')));
-      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MConMIDS))));
+      sql.Add(',' + quotedstr(trim('合同ID：' + trim(MBGMIDS))));
       sql.Add(',' + quotedstr(trim('成功')));
       sql.Add(')');
       open;

B01基础合同管理/U_DataLink.dfm

@@ -1,9 +1,10 @@
-object DataLink_Contract: TDataLink_Contract
+inherited DataLink_Contract: TDataLink_Contract
-  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_Contract: TDataLink_Contract
   object ThreeLookAndFeelCol: TcxLookAndFeelController
     Kind = lfStandard
     NativeStyle = False
+    ScrollbarMode = sbmHybrid
+    SkinName = 'WXI'
     Left = 253
     Top = 12
   end

B01基础合同管理/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, dxSkinWXI;
+  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_Contract = class(TDataModule)
+  TDataLink_Contract = class(TBaseDataLink)
     AdoDataLink: TADOQuery;
     ADOLink: TADOConnection;
     ThreeImgList: TImageList;
@@ -109,6 +110,7 @@ end;
 
 procedure TDataLink_Contract.DataModuleDestroy(Sender: TObject);
 begin
+Inherited;
   CriticalSection.Free;
   DataLink_Contract := nil;
 end;
@@ -120,6 +122,7 @@ end;
 
 procedure TDataLink_Contract.DataModuleCreate(Sender: TObject);
 begin
+Inherited;
   CriticalSection := TCriticalSection.Create;
 end;
 

B01基础合同管理/U_SalesConInPut.dfm

@@ -795,8 +795,8 @@ inherited frmSalesConInPut: TfrmSalesConInPut
     end
     object ShippMent: TEdit
       Tag = 2
-      Left = 355
+      Left = 356
-      Top = 78
+      Top = 82
       Width = 99
       Height = 18
       TabOrder = 23
@@ -951,8 +951,10 @@ inherited frmSalesConInPut: TfrmSalesConInPut
       BorderStyle = cxcbsNone
       PopupMenu = pm_sub
       TabOrder = 0
+      ExplicitLeft = 4
       object Tv1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         OnFocusedRecordChanged = Tv1FocusedRecordChanged
         DataController.DataSource = DS_1
         DataController.Filter.AutoDataSetFilter = True
@@ -999,6 +1001,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
           Tag = 9
           Caption = #36873#25321
           DataBinding.FieldName = 'SSel'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxCheckBoxProperties'
           Properties.ImmediatePost = True
           Properties.NullStyle = nssUnchecked
@@ -1008,6 +1011,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object v1XHNo: TcxGridDBColumn
           Caption = #24207#21495
           DataBinding.FieldName = 'SerialNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Sorting = False
           SortIndex = 0
@@ -1018,6 +1022,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object VC_SCSCode: TcxGridDBColumn
           Caption = #20135#21697#32534#21495
           DataBinding.FieldName = 'C_Code'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -1033,6 +1038,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object v1Column4: TcxGridDBColumn
           Caption = #20135#21697#21517#31216
           DataBinding.FieldName = 'C_Name'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Sorting = False
@@ -1041,6 +1047,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object Tv1Column3: TcxGridDBColumn
           Caption = #20135#21697#33521#25991#21517
           DataBinding.FieldName = 'C_EName'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -1056,6 +1063,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object v1Column5: TcxGridDBColumn
           Caption = #35268#26684
           DataBinding.FieldName = 'C_Spec'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Sorting = False
           Width = 60
@@ -1063,6 +1071,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object v1Column1: TcxGridDBColumn
           Caption = #25104#20998
           DataBinding.FieldName = 'C_Composition'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Sorting = False
@@ -1071,6 +1080,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object Tv1Column5: TcxGridDBColumn
           Caption = #39068#33394
           DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Sorting = False
           Width = 70
@@ -1078,6 +1088,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object v1Column8: TcxGridDBColumn
           Caption = #33394#21495
           DataBinding.FieldName = 'C_ColorNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Sorting = False
           Width = 57
@@ -1085,6 +1096,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object Tv1Column1: TcxGridDBColumn
           Caption = #27454#21495
           DataBinding.FieldName = 'C_StyleNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Sorting = False
           Width = 77
@@ -1092,6 +1104,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object Tv1Column8: TcxGridDBColumn
           Caption = #33457#22411
           DataBinding.FieldName = 'C_Pattern'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Sorting = False
           Width = 70
@@ -1099,6 +1112,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object v1Column6: TcxGridDBColumn
           Caption = #38376#24133
           DataBinding.FieldName = 'C_Width'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -1114,6 +1128,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object v1Column7: TcxGridDBColumn
           Caption = #20811#37325
           DataBinding.FieldName = 'C_GramWeight'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -1129,6 +1144,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object Tv1Column6: TcxGridDBColumn
           Caption = #25968#37327
           DataBinding.FieldName = 'ConQty'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
           HeaderAlignmentHorz = taCenter
@@ -1137,6 +1153,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object v1OrderUnit: TcxGridDBColumn
           Caption = #21333#20301
           DataBinding.FieldName = 'ConUnit'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxComboBoxProperties'
           Properties.DropDownListStyle = lsEditFixedList
           Properties.Items.Strings = (
@@ -1151,6 +1168,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object v1PRTPrice: TcxGridDBColumn
           Caption = #21333#20215
           DataBinding.FieldName = 'ConPrice'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
           HeaderAlignmentHorz = taCenter
@@ -1161,6 +1179,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object Tv1Column9: TcxGridDBColumn
           Caption = #37329#39069
           DataBinding.FieldName = 'ConTotalAmount'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           HeaderAlignmentHorz = taCenter
           Options.Sorting = False
@@ -1169,6 +1188,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object Tv1Column2: TcxGridDBColumn
           Caption = #39044#20272#25104#26412
           DataBinding.FieldName = 'Estimated'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Sorting = False
@@ -1176,6 +1196,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object Tv1Column4: TcxGridDBColumn
           Caption = #21033#28070#29575
           DataBinding.FieldName = 'ProfitRate'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Sorting = False
@@ -1183,6 +1204,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object v1Column2: TcxGridDBColumn
           Caption = #22791#27880
           DataBinding.FieldName = 'ConSNote'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Sorting = False
           Width = 70
@@ -1297,6 +1319,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
       TabOrder = 1
       object TV2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DataSource2
         DataController.Filter.AutoDataSetFilter = True
         DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -1339,6 +1362,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object TV2Column2: TcxGridDBColumn
           Caption = #21512#21516#23376#34920
           DataBinding.FieldName = 'Consid'
+          DataBinding.IsNullValueType = True
           Visible = False
           HeaderAlignmentHorz = taCenter
           Width = 107
@@ -1346,18 +1370,21 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         object TV2Column1: TcxGridDBColumn
           Caption = #24207#21495
           DataBinding.FieldName = 'SerialNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 41
         end
         object TV2Column3: TcxGridDBColumn
           Caption = #39033#30446
           DataBinding.FieldName = 'CB_Name'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 86
         end
         object TV2Column4: TcxGridDBColumn
           Caption = #25968#37327
           DataBinding.FieldName = 'CB_Price'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 91
         end

B01基础合同管理/U_SalesConInPut.pas

@@ -14,7 +14,8 @@ uses
   dxDateRanges, dxBarBuiltInMenu, dxDateTimeWheelPicker, dxGDIPlusClasses,
   Vcl.Menus, MovePanel, cxCheckBox, cxImage, cxDBEdit, Vcl.DBCtrls, U_BaseInput,
   System.ImageList, Vcl.ImgList, IdBaseComponent, IdComponent, IdTCPConnection,
-  IdTCPClient, IdExplicitTLSClientServerBase, IdFTP, ShellAPI, cxSplitter;
+  IdTCPClient, IdExplicitTLSClientServerBase, IdFTP, ShellAPI, cxSplitter,
+  dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmSalesConInPut = class(TfrmBaseInput)

B01基础合同管理/U_SalesContractList.dfm

@@ -197,6 +197,7 @@ inherited frmSalesContractList: TfrmSalesContractList
     TabOrder = 3
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnCellDblClick = Tv1CellDblClick
       OnCustomDrawCell = Tv1CustomDrawCell
       OnFocusedRecordChanged = Tv1FocusedRecordChanged
@@ -224,6 +225,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1Column4: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         Properties.NullStyle = nssUnchecked
@@ -234,6 +236,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1OrdDate: TcxGridDBColumn
         Caption = #19979#21333#26085#26399
         DataBinding.FieldName = 'ConDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
@@ -245,6 +248,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1DeliveryDate: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
@@ -256,6 +260,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1ConNo: TcxGridDBColumn
         Caption = #21512#21516#21495
         DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -265,6 +270,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1Column1: TcxGridDBColumn
         Caption = #32463#33829#21333#20301
         DataBinding.FieldName = 'SellName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -274,6 +280,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1CustomerNoName: TcxGridDBColumn
         Caption = #23458#25143
         DataBinding.FieldName = 'BuyName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -283,6 +290,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object Tv1Column1: TcxGridDBColumn
         Caption = #20013#38388#21830
         DataBinding.FieldName = 'MiddleName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -292,6 +300,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object Tv1Column19: TcxGridDBColumn
         Caption = #20132#26399#35828#26126
         DataBinding.FieldName = 'ShippMent'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 271
@@ -299,6 +308,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1Column9: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'note'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -306,6 +316,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object Tv1Column14: TcxGridDBColumn
         Caption = #20215#26684#26415#35821
         DataBinding.FieldName = 'JiaGeSY'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -313,6 +324,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object Tv1Column7: TcxGridDBColumn
         Caption = #24065#31181
         DataBinding.FieldName = 'Currency'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -320,6 +332,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1Column8: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 86
@@ -327,6 +340,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1OrdPerson1: TcxGridDBColumn
         Caption = #38144#21806#21592
         DataBinding.FieldName = 'Saleser'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -335,6 +349,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       end
       object v1Column10: TcxGridDBColumn
         DataBinding.FieldName = 'status'
+        DataBinding.IsNullValueType = True
         Visible = False
         Options.Editing = False
         VisibleForCustomization = False
@@ -342,6 +357,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1Column12: TcxGridDBColumn
         Caption = #21512#21516#38468#20214
         DataBinding.FieldName = 'ISFJ'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.NullStyle = nssUnchecked
         HeaderAlignmentHorz = taCenter
@@ -351,6 +367,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1Column13: TcxGridDBColumn
         Caption = #21046#21333#20154
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 78
@@ -358,18 +375,21 @@ inherited frmSalesContractList: TfrmSalesContractList
       object Tv1Column2: TcxGridDBColumn
         Caption = #26159#21542#21547#31246
         DataBinding.FieldName = 'IsTax'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
       end
       object Tv1Column9: TcxGridDBColumn
         Caption = #26159#21542#21547#36816
         DataBinding.FieldName = 'ISYF'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 69
       end
       object Tv1Column3: TcxGridDBColumn
         Caption = #36215#36816#28207
         DataBinding.FieldName = 'QiYun'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -377,6 +397,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object Tv1Column4: TcxGridDBColumn
         Caption = #30446#30340#28207
         DataBinding.FieldName = 'MuDi'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -385,6 +406,7 @@ inherited frmSalesContractList: TfrmSalesContractList
         Tag = 2
         Caption = #28322#30701#35013
         DataBinding.FieldName = 'QtyNote'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -392,6 +414,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object Tv1Column6: TcxGridDBColumn
         Caption = #27719#29575
         DataBinding.FieldName = 'huilv'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -399,6 +422,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object Tv1Column25: TcxGridDBColumn
         Caption = #31867#22411
         DataBinding.FieldName = 'SCMType'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -406,6 +430,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object Tv1Column27: TcxGridDBColumn
         Caption = #29702#21333
         DataBinding.FieldName = 'lidan'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 58
@@ -413,6 +438,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object Tv1Column8: TcxGridDBColumn
         Caption = #29366#24577
         DataBinding.FieldName = 'ZT'
+        DataBinding.IsNullValueType = True
         Width = 40
       end
     end
@@ -718,6 +744,7 @@ inherited frmSalesContractList: TfrmSalesContractList
     TabOrder = 5
     object TV2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_2
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -763,6 +790,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1XHNo: TcxGridDBColumn
         Caption = #24207#21495
         DataBinding.FieldName = 'SerialNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         SortIndex = 0
@@ -773,6 +801,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object VC_SCSCode: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -787,6 +816,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object cxGridDBColumn2: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -794,6 +824,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object cxGridDBColumn3: TcxGridDBColumn
         Caption = #20135#21697#33521#25991#21517
         DataBinding.FieldName = 'C_EName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -808,6 +839,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1Column5: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -816,6 +848,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object cxGridDBColumn4: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -823,6 +856,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object cxGridDBColumn5: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -830,6 +864,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object cxGridDBColumn6: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -838,6 +873,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object cxGridDBColumn7: TcxGridDBColumn
         Caption = #27454#21495
         DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -846,6 +882,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object cxGridDBColumn8: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -861,6 +898,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1Column6: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -874,6 +912,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1Column7: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -887,6 +926,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1PRTOrderQty: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'ConQty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -896,6 +936,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1OrderUnit: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'ConUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsEditFixedList
         Properties.Items.Strings = (
@@ -910,6 +951,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1PRTPrice: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'ConPrice'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -920,6 +962,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object cxGridDBColumn9: TcxGridDBColumn
         Caption = #37329#39069
         DataBinding.FieldName = 'ConTotalAmount'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -928,6 +971,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       object v1Column2: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'ConSNote'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -935,12 +979,14 @@ inherited frmSalesContractList: TfrmSalesContractList
       object TV2Column1: TcxGridDBColumn
         Caption = #39044#20272#25104#26412
         DataBinding.FieldName = 'Estimated'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
       object TV2Column2: TcxGridDBColumn
         Caption = #21033#28070#29575
         DataBinding.FieldName = 'ProfitRate'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 54
       end

B01基础合同管理/U_SalesContractList.pas

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

T02贸易汇总仓库/U_TradePackClothOutList.dfm

@@ -434,7 +434,7 @@ inherited frmTradePackClothOutList: TfrmTradePackClothOutList
       object v1Column14: TcxGridDBColumn
         Tag = 2
         Caption = #26469#33258#21333#20301
-        DataBinding.FieldName = 'FromCoName'
+        DataBinding.FieldName = 'StkCoName'
         DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Alignment.Horz = taLeftJustify

T03贸易布匹检验/ProjectGroup1.groupproj.local

@@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-    <Projects ActiveProject="D:\Dp10Repo\项目代码\骉骐\T03贸易布匹检验\testDll.dproj"/>
+		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10myBiaoqi\T03贸易布匹检验\TradeInsp.dproj"/>
 	</Default.Personality>
 </BorlandProject>

T03贸易布匹检验/TradeInsp.skincfg

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