diff --git a/ProjectGroup1.bpg b/ProjectGroup1.bpg new file mode 100644 index 0000000..c22ec2b --- /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 = TradeManage.dll testDll.exe +#------------------------------------------------------------------------------ +default: $(PROJECTS) +#------------------------------------------------------------------------------ + +TradeManage.dll: 检验管理\TradeManage.dpr + $(DCC) + +testDll.exe: 检验管理\testDll.dpr + $(DCC) + + diff --git a/妫楠岀鐞/TradeManage.dof b/妫楠岀鐞/TradeManage.dof index 0fc37f2..49ee4cc 100644 --- a/妫楠岀鐞/TradeManage.dof +++ b/妫楠岀鐞/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\徐加艳项目代码\项目代码\鹏辉\检验管理\testDll.exe +HostApplication=D:\Dp7Repo\项目代码\D7DJpenghui\检验管理\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_JYOrderCDOne.dfm b/妫楠岀鐞/U_JYOrderCDOne.dfm index 420e95b..6e603fe 100644 --- a/妫楠岀鐞/U_JYOrderCDOne.dfm +++ b/妫楠岀鐞/U_JYOrderCDOne.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne - Left = 238 - Top = 85 + Left = 219 + Top = 95 Width = 1391 Height = 718 Caption = #26816#39564#25253#21578 @@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1375 + Width = 1383 Height = 62 AutoSize = True ButtonHeight = 30 @@ -282,7 +282,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object Panel1: TPanel Left = 0 Top = 62 - Width = 1375 + Width = 1383 Height = 88 Align = alTop BevelInner = bvRaised @@ -811,8 +811,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object cxGrid1: TcxGrid Left = 0 Top = 150 - Width = 1375 - Height = 529 + Width = 1383 + Height = 537 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 diff --git a/妫楠岀鐞/U_JYOrderCDOne.pas b/妫楠岀鐞/U_JYOrderCDOne.pas index d9fe4c4..9476c5c 100644 --- a/妫楠岀鐞/U_JYOrderCDOne.pas +++ b/妫楠岀鐞/U_JYOrderCDOne.pas @@ -1764,7 +1764,7 @@ begin end; end; - if (trim(ComboBox1.Text) = '检验码单(中文)') then + if (trim(ComboBox1.Text) = '检验码单(中文)') or (trim(ComboBox1.Text) = '盈荟码单') then begin with ADOQueryTemp do begin diff --git a/妫楠岀鐞/U_ProductOrderNewList.dfm b/妫楠岀鐞/U_ProductOrderNewList.dfm index 3d3dbb4..ba57fe8 100644 --- a/妫楠岀鐞/U_ProductOrderNewList.dfm +++ b/妫楠岀鐞/U_ProductOrderNewList.dfm @@ -1,6 +1,6 @@ object frmProductOrderNewList: TfrmProductOrderNewList - Left = 352 - Top = 210 + Left = 247 + Top = 234 Width = 1382 Height = 754 Caption = #21253#35013#25351#31034#21333 @@ -20,7 +20,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1366 + Width = 1374 + Height = 62 AutoSize = True ButtonHeight = 30 ButtonWidth = 95 @@ -109,66 +110,67 @@ object frmProductOrderNewList: TfrmProductOrderNewList AutoSize = True Caption = #35746#21333#23436#25104 ImageIndex = 41 + Wrap = True OnClick = TWCClick end object TNoWC: TToolButton - Left = 591 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #25764#38144#23436#25104 ImageIndex = 86 OnClick = TNoWCClick end object TBExport: TToolButton - Left = 678 - Top = 0 + Left = 87 + Top = 30 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object TFJ: TToolButton - Left = 741 - Top = 0 + Left = 150 + Top = 30 AutoSize = True Caption = #25351#31034#21333#38468#20214 ImageIndex = 57 OnClick = TFJClick end object TBPrint: TToolButton - Left = 840 - Top = 0 + Left = 249 + Top = 30 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = TBPrintClick end object ToolButton4: TToolButton - Left = 903 - Top = 0 + Left = 312 + Top = 30 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton4Click end object ToolButton5: TToolButton - Left = 990 - Top = 0 + Left = 399 + Top = 30 Caption = #30133#28857#31649#29702 ImageIndex = 132 OnClick = ToolButton5Click end object ToolButton6: TToolButton - Left = 1085 - Top = 0 + Left = 494 + Top = 30 AutoSize = True Caption = #26085#24535 ImageIndex = 72 OnClick = ToolButton6Click end object TBClose: TToolButton - Left = 1148 - Top = 0 + Left = 557 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -177,8 +179,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel1: TPanel Left = 0 - Top = 32 - Width = 1366 + Top = 62 + Width = 1374 Height = 40 Align = alTop BevelInner = bvRaised @@ -406,8 +408,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxGrid1: TcxGrid Left = 0 - Top = 95 - Width = 1366 + Top = 125 + Width = 1374 Height = 333 Align = alTop TabOrder = 3 @@ -755,8 +757,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxSplitter1: TcxSplitter Left = 0 - Top = 451 - Width = 1366 + Top = 459 + Width = 1374 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom @@ -764,8 +766,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel2: TPanel Left = 0 - Top = 459 - Width = 1366 + Top = 467 + Width = 1374 Height = 256 Align = alBottom Caption = 'Panel2' @@ -773,7 +775,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxGrid2: TcxGrid Left = 1 Top = 1 - Width = 987 + Width = 995 Height = 254 Align = alClient TabOrder = 0 @@ -1088,7 +1090,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList end end object GroupBox1: TGroupBox - Left = 988 + Left = 996 Top = 1 Width = 377 Height = 254 @@ -1117,8 +1119,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxTabControl1: TcxTabControl Left = 0 - Top = 72 - Width = 1366 + Top = 102 + Width = 1374 Height = 23 Align = alTop TabOrder = 2 @@ -1131,7 +1133,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 23 - ClientRectRight = 1366 + ClientRectRight = 1374 ClientRectTop = 19 end object cxGridPopupMenu1: TcxGridPopupMenu diff --git a/妫楠岀鐞/U_ProductOrderNewList.pas b/妫楠岀鐞/U_ProductOrderNewList.pas index 1801f69..12e0eae 100644 --- a/妫楠岀鐞/U_ProductOrderNewList.pas +++ b/妫楠岀鐞/U_ProductOrderNewList.pas @@ -12,7 +12,7 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxContainer, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, shellAPI, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxBarBuiltInMenu; + dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter; type TfrmProductOrderNewList = class(TForm)