From 7a067e88c9ce06b1eecc8ea9236b736b71b9b813 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Mon, 18 Aug 2025 16:29:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=A0=81=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 检验管理/ProjectGroup1.bpg | 8 +++---- 检验管理/ProjectGroup1.~bpg | 23 +++++++++++++++++++ 检验管理/TradeManage.dof | 5 +---- 检验管理/TradeManage.dpr | 2 +- 检验管理/U_JYOrderCDOne.dfm | 11 ++++----- 检验管理/U_JYOrderCDOne.pas | 45 +++++++++++++++++++++++++++++++++---- 检验管理/testDll.cfg | 4 ++-- 检验管理/testDll.dof | 2 +- 8 files changed, 79 insertions(+), 21 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 0d418e6..014d54a 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\ҫ\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJjunyao\\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/检验管理/TradeManage.dpr b/检验管理/TradeManage.dpr index dd7f318..b5991a7 100644 --- a/检验管理/TradeManage.dpr +++ b/检验管理/TradeManage.dpr @@ -3,7 +3,7 @@ uses SysUtils, classes, forms, - WinTypes, + WinTypes, WinProcs, U_DataLink in 'U_DataLink.pas' {DataLink_TradeManage: TDataModule}, U_GetDllForm in 'U_GetDllForm.pas', diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm index b59904a..d18b41b 100644 --- a/检验管理/U_JYOrderCDOne.dfm +++ b/检验管理/U_JYOrderCDOne.dfm @@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1374 + Width = 1366 Height = 62 AutoSize = True ButtonHeight = 30 @@ -200,7 +200,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #31859#25968#30721#21333'('#25171#21253')' #30721#25968#30721#21333'('#25171#21253')' 'po'#30721#21333 - #19968#21015#30721#21333) + #19968#21015#30721#21333 + #26816#39564#30721#21333'('#38271#24230')') end object ToolButton9: TToolButton Left = 664 @@ -230,7 +231,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object Panel1: TPanel Left = 0 Top = 62 - Width = 1374 + Width = 1366 Height = 88 Align = alTop BevelInner = bvRaised @@ -730,8 +731,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object cxGrid1: TcxGrid Left = 0 Top = 150 - Width = 1374 - Height = 573 + Width = 1366 + Height = 565 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas index df0dfd7..fb6d610 100644 --- a/检验管理/U_JYOrderCDOne.pas +++ b/检验管理/U_JYOrderCDOne.pas @@ -11,7 +11,20 @@ uses cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, - cxCurrencyEdit; + cxCurrencyEdit, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, + dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, + dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, + dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmJYOrderCDOne = class(TForm) @@ -1434,7 +1447,7 @@ begin ExecSQL; end; - if (trim(ComboBox1.Text) = '뵥BG') or (trim(ComboBox1.Text) = '뵥ST') or (trim(ComboBox1.Text) = '뵥02') or (trim(ComboBox1.Text) = '뵥BT') or (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = 'po뵥') then + if (trim(ComboBox1.Text) = '뵥BG') or (trim(ComboBox1.Text) = '뵥ST') or (trim(ComboBox1.Text) = '뵥02') or (trim(ComboBox1.Text) = '뵥BT') or (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = 'po뵥') then begin with ADOQueryTemp do begin @@ -1459,7 +1472,7 @@ begin end; end; - if (trim(ComboBox1.Text) = 'һ뵥') then + if (trim(ComboBox1.Text) = 'һ뵥') then begin with ADOQueryTemp do begin @@ -1477,7 +1490,7 @@ begin Close; sql.Clear; sql.add('exec P_Do_PrintMd_HZ '); - sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add('@mainID=' + quotedstr(Trim(''))); sql.add(',@DName=' + quotedstr(Trim(DCode))); sql.add(',@flag=''2'' '); Open; @@ -1508,7 +1521,31 @@ begin Open; end; end; + if (trim(ComboBox1.Text) = '뵥()') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Do_PrintMd10 '); + sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + Open; + end; + SCreateCDS20(ADOQueryTemp, CDS_HZ); + SInitCDSData20(ADOQueryTemp, CDS_HZ); + with ADOQueryPrint do + begin + Close; + sql.Clear; + sql.add('exec P_Do_PrintMd_HZ '); + sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add(',@flag=''2'' '); + Open; + end; + end; if trim(ComboBox1.Text) = '뵥' then begin with ADOQueryTemp do 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..5274119 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\Ŀ\D7DJjunyao\\testDll.exe Launcher= UseLauncher=0 DebugCWD=