111.3cxz
This commit is contained in:
parent
c07391b2d0
commit
81ca91d7fa
|
|
@ -284,9 +284,11 @@ object frmYFGLList: TfrmYFGLList
|
||||||
DataController.Summary.FooterSummaryItems = <
|
DataController.Summary.FooterSummaryItems = <
|
||||||
item
|
item
|
||||||
Kind = skSum
|
Kind = skSum
|
||||||
|
Column = TV1ZUSD
|
||||||
end
|
end
|
||||||
item
|
item
|
||||||
Kind = skSum
|
Kind = skSum
|
||||||
|
Column = TV1ZRMB
|
||||||
end
|
end
|
||||||
item
|
item
|
||||||
Kind = skSum
|
Kind = skSum
|
||||||
|
|
@ -391,17 +393,17 @@ object frmYFGLList: TfrmYFGLList
|
||||||
HeaderAlignmentHorz = taCenter
|
HeaderAlignmentHorz = taCenter
|
||||||
Width = 66
|
Width = 66
|
||||||
end
|
end
|
||||||
object TV1Column13: TcxGridDBColumn
|
object TV1ZUSD: TcxGridDBColumn
|
||||||
Caption = #24635'USD'#37329#39069
|
Caption = #24635'USD'#37329#39069
|
||||||
DataBinding.FieldName = 'ZUSD'
|
DataBinding.FieldName = 'ZUSD'
|
||||||
HeaderAlignmentHorz = taCenter
|
HeaderAlignmentHorz = taCenter
|
||||||
Width = 78
|
Width = 78
|
||||||
end
|
end
|
||||||
object TV1Column14: TcxGridDBColumn
|
object TV1ZRMB: TcxGridDBColumn
|
||||||
Caption = #24635'RMB'#37329#39069
|
Caption = #24635'RMB'#37329#39069
|
||||||
DataBinding.FieldName = 'ZRMB'
|
DataBinding.FieldName = 'ZRMB'
|
||||||
HeaderAlignmentHorz = taCenter
|
HeaderAlignmentHorz = taCenter
|
||||||
Width = 66
|
Width = 78
|
||||||
end
|
end
|
||||||
object TV1Column15: TcxGridDBColumn
|
object TV1Column15: TcxGridDBColumn
|
||||||
Caption = #22791#27880
|
Caption = #22791#27880
|
||||||
|
|
|
||||||
|
|
@ -79,8 +79,8 @@ type
|
||||||
TV1Column10: TcxGridDBColumn;
|
TV1Column10: TcxGridDBColumn;
|
||||||
TV1Column11: TcxGridDBColumn;
|
TV1Column11: TcxGridDBColumn;
|
||||||
TV1Column12: TcxGridDBColumn;
|
TV1Column12: TcxGridDBColumn;
|
||||||
TV1Column13: TcxGridDBColumn;
|
TV1ZUSD: TcxGridDBColumn;
|
||||||
TV1Column14: TcxGridDBColumn;
|
TV1ZRMB: TcxGridDBColumn;
|
||||||
TV1Column15: TcxGridDBColumn;
|
TV1Column15: TcxGridDBColumn;
|
||||||
TV1Column16: TcxGridDBColumn;
|
TV1Column16: TcxGridDBColumn;
|
||||||
ToolButton3: TToolButton;
|
ToolButton3: TToolButton;
|
||||||
|
|
@ -160,7 +160,8 @@ type
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
uses
|
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}
|
{$R *.dfm}
|
||||||
function TfrmYFGLList.GetShellFolders(strDir: string): string;
|
function TfrmYFGLList.GetShellFolders(strDir: string): string;
|
||||||
|
|
@ -1067,7 +1068,7 @@ end;
|
||||||
|
|
||||||
procedure TfrmYFGLList.ToolButton8Click(Sender: TObject);
|
procedure TfrmYFGLList.ToolButton8Click(Sender: TObject);
|
||||||
var
|
var
|
||||||
MPrintJson, JsonResult, msql: string;
|
MPrintJson, JsonResult, msql, Pwhere: string;
|
||||||
begin
|
begin
|
||||||
|
|
||||||
if CDS_Main.IsEmpty then
|
if CDS_Main.IsEmpty then
|
||||||
|
|
@ -1086,6 +1087,12 @@ begin
|
||||||
msql := msql + ' and FILLTIME<''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.Date + 1)) + ''' ';
|
msql := msql + ' and FILLTIME<''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.Date + 1)) + ''' ';
|
||||||
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
Pwhere := SGetFilters(Panel1, 1, 2);
|
||||||
|
|
||||||
|
if trim(Pwhere) <> '' then
|
||||||
|
msql := msql + ' and ' + trim(Pwhere);
|
||||||
|
|
||||||
msql := msql + 'ORDER BY YWY desc, FILLTIME ';
|
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 + '" }] }';
|
MPrintJson := '{ "LBName": "°´ÒµÎñÔ±µ¼³ö","QrCodeField": "ssid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "xls", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }';
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user