From d946df2f551477ae491dde797366b5f0f7c687ec Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 24 十月 2022 15:59:09 +0800
Subject: [PATCH] 调整
---
MES/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs | 4 ++++
MES/src/BLL/Demo.Report/PRD/prd_CompleteReport.cs | 3 +++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/MES/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs b/MES/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
index 09c2353..fd624ea 100644
--- a/MES/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
+++ b/MES/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
@@ -72,6 +72,8 @@
this.Model.SetValue("FStockId", dt.Rows[i]["FSTOCKID"], i);//浠撳簱
this.Model.SetValue("FWorkShopId", dt.Rows[i]["FWORKSHOPID"], i);//杞﹂棿
this.Model.SetValue("FLot", dt.Rows[i]["FLot"], i);//鎵瑰彿
+ this.Model.SetValue("FReceiveQty", dt.Rows[i]["FReceiveQty"], i);//鏈叆搴撴暟閲�
+ this.Model.SetValue("F_bsv_Decimal1", Convert.ToDecimal(dt.Rows[i]["FRemainReceiveQty"])+ Convert.ToDecimal(dt.Rows[i]["FNoStockInQty"]), i);//鏈氦璁㈠崟鏁伴噺
}
}
ChangeColor();
@@ -213,6 +215,8 @@
this.Model.SetValue("FStockId", dt.Rows[i]["FSTOCKID"], i);//浠撳簱
this.Model.SetValue("FWorkShopId", dt.Rows[i]["FWORKSHOPID"], i);//杞﹂棿
this.Model.SetValue("FLot", dt.Rows[i]["FLot"], i);//鎵瑰彿
+ this.Model.SetValue("FReceiveQty", dt.Rows[i]["FReceiveQty"], i);//鏈叆搴撴暟閲�
+ this.Model.SetValue("F_bsv_Decimal1", Convert.ToDecimal(dt.Rows[i]["FRemainReceiveQty"]) + Convert.ToDecimal(dt.Rows[i]["FNoStockInQty"]), i);//鏈氦璁㈠崟鏁伴噺
}
}
//this.View.UpdateView();
diff --git a/MES/src/BLL/Demo.Report/PRD/prd_CompleteReport.cs b/MES/src/BLL/Demo.Report/PRD/prd_CompleteReport.cs
index 902f454..1536894 100644
--- a/MES/src/BLL/Demo.Report/PRD/prd_CompleteReport.cs
+++ b/MES/src/BLL/Demo.Report/PRD/prd_CompleteReport.cs
@@ -59,6 +59,7 @@
header.AddChild("FCOLUMN17", new LocaleValue("鐗╂枡缂栫爜"), SqlStorageType.Sqlvarchar);
header.AddChild("FCOLUMN18", new LocaleValue("鐗╂枡鍚嶇О"), SqlStorageType.Sqlvarchar);
header.AddChild("FCOLUMN27", new LocaleValue("鐗╂枡瑙勬牸鍨嬪彿"), SqlStorageType.Sqlvarchar);
+ header.AddChild("FCOLUMN30", 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);
@@ -67,6 +68,8 @@
header.AddChild("FCOLUMN24", new LocaleValue("鍗犵敤鏁伴噺"), SqlStorageType.SqlDecimal);
header.AddChild("FCOLUMN25", new LocaleValue("棰嗙敤鍗犵敤鏁伴噺"), SqlStorageType.SqlDecimal);
header.AddChild("FCOLUMN9", new LocaleValue("鐗╂枡灞炴��"), SqlStorageType.Sqlvarchar);
+ header.AddChild("FReceiveQty", new LocaleValue("鏈叆搴撴暟閲�"), SqlStorageType.SqlDecimal);
+ header.AddChild("FQTY", new LocaleValue("鏈氦璁㈠崟鏁伴噺"), SqlStorageType.SqlDecimal);
//header.AddChild("FCOLUMN28", new LocaleValue("鏈夋棤閲囪喘璁㈠崟"), SqlStorageType.Sqlvarchar);
return header;
}
--
Gitblit v1.9.1