diff --git a/GZ_KD_Parino/SQL文件/获取word模板数据.sql b/GZ_KD_Parino/SQL文件/获取word模板数据.sql index d364bc2..26eceb3 100644 --- a/GZ_KD_Parino/SQL文件/获取word模板数据.sql +++ b/GZ_KD_Parino/SQL文件/获取word模板数据.sql @@ -501,7 +501,8 @@ 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 ) - + ORDER BY fseq + 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', @@ -520,7 +521,8 @@ Select ROW_NUMBER() OVER (ORDER BY B.FRETURNTYPE) AS ID,CASE WHEN B.FRETURNTYPE 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 ) - +ORDER BY ID + SELECT fseq,b.FSPECIFICATION,C.FNAME,FLOOR(A.FQTY), FORMAT(ROUND( D.FTAXPRICE,2), 'N2'), FORMAT(D.FALLAMOUNT_LC, 'N2') FROM T_SAL_ORDERENTRY A JOIN T_SAL_ORDER AA on A.FID = AA.FID