diff --git a/检验管理/ProjectGroup1.bpg b/检验管理/ProjectGroup1.bpg index 7c050f6..6a460d7 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) #------------------------------------------------------------------------------ -testDll.exe: testDll.dpr +TradeManage.dll: ..\..\D7DJlongsheng\\TradeManage.dpr $(DCC) -ProductPrice.dll: ProductPrice.dpr +testDll.exe: ..\..\D7DJlongsheng\\testDll.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 4e5d72b..6bdef09 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\˶\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJqianjing\\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.skincfg b/检验管理/TradeManage.skincfg new file mode 100644 index 0000000..554ddb0 --- /dev/null +++ b/检验管理/TradeManage.skincfg @@ -0,0 +1,50 @@ +[ExpressSkins] +Default=1 +ShowNotifications=1 +Enabled=0 +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 +dxSkinPumpkin=1 +dxSkinSeven=1 +dxSkinSevenClassic=1 +dxSkinSharp=1 +dxSkinSharpPlus=1 +dxSkinSilver=1 +dxSkinSpringTime=1 +dxSkinStardust=1 +dxSkinSummer2008=1 +dxSkinTheAsphaltWorld=1 +dxSkinsDefaultPainters=1 +dxSkinValentine=1 +dxSkinVS2010=1 +dxSkinWhiteprint=1 +dxSkinXmas2008Blue=1 diff --git a/检验管理/U_GetDllForm.pas b/检验管理/U_GetDllForm.pas index d491d46..04ade69 100644 --- a/检验管理/U_GetDllForm.pas +++ b/检验管理/U_GetDllForm.pas @@ -84,7 +84,7 @@ begin //DCode:='ADMIN'; //DName:='ADMIN'; // DParameters2:='Ʒ'; -// DParameters2:=''; + DParameters2:=''; if not ConnData() then begin result := 0; diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm index ae479fd..064e045 100644 --- a/检验管理/U_JYOrderCDOne.dfm +++ b/检验管理/U_JYOrderCDOne.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne - Left = -8 - Top = -8 + Left = 405 + Top = 314 Width = 1382 Height = 754 Caption = #26816#39564#25253#21578 @@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1366 + Width = 1374 Height = 62 AutoSize = True ButtonHeight = 30 @@ -237,7 +237,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object Panel1: TPanel Left = 0 Top = 62 - Width = 1366 + Width = 1374 Height = 88 Align = alTop BevelInner = bvRaised @@ -758,8 +758,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object cxGrid1: TcxGrid Left = 0 Top = 150 - Width = 1366 - Height = 566 + Width = 1374 + Height = 573 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 @@ -1075,6 +1075,13 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne HeaderAlignmentHorz = taCenter Width = 60 end + object Tv1Column4: TcxGridDBColumn + Caption = #20986#24211#26085#26399 + DataBinding.FieldName = 'CkTime' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 70 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas index 024dd54..db7e455 100644 --- a/检验管理/U_JYOrderCDOne.pas +++ b/检验管理/U_JYOrderCDOne.pas @@ -186,6 +186,7 @@ type conNo: TEdit; Label33: TLabel; Tv1Column3: TcxGridDBColumn; + Tv1Column4: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -1707,7 +1708,9 @@ begin begin Close; sql.Clear; - sql.Add('update WFB_MJJY set CKFlag=''ѳ'' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); + sql.Add('update WFB_MJJY set CKFlag=''ѳ'' '); + sql.Add(' ckTime=Getdate(),Cker=''' + trim(DName) + ''''); + sql.add(' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); ExecSQL; end;