This commit is contained in:
DESKTOP-E401PHE\Administrator 2025-11-03 09:27:34 +08:00
parent c07391b2d0
commit 81ca91d7fa
2 changed files with 16 additions and 7 deletions

View File

@ -284,9 +284,11 @@ object frmYFGLList: TfrmYFGLList
DataController.Summary.FooterSummaryItems = <
item
Kind = skSum
Column = TV1ZUSD
end
item
Kind = skSum
Column = TV1ZRMB
end
item
Kind = skSum
@ -391,17 +393,17 @@ object frmYFGLList: TfrmYFGLList
HeaderAlignmentHorz = taCenter
Width = 66
end
object TV1Column13: TcxGridDBColumn
object TV1ZUSD: TcxGridDBColumn
Caption = #24635'USD'#37329#39069
DataBinding.FieldName = 'ZUSD'
HeaderAlignmentHorz = taCenter
Width = 78
end
object TV1Column14: TcxGridDBColumn
object TV1ZRMB: TcxGridDBColumn
Caption = #24635'RMB'#37329#39069
DataBinding.FieldName = 'ZRMB'
HeaderAlignmentHorz = taCenter
Width = 66
Width = 78
end
object TV1Column15: TcxGridDBColumn
Caption = #22791#27880

View File

@ -79,8 +79,8 @@ type
TV1Column10: TcxGridDBColumn;
TV1Column11: TcxGridDBColumn;
TV1Column12: TcxGridDBColumn;
TV1Column13: TcxGridDBColumn;
TV1Column14: TcxGridDBColumn;
TV1ZUSD: TcxGridDBColumn;
TV1ZRMB: TcxGridDBColumn;
TV1Column15: TcxGridDBColumn;
TV1Column16: TcxGridDBColumn;
ToolButton3: TToolButton;
@ -160,7 +160,8 @@ type
implementation
uses
U_DataLink, U_RTFun, U_ZDYHelp, U_BaoGuanInPut, U_Fun, U_YFGLInPut, U_LabelPrintFun;
U_DataLink, U_RTFun, U_ZDYHelp, U_BaoGuanInPut, U_Fun, U_YFGLInPut,
U_LabelPrintFun;
{$R *.dfm}
function TfrmYFGLList.GetShellFolders(strDir: string): string;
@ -1067,7 +1068,7 @@ end;
procedure TfrmYFGLList.ToolButton8Click(Sender: TObject);
var
MPrintJson, JsonResult, msql: string;
MPrintJson, JsonResult, msql, Pwhere: string;
begin
if CDS_Main.IsEmpty then
@ -1086,6 +1087,12 @@ begin
msql := msql + ' and FILLTIME<''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.Date + 1)) + ''' ';
end;
Pwhere := SGetFilters(Panel1, 1, 2);
if trim(Pwhere) <> '' then
msql := msql + ' and ' + trim(Pwhere);
msql := msql + 'ORDER BY YWY desc, FILLTIME ';
MPrintJson := '{ "LBName": "°´ÒµÎñÔ±µ¼³ö","QrCodeField": "ssid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "xls", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }';