From e8e56e282823d4a46f58fc322de54b7508f33925 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Sat, 20 Sep 2025 10:20:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=BC=96=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BC=96=E5=8F=B7=E9=83=BD=E6=94=B9=E6=88=90?= =?UTF-8?q?CF=E5=BC=80=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectGroup1.bpg | 6 ++-- .../U_ConInPutNX.pas | 3 +- 客户供应商管理(Company.dll)/Company.dof | 2 +- 客户供应商管理(Company.dll)/ProjectGroup1.bpg | 6 ++-- 客户供应商管理(Company.dll)/U_Customer.dfm | 17 +++++----- 客户供应商管理(Company.dll)/U_Customer.pas | 1 + .../U_CustomerInput.dfm | 14 ++++----- .../U_CustomerInput.pas | 3 +- 客户供应商管理(Company.dll)/U_GetDllForm.pas | 31 ++++++++++++++----- .../ProjectGroup1.bpg | 6 ++-- 10 files changed, 55 insertions(+), 34 deletions(-) diff --git a/合同管理(ContractManagement.dll)/ProjectGroup1.bpg b/合同管理(ContractManagement.dll)/ProjectGroup1.bpg index fd380d3..d5c7104 100644 --- a/合同管理(ContractManagement.dll)/ProjectGroup1.bpg +++ b/合同管理(ContractManagement.dll)/ProjectGroup1.bpg @@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = ContractManagement.dll testDll.exe +PROJECTS = Company.dll testDll.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ -ContractManagement.dll: ContractManagement.dpr +Company.dll: ..\ͻӦ̹(Company.dll)\Company.dpr $(DCC) -testDll.exe: testDll.dpr +testDll.exe: ..\ͻӦ̹(Company.dll)\testDll.dpr $(DCC) diff --git a/合同管理(ContractManagement.dll)/U_ConInPutNX.pas b/合同管理(ContractManagement.dll)/U_ConInPutNX.pas index 1018438..7ff25c1 100644 --- a/合同管理(ContractManagement.dll)/U_ConInPutNX.pas +++ b/合同管理(ContractManagement.dll)/U_ConInPutNX.pas @@ -318,7 +318,8 @@ begin end; if trim(ConNo.Text) = 'Զ' then begin - if GetLSNo(ADOCmd, fconNO, 'LH', 'Contract_Main', 2, 1) = False then +// if GetLSNo(ADOCmd, fconNO, 'LH', 'Contract_Main', 2, 1) = False then + if GetLSNo(ADOCmd, fconNO, 'CF', 'Contract_Main', 2, 1) = False then begin ADOCmd.Connection.RollbackTrans; Application.MessageBox('ȡͬʧ!', 'ʾ', 0); diff --git a/客户供应商管理(Company.dll)/Company.dof b/客户供应商管理(Company.dll)/Company.dof index e4df7e9..69eeaac 100644 --- a/客户供应商管理(Company.dll)/Company.dof +++ b/客户供应商管理(Company.dll)/Company.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\Ŀ\·\ͻӦ̹(Company.dll)\testDll.exe +HostApplication=D:\Ŀ\D7szChenfeng\ͻӦ̹(Company.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/客户供应商管理(Company.dll)/ProjectGroup1.bpg b/客户供应商管理(Company.dll)/ProjectGroup1.bpg index 7c050f6..3b2a1ae 100644 --- a/客户供应商管理(Company.dll)/ProjectGroup1.bpg +++ b/客户供应商管理(Company.dll)/ProjectGroup1.bpg @@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = testDll.exe ProductPrice.dll +PROJECTS = ContractManagement.dll testDll.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ -testDll.exe: testDll.dpr +ContractManagement.dll: ..\ͬ(ContractManagement.dll)\ContractManagement.dpr $(DCC) -ProductPrice.dll: ProductPrice.dpr +testDll.exe: ..\ͬ(ContractManagement.dll)\testDll.dpr $(DCC) diff --git a/客户供应商管理(Company.dll)/U_Customer.dfm b/客户供应商管理(Company.dll)/U_Customer.dfm index 1f3d16d..bf21806 100644 --- a/客户供应商管理(Company.dll)/U_Customer.dfm +++ b/客户供应商管理(Company.dll)/U_Customer.dfm @@ -1,6 +1,6 @@ object frmCustomer: TfrmCustomer - Left = 191 - Top = 114 + Left = 232 + Top = 249 Width = 1388 Height = 650 Caption = #23458#25143#36164#26009#31649#29702 @@ -21,7 +21,7 @@ object frmCustomer: TfrmCustomer object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1372 + Width = 1380 Height = 31 ButtonHeight = 30 ButtonWidth = 95 @@ -102,7 +102,7 @@ object frmCustomer: TfrmCustomer object Panel1: TPanel Left = 0 Top = 31 - Width = 1372 + Width = 1380 Height = 39 Align = alTop BevelInner = bvRaised @@ -177,8 +177,8 @@ object frmCustomer: TfrmCustomer object cxGrid2: TcxGrid Left = 0 Top = 70 - Width = 1372 - Height = 337 + Width = 1380 + Height = 345 Align = alClient TabOrder = 2 object Tv2: TcxGridDBTableView @@ -187,6 +187,7 @@ object frmCustomer: TfrmCustomer Navigator.Buttons.Delete.Visible = False OnFocusedRecordChanged = Tv2FocusedRecordChanged DataController.DataSource = DS_HZ + DataController.Filter.AutoDataSetFilter = True DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < item @@ -289,8 +290,8 @@ object frmCustomer: TfrmCustomer end object cxGrid1: TcxGrid Left = 0 - Top = 407 - Width = 1372 + Top = 415 + Width = 1380 Height = 204 Align = alBottom TabOrder = 3 diff --git a/客户供应商管理(Company.dll)/U_Customer.pas b/客户供应商管理(Company.dll)/U_Customer.pas index 2870ea5..06d1f4f 100644 --- a/客户供应商管理(Company.dll)/U_Customer.pas +++ b/客户供应商管理(Company.dll)/U_Customer.pas @@ -142,6 +142,7 @@ begin if Trim(canshu1) = 'ҵԱ' then sql.Add(' and YwyName=' + quotedstr(trim(DName))); Open; + //ShowMessage(SQL.Text); end; SCreateCDS20(ADOQueryMain, CDS_HZ); SInitCDSData20(ADOQueryMain, CDS_HZ); diff --git a/客户供应商管理(Company.dll)/U_CustomerInput.dfm b/客户供应商管理(Company.dll)/U_CustomerInput.dfm index 549a085..28c3131 100644 --- a/客户供应商管理(Company.dll)/U_CustomerInput.dfm +++ b/客户供应商管理(Company.dll)/U_CustomerInput.dfm @@ -1,6 +1,6 @@ object frmCustomerInput: TfrmCustomerInput - Left = 261 - Top = 149 + Left = 210 + Top = 420 Width = 1123 Height = 574 Caption = #23458#25143#36164#26009#24405#20837 @@ -20,7 +20,7 @@ object frmCustomerInput: TfrmCustomerInput object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1107 + Width = 1115 Height = 31 ButtonHeight = 30 ButtonWidth = 59 @@ -53,7 +53,7 @@ object frmCustomerInput: TfrmCustomerInput object ToolBar2: TToolBar Left = 0 Top = 225 - Width = 1107 + Width = 1115 Height = 31 ButtonHeight = 30 ButtonWidth = 119 @@ -102,8 +102,8 @@ object frmCustomerInput: TfrmCustomerInput object cxGrid1: TcxGrid Left = 0 Top = 256 - Width = 1107 - Height = 279 + Width = 1115 + Height = 287 Align = alClient TabOrder = 3 object Tv1: TcxGridDBTableView @@ -206,7 +206,7 @@ object frmCustomerInput: TfrmCustomerInput object ScrollBox1: TScrollBox Left = 0 Top = 31 - Width = 1107 + Width = 1115 Height = 194 Align = alTop BevelInner = bvNone diff --git a/客户供应商管理(Company.dll)/U_CustomerInput.pas b/客户供应商管理(Company.dll)/U_CustomerInput.pas index 55a335e..a72eaa1 100644 --- a/客户供应商管理(Company.dll)/U_CustomerInput.pas +++ b/客户供应商管理(Company.dll)/U_CustomerInput.pas @@ -376,7 +376,8 @@ begin // Application.MessageBox('ͻŲΪ!', 'ʾ', 0); // Exit; // Զȡͻ - if GetLSNo(ADOQueryCmd, FCoCode, 'KH', 'Company', 5, 0) = False then + //if GetLSNo(ADOQueryCmd, FCoCode, 'KH', 'Company', 5, 0) = False then + if GetLSNo(ADOQueryCmd, FCoCode, 'CF', 'Company', 5, 0) = False then begin Application.MessageBox('ȡʧܣ', 'ʾ', 0); diff --git a/客户供应商管理(Company.dll)/U_GetDllForm.pas b/客户供应商管理(Company.dll)/U_GetDllForm.pas index aafe7ed..60bee33 100644 --- a/客户供应商管理(Company.dll)/U_GetDllForm.pas +++ b/客户供应商管理(Company.dll)/U_GetDllForm.pas @@ -66,18 +66,35 @@ begin SetLength(user, 255); SetLength(pswd, 255); - server := '101.132.143.144,7781'; - dtbase := 'chenfengdata'; - user := 'rtsa'; - pswd := 'rightsoft@5740'; - DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; - DConString := DataBaseStr; - //DName := 'ADMIN'; +// server := '101.132.143.144,7781'; +// dtbase := 'chenfengdata'; +// user := 'rtsa'; +// pswd := 'rightsoft@5740'; +// DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; +// DConString := DataBaseStr; + + if trim(DataBaseStr) = '' then + begin + server := '101.132.143.144,7781'; + dtbase := 'chenfengdata'; + user := 'rtsa'; + pswd := 'rightsoft@5740'; + DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; + end + else + begin + DConString := DataBaseStr; + end; + + + +// DName := 'ADMIN'; // DCode := 'ADMINCode'; // DParameters1:='ҵԱ'; // DParameters1 := 'Ա'; // DParameters1:='Ȩ'; // DParameters3:='1'; + if not ConnData() then begin result := 0; diff --git a/成品仓库(FinishedClothWarehouse.dll)/ProjectGroup1.bpg b/成品仓库(FinishedClothWarehouse.dll)/ProjectGroup1.bpg index 7c050f6..d5c7104 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/ProjectGroup1.bpg +++ b/成品仓库(FinishedClothWarehouse.dll)/ProjectGroup1.bpg @@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = testDll.exe ProductPrice.dll +PROJECTS = Company.dll testDll.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ -testDll.exe: testDll.dpr +Company.dll: ..\ͻӦ̹(Company.dll)\Company.dpr $(DCC) -ProductPrice.dll: ProductPrice.dpr +testDll.exe: ..\ͻӦ̹(Company.dll)\testDll.dpr $(DCC)