Compare commits

...

2 Commits

Author SHA1 Message Date
liqionghai
8a435c467c Merge branch 'main' of http://8.130.121.29:3000/TianHua/PiolotTH_ReportFrom
# Conflicts:
#	YSZKDZBaoBiao/AccountsReceivableReport2.cs
2025-07-24 16:27:31 +08:00
liqionghai
49dbc68723 1 2025-07-23 09:44:27 +08:00
16 changed files with 149 additions and 75 deletions

View File

@@ -57,8 +57,10 @@ namespace GZ_LTHReportForms.ReporyDDWFH
ReportHeader header = new ReportHeader(); ReportHeader header = new ReportHeader();
header.AddChild("日期", new LocaleValue("日期"), SqlStorageType.SqlDatetime); header.AddChild("单据日期", new LocaleValue("单据日期"), SqlStorageType.SqlDatetime);
header.AddChild("制单人", new LocaleValue("制单人"), SqlStorageType.Sqlnvarchar); header.AddChild("制单人", new LocaleValue("制单人"), SqlStorageType.Sqlnvarchar);
header.AddChild("审核日期", new LocaleValue("审核日期"), SqlStorageType.SqlDatetime);
header.AddChild("审核人", new LocaleValue("审核人"), SqlStorageType.Sqlnvarchar);
header.AddChild("区域", new LocaleValue("区域"), SqlStorageType.Sqlnvarchar); header.AddChild("区域", new LocaleValue("区域"), SqlStorageType.Sqlnvarchar);
header.AddChild("业务员", new LocaleValue("业务员"), SqlStorageType.Sqlnvarchar); header.AddChild("业务员", new LocaleValue("业务员"), SqlStorageType.Sqlnvarchar);
header.AddChild("合同号", new LocaleValue("合同号"), SqlStorageType.Sqlnvarchar); header.AddChild("合同号", new LocaleValue("合同号"), SqlStorageType.Sqlnvarchar);
@@ -113,12 +115,12 @@ namespace GZ_LTHReportForms.ReporyDDWFH
EXEC GZTH_DDWFHMXB '{0}','{1}','{2}','{4}' EXEC GZTH_DDWFHMXB '{0}','{1}','{2}','{4}'
SELECT SELECT
ROW_NUMBER() OVER (ORDER BY [日期]) AS FIDENTITYID, ROW_NUMBER() OVER (ORDER BY [审核日期]) AS FIDENTITYID,
* *
INTO {3} INTO {3}
FROM GZ_DDWFHMX_TH FROM GZ_DDWFHMX_TH
WHERE [未发货数量] <> 0 AND [未发货数量] <> 0 WHERE [未发货数量] <> 0 AND [未发货数量] <> 0
ORDER BY [日期] ORDER BY [审核日期]
", FstartDate, FEndDate, FSaleOrgId, tableName, Fcontractnumber); ", FstartDate, FEndDate, FSaleOrgId, tableName, Fcontractnumber);
DBUtils.Execute(this.Context, sql); DBUtils.Execute(this.Context, sql);
} }
@@ -131,6 +133,12 @@ namespace GZ_LTHReportForms.ReporyDDWFH
result.Add(new SummaryField("已发货金额", BOSEnums.Enu_SummaryType.SUM)); result.Add(new SummaryField("已发货金额", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("未发货数量", BOSEnums.Enu_SummaryType.SUM)); result.Add(new SummaryField("未发货数量", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("未发货金额", BOSEnums.Enu_SummaryType.SUM)); result.Add(new SummaryField("未发货金额", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("星空已发货数量", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("星空已发货金额", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("星空未发货数量", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("K3已发货数量", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("K3已发货金额", BOSEnums.Enu_SummaryType.SUM));
result.Add(new SummaryField("K3未发货数量", BOSEnums.Enu_SummaryType.SUM));
return result; return result;
} }
} }

View File

@@ -163,12 +163,11 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH); ", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH);
sql += string.Format(@"/*dialect*/ sql += string.Format(@"/*dialect*/
INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FTAXPRICE,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount, INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount,
ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,[K3退货金额],PPBillingAmount,ZPBillingAmount,[星空退货金额],[星空发货金额]) ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,[K3退货金额],PPBillingAmount,ZPBillingAmount,[星空退货金额],[星空发货金额])
SELECT SELECT
'合计', '合计',
SUM(FQTY), SUM(FQTY),
SUM(FTAXPRICE),
SUM(FALLAMOUNT), SUM(FALLAMOUNT),
SUM(OrderAmount), SUM(OrderAmount),
SUM(ShipmentsNum), SUM(ShipmentsNum),
@@ -182,7 +181,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
SUM(OwedTickets),sum(K3退货金额) , SUM(OwedTickets),sum(K3退货金额) ,
SUM(PPBillingAmount), SUM(PPBillingAmount),
SUM(ZPBillingAmount), SUM(ZPBillingAmount),
sum(星空退货金额),SUM(星空发货金额) sum(星空退货金额),SUM(星空发货金额),
FROM FROM
YingShouZhanKuanMX_GZTH YingShouZhanKuanMX_GZTH
where 1=1 where 1=1

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,9 +1,3 @@
/****** Object: StoredProcedure [dbo].[GXFPJEYSDZDMX_GZTH] Script Date: 2025/7/15 16:06:03 ******/
SET ANSI_NULLS ON
GO
SET QUOTED_IDENTIFIER ON
GO
ALTER PROCEDURE [dbo].[GXFPJEYSDZDMX_GZTH] ALTER PROCEDURE [dbo].[GXFPJEYSDZDMX_GZTH]
AS AS
@@ -52,10 +46,24 @@ BEGIN
--<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>
UPDATE A UPDATE A
SET A.KPJE = B.HZKPJE, A.ISTrue = 1 SET --A.KPJE = B.HZKPJE,
A.ISTrue = 1
FROM FPYSDZDMX A FROM FPYSDZDMX A
INNER JOIN FPYSDZDHPMXHP B ON A.FPFID = B.LZFPFID AND A.FPFENTRYID = B.LZFPFENTRYID INNER JOIN FPYSDZDHPMXHP B ON A.FPFID = B.LZFPFID AND A.FPFENTRYID = B.LZFPFENTRYID
UPDATE A
SET PPBillingDate = FORMAT(CONVERT(DATE, B.FPRQ), 'yyyy-MM-dd')
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN (SELECT MAX(FPRQ) FPRQ,XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX FROM FPYSDZDMX GROUP BY XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX) B
ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ
WHERE B.FPLX = '<EFBFBD><EFBFBD>Ʊ' AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
UPDATE A
SET ZPBillingDate = FORMAT(CONVERT(DATE, B.FPRQ), 'yyyy-MM-dd')
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN (SELECT MAX(FPRQ) FPRQ,XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX FROM FPYSDZDMX GROUP BY XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX) B
ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ
WHERE B.FPLX = 'רƱ' AND A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
--UPDATE A --UPDATE A
--SET PPBillingAmount = B.KPJE --SET PPBillingAmount = B.KPJE
--FROM YingShouZhanKuanMX_GZTH A --FROM YingShouZhanKuanMX_GZTH A
@@ -85,6 +93,16 @@ BEGIN
ON A.FID = B.XSDDFID AND A.FSaleOrgId = B.FPJSZZ ON A.FID = B.XSDDFID AND A.FSaleOrgId = B.FPJSZZ
WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
--UPDATE A
--SET PPBillingAmount = B.KPJE
-- FROM YingShouZhanKuanMX_GZTH A
--INNER JOIN ( SELECT SUM(cc.KPJE) KPJE,XSDDFID,cc.FPJSZZ,cc.XSDDFENTRYID FROM (
-- SELECT DISTINCT bb.XSDDFID,bb.FPFENTRYID,bb.KPJE ,bb.FPJSZZ,bb.XSDDFENTRYID FROM FPYSDZDMX bb
-- WHERE bb.FPLX = '<27><>Ʊ' ) cc
-- GROUP BY cc.XSDDFID,cc.FPJSZZ,cc.XSDDFENTRYID ) B
--ON A.FID = B.XSDDFID AND A.FSaleOrgId = B.FPJSZZ AND A.FENTRYID = b.XSDDFENTRYID
--WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
UPDATE A UPDATE A
SET ZPBillingAmount = B.KPJE SET ZPBillingAmount = B.KPJE
@@ -96,7 +114,15 @@ BEGIN
ON A.FID = B.XSDDFID AND A.FSaleOrgId = B.FPJSZZ ON A.FID = B.XSDDFID AND A.FSaleOrgId = B.FPJSZZ
WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
--UPDATE A
--SET PPBillingAmount = B.KPJE
-- FROM YingShouZhanKuanMX_GZTH A
--INNER JOIN ( SELECT SUM(cc.KPJE) KPJE,XSDDFID,cc.FPJSZZ,cc.XSDDFENTRYID FROM (
-- SELECT DISTINCT bb.XSDDFID,bb.FPFENTRYID,bb.KPJE ,bb.FPJSZZ,bb.XSDDFENTRYID FROM FPYSDZDMX bb
-- WHERE bb.FPLX = 'רƱ' ) cc
-- GROUP BY cc.XSDDFID,cc.FPJSZZ,cc.XSDDFENTRYID ) B
--ON A.FID = B.XSDDFID AND A.FSaleOrgId = B.FPJSZZ AND A.FENTRYID = b.XSDDFENTRYID
--WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
--<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><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>
SELECT SELECT
@@ -131,7 +157,7 @@ BEGIN
GROUP BY FID GROUP BY FID
UPDATE A UPDATE A
SET A.ShippedDebt = B.[<EFBFBD>ѳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>], A.InvoicedDebt = B.[<EFBFBD>ѿ<EFBFBD>ƱǷ<EFBFBD><EFBFBD>],A.OwedTickets = B.[ǷƱ], SET A.ShippedDebt = B.[<EFBFBD>ѳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>], A.InvoicedDebt = B.[<EFBFBD>ѿ<EFBFBD>ƱǷ<EFBFBD><EFBFBD>],--A.OwedTickets = B.[ǷƱ],
A.IsEnded = B.[<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] A.IsEnded = B.[<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]
FROM YingShouZhanKuanMX_GZTH A FROM YingShouZhanKuanMX_GZTH A
INNER JOIN #TEMP4 B ON A.FID = B.FID INNER JOIN #TEMP4 B ON A.FID = B.FID
@@ -151,6 +177,7 @@ BEGIN
INNEr JOIN #TEMP5 B ON A.FID = B.FID AND A.FENTRYID = B.FENTRYID INNEr JOIN #TEMP5 B ON A.FID = B.FID AND A.FENTRYID = B.FENTRYID
--UPDATE A --UPDATE A
--SET A.BillingAmount = 0,A.OrderAmount = 0,A.PaymentAmount = 0,A.ShippedDebt = 0,A.InvoicedDebt = 0,A.OwedTickets = 0,A.IsEnded = '',QCPPBillingAmount = 0,QCZPBillingAmount = 0 --SET A.BillingAmount = 0,A.OrderAmount = 0,A.PaymentAmount = 0,A.ShippedDebt = 0,A.InvoicedDebt = 0,A.OwedTickets = 0,A.IsEnded = '',QCPPBillingAmount = 0,QCZPBillingAmount = 0
--FROM YingShouZhanKuanMX_GZTH A --FROM YingShouZhanKuanMX_GZTH A
@@ -162,7 +189,7 @@ BEGIN
WHERE PPBillingAmount = 0 WHERE PPBillingAmount = 0
UPDATE YingShouZhanKuanMX_GZTH UPDATE YingShouZhanKuanMX_GZTH
SET OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL ,OwedTickets= 0,BillingAmount=0 SET OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL ,OwedTickets= 0,BillingAmount=0,PPBillingAmount=0,ZPBillingAmount=0,ZPBillingDate='',PPBillingDate='',PaymentDate = ''
from ( from (
SELECT CASE WHEN ROW_NUMBER() OVER(PARTITION BY FBILLNO ORDER BY fid) = 1 THEN FBILLNO SELECT CASE WHEN ROW_NUMBER() OVER(PARTITION BY FBILLNO ORDER BY fid) = 1 THEN FBILLNO
END AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD>,* FROM YingShouZhanKuanMX_GZTH END AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD>,* FROM YingShouZhanKuanMX_GZTH
@@ -170,4 +197,13 @@ BEGIN
) B ) B
WHERE YingShouZhanKuanMX_GZTH.FID=B.FID AND YingShouZhanKuanMX_GZTH.FENTRYID=b.FENTRYID AND b.<EFBFBD><EFBFBD><EFBFBD><EFBFBD> IS null WHERE YingShouZhanKuanMX_GZTH.FID=B.FID AND YingShouZhanKuanMX_GZTH.FENTRYID=b.FENTRYID AND b.<EFBFBD><EFBFBD><EFBFBD><EFBFBD> IS null
UPDATE A
SET OwedTickets = B.QP
FROM YingShouZhanKuanMX_GZTH A
JOIN (SELECT FID,SUM(OrderAmount) - SUM(BillingAmount) AS 'QP' FROM YingShouZhanKuanMX_GZTH GROUP BY FID) B ON A.FID = B.FID
WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 AND A.row_num = 1
DROP TABLE #TEMP3
DROP TABLE #TEMP4
DROP TABLE #TEMP5
END END

View File

@@ -1,4 +1,4 @@
ALTER PROCEDURE UpdateYSDZBMX_GZTH ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]
@FSDATE varchar(1000), @FSDATE varchar(1000),
@FEDATE varchar(1000), @FEDATE varchar(1000),
@FSaleOrgId varchar(1000), @FSaleOrgId varchar(1000),
@@ -8,14 +8,17 @@ ALTER PROCEDURE UpdateYSDZBMX_GZTH
AS AS
BEGIN BEGIN
DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE); DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);
DECLARE @EndDate DATE = CONVERT(DATE, @FEDATE); --DECLARE @EndDate DATE = CONVERT(DATE,@FEDATE);
DECLARE @EndDate DATE = CONVERT(DATE,CASE @FEDATE WHEN '' THEN '2099-12-31'ELSE @FEDATE END);
-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB> -- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>
SET @EndDate = DATEADD(DAY, 1, @EndDate); SET @EndDate = DATEADD(DAY, 1, @EndDate);
TRUNCATE TABLE YingShouZhanKuanMX_GZTH; TRUNCATE TABLE YingShouZhanKuanMX_GZTH;
INSERT INTO YingShouZhanKuanMX_GZTH (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) INSERT INTO
YingShouZhanKuanMX_GZTH
(FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>,NUMBER)
SELECT SELECT
A.FID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FID A.FID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FID
,B.FENTRYID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID ,B.FENTRYID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID
@@ -32,11 +35,14 @@ BEGIN
,AF.FBillAllAmount <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ,AF.FBillAllAmount <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,A.F_Amount AS <EFBFBD>ۼƺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ,A.F_Amount AS <EFBFBD>ۼƺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,0 AS <EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ,0 AS <EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,tmm.FOldNumber
,ROW_NUMBER() OVER(ORDER BY A.FID) AS NUMBER
FROM T_SAL_ORDER A FROM T_SAL_ORDER A
INNER JOIN T_SAL_ORDERFIN AF ON A.FID = AF.FID INNER JOIN T_SAL_ORDERFIN AF ON A.FID = AF.FID
INNER JOIN T_BAS_PREBDONE_L GC ON A.F_projectname = GC.FID INNER JOIN T_BAS_PREBDONE_L GC ON A.F_projectname = GC.FID
INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID
INNER JOIN T_BD_MATERIAL_L WL_L ON B.FMATERIALID = WL_L.FMATERIALID INNER JOIN T_BD_MATERIAL_L WL_L ON B.FMATERIALID = WL_L.FMATERIALID
INNER JOIN T_BD_MATERIAL tmm ON B.FMATERIALID = tmm.FMATERIALID
INNER JOIN T_SAL_ORDERENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID INNER JOIN T_SAL_ORDERENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID
INNER JOIN V_BD_SALESMAN_L XS ON XS.FID = A.FSALERID INNER JOIN V_BD_SALESMAN_L XS ON XS.FID = A.FSALERID
WHERE A.FSaleOrgId = @FSaleOrgId WHERE A.FSaleOrgId = @FSaleOrgId
@@ -45,36 +51,50 @@ BEGIN
AND A.FApproveDate <= @EndDate AND A.FApproveDate <= @EndDate
AND (ISNULL(@XSYFID, '') = '' OR A.FSalerId = @XSYFID) AND (ISNULL(@XSYFID, '') = '' OR A.FSalerId = @XSYFID)
AND (ISNULL(@ZZHTH,'') = '' OR A.F_contractnumber = @ZZHTH) AND (ISNULL(@ZZHTH,'') = '' OR A.F_contractnumber = @ZZHTH)
AND B.FRETURNTYPE <> 'RETURN'
UPDATE a
SET a.[K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]=b.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,a.[K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]=b.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,a.[K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]=b.<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,a.[K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]=b.<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,a.[K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = b.רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ,a.[K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]= b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--<EFBFBD><EFBFBD><EFBFBD><EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD> FROM YingShouZhanKuanMX_GZTH A
INSERT INTO YingShouZhanKuanMX_GZTH (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,[K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) INNER JOIN [oldk3seorder0701] b
SELECT ON a.FBILLNO=b.[<EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD>] AND a.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>=[<EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>] AND a.FQty=[<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] AND (ABS(a.FTaxPrice-b.[<EFBFBD><EFBFBD>˰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>])<=0.02 OR ABS(a.FTaxPrice-b.[<EFBFBD><EFBFBD><EFBFBD><EFBFBD>])<=0.02)
B.FID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FID WHERE <EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=0
,0 AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID
,B.FSaleOrgId AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֯
,B.FBILLNO AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,XS.FNAME AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԱFID
,FORMAT( B.FApproveDate,'yyyy-MM-dd') AS ǩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ----<EFBFBD><EFBFBD><EFBFBD><EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,B.F_contractnumber AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> --INSERT INTO
,GC.FNAME AS <EFBFBD><EFBFBD>Ŀ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> --YingShouZhanKuanMX_GZTH
,A.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͺ<EFBFBD> AS <EFBFBD>ͺ<EFBFBD> --(FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,[K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>])
,A.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> --SELECT
,A.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> -- B.FID AS <20><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FID
,A.<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> AS <EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> --,0 AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID
,A.<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> AS <EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> --,B.FSaleOrgId AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֯
,A.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> AS <EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> --,B.FBILLNO AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,A.רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> AS רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> --,XS.FNAME AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԱFID
,1 AS <EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD> --,FORMAT( B.FApproveDate,'yyyy-MM-dd') AS ǩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
FROM oldk3seorder0701 A --,B.F_contractnumber AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
INNER JOIN T_SAL_ORDER B ON A.<EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD> = B.FBILLNO --,GC.FNAME AS <EFBFBD><EFBFBD>Ŀ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
INNER JOIN T_BAS_PREBDONE_L GC ON B.F_projectname = GC.FID --,A.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͺ<EFBFBD> AS <EFBFBD>ͺ<EFBFBD>
INNER JOIN V_BD_SALESMAN_L XS ON XS.FID = B.FSALERID --,A.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
WHERE B.FSaleOrgId = @FSaleOrgId --,A.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
AND B.FCUSTID = @FCUSTID --,A.<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> AS <EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
AND B.FApproveDate >= @StartDate --,A.<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> AS <EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
AND B.FApproveDate <= @EndDate --,A.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> AS <EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
AND (ISNULL(@XSYFID, '') = '' OR B.FSalerId = @XSYFID) --,A.רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> AS רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
AND (ISNULL(@ZZHTH,'') = '' OR B.F_contractnumber = @ZZHTH) --,1 AS <EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--FROM oldk3seorder0701 A
--INNER JOIN T_SAL_ORDER B ON A.<EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD> = B.FBILLNO
--INNER JOIN T_BAS_PREBDONE_L GC ON B.F_projectname = GC.FID
--INNER JOIN V_BD_SALESMAN_L XS ON XS.FID = B.FSALERID
--WHERE B.FSaleOrgId = @FSaleOrgId
--AND B.FCUSTID = @FCUSTID
--AND B.FApproveDate >= @StartDate
--AND B.FApproveDate <= @EndDate
--AND (ISNULL(@XSYFID, '') = '' OR B.FSalerId = @XSYFID)
--AND (ISNULL(@ZZHTH,'') = '' OR B.F_contractnumber = @ZZHTH)
--<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><EFBFBD><EFBFBD><EFBFBD>ͷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
SELECT SELECT
@@ -85,9 +105,9 @@ BEGIN
,B_F.FAllAmount_LC AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ,B_F.FAllAmount_LC AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
INTO #TEMP1 INTO #TEMP1
FROM T_SAL_DELIVERYNOTICE A FROM T_SAL_DELIVERYNOTICE A
INNER JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID LEFT JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID
INNER JOIN T_SAL_DELIVERYNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID
INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY' LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'
WHERE C.FSBILLID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH) WHERE C.FSBILLID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH)
AND C.FSID IN (SELECT FENTRYID FROM YingShouZhanKuanMX_GZTH) AND C.FSID IN (SELECT FENTRYID FROM YingShouZhanKuanMX_GZTH)
@@ -126,8 +146,8 @@ BEGIN
--<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><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
SELECT SELECT
C.FSBILLID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FID E.FSBILLID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FID
,C.FSID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID ,E.FSID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID
,A.FDATE AS <EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ,A.FDATE AS <EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,B.FQTY 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> ,B_F.FALLAMOUNT_LC AS <EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -136,6 +156,8 @@ BEGIN
INNER JOIN T_SAL_RETURNNOTICEENTRY B ON A.FID = B.FID 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_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_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_ORDERENTRY_LK E ON E.FENTRYID = D.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'
----<EFBFBD><EFBFBD><EFBFBD><EFBFBD>k3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ----<EFBFBD><EFBFBD><EFBFBD><EFBFBD>k3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--update A --update A
@@ -151,6 +173,13 @@ BEGIN
INNER JOIN #TEMP2 B ON A.FID = B.<2E><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FID AND A.FENTRYID = B.<2E><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FENTRYID INNER JOIN #TEMP2 B ON A.FID = B.<2E><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FID AND A.FENTRYID = B.<2E><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FENTRYID
update YingShouZhanKuanMX_GZTH update YingShouZhanKuanMX_GZTH
SET ReturnNum = K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> + <EFBFBD>ǿ<EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, ReturnAmount = K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> + <EFBFBD>ǿ<EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> SET ReturnNum = K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> + <EFBFBD>ǿ<EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, ReturnAmount = K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> + <EFBFBD>ǿ<EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
--<EFBFBD><EFBFBD><EFBFBD>»ؿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
UPDATE A
SET PaymentDate = FORMAT(B.ShouKuanFDate,'yyyy-MM-dd')
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN ZZZ_HeXiaoBook B ON B.XiaoShouFid = A.FID
--SELECT OrderAmount,PaymentAmount,ShippedDebt,InvoicedDebt,IsEnded ,OwedTickets,BillingAmount, CASE WHEN ROW_NUMBER() OVER(PARTITION BY FBILLNO ORDER BY fid) = 1 THEN FBILLNO
--END AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD>,* FROM YingShouZhanKuanMX_GZTH
END END

View File

@@ -1,16 +1,17 @@
USE [AIS2025]
/****** Object: StoredProcedure [dbo].[UpdateYSDZBMX_GZTH] Script Date: 2025/7/15 15:56:20 ******/ GO
/****** Object: StoredProcedure [dbo].[UpdateYSDZBMX_GZTH] Script Date: 2025/7/23 13:45:57 ******/
SET ANSI_NULLS ON SET ANSI_NULLS ON
GO GO
SET QUOTED_IDENTIFIER ON SET QUOTED_IDENTIFIER ON
GO GO
ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH] ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]
@FSDATE VARCHAR(1000), @FSDATE varchar(1000),
@FEDATE VARCHAR(1000), @FEDATE varchar(1000),
@FSaleOrgId VARCHAR(1000), @FSaleOrgId varchar(1000),
@FCUSTID VARCHAR(1000), @FCUSTID varchar(1000),
@XSYFID VARCHAR(1000), @XSYFID varchar(1000),
@ZZHTH VARCHAR(1000) @ZZHTH varchar(1000)
AS AS
BEGIN BEGIN
DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE); DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);
@@ -23,7 +24,7 @@ BEGIN
INSERT INTO INSERT INTO
YingShouZhanKuanMX_GZTH YingShouZhanKuanMX_GZTH
(FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>) (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>,NUMBER)
SELECT SELECT
A.FID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FID A.FID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FID
,B.FENTRYID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID ,B.FENTRYID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID
@@ -41,6 +42,7 @@ BEGIN
,A.F_Amount AS <EFBFBD>ۼƺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ,A.F_Amount AS <EFBFBD>ۼƺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,0 AS <EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ,0 AS <EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
,tmm.FOldNumber ,tmm.FOldNumber
,ROW_NUMBER() OVER(ORDER BY A.FID) AS NUMBER
FROM T_SAL_ORDER A FROM T_SAL_ORDER A
INNER JOIN T_SAL_ORDERFIN AF ON A.FID = AF.FID INNER JOIN T_SAL_ORDERFIN AF ON A.FID = AF.FID
INNER JOIN T_BAS_PREBDONE_L GC ON A.F_projectname = GC.FID INNER JOIN T_BAS_PREBDONE_L GC ON A.F_projectname = GC.FID

View File

@@ -4,9 +4,9 @@ BEGIN
TRUNCATE TABLE YingShouZhanKuanJY_GZTH TRUNCATE TABLE YingShouZhanKuanJY_GZTH
INSERT INTO YingShouZhanKuanJY_GZTH(FID,FSaleOrgId,FSalerId,[DATE],ContractNumber,ProjectName,OrderAmount,FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,IsEnded,Remark,[K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) INSERT INTO YingShouZhanKuanJY_GZTH(FID,FSaleOrgId,FSalerId,[DATE],ContractNumber,ProjectName,OrderAmount,FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,IsEnded,Remark,[K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],ZPFALLAmountFor,PPFALLAmountFor)
SELECT FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,SUM(OrderAmount) OrderAmount,SUM(BillingAmount) BillingAmount,SUM(PaymentAmount) PaymentAmount,SUM(ShippedDebt) ShippedDebt SELECT FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,SUM(OrderAmount) OrderAmount,SUM(BillingAmount) BillingAmount,SUM(PaymentAmount) PaymentAmount,SUM(ShippedDebt) ShippedDebt
,SUM(InvoicedDebt) InvoicedDebt,SUM(OwedTickets) OwedTickets,null,Remark,SUM([K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM([K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] ,SUM(InvoicedDebt) InvoicedDebt,SUM(OwedTickets) OwedTickets,null,Remark,SUM([K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM([K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM(ZPBillingAmount) [רƱ<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM(PPBillingAmount) [<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]
FROM YingShouZhanKuanMX_GZTH FROM YingShouZhanKuanMX_GZTH
WHERE Number <> '<EFBFBD>ϼ<EFBFBD>' OR Number IS NULL WHERE Number <> '<EFBFBD>ϼ<EFBFBD>' OR Number IS NULL
GROUP BY FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,Remark GROUP BY FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,Remark