From 11b73650c78c9329e1ff39f1081d1164162beea8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Sat, 6 Dec 2025 17:10:55 +0800 Subject: [PATCH] ~ --- 检验管理/TradeManage.dof | 2 +- 检验管理/TradeManage.skincfg | 50 ++++++++++++++++++++++++++++++++++++ 检验管理/U_JYOrderCDOne.pas | 32 +++++++++++++++++++++-- 3 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 检验管理/TradeManage.skincfg diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof index e3d9d51..4b22ded 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\ԥ\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJyuwan\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/检验管理/TradeManage.skincfg b/检验管理/TradeManage.skincfg new file mode 100644 index 0000000..89edbfe --- /dev/null +++ b/检验管理/TradeManage.skincfg @@ -0,0 +1,50 @@ +[ExpressSkins] +Default=1 +ShowNotifications=1 +Enabled=1 +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_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas index e731818..0e485b3 100644 --- a/检验管理/U_JYOrderCDOne.pas +++ b/检验管理/U_JYOrderCDOne.pas @@ -1148,7 +1148,7 @@ begin begin ExportFtErpFile(Trim(ADOQueryPrint.fieldbyname('NLBName').AsString), ADOQueryCmd); fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(ADOQueryPrint.fieldbyname('NLBName').AsString); - end + end else begin ExportFtErpFile('ͨðǩ.rmf', ADOQueryCmd); @@ -1824,7 +1824,7 @@ begin if (trim(ComboBox1.Text) = 'ʮһ') or (trim(ComboBox1.Text) = 'ʮһ(ë)') or (trim(ComboBox1.Text) = 'ʮһ()') then begin with ADOQueryTemp do - begin + begin Close; sql.Clear; sql.add('exec P_Print_HSDB '); @@ -1846,6 +1846,34 @@ begin Open; end; end; + + if (trim(ComboBox1.Text) = 'ʮһ()') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_HSDB_SW '); + 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) = 'һ') or (ComboBox1.ItemIndex = 4) then // begin // with ADOQueryTemp do