This commit is contained in:
余宇波 2025-10-24 16:26:31 +08:00
parent 0222e71ce4
commit 91bbcdd3ac

View File

@ -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_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 INNER JOIN T_SAL_ORDERENTRY_F D ON D.FENTRYID =A.FENTRYID
WHERE A.FID =@FID AND --A.FMRPCLOSESTATUS = 'A' 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') FORMAT(ROUND( D.FTAXPRICE,2), 'N2'), FORMAT(D.FALLAMOUNT_LC, 'N2')
,A.FNOTE,F_Projecttype as 'FType', ,A.FNOTE,F_Projecttype as 'FType',
FORMAT(ROUND( SUM(D.FALLAMOUNT_LC)OVER(PARTITION BY A.FID ),2),'N2') AS 'FALLAMOUNT', 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_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_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 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 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' 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 ,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 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' 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), SELECT fseq,b.FSPECIFICATION,C.FNAME,FLOOR(A.FQTY),
FORMAT(ROUND( D.FTAXPRICE,2), 'N2'), FORMAT(D.FALLAMOUNT_LC, 'N2') 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_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 INNER JOIN T_SAL_ORDERENTRY_F D ON D.FENTRYID =A.FENTRYID
WHERE A.FID =@FID AND --A.FMRPCLOSESTATUS = 'A' 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' --EXEC GetTempModelData @FID = 101521,@FType = 'HH'
--Select * From T_TempModelPath --Select * From T_TempModelPath