This commit is contained in:
liqionghai
2025-11-28 09:47:20 +08:00
parent 6640015719
commit df308eb0ef
2 changed files with 33 additions and 10 deletions

View File

@@ -263,9 +263,9 @@ INNER JOIN (
SET ShipmentsDate = LEFT(CONCAT(CASE WHEN ISNULL(A.ShipmentsDate,'') = '' THEN '' ELSE A.ShipmentsDate+',' END ,B.<EFBFBD>ϲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>),1990)
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
INNER JOIN (SELECT <EFBFBD>к<EFBFBD>,STUFF((SELECT DISTINCT ','+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> FROM oldk3seorder0701 WHERE <EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD> = a.<EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD> FOR XML PATH('')),1,1,'') AS '<EFBFBD>ϲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',<EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD>
INNER JOIN (SELECT <EFBFBD>к<EFBFBD>,STUFF((SELECT DISTINCT ','+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> FROM oldk3seorder0701 WHERE <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> = a.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> FOR XML PATH('')),1,1,'') AS '<EFBFBD>ϲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>
from oldk3seorder0701 a) b
ON C.F_K3SEQ = b.<EFBFBD>к<EFBFBD> AND a.FBILLNO=b.[<EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD>]
ON C.F_K3SEQ = b.<EFBFBD>к<EFBFBD> AND a.CONTRACTNUMBER=b.[<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>]
UPDATE A
SET A.<EFBFBD>ǿշ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = B.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,A.<EFBFBD>ǿշ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = B.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -283,7 +283,7 @@ SET a.[K3
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
INNER JOIN [oldk3seorder0701] b
ON C.F_K3SEQ = b.<EFBFBD>к<EFBFBD> AND a.FBILLNO=b.[<EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD>]
ON C.F_K3SEQ = b.<EFBFBD>к<EFBFBD> AND a.CONTRACTNUMBER=b.[<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>]
WHERE <EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=0
AND B.<EFBFBD><EFBFBD><EFBFBD><EFBFBD> >= @StartDate
AND B.<EFBFBD><EFBFBD><EFBFBD><EFBFBD> < @EndDate
@@ -316,6 +316,29 @@ AND B.
AND A.FApproveDate < @EndDate
AND A.FDOCUMENTSTATUS = 'C'
--<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڣ<EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
INSERT INTO #TEMP2 (<28><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FID,<2C><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FENTRYID,<2C>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD>,<2C>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD>,<2C>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD><>ʺ<EFBFBD>ͬ<EFBFBD><CDAC>)
SELECT
F.FID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FID
,D.FENTRYID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID
,A.FDATE AS <EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,B.FQTY AS <EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,B_F.FALLAMOUNT_LC AS <EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,F.F_CONTRACTNUMBER AS ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD>
FROM T_SAL_RETURNNOTICE A
INNER JOIN T_SAL_RETURNNOTICEENTRY B ON A.FID = B.FID
INNER JOIN T_SAL_RETURNNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID
INNER JOIN T_SAL_RETURNNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'
INNER JOIN T_SAL_ORDERENTRY D ON C.FSBILLID = D.FID AND C.FSID = D.FENTRYID
INNER JOIN T_SAL_ORDER F ON D.FID = F.FID
WHERE 1=1
AND D.FRETURNTYPE <> 'RETURN'
AND D.FRETURNTYPE <> 'SEND'
AND F.F_CONTRACTNUMBER NOT IN (SELECT DISTINCT [ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD>] FROM #TEMP2)
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.FDOCUMENTSTATUS = 'C'
--<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڣ<EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
INSERT INTO #TEMP2 (<28><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FID,<2C><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FENTRYID,<2C>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD>,<2C>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD>,<2C>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD><>ʺ<EFBFBD>ͬ<EFBFBD><CDAC>)
SELECT