From 7af4d9d0181f2442bc60b218ec65bfaf831d0422 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 02 九月 2021 09:27:22 +0800
Subject: [PATCH] nothing
---
src/BLL/Demo.Report/PRD/prd_CompleteSetRateReport.cs | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/src/BLL/Demo.Report/PRD/prd_CompleteSetRateReport.cs b/src/BLL/Demo.Report/PRD/prd_CompleteSetRateReport.cs
index 6ee019c..eaa7b5f 100644
--- a/src/BLL/Demo.Report/PRD/prd_CompleteSetRateReport.cs
+++ b/src/BLL/Demo.Report/PRD/prd_CompleteSetRateReport.cs
@@ -53,21 +53,26 @@
{
ReportHeader header = new ReportHeader();
- header.AddChild("FROWID", new LocaleValue("搴忓彿"), SqlStorageType.Sqlvarchar).ColIndex = 0;
- header.AddChild("FHDATE", new LocaleValue("鎻愭枡璁″垝鏃ユ湡"), SqlStorageType.Sqlvarchar).ColIndex = 1;
- header.AddChild("FHSOURCEBILLNO", new LocaleValue("鐢熶骇璁㈠崟缂栧彿"), SqlStorageType.Sqlvarchar).ColIndex = 2;
- //header.AddChild("Fcolumn3", new LocaleValue("鐢熶骇绾�"), SqlStorageType.Sqlvarchar).ColIndex = 3;
- header.AddChild("FSUPPLIERNUMBER", new LocaleValue("渚涘簲鍟嗙紪鐮�"), SqlStorageType.Sqlvarchar).ColIndex = 4;
- header.AddChild("FSUPPLIERNAME", new LocaleValue("渚涘簲鍟嗗悕绉�"), SqlStorageType.Sqlvarchar).ColIndex = 5;
- //header.AddChild("Fcolumn6", new LocaleValue("浜у搧缂栫爜"), SqlStorageType.Sqlvarchar).ColIndex = 6;
- //header.AddChild("Fcolumn7", new LocaleValue("浜у搧鍚嶇О"), SqlStorageType.Sqlvarchar).ColIndex = 7;
- //header.AddChild("Fcolumn8", new LocaleValue("浜у搧瑙勬牸"), SqlStorageType.Sqlvarchar).ColIndex = 8;
- header.AddChild("FMATERIALNUMBER", new LocaleValue("鍘熸潗鏂欑紪鐮�"), SqlStorageType.Sqlvarchar).ColIndex = 9;
- header.AddChild("FMATERIALNAME", new LocaleValue("鍘熸潗鏂欏悕绉�"), SqlStorageType.Sqlvarchar).ColIndex = 10;
- header.AddChild("FSPECIFICATION", new LocaleValue("鍘熸潗鏂欒鏍�"), SqlStorageType.Sqlvarchar).ColIndex = 11;
- header.AddChild("FHQTY", new LocaleValue("璁㈠崟鏁伴噺")).ColIndex = 11;
- header.AddChild("FREALQTY", new LocaleValue("瀹為檯鍒拌揣鏁伴噺")).ColIndex = 11;
- header.AddChild("FRKDATE", new LocaleValue("瀹為檯鍒拌揣鏃堕棿"), SqlStorageType.Sqlvarchar).ColIndex = 12;
+ header.AddChild("FIDENTITYID", new LocaleValue("搴忓彿"), SqlStorageType.SqlInt).ColIndex = 1;
+ header.AddChild("FHDATE", new LocaleValue("鎻愭枡璁″垝鏃ユ湡", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 1;
+ header.AddChild("FHSOURCEBILLNO", new LocaleValue("鐢熶骇璁㈠崟缂栧彿", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 2;
+ header.AddChild("FSOURCENAME", new LocaleValue("鐢熶骇绾�"), SqlStorageType.Sqlvarchar).ColIndex = 3;
+ header.AddChild("FSUPPLIERNUMBER", new LocaleValue("渚涘簲鍟嗙紪鐮�", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 4;
+ header.AddChild("FSUPPLIERNAME", new LocaleValue("渚涘簲鍟嗗悕绉�", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 5;
+ header.AddChild("FMATERIALNUMBER2", new LocaleValue("浜у搧缂栫爜"), SqlStorageType.Sqlvarchar).ColIndex = 6;
+ header.AddChild("FMATERIALNAME2", new LocaleValue("浜у搧鍚嶇О"), SqlStorageType.Sqlvarchar).ColIndex = 7;
+ header.AddChild("FSPECIFICATION2", new LocaleValue("浜у搧瑙勬牸"), SqlStorageType.Sqlvarchar).ColIndex = 8;
+ header.AddChild("FRJHQTY", new LocaleValue("宸ュ崟鏁伴噺"), SqlStorageType.SqlDecimal).ColIndex = 8;
+ header.AddChild("FQTQTY", new LocaleValue("宸ュ崟榻愬鏁伴噺"), SqlStorageType.SqlDecimal).ColIndex = 8;
+ header.AddChild("FGDQTL", new LocaleValue("宸ュ崟榻愬鐜�"), SqlStorageType.SqlDecimal).ColIndex = 8;
+ header.AddChild("FMATERIALNUMBER", new LocaleValue("鍘熸潗鏂欑紪鐮�", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 9;
+ header.AddChild("FMATERIALNAME", new LocaleValue("鍘熸潗鏂欏悕绉�", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 10;
+ header.AddChild("FSPECIFICATION", new LocaleValue("鍘熸潗鏂欒鏍�", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 11;
+ header.AddChild("FHQTY", new LocaleValue("闇�姹傜墿鏂欐暟閲�", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 11;
+ header.AddChild("FREALQTY", new LocaleValue("鍏ュ簱鏁伴噺", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 11;
+ header.AddChild("FISQT", new LocaleValue("鏄惁榻愬", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 12;
+ header.AddChild("FTYPE", new LocaleValue("绫诲瀷", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 12;
+ header.AddChild("FJSRATE", new LocaleValue("榻愬鐜�", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 12;
return header;
}
@@ -76,18 +81,16 @@
{
base.BuilderReportSqlAndTempTable(filter, tableName);
DynamicObject customFil = filter.FilterParameter.CustomFilter;
- string FDATE = ""; //鎻愭枡鏃ユ湡
+ string FBeginDATE = ""; //鎻愭枡鏃ユ湡
+ string FEndDATE = ""; //鎻愭枡鏃ユ湡
string FProductLine = ""; //鐢熶骇绾�
string FMoBillNo = ""; //鐢熶骇璁㈠崟鍙�
- string FMaterialID = ""; //鐗╂枡
string FSupplyID = ""; //渚涘簲鍟�
- FDATE = customFil["FDATE"].ToString();
- FMoBillNo = customFil["FMoBillNo"].ToString();
- if (((DynamicObject)customFil["FMaterialID"]) != null)
- {
- FMaterialID = ((DynamicObject)customFil["FMaterialID"])["Id"].ToString();
- }
+ FBeginDATE = customFil["FBeginDATE"]?.ToString();
+ FEndDATE = customFil["FEndDATE"]?.ToString();
+ FMoBillNo = customFil["FMoBillNo"]?.ToString();
+
if (((DynamicObject)customFil["FProductLine"]) != null)
{
FProductLine = ((DynamicObject)customFil["FProductLine"])["Id"].ToString();
@@ -96,7 +99,7 @@
{
FSupplyID = ((DynamicObject)customFil["FSupplyID"])["Id"].ToString();
}
- string sql = string.Format($"/*dialect*/ EXEC pr_TimelinessRateReport '{tableName}','{FDATE}','{FMoBillNo}','{FProductLine}','{FSupplyID}','{FMaterialID}'");
+ string sql = string.Format($"/*dialect*/ EXEC pr_CompleteSetRateReport '{tableName}','{FBeginDATE}','{FEndDATE}','{FMoBillNo}','{FProductLine}','{FSupplyID}'");
LogHelper.Info(sql);
DBUtils.Execute(this.Context, sql);
}
--
Gitblit v1.9.1