From acbee7c76efb9eb978a2acfb042499ec82a44e93 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Fri, 21 Nov 2025 09:33:40 +0800 Subject: [PATCH] ~ --- 复合检验管理/ProjectGroup1.bpg | 8 +++---- 复合检验管理/ProjectGroup1.~bpg | 23 ++++++++++++++++++ 复合检验管理/TradeManage.dof | 5 +--- 复合检验管理/U_MJManageNewFDNew.dfm | 36 ++++++++++++++--------------- 复合检验管理/U_MJManageNewFDNew.pas | 8 +++---- 复合检验管理/testDll.cfg | 4 ++-- 复合检验管理/testDll.dof | 2 +- 7 files changed, 53 insertions(+), 33 deletions(-) create mode 100644 复合检验管理/ProjectGroup1.~bpg diff --git a/复合检验管理/ProjectGroup1.bpg b/复合检验管理/ProjectGroup1.bpg index 7c050f6..091c62d 100644 --- a/复合检验管理/ProjectGroup1.bpg +++ b/复合检验管理/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 = TradeManage.dll testDll.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ +TradeManage.dll: TradeManage.dpr + $(DCC) + testDll.exe: testDll.dpr $(DCC) -ProductPrice.dll: ProductPrice.dpr - $(DCC) - diff --git a/复合检验管理/ProjectGroup1.~bpg b/复合检验管理/ProjectGroup1.~bpg new file mode 100644 index 0000000..7c050f6 --- /dev/null +++ b/复合检验管理/ProjectGroup1.~bpg @@ -0,0 +1,23 @@ +#------------------------------------------------------------------------------ +VERSION = BWS.01 +#------------------------------------------------------------------------------ +!ifndef ROOT +ROOT = $(MAKEDIR)\.. +!endif +#------------------------------------------------------------------------------ +MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** +DCC = $(ROOT)\bin\dcc32.exe $** +BRCC = $(ROOT)\bin\brcc32.exe $** +#------------------------------------------------------------------------------ +PROJECTS = testDll.exe ProductPrice.dll +#------------------------------------------------------------------------------ +default: $(PROJECTS) +#------------------------------------------------------------------------------ + +testDll.exe: testDll.dpr + $(DCC) + +ProductPrice.dll: ProductPrice.dpr + $(DCC) + + diff --git a/复合检验管理/TradeManage.dof b/复合检验管理/TradeManage.dof index 6da0054..3f44182 100644 --- a/复合检验管理/TradeManage.dof +++ b/复合检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\\ϼ\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJhongxin\ϼ\testDll.exe Launcher= UseLauncher=0 DebugCWD= @@ -136,6 +136,3 @@ ProductVersion=1.0.0.0 Comments= [Excluded Packages] c:\program files\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package -[HistoryLists\hlUnitAliases] -Count=1 -Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; diff --git a/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm index d128b9a..a698589 100644 --- a/复合检验管理/U_MJManageNewFDNew.dfm +++ b/复合检验管理/U_MJManageNewFDNew.dfm @@ -1197,7 +1197,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label22: TLabel Left = 144 - Top = 460 + Top = 452 Width = 36 Height = 22 Caption = 'g/'#13217 @@ -1210,7 +1210,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label23: TLabel Left = 8 - Top = 459 + Top = 451 Width = 42 Height = 20 Caption = #20811#37325 @@ -1223,17 +1223,16 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label27: TLabel Left = 211 - Top = 501 - Width = 40 - Height = 23 - Caption = #36192#36865 - Font.Charset = ANSI_CHARSET - Font.Color = clRed + Top = 325 + Width = 42 + Height = 20 + Caption = #21152#38271 + Font.Charset = GB2312_CHARSET + Font.Color = clBlue Font.Height = -20 - Font.Name = 'Arial' - Font.Style = [] + Font.Name = #23435#20307 + Font.Style = [fsBold] ParentFont = False - Visible = False end object Label26: TLabel Left = 8 @@ -1530,7 +1529,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 51 Top = 413 Width = 90 - Height = 41 + Height = 33 + AutoSize = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -32 @@ -1576,7 +1576,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object BTPrint: TButton Left = 10 - Top = 496 + Top = 481 Width = 171 Height = 93 Caption = #25552#20132 @@ -1641,9 +1641,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object MJSJKZ: TEdit Left = 51 - Top = 454 + Top = 446 Width = 90 - Height = 41 + Height = 33 + AutoSize = False Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -32 @@ -1655,8 +1656,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnKeyPress = MJstr3KeyPress end object MJQty2: TEdit - Left = 265 - Top = 500 + Left = 260 + Top = 315 Width = 90 Height = 36 Font.Charset = GB2312_CHARSET @@ -1666,7 +1667,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Font.Style = [fsBold] ParentFont = False TabOrder = 17 - Visible = False OnChange = MJQty2Change OnClick = Edit1Click OnKeyDown = MJQty4KeyDown diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas index abb10de..58c5676 100644 --- a/复合检验管理/U_MJManageNewFDNew.pas +++ b/复合检验管理/U_MJManageNewFDNew.pas @@ -1183,7 +1183,7 @@ begin end else begin - FieldByName('MJLen').value := StrToFloat(format('%.' + trim(fxsws) + 'f', [StrToFloatdef(trim(MJLen1.Text), 0) / StrToFloatdef(trim(MC.Text), 1)])) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc; + FieldByName('MJLen').value := StrToFloat(format('%.' + trim(fxsws) + 'f', [StrToFloatdef(trim(MJLen1.Text), 0) / StrToFloatdef(trim(MC.Text), 1)])) + StrToFloatdef(trim(MJQty2.Text), 0) + fjc; end; FieldByName('MJQty1').value := StrToFloatdef(trim(MJQty1.Text), 0); @@ -1871,7 +1871,7 @@ begin Exit; end; end; - end; + end; BTPrint.Enabled := False; Timer1.Enabled := True; @@ -1879,7 +1879,7 @@ begin begin MJMaoZ.Text := ''; MJQty1.Text := ''; - MJQty2.Text := ''; +// MJQty2.Text := ''; Label15.Caption := ''; MJQty4.Text := ''; @@ -2939,7 +2939,7 @@ begin PState := 0; InitCDGrid(); with ADOTmp do - begin + begin close; sql.Clear; sql.Add('select * from WFB_MJJY where MJID=''' + Trim(CDS_MJID.fieldbyname('MJID').AsString) + ''''); diff --git a/复合检验管理/testDll.cfg b/复合检验管理/testDll.cfg index 6c57635..e9c1cc1 100644 --- a/复合检验管理/testDll.cfg +++ b/复合检验管理/testDll.cfg @@ -31,8 +31,8 @@ -M -$M16384,1048576 -K$00400000 --LE"c:\program files\borland\delphi7\Projects\Bpl" --LN"c:\program files\borland\delphi7\Projects\Bpl" +-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl" +-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl" -w-UNSAFE_TYPE -w-UNSAFE_CODE -w-UNSAFE_CAST diff --git a/复合检验管理/testDll.dof b/复合检验管理/testDll.dof index f452c6e..b9b8f97 100644 --- a/复合检验管理/testDll.dof +++ b/复合检验管理/testDll.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\selfware_83398\selfware\ֿ\Ŀ\self\·չó׹\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJhongxin\ϼ\testDll.exe Launcher= UseLauncher=0 DebugCWD=