This commit is contained in:
余宇波 2025-06-27 15:40:30 +08:00
parent f030c3e473
commit 3e5c4ca173
4 changed files with 24 additions and 8 deletions

View File

@ -296,6 +296,13 @@ else
wheresql += $@" and [F_009] = '{GCXMFid}'"; wheresql += $@" and [F_009] = '{GCXMFid}'";
} }
//获取责任人
var ZeRenRen = Convert.ToString(dyObj["F_ZeRenRen"]);
if (!string.IsNullOrWhiteSpace(ZeRenRen))
{
wheresql += $@" and [ZeRenRen] = '{ZeRenRen}'";
}
//获取合同号 //获取合同号
var HeTongHao = Convert.ToString(dyObj["F_HeTongHao"]); var HeTongHao = Convert.ToString(dyObj["F_HeTongHao"]);
if (!string.IsNullOrWhiteSpace(HeTongHao)) if (!string.IsNullOrWhiteSpace(HeTongHao))
@ -309,6 +316,8 @@ else
wheresql += $@" and [F_003] like '%{F_SBU}%'"; wheresql += $@" and [F_003] like '%{F_SBU}%'";
} }
//[F_025] [实际已出货应收款合计] F_ChuHuo1 F_ChuHuo2
this.View.Model.DeleteEntryData("F_MBBA_Entity_qtr"); this.View.Model.DeleteEntryData("F_MBBA_Entity_qtr");
//获取表1 //获取表1

View File

@ -426,18 +426,21 @@ FROM #PLChongDianZhuangHeTong ;");
H5.FDATAVALUE AS 'SpecialCauseType', -- H5.FDATAVALUE AS 'SpecialCauseType', --
A.FCRMSPECIALPRICINGREASON AS 'CRMSpecialCause', --CRM特价原因 A.FCRMSPECIALPRICINGREASON AS 'CRMSpecialCause', --CRM特价原因
CASE CASE
WHEN AAA.F_ORDERTYPE = 'YB' THEN WHEN (AAA.F_ORDERTYPE = 'YB' or AAA.F_ORDERTYPE = 'CDZYB') THEN
B.F_SETTLEMENTP B.F_SETTLEMENTP
ELSE ELSE
NULL NULL
END AS 'CurrentSettledUpset1', -- END AS 'CurrentSettledUpset1', --
CASE
CASE
WHEN (AAA.F_ORDERTYPE = 'CDZXT') THEN
isnull(g.F_JSJ,0)* B.FQTY+isnull(A.F_KFYS,0)+isnull(F_SGCB,0)+isnull(F_SSRT,0)*800+isnull(F_SJRT,0)*800
WHEN AAA.F_ORDERTYPE = 'XT' WHEN AAA.F_ORDERTYPE = 'XT'
AND ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN AND ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN
CAST(ISNULL(A.F_VRYF_AMOUNT_YRR, 0) AS FLOAT) CAST(ISNULL(A.F_VRYF_AMOUNT_YRR, 0) AS FLOAT)
ELSE ELSE
NULL NULL
END AS 'CurrentSettledUpset2', -- END AS 'CurrentSettledUpset2', --
(B2.FTAXPRICE - B.F_SETTLEMENTP) AS 'Difference', --- (B2.FTAXPRICE - B.F_SETTLEMENTP) AS 'Difference', ---
--PCES --PCES
CASE CASE

View File

@ -261,6 +261,8 @@ GROUP BY F_PaperNumber, FSALEORGID
UPDATE [ZRP_YingShouMingXi_yuyubo] SET []= [] UPDATE [ZRP_YingShouMingXi_yuyubo] SET []= []
WHERE ISNULL([],'')='' OR [] LIKE ' %' WHERE ISNULL([],'')='' OR [] LIKE ' %'
update [ZRP_YingShouMingXi_yuyubo] set []=[];
UPDATE [ZRP_YingShouMingXi_yuyubo] SET SBU=b.,[]=b. UPDATE [ZRP_YingShouMingXi_yuyubo] SET SBU=b.,[]=b.
FROM (SELECT DISTINCT ACO22.,ACO22.,ACO22. FROM ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO22 ) b FROM (SELECT DISTINCT ACO22.,ACO22.,ACO22. FROM ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO22 ) b
WHERE []=b. WHERE []=b.

View File

@ -119,7 +119,7 @@ WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW' )
--CSCW --CSCW
SELECT A.FBILLNO AS 'AFBILLNO', SELECT A.FBILLNO AS 'AFBILLNO',
'CDZ' F_ORDERTYPE, 'CDZYB' F_ORDERTYPE,
CONVERT(NVARCHAR, A.FDATE, 23) AS 'Date', -- CONVERT(NVARCHAR, A.FDATE, 23) AS 'Date', --
MONTH(A.FDATE) AS 'Month', -- MONTH(A.FDATE) AS 'Month', --
A.F_CONTRACTNUMBER AS 'ContractNumber', -- A.F_CONTRACTNUMBER AS 'ContractNumber', --
@ -176,7 +176,7 @@ WHERE
--CSCW --CSCW
SELECT A.FBILLNO AS 'AFBILLNO', SELECT A.FBILLNO AS 'AFBILLNO',
A.F_ORDERTYPE, 'CDZXT' F_ORDERTYPE,
CONVERT(NVARCHAR, A.FDATE, 23) AS 'Date', -- CONVERT(NVARCHAR, A.FDATE, 23) AS 'Date', --
MONTH(A.FDATE) AS 'Month', -- MONTH(A.FDATE) AS 'Month', --
A.F_CONTRACTNUMBER AS 'ContractNumber', -- A.F_CONTRACTNUMBER AS 'ContractNumber', --
@ -325,12 +325,14 @@ SELECT AAA.TableName, A.FBILLNO AS 'AFBILLNO',
H5.FDATAVALUE AS 'SpecialCauseType', -- H5.FDATAVALUE AS 'SpecialCauseType', --
A.FCRMSPECIALPRICINGREASON AS 'CRMSpecialCause', --CRM特价原因 A.FCRMSPECIALPRICINGREASON AS 'CRMSpecialCause', --CRM特价原因
CASE CASE
WHEN AAA.F_ORDERTYPE = 'YB' THEN WHEN (AAA.F_ORDERTYPE = 'YB' or AAA.F_ORDERTYPE = 'CDZYB') THEN
B.F_SETTLEMENTP B.F_SETTLEMENTP
ELSE ELSE
NULL NULL
END AS 'CurrentSettledUpset1', -- END AS 'CurrentSettledUpset1', --
CASE CASE
WHEN (AAA.F_ORDERTYPE = 'CDZXT') THEN
isnull(g.F_JSJ,0)* B.FQTY+isnull(A.F_KFYS,0)+isnull(F_SGCB,0)+isnull(F_SSRT,0)*800+isnull(F_SJRT,0)*800
WHEN AAA.F_ORDERTYPE = 'XT' WHEN AAA.F_ORDERTYPE = 'XT'
AND ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN AND ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN
CAST(ISNULL(A.F_VRYF_AMOUNT_YRR, 0) AS FLOAT) CAST(ISNULL(A.F_VRYF_AMOUNT_YRR, 0) AS FLOAT)