From 81e5e0ed03933da6006d929ea71c678c77eadc77 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 26 九月 2022 11:29:51 +0800
Subject: [PATCH] 齐套报表
---
MES/src/BLL/Demo.Report/PRD/prd_CompleteReport.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/MES/src/BLL/Demo.Report/PRD/prd_CompleteReport.cs b/MES/src/BLL/Demo.Report/PRD/prd_CompleteReport.cs
index 3925ecd..8735599 100644
--- a/MES/src/BLL/Demo.Report/PRD/prd_CompleteReport.cs
+++ b/MES/src/BLL/Demo.Report/PRD/prd_CompleteReport.cs
@@ -45,12 +45,12 @@
ReportHeader header = new ReportHeader();
// 缁勭粐 FCOLUMN1,缁勭粐鍚嶇О FCOLUMN2,鐢熶骇杞﹂棿 FCOLUMN3,鐢熶骇杞﹂棿鍚嶇О FCOLUMN4,鐢熶骇璧勬簮 FCOLUMN5,鐢熶骇璧勬簮鍚嶇О FCOLUMN6,鐢熶骇璁㈠崟鍙� FCOLUMN7,閿�鍞鍗曞彿 FCOLUMN8,鐢靛帇+鍔熺巼+搴曟澘 FCOLUMN9,璁㈠崟浜ゆ湡 FCOLUMN10,浜у搧 FCOLUMN11,浜у搧缂栫爜 FCOLUMN12,浜у搧鍚嶇О FCOLUMN13,浜у搧瑙勬牸鍨嬪彿 FCOLUMN26,鏃ヨ鍒掓棩鏈� FCOLUMN14,鏃ヨ鍒掓暟閲� FCOLUMN15,鐗╂枡 FCOLUMN16,鐗╂枡缂栫爜 FCOLUMN17,鐗╂枡鍚嶇О FCOLUMN18,鐗╂枡瑙勬牸鍨嬪彿 FCOLUMN27,璁″垝鍙戞枡鏁伴噺 FCOLUMN19,榻愬鏁伴噺 FCOLUMN20,缂烘枡鏁伴噺 FCOLUMN21,鍙敤鏁伴噺 FCOLUMN22,鍗虫椂搴撳瓨鏁伴噺 FCOLUMN23,鍗犵敤鏁伴噺 FCOLUMN24,棰嗙敤鍗犵敤鏁伴噺 FCOLUMN25
header.AddChild("FCOLUMN2", new LocaleValue("缁勭粐鍚嶇О"), SqlStorageType.Sqlvarchar);
- header.AddChild("FCOLUMN4", new LocaleValue("鐢熶骇杞﹂棿鍚嶇О"), SqlStorageType.Sqlvarchar);
- header.AddChild("FCOLUMN6", new LocaleValue("鐢熶骇璧勬簮鍚嶇О"), SqlStorageType.Sqlvarchar);
+ //header.AddChild("FCOLUMN4", new LocaleValue("鐢熶骇杞﹂棿鍚嶇О"), SqlStorageType.Sqlvarchar);
+ //header.AddChild("FCOLUMN6", new LocaleValue("鐢熶骇璧勬簮鍚嶇О"), SqlStorageType.Sqlvarchar);
header.AddChild("FCOLUMN7", new LocaleValue("鐢熶骇璁㈠崟鍙�"), SqlStorageType.Sqlvarchar);
- header.AddChild("FCOLUMN8", new LocaleValue("閿�鍞鍗曞彿"), SqlStorageType.Sqlvarchar);
+ //header.AddChild("FCOLUMN8", new LocaleValue("閿�鍞鍗曞彿"), SqlStorageType.Sqlvarchar);
//header.AddChild("FCOLUMN9", new LocaleValue("鐢靛帇/鍔熺巼/搴曟澘"), SqlStorageType.Sqlvarchar);
- header.AddChild("FCOLUMN10", new LocaleValue("璁㈠崟浜ゆ湡"), SqlStorageType.SqlDatetime);
+ //header.AddChild("FCOLUMN10", new LocaleValue("璁㈠崟浜ゆ湡"), SqlStorageType.SqlDatetime);
header.AddChild("FCOLUMN12", new LocaleValue("浜у搧缂栫爜"), SqlStorageType.Sqlvarchar);
header.AddChild("FCOLUMN13", new LocaleValue("浜у搧鍚嶇О"), SqlStorageType.Sqlvarchar);
header.AddChild("FCOLUMN26", new LocaleValue("浜у搧瑙勬牸鍨嬪彿"), SqlStorageType.Sqlvarchar);
@@ -61,13 +61,13 @@
header.AddChild("FCOLUMN27", new LocaleValue("鐗╂枡瑙勬牸鍨嬪彿"), SqlStorageType.Sqlvarchar);
header.AddChild("FCOLUMN19", new LocaleValue("璁″垝鍙戞枡鏁伴噺"), SqlStorageType.SqlDecimal);
header.AddChild("FCOLUMN20", new LocaleValue("榻愬鏁伴噺"), SqlStorageType.SqlDecimal);
+ header.AddChild("FCOLUMN23", new LocaleValue("鍗虫椂搴撳瓨鏁伴噺"), SqlStorageType.SqlDecimal);
header.AddChild("FCOLUMN21", new LocaleValue("缂烘枡鏁伴噺"), SqlStorageType.SqlDecimal);
header.AddChild("FCOLUMN22", new LocaleValue("鍙敤鏁伴噺"), SqlStorageType.SqlDecimal);
- header.AddChild("FCOLUMN23", new LocaleValue("鍗虫椂搴撳瓨鏁伴噺"), SqlStorageType.SqlDecimal);
header.AddChild("FCOLUMN24", new LocaleValue("鍗犵敤鏁伴噺"), SqlStorageType.SqlDecimal);
header.AddChild("FCOLUMN25", new LocaleValue("棰嗙敤鍗犵敤鏁伴噺"), SqlStorageType.SqlDecimal);
- header.AddChild("FCOLUMN28", new LocaleValue("鏈夋棤閲囪喘璁㈠崟"), SqlStorageType.Sqlvarchar);
-
+ header.AddChild("FCOLUMN9", new LocaleValue("鐗╂枡灞炴��"), SqlStorageType.SqlDecimal);
+ //header.AddChild("FCOLUMN28", new LocaleValue("鏈夋棤閲囪喘璁㈠崟"), SqlStorageType.Sqlvarchar);
return header;
}
//鍒涘缓涓存椂鎶ヨ〃
@@ -77,14 +77,14 @@
DynamicObject customFilter = filter.FilterParameter.CustomFilter;
string FOrgId = Convert.ToString(customFilter["FOrgId_Id"]);//缁勭粐
string FMATERIALID = Convert.ToString(customFilter["FMATERIALID_Id"]);//鐗╂枡
- string FWORKSHOPID = Convert.ToString(customFilter["FWORKSHOPID_Id"]);//鐢熶骇杞﹂棿
- string FSCZYID = Convert.ToString(customFilter["FSCZYID_Id"]);//鐢熶骇璧勬簮
- string FXQD = Convert.ToString(customFilter["FXQD"]);//闇�姹傚崟鍙�
+ string FWORKSHOPID = "0";
+ string FSCZYID = "0";//鐢熶骇璧勬簮
+ string FXQD = "";//闇�姹傚崟鍙�
string FMOBILLNO = Convert.ToString(customFilter["FMOBILLNO"]);//鐢熶骇璁㈠崟鍙�
TableName = tableName;
// 鍙栨暟SQL
// FID, FEntryId, 缂栧彿銆佺姸鎬併�佺墿鏂欍�佹暟閲忋�佸崟浣嶃�佸崟浣嶇簿搴︺�佸崟浠枫�佷环绋庡悎璁� ,t1M_L.FNAME as FMaterialName
- string sql = string.Format(@"/*dialect*/exec PR_Complete_Report '{0}','{1}', '{2}','{3}', '{4}','{5}','{6}'", TableName, FXQD, FMOBILLNO, FOrgId, FWORKSHOPID, FSCZYID, FMATERIALID);
+ string sql = string.Format(@"/*dialect*/exec proc_jit_Complete_Report '{0}','{1}', '{2}','{3}', '{4}','{5}','{6}'", TableName, FXQD, FMOBILLNO, FOrgId, FWORKSHOPID, FSCZYID, FMATERIALID);
LogService.Write("榻愬鎶ヨ〃sql锛�" + sql);
DBServiceHelper.Execute(this.Context, sql);
--
Gitblit v1.9.1