From ad520a03eb4ce918a45ca292f808e06c11f69fef Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Wed, 22 Oct 2025 16:44:40 +0800
Subject: [PATCH] 1

---
 GZ_KD_Parino/SQL文件/更新特价.sql         | 15 +++++++++------
 GZ_KD_Parino/SQL文件/获取word模板数据.sql |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/GZ_KD_Parino/SQL文件/更新特价.sql b/GZ_KD_Parino/SQL文件/更新特价.sql
index e6d427a..5535515 100644
--- a/GZ_KD_Parino/SQL文件/更新特价.sql
+++ b/GZ_KD_Parino/SQL文件/更新特价.sql
@@ -43,7 +43,7 @@ AS
                                                                          
                                                                                  
  --是或空的直签客户，判断是否走特价审批流程          
- update a set F_SPECIALCONTRACTS = '是'                                                      
+ UPDATE a SET F_SPECIALCONTRACTS = '是'                                                      
  --SELECT 1                                                                   
   FROM T_SAL_ORDER  A                                                    
  INNER JOIN T_BD_CUSTOMER E ON E.FCUSTID = A.FCUSTID                                                
@@ -62,7 +62,7 @@ AS
   AND A.FCUSTID =E.FCUSTID AND  H.FNAME = I.FNAME AND F.FMATERIALID = B.FMATERIALID AND (D.FAllAmount_LC/B.FQTY) = (G.FAllAmount_LC/F.FQTY)                                                  
  ) G                                                                                 
  INNER JOIN V_ASSISTANTDATA U ON U.FENTRYID = A.F_Ordercategory                                                                            
- where U.FNUMBER IN  ('P','C','E','S')                                                       
+ WHERE U.FNUMBER IN  ('P','C','E','S')                                                       
  AND ABS(D.FAllAmount_LC)<ABS(B.F_SettlementP*B.FQTY)                                                                   
  AND A.FID = @FID                                                                                  
  AND A.FDOCUMENTSTATUS IN ('Z','A','D')                                                                                 
@@ -75,14 +75,17 @@ AS
                                                                               
 DECLARE @EmployeeID DECIMAL(23,10)                                                                              
                                                                               
-SELECT @EmployeeID = (CASE WHEN ISNULL(SUM(CAST(C.F_JSJ AS decimal(23,10)) * B.FQTY * CASE ISNULL(F_useyears, 0)  WHEN 0 THEN 1 ELSE F_useyears END ),0) = 0                 
-THEN  0 ELSE SUM(CAST(C.F_JSJ AS decimal(23,10))*B.FQTY * CASE ISNULL(F_useyears, 0)  WHEN 0 THEN 1 ELSE F_useyears END ) END)                                                                       
+SELECT @EmployeeID = (CASE WHEN ISNULL(SUM(CAST(C.F_JSJ AS DECIMAL(23,10)) * B.FQTY * CASE ISNULL(F_useyears, 0)  WHEN 0 THEN 1 ELSE F_useyears END ),0) = 0                 
+THEN  0 ELSE SUM(CAST(C.F_JSJ AS DECIMAL(23,10))*B.FQTY * CASE ISNULL(F_useyears, 0)  WHEN 0 THEN 1 ELSE F_useyears END ) END)                                                                       
 FROM T_SAL_ORDER A                 
 INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID                 
 INNER JOIN T_BD_MATERIAL C ON B.FMATERIALID = C.FMATERIALID                
 WHERE A.FID = @FID                                                                       
-                                                                              
-update a set F_SPECIALCONTRACTS = '是'                                                                                            
+           
+    
+		   
+
+UPDATE a SET F_SPECIALCONTRACTS = '是'                                                                                            
  FROM T_SAL_ORDER  A                                           
  INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID                                          
  INNER JOIN T_SAL_ORDERFIN D ON D.FID = A.FID                     
diff --git a/GZ_KD_Parino/SQL文件/获取word模板数据.sql b/GZ_KD_Parino/SQL文件/获取word模板数据.sql
index 9970387..ac3c7b0 100644
--- a/GZ_KD_Parino/SQL文件/获取word模板数据.sql
+++ b/GZ_KD_Parino/SQL文件/获取word模板数据.sql
@@ -227,7 +227,7 @@ AS
    INNER JOIN     T_SAL_ORDERENTRY_F D ON D.FENTRYID =A.FENTRYID                      
    WHERE A.FID =@FID         
         
-  SELECT  rank()over(partition by a.fid ,a.F_Projecttype order by a.fseq desc) as 'fseq',B.fname,E.F_103,b.FSPECIFICATION,C.FNAME,FORMAT(A.FQTY, 'N2'),                      
+  SELECT  rank()over(partition by a.fid ,a.F_Projecttype order by a.fseq ) as 'fseq',B.fname,E.F_103,b.FSPECIFICATION,C.FNAME,FORMAT(A.FQTY, 'N2'),                      
    FORMAT(ROUND( D.FTAXPRICE,2), 'N2'), FORMAT(D.FALLAMOUNT_LC, 'N2')                      
    ,A.FNOTE,F_Projecttype as 'FType',          
     FORMAT(ROUND( SUM(D.FALLAMOUNT_LC)OVER(PARTITION BY A.FID ),2), 'N2') AS 'FALLAMOUNT',