From 532355b157a1252b2f2e3910d956bc45a3b4bf97 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Mon, 15 Sep 2025 11:33:17 +0800 Subject: [PATCH] 1 --- .../U_ContractListNX.pas | 19 +++++++++++++++++-- 客户供应商管理(Company.dll)/U_GetDllForm.pas | 2 +- .../U_ContractListSel.pas | 1 + 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/合同管理(ContractManagement.dll)/U_ContractListNX.pas b/合同管理(ContractManagement.dll)/U_ContractListNX.pas index 98f92cb..9d99c17 100644 --- a/合同管理(ContractManagement.dll)/U_ContractListNX.pas +++ b/合同管理(ContractManagement.dll)/U_ContractListNX.pas @@ -12,7 +12,20 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxPC, cxButtonEdit, cxTextEdit, cxDropDownEdit, cxImage, cxImageComboBox, ImgList, cxContainer, cxDBEdit, cxBlobEdit, 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 TfrmContractListNX = class(TForm) @@ -492,12 +505,14 @@ begin if CDS_Main.IsEmpty then Exit; fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\ۺͬ.rmf'; - ExportFtErpFile('ۺͬ', ADOQueryPrint); + ExportFtErpFile('ۺͬ.rmf', ADOQueryPrint); with ADOQueryPrint do begin Close; sql.Clear; sql.Add('select A.*,B.*,MXNote=B.Note '); + + sql.Add(',TJNAME=( select TOP 1 TJNAME from BS_Company_Main X where X.CoType=''ͻ'' and X.Valid=''Y'' and X.Code= A.buyno) '); sql.Add(' from Contract_Main A inner join Contract_Sub B on A.ConMainId=B.ConMainId '); sql.Add(' where A.ConMainId=''' + Trim(CDS_Main.fieldbyname('ConMainId').AsString) + ''''); sql.Add(' order by B.XHNo '); diff --git a/客户供应商管理(Company.dll)/U_GetDllForm.pas b/客户供应商管理(Company.dll)/U_GetDllForm.pas index d4d1731..aafe7ed 100644 --- a/客户供应商管理(Company.dll)/U_GetDllForm.pas +++ b/客户供应商管理(Company.dll)/U_GetDllForm.pas @@ -198,7 +198,7 @@ begin try with DataLink_Company.ADOLink do begin - //if not Connected then + if not Connected then begin Connected := false; ConnectionString := DConString; diff --git a/梭织计划单(ShuttleSchedule.dll)/U_ContractListSel.pas b/梭织计划单(ShuttleSchedule.dll)/U_ContractListSel.pas index 1b1b106..739ece7 100644 --- a/梭织计划单(ShuttleSchedule.dll)/U_ContractListSel.pas +++ b/梭织计划单(ShuttleSchedule.dll)/U_ContractListSel.pas @@ -158,6 +158,7 @@ begin SQL.Add('where A.ConDate>=''' + FormatDateTime('yyyy-MM-dd', BegDate.DateTime) + ''''); SQL.Add('and A.ConDate<''' + FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1) + ''''); // SQL.Add(' and isnull(A.status,''0'')=''1'' '); + SQL.Add(' and isnull(A.status,''0'')<>''2'' '); SQL.Add('and isnull(ISZJXS,'''')<>'''''); if trim(FConNo) <> '' then SQL.Add(' and A.ConNo=' + quotedstr(trim(FConNo)));