Develop/Piolot_RepotForm_PeiHao
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Develop:6b53f3320174b71a6ccee57a796252874e058f63
Branches Tags
Develop:master
..
compare: Develop:59951854d31d0e579bc08875909e6775f92b7202
Branches Tags
Develop:master

3 Commits
6b53f33201 ... 59951854d3

Author SHA1 Message Date
yuyubo
59951854d3 1 2025-08-01 13:56:26 +08:00
yuyubo
046ff975f9 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm 2025-08-01 13:47:32 +08:00
yuyubo
ca6db5596d 11 2025-08-01 13:45:40 +08:00
3 changed files with 27 additions and 11 deletions
Expand all files Collapse all files

10
Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>

22
Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs
View File

@@ -836,7 +836,7 @@ else
indexi++;
#endregion
}
if (sql_List1.Count > 0)
if (sql_List1.Count > 1)
{
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();
@@ -854,7 +854,8 @@ else
// ");
sql_4 += string.Format(@"/*dialect*/
Select T1.FPAYORGID As ZZ,T2.FNAME As GHDW,(FRECAMOUNTFOR) As SKJE,(FRECAMOUNT-F_AMOUNT*FEXCHANGERATE) AS DHXJE, CONVERT(NVARCHAR(50), t1.FDATE,23) AS FDATE
Select T1.FPAYORGID As ZZ,T2.FNAME As GHDW,(FRECAMOUNT) As SKJE,(FRECAMOUNT-F_AMOUNT*FEXCHANGERATE) AS DHXJE, CONVERT(NVARCHAR(50), t1.FDATE,23) AS FDATE
,(FRECAMOUNTFOR) As SKJE_YB,(FRECAMOUNTFOR-F_AMOUNT) AS DHXJE_YB
From T_AR_RECEIVEBILL T1
Join T_BD_CUSTOMER_L T2 On T1.FCONTACTUNIT = T2.FCUSTID And T2.FLOCALEID = 2052
Where FRECAMOUNTFOR<> isnull( F_AMOUNT,0)
@@ -883,13 +884,28 @@ else
this.View.Model.SetValue("F_zuzhi", item["ZZ"], indexi);
//购货单位
this.View.Model.SetValue("F_005", item["GHDW"], indexi);
//收款金额
//收款金额(本位币)
this.View.Model.SetValue("F_010", item["SKJE"], indexi);
//收款金额(原币)
this.View.Model.SetValue("FDingDanZongE_YuanBi", item["SKJE_YB"], indexi);
//累计到款金额(本位币)
this.View.Model.SetValue("F_020", item["DHXJE"], indexi);
//应收款合计(本位币)
this.View.Model.SetValue("F_021", -1* decimal.Parse(item["DHXJE"]?.ToString()), indexi);
//[实际已出货应收款合计(本位币)]
this.View.Model.SetValue("F_SJYCHYSKHJ_BWB", -1 * decimal.Parse(item["DHXJE"]?.ToString()), indexi);
//累计到款金额(原币)
this.View.Model.SetValue("FDaoKuanJinE_YuanBi", item["DHXJE_YB"], indexi);
//应收款合计(原币)
this.View.Model.SetValue("FYingShouHeJi_YuanBi", -1 * decimal.Parse(item["DHXJE_YB"]?.ToString()), indexi);
//[实际已出货应收款合计(原币)]
this.View.Model.SetValue("F_025", -1 * decimal.Parse(item["DHXJE_YB"]?.ToString()), indexi);
//订单日期
this.View.Model.SetValue("F_012", item["FDATE"], indexi);
//类型

6
非C#代码文件/应收明细SQL.sql
View File

@@ -401,9 +401,9 @@ update [ZRP_YingShouMingXi_yuyubo] SET [
UPDATE [ZRP_YingShouMingXi_yuyubo] SET [<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD>]=CASE WHEN [<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]>12 THEN 'Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>' ELSE [<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] END;
PRINT 'Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>'
UPDATE [ZRP_YingShouMingXi_yuyubo] SET SBU='Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>',[<EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]='Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>'
WHERE [<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]>12;
-- PRINT 'Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>'
--UPDATE [ZRP_YingShouMingXi_yuyubo] SET SBU='Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>',[<EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]='Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>'
--WHERE [<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]>12;
UPDATE [ZRP_YingShouMingXi_yuyubo] SET