Group_99/D7szChenfeng
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
DESKTOP-E401PHE\Administrator 2025-09-15 11:33:17 +08:00
parent f778ed02f7
commit 532355b157
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
合同管理(ContractManagement.dll)/U_ContractListNX.pas
View File

@ -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 ');

2
客户供应商管理(Company.dll)/U_GetDllForm.pas
View File

@ -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;

1
梭织计划单(ShuttleSchedule.dll)/U_ContractListSel.pas
View File

@ -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)));