This commit is contained in:
余宇波 2025-10-30 10:17:47 +08:00
parent 91bbcdd3ac
commit 15401e84b1

View File

@ -501,6 +501,7 @@ 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')
@ -520,6 +521,7 @@ 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')