From 2e65b50b11191da32371decf5ee26fd684e432a9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Wed, 20 Aug 2025 14:04:44 +0800
Subject: [PATCH] ~

---
 检验管理/TradeManage.dof        |  2 +-
 检验管理/U_MJManageNewFDNew.pas | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof
index d24ce60..a0be1aa 100644
--- a/检验管理/TradeManage.dof
+++ b/检验管理/TradeManage.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�������Ŀ����\��Ŀ����\�ְ�\�������\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJyuebang\�������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas
index 05a6fd1..4278d62 100644
--- a/检验管理/U_MJManageNewFDNew.pas
+++ b/检验管理/U_MJManageNewFDNew.pas
@@ -1574,7 +1574,7 @@ begin
     begin
       close;
       sql.Clear;
-      sql.Add('update WFB_MJJY SET CDList= dbo.F_Get_Order_SubStr(MJID,''MJCDHZSL'')');
+      sql.Add('update WFB_MJJY SET CDList= dbo.F_Get_Order_SubStr(MJID,''MJCDHZSL''),DETM2=dbo.F_Get_MJJY_DETM2(MJID)');
       sql.Add('where MJID=''' + Trim(FMJID) + ''' ');
       execsql;
     end;
@@ -1830,7 +1830,7 @@ begin
   begin
     Close;
     sql.Clear;
-    sql.Add('select sum(MJLen) as CGMJLen from WFB_MJJY where Subid='''+FAPID+''' and MJSTR4= ''' + Trim(MJStr4.Text) + ''' ');
+    sql.Add('select sum(MJLen) as CGMJLen from WFB_MJJY where Subid=''' + FAPID + ''' and MJSTR4= ''' + Trim(MJStr4.Text) + ''' ');
     Open;
   end;
   Label56.caption := '�׳��ȣ�' + Trim(ADOTmp.fieldbyname('CGMJLen').AsString);
@@ -1856,7 +1856,7 @@ begin
     SQL.Clear;
     sql.Add('select A.MJID,A.mjstr3,QtyUnit=A.MJTypeOther,B.orderNo,B.customerNoName,B.LBName ');
     sql.Add(',EngColor=(select max(Note) from KH_Zdy X where X.ZDYName=C.PRTColor and X.Type=''OrdColor'' ) ');
-    sql.Add(',B.MPRTCF,C.*,A.* ');
+    sql.Add(',B.MPRTCF,C.*,A.* ');           
     sql.Add(' from WFB_MJJY A');
     sql.Add(' inner join JYOrder_Main B On A.Mainid=B.Mainid');
     sql.Add(' inner join JYOrder_Sub C on A.SubId=C.SubId');
@@ -2531,12 +2531,12 @@ begin
     fRollType := '';
     Exit;
   end;
-  Label56.caption := '';                           
+  Label56.caption := '';
   with ADOTmp do
-  begin                                   
+  begin
     Close;
     sql.Clear;
-    sql.Add('select sum(MJLen) as CGMJLen from WFB_MJJY where Subid='''+FAPID+''' and MJSTR4= ''' + Trim(MJStr4.Text) + ''' ');
+    sql.Add('select sum(MJLen) as CGMJLen from WFB_MJJY where Subid=''' + FAPID + ''' and MJSTR4= ''' + Trim(MJStr4.Text) + ''' ');
 //   ShowMessage(SQL.text);
     Open;
   end;
@@ -2725,7 +2725,7 @@ begin
   begin
     Close;
     sql.Clear;
-    sql.Add('select sum(MJLen) as CGMJLen from WFB_MJJY where Subid='''+FAPID+''' and MJSTR4= ''' + Trim(MJStr4.Text) + ''' ');
+    sql.Add('select sum(MJLen) as CGMJLen from WFB_MJJY where Subid=''' + FAPID + ''' and MJSTR4= ''' + Trim(MJStr4.Text) + ''' ');
     Open;
   end;
   Label56.caption := '�׳��ȣ�' + Trim(ADOTmp.fieldbyname('CGMJLen').AsString);