From 8886dae5e6da8dfa729f1011cb383fc002e4311e Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Tue, 22 Jul 2025 14:03:20 +0800
Subject: [PATCH] ~

---
 打卷检验管理/U_JYOrderCDOne.dfm     |  6 +++++
 打卷检验管理/U_JYOrderCDOne.pas     | 34 ++++++++++++++++++++++++-----
 打卷检验管理/U_MJManageNewFDNew.dfm | 26 +++++++++++++++++++++-
 打卷检验管理/U_MJManageNewFDNew.pas |  6 +++--
 4 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm
index 47137a5..9bb1b5e 100644
--- a/打卷检验管理/U_JYOrderCDOne.dfm
+++ b/打卷检验管理/U_JYOrderCDOne.dfm
@@ -1103,6 +1103,12 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
+      object Tv1Column5: TcxGridDBColumn
+        Caption = #25351#31034#21333#20811#37325
+        DataBinding.FieldName = 'PRTKZ'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas
index 5aed2d3..9a1b635 100644
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@@ -225,6 +225,7 @@ type
     Tv1Column2: TcxGridDBColumn;
     Tv1Column3: TcxGridDBColumn;
     Tv1Column4: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -385,12 +386,12 @@ var
   i: integer;
   j: Integer;
 begin
-  try                                     
+  try
     ADOQueryMain.DisableControls;
     with ADOQueryMain do
     begin
-      Close;                              
-      Filtered := False;                          
+      Close;
+      Filtered := False;
       sql.Clear;
       sql.Add('select A.*,C.CustomerNoName,');
       SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno,');
@@ -1602,7 +1603,31 @@ begin
     begin
       Close;
       sql.Clear;
-      sql.add('exec P_Print_CKMDYDL ');
+      sql.add('exec P_Print_CKMDYDL ');               
+      sql.add('@DName=' + quotedstr(Trim(DCode)));
+      Open;
+    end;
+    SCreateCDS20(ADOQueryTemp, CDS_HZ);
+    SInitCDSData20(ADOQueryTemp, CDS_HZ);
+
+    with ADOQueryPrint do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Do_PrintMd_HZ ');
+      sql.add('@mainID=' + quotedstr(Trim('')));
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      sql.add(',@flag=''2'' ');
+      Open;                                                             
+    end;
+  end;
+  if (trim(ComboBox1.Text) = '�����뵥(����)') then                
+  begin
+    with ADOQueryTemp do
+    begin                                               
+      Close;
+      sql.Clear;
+      sql.add('exec P_Print_CKMDYDL_Y ');
       sql.add('@DName=' + quotedstr(Trim(DCode)));
       Open;
     end;
@@ -1620,7 +1645,6 @@ begin
       Open;
     end;
   end;
-
   if (trim(ComboBox1.Text) = 'ά���뵥') then
   begin
     with ADOQueryTemp do
diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm
index ed13683..d1eb901 100644
--- a/打卷检验管理/U_MJManageNewFDNew.dfm
+++ b/打卷检验管理/U_MJManageNewFDNew.dfm
@@ -71,6 +71,14 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
         item
           Kind = skCount
           Column = v3Column1
+        end
+        item
+          Kind = skSum
+          Column = Tv3Column7
+        end
+        item
+          Kind = skSum
+          Column = Tv3Column6
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
@@ -131,7 +139,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
         Width = 40
       end
       object v3Column2: TcxGridDBColumn
-        Caption = #25968#37327
+        Caption = #31859#25968
         DataBinding.FieldName = 'MJLen'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -139,6 +147,22 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
         Styles.Header = cxStyle3
         Width = 42
       end
+      object Tv3Column6: TcxGridDBColumn
+        Caption = #30721#25968
+        DataBinding.FieldName = 'YMJlen'
+        HeaderAlignmentHorz = taCenter
+        Styles.Content = cxStyle3
+        Styles.Header = cxStyle3
+        Width = 42
+      end
+      object Tv3Column7: TcxGridDBColumn
+        Caption = #30721#23610#38271#24230
+        DataBinding.FieldName = 'MCMJlen'
+        HeaderAlignmentHorz = taCenter
+        Styles.Content = cxStyle3
+        Styles.Header = cxStyle3
+        Width = 47
+      end
       object v3Column4: TcxGridDBColumn
         Caption = #27611#37325
         DataBinding.FieldName = 'MJMaoZ'
diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas
index 28aacc4..235f847 100644
--- a/打卷检验管理/U_MJManageNewFDNew.pas
+++ b/打卷检验管理/U_MJManageNewFDNew.pas
@@ -314,6 +314,8 @@ type
     SpeedButton96: TSpeedButton;
     SpeedButton97: TSpeedButton;
     Button8: TButton;
+    Tv3Column6: TcxGridDBColumn;
+    Tv3Column7: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -1121,8 +1123,8 @@ begin
         FieldByName('MJLen').Value := FDC;
       end
       else
-      begin
-        if Label9.Caption = 'M' then
+      begin                                                             
+        if Label9.Caption = 'M' then                       
         begin
           MMJlen := RoundFloat(StrToFloatdef(trim(MJlen.Text), 0), StrToint(Fxsws));
           MYMJlen := RoundFloat(MMJlen / 0.9144, StrToint(Fysws));