diff --git a/GZ_KD_Parino/SQL文件/获取word模板数据.sql b/GZ_KD_Parino/SQL文件/获取word模板数据.sql index 1802785..2925d6c 100644 --- a/GZ_KD_Parino/SQL文件/获取word模板数据.sql +++ b/GZ_KD_Parino/SQL文件/获取word模板数据.sql @@ -513,7 +513,7 @@ 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' -ORDER BY a.F_Projecttype ,a.fseq DESC +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