From 91bbcdd3ac805dc859c407ff28933999f45184b0 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Fri, 24 Oct 2025 16:26:31 +0800 Subject: [PATCH] 1 --- GZ_KD_Parino/SQL文件/获取word模板数据.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/GZ_KD_Parino/SQL文件/获取word模板数据.sql b/GZ_KD_Parino/SQL文件/获取word模板数据.sql index 2925d6c..d364bc2 100644 --- a/GZ_KD_Parino/SQL文件/获取word模板数据.sql +++ b/GZ_KD_Parino/SQL文件/获取word模板数据.sql @@ -500,9 +500,9 @@ INNER JOIN T_BD_MATERIAL_L B ON B.FMATERIALID = A.FMATERIALID AND B.FLOCALEID =2 INNER JOIN T_BD_UNIT_L C ON C.FUNITID =A.FUNITID AND C.FLOCALEID =2052 INNER JOIN T_SAL_ORDERENTRY_F D ON D.FENTRYID =A.FENTRYID WHERE A.FID =@FID AND --A.FMRPCLOSESTATUS = 'A' -(ISNULL(AA.FCHANGEDATE,'') = '' AND AA.FID = @FID) or (AA.FID = @FID AND A.FMRPCLOSESTATUS = 'A') +(ISNULL(AA.FCHANGEDATE,'') = '' AND AA.FID = @FID) or (AA.FID = @FID ) -SELECT rank()over(partition by a.fid ,a.F_Projecttype order by a.fseq ) as 'fseq',B.fname,b.FSPECIFICATION,E.F_103,FLOOR(A.FQTY),C.FNAME, +SELECT rank()over(partition by a.fid ,a.F_Projecttype order by a.F_Projecttype,a.fseq ) as 'fseq',B.fname,b.FSPECIFICATION,E.F_103,FLOOR(A.FQTY),C.FNAME, 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', @@ -512,14 +512,14 @@ INNER JOIN T_BD_MATERIAL_L B ON B.FMATERIALID = A.FMATERIALID AND B.FLOCALEID =2 INNER JOIN T_BD_MATERIAL E ON E.FMATERIALID = A.FMATERIALID INNER JOIN T_BD_UNIT_L C ON C.FUNITID =A.FUNITID AND C.FLOCALEID =2052 INNER JOIN T_SAL_ORDERENTRY_F D ON D.FENTRYID =A.FENTRYID -WHERE A.FID =@FID AND (ISNULL(AA.FCHANGEDATE,'') = '' AND AA.FID = @FID) or (AA.FID = @FID AND A.FMRPCLOSESTATUS = 'A') --A.FMRPCLOSESTATUS = 'A' +WHERE A.FID =@FID AND (ISNULL(AA.FCHANGEDATE,'') = '' AND AA.FID = @FID) or (AA.FID = @FID ) --A.FMRPCLOSESTATUS = 'A' ORDER BY a.F_Projecttype ,a.fseq Select ROW_NUMBER() OVER (ORDER BY B.FRETURNTYPE) AS ID,CASE WHEN B.FRETURNTYPE = 'SEND' THEN '换货' ELSE '退货' END as 'FRETURNTYPE' ,C.FSPECIFICATION,D.FNAME,FLOOR(B.FQTY),FORMAT(E.FTAXPRICE,'N2'),FORMAT(E.FALLAMOUNT_LC,'N2') From T_SAL_ORDER A JOIN T_SAL_ORDERENTRY B on A.FID = B.FID INNER JOIN T_BD_MATERIAL_L C ON C.FMATERIALID = B.FMATERIALID AND C.FLOCALEID =2052 INNER JOIN T_BD_UNIT_L D ON D.FUNITID =B.FUNITID AND D.FLOCALEID =2052 INNER JOIN T_SAL_ORDERENTRY_F E ON E.FENTRYID =B.FENTRYID Where --A.FID = @FID AND B.FMRPCLOSESTATUS = 'A' -(ISNULL(A.FCHANGEDATE,'') = '' AND A.FID = @FID) or (A.FID = @FID AND B.FMRPCLOSESTATUS = 'A') +(ISNULL(A.FCHANGEDATE,'') = '' AND A.FID = @FID) or (A.FID = @FID ) SELECT fseq,b.FSPECIFICATION,C.FNAME,FLOOR(A.FQTY), FORMAT(ROUND( D.FTAXPRICE,2), 'N2'), FORMAT(D.FALLAMOUNT_LC, 'N2') @@ -528,7 +528,7 @@ INNER JOIN T_BD_MATERIAL_L B ON B.FMATERIALID = A.FMATERIALID AND B.FLOCALEID =2 INNER JOIN T_BD_UNIT_L C ON C.FUNITID =A.FUNITID AND C.FLOCALEID =2052 INNER JOIN T_SAL_ORDERENTRY_F D ON D.FENTRYID =A.FENTRYID WHERE A.FID =@FID AND --A.FMRPCLOSESTATUS = 'A' -(ISNULL(AA.FCHANGEDATE,'') = '' AND AA.FID = @FID) or (AA.FID = @FID AND A.FMRPCLOSESTATUS = 'A') +(ISNULL(AA.FCHANGEDATE,'') = '' AND AA.FID = @FID) or (AA.FID = @FID ) --EXEC GetTempModelData @FID = 101521,@FType = 'HH' --Select * From T_TempModelPath