This commit is contained in:
余宇波 2025-07-29 20:17:28 +08:00
parent 9ea8a4af86
commit be31b3f133
2 changed files with 66 additions and 51 deletions

View File

@ -799,36 +799,47 @@ else
indexi++; indexi++;
#endregion #endregion
} }
if (sql_List1.Count > 0)
{
var kehuName = sql_List1.Where(t=> t["F_000"] !=null && t["F_005"] !=null).Select(t => new { kehu = t["F_005"].ToString(), zhuzhi = t["F_000"].ToString() }).Distinct().ToList();
var sql_4 = ""; var sql_4 = "";
// sql_4 += string.Format(@"/*dialect*/
// Select T1.FPAYORGID As ZZ,T2.FNAME As GHDW,Sum(FRECAMOUNT) As SKJE,Sum(FRECAMOUNT-F_AMOUNT*FEXCHANGERATE) AS DHXJE
// From T_AR_RECEIVEBILL T1
// Join T_BD_CUSTOMER_L T2 On T1.FCONTACTUNIT = T2.FCUSTID And T2.FLOCALEID = 2052
// Join (Select DISTINCT 购货单位,组织ID
//From ZRP_YingShouMingXi_yuyubo
//Where ([整单正数订单总额]-[累计退货金额(原币)]-[K3整单累计退货金额(本位币)])<>[累计到款金额(原币)]) T3
//ON T3.组织ID = T1.FPAYORGID AND t3.购货单位=t2.FNAME
// Where 1=1
// And FCONTACTUNITTYPE = 'BD_Customer'
// ");
sql_4 += string.Format(@"/*dialect*/ sql_4 += string.Format(@"/*dialect*/
Select T1.FPAYORGID As ZZ,T2.FNAME As GHDW,Sum(FRECAMOUNT) As SKJE,Sum(FRECAMOUNT-F_AMOUNT*FEXCHANGERATE) AS DHXJE Select T1.FPAYORGID As ZZ,T2.FNAME As GHDW,Sum(FRECAMOUNT) As SKJE,Sum(FRECAMOUNT-F_AMOUNT*FEXCHANGERATE) AS DHXJE
From T_AR_RECEIVEBILL T1 From T_AR_RECEIVEBILL T1
Join T_BD_CUSTOMER_L T2 On T1.FCONTACTUNIT = T2.FCUSTID And T2.FLOCALEID = 2052 Join T_BD_CUSTOMER_L T2 On T1.FCONTACTUNIT = T2.FCUSTID And T2.FLOCALEID = 2052
Join (Select DISTINCT ,ID
From ZRP_YingShouMingXi_yuyubo
Where ([]-[退()]-[K3整单累计退货金额()])<>[()]) T3
ON T3.ID = T1.FPAYORGID AND t3.=t2.FNAME
Where 1=1 Where 1=1
And FCONTACTUNITTYPE = 'BD_Customer' And FCONTACTUNITTYPE = 'BD_Customer'
"); ");
if (CUST != null) CustFid = string.Join("','", kehuName.Select(t => t.kehu).Distinct().ToList());
{ sql_4 += $@" And t2.FNAME in ('{CustFid}') ";
CustFid = Convert.ToString(CUST["name"]); FSaleOrgId = string.Join(",", kehuName.Select(t => t.zhuzhi).Distinct().ToList());
sql_4 += $@" And t2.FNAME = '{CustFid}'"; sql_4 += $@" And T1.FPAYORGID in ({FSaleOrgId}) ";
}
if (FSaleOrg != null)
{
FSaleOrgId = Convert.ToString(FSaleOrg["ID"]);
sql_4 += $@" And T1.FPAYORGID ={FSaleOrgId}";
}
sql_4 += " Group By T1.FPAYORGID,T2.FNAME"; sql_4 += " Group By T1.FPAYORGID,T2.FNAME";
var sql_List3 = DBUtils.ExecuteDynamicObject(Context, sql_4); var sql_List3 = DBUtils.ExecuteDynamicObject(Context, sql_4);
var sumList = (from q in sql_List3
join k in kehuName on new { kehu = q["GHDW"].ToString(), zhuzhi = q["ZZ"].ToString() } equals new { k.kehu, k.zhuzhi }
select q).ToList();
this.View.Model.CreateNewEntryRow("F_MBBA_Entity_qtr"); this.View.Model.CreateNewEntryRow("F_MBBA_Entity_qtr");
//类型 //类型
this.View.Model.SetValue("F_009", "类型", indexi); this.View.Model.SetValue("F_009", "类型", indexi);
indexi += 1; indexi += 1;
foreach (var item in sql_List3) foreach (var item in sumList)
{ {
this.View.Model.CreateNewEntryRow("F_MBBA_Entity_qtr"); this.View.Model.CreateNewEntryRow("F_MBBA_Entity_qtr");
//组织 //组织
@ -843,7 +854,7 @@ else
this.View.Model.SetValue("F_009", "收款单", indexi); this.View.Model.SetValue("F_009", "收款单", indexi);
indexi++; indexi++;
} }
}
this.View.UpdateView("F_MBBA_Entity_qtr"); this.View.UpdateView("F_MBBA_Entity_qtr");
} }

View File

@ -282,7 +282,7 @@ INNER JOIN (
FROM [oldk3seorder0701] FROM [oldk3seorder0701]
GROUP BY GROUP BY
) T2 ON T1. = T2. ) T2 ON T1. = T2.
WHERE T1.ID = 100302 WHERE T1.ID = 100302 AND T1. = T2.
---K3明细字段 ---K3明细字段
update [ZRP_YingShouMingXi_yuyubo] set update [ZRP_YingShouMingXi_yuyubo] set
@ -327,33 +327,37 @@ GROUP BY F_PaperNumber, FSALEORGID
-- 补充一点这些字段还要按销售员分摊进行区分比如订单金额100元销售员A 30%销售员B 70%,这些字段就会显示 A显示30元B显示70元 -- 补充一点这些字段还要按销售员分摊进行区分比如订单金额100元销售员A 30%销售员B 70%,这些字段就会显示 A显示30元B显示70元
update [ZRP_YingShouMingXi_yuyubo] set update [ZRP_YingShouMingXi_yuyubo] set
[]=[]*[]*0.01 []=[]*[]*0.01
,[]=[]*[]*0.01+[K3整单累计发货金额()]*[]*0.01 ,[]=[]*[]*0.01
,[退]=[退]*[]*0.01+[K3整单累计退货金额()]*[]*0.01 ,[退]=[退]*[]*0.01
,[]=[]*[]*0.01+[K3整单累计专票金额()]*[]*0.01+[K3整单累计普票金额()]*[]*0.01 ,[]=[]*[]*0.01
,[]=[]*[]*0.01 ,[]=[]*[]*0.01
,[]=ISNULL([],100) ,[]=ISNULL([],100)
,[]=[]*[]*0.01; ,[]=[]*[]*0.01;
--UPDATE [ZRP_YingShouMingXi_yuyubo] set []=[]; --UPDATE [ZRP_YingShouMingXi_yuyubo] set []=[];
UPDATE [ZRP_YingShouMingXi_yuyubo] set UPDATE [ZRP_YingShouMingXi_yuyubo] set
[]=CASE WHEN []>0 then ABS([])-ABS(([退]+[K3整单累计退货金额()]+[])*[]*0.01) +[] ELSE 0 end []=CASE WHEN []>0 then ABS([])-ABS(([退]+[K3整单累计退货金额()]/+[])*[]*0.01) +[] ELSE 0 end
,[]=CASE WHEN []>0 then ABS([])-ABS(([]+[K3整单累计退货金额()])*[]*0.01) ELSE 0 end ,[]=CASE WHEN []>0 then ABS([])-ABS(([]+[K3整单累计退货金额()]/)*[]*0.01) ELSE 0 end
--,[]='2022-01-01' --,[]='2022-01-01'
--,[]=CASE WHEN [] IS NOT NULL AND [] <= GETDATE() AND [] >'1990-01-01' AND []>0 THEN [] ELSE NULL END --,[]=CASE WHEN [] IS NOT NULL AND [] <= GETDATE() AND [] >'1990-01-01' AND []>0 THEN [] ELSE NULL END
--,[]=CASE WHEN [] IS NOT NULL AND [] <= GETDATE() AND [] >'1990-01-01' AND []>0 THEN([]-[退]-[])*[]*0.01*ISNULL([],100)*0.01 ELSE 0 END --,[]=CASE WHEN [] IS NOT NULL AND [] <= GETDATE() AND [] >'1990-01-01' AND []>0 THEN([]-[退]-[])*[]*0.01*ISNULL([],100)*0.01 ELSE 0 END
,[]=CASE WHEN [] >0 THEN ([]+[K3整单累计发货金额()]-[退]-[K3整单累计退货金额()]- [] )*[]*0.01 ELSE 0 end ,[]=CASE WHEN [] >0 THEN ([]+[K3整单累计发货金额()]-[退]-[K3整单累计退货金额()]/- [] )*[]*0.01 ELSE 0 end
,[]= CASE WHEN []>='1990-01-01' AND [] IS NOT NULL THEN '验收完成' ,[]= CASE WHEN []>='1990-01-01' AND [] IS NOT NULL THEN '验收完成'
WHEN []>='1990-01-01' AND [] IS NOT NULL THEN '调试完成' WHEN []>='1990-01-01' AND [] IS NOT NULL THEN '调试完成'
WHEN ISNULL([],'') <> '' THEN [] WHEN ISNULL([],0) = 0 THEN '未启动' WHEN ISNULL([],'') <> '' THEN [] WHEN ISNULL([],0) = 0 THEN '未启动'
WHEN ISNULL( [],0) = ISNULL([],0) THEN '发货完成' WHEN ISNULL([],0) > ISNULL( [],0) THEN '发货中' END WHEN ISNULL( [],0) = ISNULL([],0) THEN '发货完成' WHEN ISNULL([],0) > ISNULL( [],0) THEN '发货中' END
,[]=[]*ISNULL([],100)*0.01; ,[]=[]*ISNULL([],100)*0.01;
------[K3累计退货金额()]-----
SELECT sum(a.) [] , INTO #temp2 FROM ( SELECT sum(a.) [] , INTO #temp2 FROM (
SELECT AVG([]) AS [],ID,ID, FROM [ZRP_YingShouMingXi_yuyubo] SELECT AVG([]) AS [],ID,ID,
FROM [ZRP_YingShouMingXi_yuyubo]
GROUP BY ID,ID,) a GROUP BY ID,ID,) a
GROUP BY GROUP BY
-------[K3累计退货金额()]-----------
UPDATE [ZRP_YingShouMingXi_yuyubo] SET []=ISNULL(ISNULL((SELECT CONVERT(NVARCHAR(10),MAX(SAL.FDATE),23) UPDATE [ZRP_YingShouMingXi_yuyubo] SET []=ISNULL(ISNULL((SELECT CONVERT(NVARCHAR(10),MAX(SAL.FDATE),23)
AS '发货日期' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK) AS '发货日期' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK)
INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID
@ -372,9 +376,9 @@ WHERE T0.FREDBLUE=0 AND aa1.fid=
update [ZRP_YingShouMingXi_yuyubo] SET []=CASE WHEN ([] LIKE '货到%' OR [] LIKE '款到发货%' OR [] LIKE '协议付款%') AND []>0 update [ZRP_YingShouMingXi_yuyubo] SET []=CASE WHEN ([] LIKE '货到%' OR [] LIKE '款到发货%' OR [] LIKE '协议付款%') AND []>0
THEN ([]-[退])*[]*0.01*[]*0.01 - []*[]*0.01+[]+[K3累计发货金额()]-[K3累计退货金额()] THEN ([]-[退])*[]*0.01*[]*0.01 - []*[]*0.01+[]+[K3累计发货金额()]/-[K3累计退货金额()]/
WHEN []>0 WHEN []>0
THEN ([]-[退])*[]*0.01*[]*0.01 - []*[]*0.01 +[]+[K3累计发货金额()]-[K3累计退货金额()] ELSE 0 END ; THEN ([]-[退])*[]*0.01*[]*0.01 - []*[]*0.01 +[]-[K3累计退货金额()]/ ELSE 0 END ;
UPDATE [ZRP_YingShouMingXi_yuyubo] SET []=NULL UPDATE [ZRP_YingShouMingXi_yuyubo] SET []=NULL
@ -411,7 +415,7 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] SET
,[1-2]=CASE WHEN []>=13 AND []<=24 THEN [] ELSE 0 END ,[1-2]=CASE WHEN []>=13 AND []<=24 THEN [] ELSE 0 END
,[2-3]=CASE WHEN []>=25 AND []<=36 THEN [] ELSE 0 END ,[2-3]=CASE WHEN []>=25 AND []<=36 THEN [] ELSE 0 END
,[4-5]=CASE WHEN []>=37 AND []<=60 THEN [] ELSE 0 END ,[4-5]=CASE WHEN []>=37 AND []<=60 THEN [] ELSE 0 END
,[5]=CASE WHEN []> 60 THEN (([]-[退])*[]*0.01 -[])*[]*0.01 +[]+[K3累计专票金额()]-[K3累计普票金额()] ELSE 0 END ,[5]=CASE WHEN []> 60 THEN (([]-[退]-[K3整单累计退货金额()]/)*[]*0.01 -[])*[]*0.01 +[] ELSE 0 END
update [ZRP_YingShouMingXi_yuyubo] SET []=CASE WHEN ([] IS not NULL ) OR ([]=0 AND []=0) THEN NULL ELSE [] END update [ZRP_YingShouMingXi_yuyubo] SET []=CASE WHEN ([] IS not NULL ) OR ([]=0 AND []=0) THEN NULL ELSE [] END
,[]=CASE WHEN [] IS NOT NULL THEN 0 ELSE [] END ,[]=CASE WHEN [] IS NOT NULL THEN 0 ELSE [] END
@ -594,7 +598,7 @@ FROM
,[K3累计专票金额()] ,[K3累计专票金额()]
,[K3累计普票金额()] ,[K3累计普票金额()]
FROM [ZRP_YingShouMingXi_yuyubo] A FROM [ZRP_YingShouMingXi_yuyubo] A
WHERE ([]-[退()]-[K3整单累计退货金额()])<>[()] WHERE ([]-[退()]-[K3整单累计退货金额()]/)<>[()]
ORDER BY A.[ID],[ID],[ID]; ORDER BY A.[ID],[ID],[ID];
update ReceivablesDetailsTable set F_061=B.F_061, F_054=B.F_054 ,F_055=B.F_055,F_056=B.F_056 update ReceivablesDetailsTable set F_061=B.F_061, F_054=B.F_054 ,F_055=B.F_055,F_056=B.F_056