From b4f79cb188c48f93b1cc8de57aca164be58ab0dc Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Wed, 3 Dec 2025 09:34:28 +0800
Subject: [PATCH] ~

---
 打卷检验管理/U_MJManageNewFDNew.dfm | 20 ++++++++++----------
 打卷检验管理/U_MJManageNewFDNew.pas | 12 +++++++-----
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm
index 5ad95a5..52b193a 100644
--- a/打卷检验管理/U_MJManageNewFDNew.dfm
+++ b/打卷检验管理/U_MJManageNewFDNew.dfm
@@ -21,7 +21,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 0
     Top = 87
     Width = 345
-    Height = 636
+    Height = 628
     Align = alLeft
     TabOrder = 0
     object Tv3: TcxGridDBTableView
@@ -137,8 +137,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ScrollBox1: TScrollBox
     Left = 633
     Top = 87
-    Width = 725
-    Height = 636
+    Width = 717
+    Height = 628
     Align = alClient
     Color = clWhite
     ParentColor = False
@@ -989,7 +989,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 409
     Top = 87
     Width = 224
-    Height = 636
+    Height = 628
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -2108,7 +2108,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 345
     Top = 87
     Width = 64
-    Height = 636
+    Height = 628
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -2117,7 +2117,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Left = 2
       Top = 2
       Width = 60
-      Height = 311
+      Height = 303
       Align = alClient
       TabOrder = 0
       object Tv2: TcxGridDBTableView
@@ -2225,7 +2225,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Panel8: TPanel
       Left = 2
-      Top = 313
+      Top = 305
       Width = 60
       Height = 28
       Align = alBottom
@@ -2240,7 +2240,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object AOrdDefNote1: TRichEdit
       Left = 2
-      Top = 341
+      Top = 333
       Width = 60
       Height = 293
       Align = alBottom
@@ -2467,7 +2467,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1358
+    Width = 1350
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -2655,7 +2655,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel6: TPanel
     Left = 0
     Top = 30
-    Width = 1358
+    Width = 1350
     Height = 57
     Align = alTop
     BevelInner = bvRaised
diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas
index e8e244f..c4eaedd 100644
--- a/打卷检验管理/U_MJManageNewFDNew.pas
+++ b/打卷检验管理/U_MJManageNewFDNew.pas
@@ -1740,7 +1740,7 @@ begin
       apid.Text := FAPID;
       Button3.Click;
     end;
-                                                   
+
   end
   else
     exit;
@@ -2465,7 +2465,7 @@ begin
     Close;
     sql.Clear;
     sql.Add('select B.*,B.OrderNo OrderNoM,C.*, ');
-    sql.Add('MJJH=(select MJJH from WFB_MJJY X where X.SubID=C.subID),');
+//    sql.Add('MJJH=(select MJJH from WFB_MJJY X where X.SubID=C.subID),');
     sql.Add('maxMJxh=isnull((select max(mjxh) from WFB_MJJY X where X.SubID=C.subID),0),');
     sql.Add('minMJxh=isnull((select min(mjxh) from WFB_MJJY X where X.SubID=C.subID),1),');
 //    sql.Add('maxBaoNO=1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.subID=C.subID ),0)');
@@ -2475,9 +2475,10 @@ begin
     sql.Add('from JYOrder_Sub C');
     SQL.Add('inner join JYOrder_Main B on B.MainId=C.MainId ');
     sql.Add('where C.SubID=''' + Trim(APID.Text) + '''');
+//    ShowMessage(sql.text);    
     Open;
-  end;
-  if ADOTmp.IsEmpty = False then
+  end;                                          
+  if ADOTmp.IsEmpty = False then                            
   begin
     if edit10.Text = '��' then
     begin
@@ -2528,7 +2529,7 @@ begin
     kmxs.Text := Trim(ADOTmp.fieldbyname('kmxs').AsString);
     MJFK.Text := Trim(ADOTmp.fieldbyname('PRTMF').AsString);
     MJSJKZ.Text := Trim(ADOTmp.fieldbyname('PRTKZ').AsString);
-    MJJH.Text:=Trim(ADOTmp.fieldbyname('MJJH').asstring);
+//    MJJH.Text:=Trim(ADOTmp.fieldbyname('MJJH').asstring);
     if edit10.Text = '' then
     begin
       MJXH.Text := inttostr(ADOTmp.fieldbyname('maxMJxh').AsInteger + 1);
@@ -2780,6 +2781,7 @@ begin
   MJLen.Text := Trim(ADOTmp.fieldbyname('MJLen').AsString);
   MJstr4.Text := Trim(ADOTmp.fieldbyname('MJstr4').AsString);
   MJXH.Text := Trim(ADOTmp.fieldbyname('MJXH').AsString);
+  MJXH.Text := Trim(ADOTmp.fieldbyname('MJJH').AsString);
   baono.Text := Trim(ADOTmp.fieldbyname('baono').AsString);
   baoid.Text := Trim(ADOTmp.fieldbyname('baoid').AsString);
   if Trim(ADOTmp.fieldbyname('MJType').AsString) = '��Ʒ' then