diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof index bd982d3..74cfe6b 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\֣ƽ\Ŀ\ľ\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7djWenjuan\\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..0bd3d07 --- /dev/null +++ b/检验管理/TradeManage.skincfg @@ -0,0 +1,50 @@ +[ExpressSkins] +Default=1 +ShowNotifications=1 +Enabled=1 +dxSkinBlack=0 +dxSkinBlue=0 +dxSkinBlueprint=0 +dxSkinCaramel=0 +dxSkinCoffee=0 +dxSkinDarkRoom=0 +dxSkinDarkSide=0 +dxSkinDevExpressDarkStyle=0 +dxSkinDevExpressStyle=0 +dxSkinFoggy=0 +dxSkinGlassOceans=0 +dxSkinHighContrast=0 +dxSkiniMaginary=0 +dxSkinLilian=0 +dxSkinLiquidSky=0 +dxSkinLondonLiquidSky=0 +dxSkinMcSkin=0 +dxSkinMetropolis=0 +dxSkinMetropolisDark=0 +dxSkinMoneyTwins=0 +dxSkinOffice2007Black=0 +dxSkinOffice2007Blue=0 +dxSkinOffice2007Green=0 +dxSkinOffice2007Pink=0 +dxSkinOffice2007Silver=0 +dxSkinOffice2010Black=0 +dxSkinOffice2010Blue=0 +dxSkinOffice2010Silver=0 +dxSkinOffice2013DarkGray=0 +dxSkinOffice2013LightGray=0 +dxSkinOffice2013White=0 +dxSkinPumpkin=0 +dxSkinSeven=0 +dxSkinSevenClassic=0 +dxSkinSharp=0 +dxSkinSharpPlus=0 +dxSkinSilver=0 +dxSkinSpringTime=0 +dxSkinStardust=0 +dxSkinSummer2008=0 +dxSkinTheAsphaltWorld=0 +dxSkinsDefaultPainters=1 +dxSkinValentine=0 +dxSkinVS2010=0 +dxSkinWhiteprint=0 +dxSkinXmas2008Blue=0 diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm index 8e8a7e2..7725be6 100644 --- a/检验管理/U_JYOrderCDOne.dfm +++ b/检验管理/U_JYOrderCDOne.dfm @@ -1,6 +1,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne - Left = 211 - Top = 81 + Left = 180 + Top = 134 Width = 1378 Height = 754 Caption = #26816#39564#25253#21578 @@ -173,7 +173,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object ComboBox1: TComboBox Left = 515 - Top = 33 + Top = 30 Width = 149 Height = 24 Style = csDropDownList @@ -183,10 +183,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Font.Name = #23435#20307 Font.Style = [] ItemHeight = 16 - ItemIndex = 0 ParentFont = False TabOrder = 0 - Text = #38144#21806#30721#21333'(1'#21015')' Items.Strings = ( #38144#21806#30721#21333'(1'#21015')' #33521#25991#30721#21333 @@ -200,7 +198,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #22810#21367#19968#21253'('#39068#33394')' #38024#32455#24067#21333#21367#21333#21253#35013#31665#21333 #25191#20565#30721#21333 - #25191#20565#30721#21333'('#20844#26020')') + #25191#20565#30721#21333'('#20844#26020')' + #25191#20565#30721#21333'(5'#21015')') end object TBAftChkHX: TToolButton Left = 664 diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas index feed7a6..72ccb51 100644 --- a/检验管理/U_JYOrderCDOne.pas +++ b/检验管理/U_JYOrderCDOne.pas @@ -1849,6 +1849,31 @@ begin end; end; + if (trim(ComboBox1.Text) = 'ִ뵥(5)') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_CKMDYDL_1 '); + 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 FileExists(fPrintFile) then begin RM1.LoadFromFile(fPrintFile); diff --git a/检验管理/U_testdll.dfm b/检验管理/U_testdll.dfm index b1d8f4c..af605a3 100644 --- a/检验管理/U_testdll.dfm +++ b/检验管理/U_testdll.dfm @@ -1,6 +1,6 @@ object Form1: TForm1 - Left = 153 - Top = 124 + Left = 444 + Top = 147 Width = 791 Height = 554 Caption = 'Form1' 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