This commit is contained in:
2025-06-11 14:51:56 +08:00
parent db010d0204
commit 8b13e2506c
2 changed files with 20 additions and 4 deletions

View File

@@ -57,6 +57,8 @@ SELECT A.FID [
,[<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼƷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]=ISNULL( (SELECT SUM(B.FBillAllAmount) AS '<EFBFBD>ۼƷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK)
INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID
WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber AND SAL.FSALEORGID=a.FSALEORGID),0)
+ISNULL((SELECT SUM(F_sendAmount) FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid ) ,0)
,[<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]=NULL
--,[<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]=ISNULL((CASE WHEN SUBSTRING(U.FNUMBER,1,1)= 'W' THEN T.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ELSE T.û<EFBFBD>к<EFBFBD>ɫ<EFBFBD>Ŀ<EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> END ),'')
--,[<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]=T.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -65,7 +67,9 @@ SELECT A.FID [
FROM T_SAL_RETURNSTOCK AA WITH(NOLOCK)
INNER JOIN T_SAL_RETURNSTOCKFIN B WITH(NOLOCK) ON AA.FID =B.FID
WHERE AA.FDOCUMENTSTATUS= 'C' AND aa.FSALEORGID = a.FSALEORGID
AND AA.F_contractnumber LIKE CONCAT(A.F_contractnumber, '-%') AND AA.F_contractnumber NOT LIKE CONCAT(A.F_contractnumber, '-%-%') ),0)
AND (( AA.F_contractnumber LIKE CONCAT(A.F_contractnumber, '-%') AND AA.F_contractnumber NOT LIKE CONCAT(A.F_contractnumber, '-%-%') )
OR ( AA.F_contractnumber LIKE CONCAT(A.F_contractnumber, 'HH%') AND AA.F_contractnumber NOT LIKE CONCAT(A.F_contractnumber, 'HH%HH%') ) )
),0)+ISNULL((SELECT SUM(F_returnAmount) FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid ) ,0)
,[<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼƿ<EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] =AD.<EFBFBD><EFBFBD>Ʊ<EFBFBD>ܽ<EFBFBD><EFBFBD><EFBFBD>
,[<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼƵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]=ISNULL(a.F_Amount,0)
@@ -74,6 +78,7 @@ SELECT A.FID [
(
SELECT DISTINCT * FROM (
SELECT plan1.FID ,CASE
WHEN X.FNAME LIKE '<><EFBFBD><E9B8B6>%' THEN null
WHEN X.FNAME LIKE '<><D4A4><EFBFBD><EFBFBD>%' THEN CONVERT(NVARCHAR(20), AA.FAPPROVEDATE, 120)
WHEN X.FNAME LIKE '%<25><><EFBFBD><EFBFBD><EFBFBD>տ<EFBFBD>%' THEN DATEADD(DAY, plan1.F_DAY, CK.F_SFSIGNATURETIME)
WHEN X.FNAME LIKE '%<25><><EFBFBD><EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD>տ<EFBFBD>%' THEN DATEADD(DAY, plan1.F_DAY,FP.FAPPROVEDATE)