From 1fbff41ba446bc542582da39c8c0397e8e7e343d Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Thu, 30 Apr 2026 19:07:58 +0800
Subject: [PATCH] 20260430

---
 打卷检验管理/U_CKProductCKHZList.dfm | 12 ++++++------
 打卷检验管理/U_CKProductCKHZList.pas |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/打卷检验管理/U_CKProductCKHZList.dfm b/打卷检验管理/U_CKProductCKHZList.dfm
index 5f41ce6..668e28c 100644
--- a/打卷检验管理/U_CKProductCKHZList.dfm
+++ b/打卷检验管理/U_CKProductCKHZList.dfm
@@ -1,6 +1,6 @@
 object frmCKProductCKHZList: TfrmCKProductCKHZList
-  Left = 334
-  Top = 349
+  Left = 670
+  Top = 527
   Width = 1517
   Height = 663
   Caption = #25104#21697#26816#39564#27719#24635#20449#24687
@@ -20,7 +20,7 @@ object frmCKProductCKHZList: TfrmCKProductCKHZList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1501
+    Width = 1509
     Height = 33
     ButtonHeight = 30
     ButtonWidth = 155
@@ -106,7 +106,7 @@ object frmCKProductCKHZList: TfrmCKProductCKHZList
   object Panel1: TPanel
     Left = 0
     Top = 33
-    Width = 1501
+    Width = 1509
     Height = 68
     Align = alTop
     BevelInner = bvRaised
@@ -352,8 +352,8 @@ object frmCKProductCKHZList: TfrmCKProductCKHZList
   object cxGrid2: TcxGrid
     Left = 0
     Top = 101
-    Width = 1501
-    Height = 523
+    Width = 1509
+    Height = 531
     Align = alClient
     TabOrder = 2
     object Tv1: TcxGridDBTableView
diff --git a/打卷检验管理/U_CKProductCKHZList.pas b/打卷检验管理/U_CKProductCKHZList.pas
index 00c7d19..dc49b52 100644
--- a/打卷检验管理/U_CKProductCKHZList.pas
+++ b/打卷检验管理/U_CKProductCKHZList.pas
@@ -169,8 +169,8 @@ begin
       sql.Clear;
       Filtered := False;    //D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4,D.SOrddefstr1,
       sql.Add('select CKNO,A.MainId,A.MJTypeother as QtyUnit,C.OrderNo,C.ConNO,D.Sorddefstr5,count(distinct baoid) as RKbao, ');
-      sql.Add('count(A.MainId) as JQty,SUM(A.MJLen) as Qty,SUM(A.MJMaoZ) as KGQty,SUM(A.MJQty4) as CKJZ,round(SUM(cast(A.MJFK as float)*cast(A.MJSJKZ as float)*MJLEN/1000),1) as JSJZ');
-      SQL.Add(',round(SUM(CASE WHEN A.ckflag=''�ѳ���'' THEN (cast(A.MJFK as float)*cast(A.MJSJKZ as float)*A.MJLen/1000) ELSE 0 END),1) as CKSL');
+      sql.Add('count(A.MainId) as JQty,SUM(A.MJLen) as Qty,SUM(A.MJMaoZ) as KGQty,SUM(A.MJQty4) as CKJZ,round(SUM(cast([dbo].[Get_ShuZi](A.MJFK) as float)*cast(A.MJSJKZ as float)*MJLEN/1000),1) as JSJZ');
+      SQL.Add(',round(SUM(CASE WHEN A.ckflag=''�ѳ���'' THEN (cast([dbo].[Get_ShuZi](A.MJFK) as float)*cast(A.MJSJKZ as float)*A.MJLen/1000) ELSE 0 END),1) as CKSL');
       SQL.Add(',SUM(CASE WHEN A.ckflag=''�ѳ���'' THEN A.MJLen ELSE 0 END) as SCKROLL');
       SQL.Add(',SUM(CASE WHEN A.ckflag=''���'' THEN A.MJLen ELSE 0 END) as SkcROLL');
       SQL.Add(',SUM(CASE WHEN A.ckflag=''�ѳ���'' THEN 1 ELSE 0 END) as CKROLL');