From f0ef50a40f5d279467f143fe501e1191a8e93e54 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Mon, 21 Jul 2025 14:17:40 +0800 Subject: [PATCH] ~ --- 复合检验管理/U_JYOrderCDOne.pas | 11 ++++--- 复合检验管理/U_MJManageNewFDNew.dfm | 4 +-- 复合检验管理/U_MJManageNewFDNew.pas | 6 ++-- 复合检验管理/U_ProductOrderNewList.pas | 42 +++++++++++++++++--------- 4 files changed, 39 insertions(+), 24 deletions(-) diff --git a/复合检验管理/U_JYOrderCDOne.pas b/复合检验管理/U_JYOrderCDOne.pas index a8d979d..5a91710 100644 --- a/复合检验管理/U_JYOrderCDOne.pas +++ b/复合检验管理/U_JYOrderCDOne.pas @@ -1636,20 +1636,21 @@ begin Open; end; end; - if (trim(ComboBox1.Text) = 'ķ뵥') then + if (trim(ComboBox1.Text) = 'ķ뵥') or (trim(ComboBox1.Text) = 'ķ뵥()') + or (trim(ComboBox1.Text) = 'ķ뵥()') or (trim(ComboBox1.Text) = 'ķ뵥(ë)') then begin with ADOQueryTemp do begin - Close; + Close; sql.Clear; - sql.add('exec P_Print_CKMDYDL_PY '); + sql.add('exec P_Print_CKMDYDL_PY '); SQL.Add('@ZRow =25'); SQL.Add(',@Zcol =4'); sql.add(',@DName=' + quotedstr(Trim(DCode))); // ShowMessage(sql.text); Open; end; - SCreateCDS20(ADOQueryTemp, CDS_HZ); + SCreateCDS20(ADOQueryTemp, CDS_HZ); SInitCDSData20(ADOQueryTemp, CDS_HZ); with ADOQueryPrint do @@ -1663,7 +1664,7 @@ begin Open; end; end; - if (trim(ComboBox1.Text) = '𳬸ϳ') then + if (trim(ComboBox1.Text) = '𳬸ϳ') or (trim(ComboBox1.Text) = '𳬸ϳ()') or (trim(ComboBox1.Text) = '𳬸ϳ(ë)') then begin with ADOQueryTemp do begin diff --git a/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm index 16e2376..095c9ff 100644 --- a/复合检验管理/U_MJManageNewFDNew.dfm +++ b/复合检验管理/U_MJManageNewFDNew.dfm @@ -1941,14 +1941,14 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Font.Name = #23435#20307 Font.Style = [] ItemHeight = 24 - ItemIndex = 0 ParentFont = False TabOrder = 5 Text = #36890#29992#26631#31614 OnChange = SLbNameChange Items.Strings = ( #36890#29992#26631#31614 - #36890#29992#26631#31614'('#37325#37327')' + #36890#29992#26631#31614'('#20928#37325')' + #36890#29992#26631#31614'('#27611#37325')' #36890#29992#26631#31614'('#38271#24230')') end object Button9: TButton diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas index 9f73840..afa102d 100644 --- a/复合检验管理/U_MJManageNewFDNew.pas +++ b/复合检验管理/U_MJManageNewFDNew.pas @@ -692,11 +692,11 @@ var Tf: TMyFunc; Tp: TFarProc; Th: Thandle; -begin +begin // closeCom(FComFile); - Th := LoadLibrary(Pchar(trim(DllNameT))); + Th := LoadLibrary(Pchar(trim(DllNameT))); if Th > 0 then - begin + begin try Tp := GetProcAddress(Th, 'CommOpen'); if Tp <> nil then diff --git a/复合检验管理/U_ProductOrderNewList.pas b/复合检验管理/U_ProductOrderNewList.pas index 324e2fd..549c2b0 100644 --- a/复合检验管理/U_ProductOrderNewList.pas +++ b/复合检验管理/U_ProductOrderNewList.pas @@ -12,7 +12,20 @@ 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, 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 TfrmProductOrderNewList = class(TForm) @@ -831,22 +844,23 @@ begin Exit; RMDBMain.DataSet := CDS_Print; LBName := RadioGroup1.Items.Strings[RadioGroup1.ItemIndex]; - fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf'; + fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf'; with ADOQueryPrint do begin Close; sql.Clear; - sql.Add('select A.*,B.*,C.Filesother,ColorCount=(select isnull(Count(subID),0) from JYOrder_Sub where MainId=A.MainId), '); - sql.add('ZQty=(select sum(PRTOrderQty) from JYOrder_Sub where MainId=A.MainId),'); - sql.add('FQty=(select sum(PRTOrderQty) from JYOrder_Sub X where X.MainId=B.MainId and X.PrtCodeName=B.PrtCodeName and X.KHorderNo=B.KHorderNo),'); - sql.add('maxkhOrderNO=(select max(khOrderNO) from JYOrder_Sub X where X.MainId=A.MainId ),'); - sql.Add('HXFileOther=(select top 1 Filesother from TP_File X where X.WBID=B.HXFile and X.TFType=''HX'' )'); - sql.Add(' from JYOrder_Main A inner join JYOrder_Sub B on A.MainId=B.MainId '); - sql.Add(' left join TP_File C on C.TFID=B.Subid and C.WBID=B.Mainid '); - // sql.Add(' left join TP_File D on D.TFID=A.orderNO '); - sql.Add(' Where A.MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + ''''); - sql.Add(' order by B.PRTCode,B.PRTCodeName,B.subID '); - +// sql.Add('select A.*,B.*,C.Filesother,ColorCount=(select isnull(Count(subID),0) from JYOrder_Sub where MainId=A.MainId), '); +// sql.add('ZQty=(select sum(PRTOrderQty) from JYOrder_Sub where MainId=A.MainId),'); +// sql.add('FQty=(select sum(PRTOrderQty) from JYOrder_Sub X where X.MainId=B.MainId and X.PrtCodeName=B.PrtCodeName and X.KHorderNo=B.KHorderNo),'); +// sql.add('maxkhOrderNO=(select max(khOrderNO) from JYOrder_Sub X where X.MainId=A.MainId ),'); +// sql.Add('HXFileOther=(select top 1 Filesother from TP_File X where X.WBID=B.HXFile and X.TFType=''HX'' )'); +// sql.Add(' from JYOrder_Main A inner join JYOrder_Sub B on A.MainId=B.MainId '); +// sql.Add(' left join TP_File C on C.TFID=B.Subid and C.WBID=B.Mainid '); +// // sql.Add(' left join TP_File D on D.TFID=A.orderNO '); +// sql.Add(' Where A.MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + ''''); +// sql.Add(' order by B.PRTCode,B.PRTCodeName,B.subID '); + sql.Add('exec P_Trade_Plan_Prt_Sub_bz '); + SQL.add('@mainid=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + ''''); Open; end; SCreateCDS20(ADOQueryPrint, CDS_Print); @@ -855,7 +869,7 @@ begin begin RM1.LoadFromFile(fPrintFile); RM1.ShowReport; - RMDBMain.DataSet :=nil; + RMDBMain.DataSet := nil; end else begin