From 56bb51aac246ebcc218780d3a2eb02d301c4d8aa Mon Sep 17 00:00:00 2001
From: ddf <rightsoft@163.com>
Date: Sat, 8 Nov 2025 14:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=A0=81=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 云翔一码通/U_YMTFHSQList.dfm | 61 ++++++++++--------------------------
 云翔一码通/U_YMTFHSQList.pas | 20 +++++-------
 2 files changed, 24 insertions(+), 57 deletions(-)

diff --git a/云翔一码通/U_YMTFHSQList.dfm b/云翔一码通/U_YMTFHSQList.dfm
index a199e04..abb27a2 100644
--- a/云翔一码通/U_YMTFHSQList.dfm
+++ b/云翔一码通/U_YMTFHSQList.dfm
@@ -1,6 +1,6 @@
 object frmYMTFHSQList: TfrmYMTFHSQList
-  Left = 566
-  Top = 427
+  Left = 378
+  Top = 203
   Width = 1308
   Height = 679
   Caption = #21457#36135#30003#35831
@@ -21,7 +21,6 @@ object frmYMTFHSQList: TfrmYMTFHSQList
     Left = 0
     Top = 0
     Width = 1300
-    Height = 62
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 115
@@ -93,76 +92,50 @@ object frmYMTFHSQList: TfrmYMTFHSQList
       AutoSize = True
       Caption = #21024#38500
       ImageIndex = 3
-      Wrap = True
       OnClick = TBDelClick
     end
     object tchk: TToolButton
-      Left = 0
-      Top = 30
+      Left = 593
+      Top = 0
       AutoSize = True
       Caption = #23457#26680
       ImageIndex = 75
       OnClick = tchkClick
     end
     object Tnochk: TToolButton
-      Left = 79
-      Top = 30
+      Left = 672
+      Top = 0
       AutoSize = True
       Caption = #25764#38144#23457#26680
       ImageIndex = 52
       OnClick = TnochkClick
     end
     object TBPrint: TToolButton
-      Left = 198
-      Top = 30
+      Left = 791
+      Top = 0
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 4
       OnClick = TBPrintClick
     end
     object PrintMD: TToolButton
-      Left = 277
-      Top = 30
+      Left = 870
+      Top = 0
       Caption = #25171#21360#30721#21333
       ImageIndex = 4
       OnClick = PrintMDClick
     end
-    object Panel4: TPanel
-      Left = 392
-      Top = 30
-      Width = 249
-      Height = 30
-      BevelInner = bvRaised
-      BevelOuter = bvLowered
-      Color = clSkyBlue
-      TabOrder = 0
-      object Label12: TLabel
-        Left = 8
-        Top = 7
-        Width = 80
-        Height = 19
-        Caption = #30721#21333#21517#31216
-      end
-      object MDName: TComboBox
-        Left = 94
-        Top = 2
-        Width = 145
-        Height = 27
-        ItemHeight = 19
-        TabOrder = 0
-      end
-    end
     object TBClose: TToolButton
-      Left = 641
-      Top = 30
+      Left = 985
+      Top = 0
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 21
       OnClick = TBCloseClick
     end
     object OutStock: TToolButton
-      Left = 720
-      Top = 30
+      Left = 1064
+      Top = 0
       Caption = #26680#38144#20986#24211
       ImageIndex = 8
       OnClick = OutStockClick
@@ -170,9 +143,9 @@ object frmYMTFHSQList: TfrmYMTFHSQList
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 119
+    Top = 89
     Width = 1300
-    Height = 271
+    Height = 301
     Align = alClient
     TabOrder = 2
     object Tv1: TcxGridDBTableView
@@ -420,7 +393,7 @@ object frmYMTFHSQList: TfrmYMTFHSQList
   end
   object Panel1: TPanel
     Left = 0
-    Top = 62
+    Top = 32
     Width = 1300
     Height = 57
     Align = alTop
diff --git a/云翔一码通/U_YMTFHSQList.pas b/云翔一码通/U_YMTFHSQList.pas
index 6c2bea6..fac5711 100644
--- a/云翔一码通/U_YMTFHSQList.pas
+++ b/云翔一码通/U_YMTFHSQList.pas
@@ -114,9 +114,6 @@ type
     Tv2Column1: TcxGridDBColumn;
     OutStock: TToolButton;
     PrintMD: TToolButton;
-    Panel4: TPanel;
-    Label12: TLabel;
-    MDName: TComboBox;
     //RMllPDFExport1: TRMllPDFExport;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
@@ -401,7 +398,7 @@ begin
     TBAdd2.Visible := True;
     TBAdd.Visible := False;
     PrintMD.Visible := False;
-    Panel4.Visible := False;
+//    Panel4.Visible := False;
   end;
 
 end;
@@ -869,7 +866,7 @@ end;
 
 procedure TfrmYMTFHSQList.PrintMDClick(Sender: TObject);
 var
-  fPrintFile, FCKNO, msql, MPrintJson: string;
+  FPrintJson, MFiltration: string;
 begin
   if Order_Main.IsEmpty then
     Exit;
@@ -879,16 +876,13 @@ begin
     application.MessageBox('û��ѡ������', '��ʾ');
     exit;
   end;
-  if Trim(MDName.Text) = '' then
-  begin
-    Application.MessageBox('�뵥���Ʋ���Ϊ��!', '��ʾ', 0);
-    Exit;
-  end;
 
-  msql := 'SELECT A.* FROM YMT_CK_CR A LEFT JOIN YMT_FHSQ_Sub S ON A.ToSSID=S.SSId LEFT JOIN YMT_FHSQ_Main M ON M.FSId=S.FSId WHERE A.CRType=''���۳���'' AND M.FSId=''' + Trim(Order_Main.fieldbyname('FSId').AsString) + '''';
-  MPrintJson := '{ "LBName": "' + Trim(MDName.Text) + '","QrCodeField": "ssid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }';
+  MFiltration := Trim(Order_Main.fieldbyname('FSId').AsString);
+
+  FPrintJson := '{ "LMType": "YMTCKMD","PreviewPrint": true,"DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '", "PrtArgs": [ { "IsSql": false, "Filtration": " ' + MFiltration + '" }] }';
+
+  FormPrint(Application, PChar(FPrintJson));
 
-  FunPrint(Application, PChar(MPrintJson));
 end;
 
 end.