Merge branch 'main' of http://8.130.121.29:3000/Develop/PiolotTH_ReportFrom
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
|
||||
/****** Object: StoredProcedure [dbo].[GetOrderData] Script Date: 2025/8/2 21:48:44 ******/
|
||||
|
||||
/****** Object: StoredProcedure [dbo].[GetOrderData] Script Date: 2025/8/20 10:19:00 ******/
|
||||
SET ANSI_NULLS ON
|
||||
GO
|
||||
SET QUOTED_IDENTIFIER ON
|
||||
@@ -12,7 +12,8 @@ ALTER PROCEDURE [dbo].[GetOrderData]
|
||||
@FSaleOrgIdName nvarchar(1000),
|
||||
@FSDate nvarchar(1000),
|
||||
@FEDate nvarchar(1000),
|
||||
@FPaperContract NVARCHAR(500)=''
|
||||
@FPaperContract NVARCHAR(500)='',
|
||||
@QuYu NVARCHAR(500)=''
|
||||
)
|
||||
as
|
||||
DECLARE @FSaleOrgId nvarchar(1000);
|
||||
@@ -107,7 +108,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
|
||||
(
|
||||
SELECT ','+ CONVERT(NVARCHAR(100), FNAME,120) -- Ҫƴ<D2AA>ӵ<EFBFBD><D3B5><EFBFBD>
|
||||
FROM (
|
||||
SELECT DISTINCT x.FNAME +'--'+CONVERT(NVARCHAR(50), CONVERT(INT, w.F_DAY))+'<EFBFBD><EFBFBD>--'+CONVERT(NVARCHAR(50),CONVERT(DECIMAL(18,2), w.FRECADVANCERATE))+'%' AS FNAME
|
||||
SELECT DISTINCT x.FNAME +'--'+CONVERT(NVARCHAR(50), CONVERT(INT, w.F_DAY))+'<EFBFBD><EFBFBD>--'+CONVERT(NVARCHAR(50),CONVERT(DECIMAL(18,2), w.FRECADVANCERATE))+'%'+'---' +ISNULL(CONVERT(NVARCHAR(20),w.FMUSTDATE,23),'') AS FNAME
|
||||
,w.FID,w.F_PMSDate
|
||||
,W.FRECADVANCEAMOUNT,w.F_DAY ,w.F_MBBA_DECIMAL_UKY
|
||||
,w.FENTRYID, W.F_RecConditionId ,w.FRECADVANCERATE ,x.FNAME AS fname2 ,w.FMUSTDATE [<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]
|
||||
@@ -328,9 +329,10 @@ LEFT JOIN (
|
||||
UPDATE #TEMP1 SET <20><>ͬ<EFBFBD>ܼ<EFBFBD>=<3D><>ͬ<EFBFBD>ܼ<EFBFBD>+(<28><><EFBFBD><EFBFBD><EFBFBD>ܶ<EFBFBD>- <20><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD> )
|
||||
WHERE <20><><EFBFBD><EFBFBD><EFBFBD>ܶ<EFBFBD><>0
|
||||
|
||||
|
||||
SELECT * FROM #TEMP1 ORDER BY fid,FENTRYID ,FSHARERATE desc
|
||||
|
||||
IF(@QuYu='')
|
||||
SELECT * FROM #TEMP1 ORDER BY fid,FENTRYID ,FSHARERATE DESC
|
||||
ELSE
|
||||
SELECT * FROM #TEMP1 WHERE <20><><EFBFBD><EFBFBD> LIKE '%'+@QuYu+'%' ORDER BY fid,FENTRYID ,FSHARERATE DESC
|
||||
|
||||
|
||||
drop table #TEMP2
|
||||
|
||||
Reference in New Issue
Block a user