From ddc23c8a38e7df3c294ca3227793ef717beb6580 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 14 十二月 2020 14:21:39 +0800
Subject: [PATCH] JIT分析更改后代码上传
---
src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs | 46 +---
src/Model/Demo.Model/Model/PRD_PPBOM.cs | 50 +++++
ProductizationTemplate.sln | 5
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 6
src/Model/Demo.Model/Demo.Model.csproj | 1
src/Model/Demo.Model/Model/PRD_Inventory.cs | 5
src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs | 51 ----
.editorconfig | 4
src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs | 128 ++++++++++++++
src/ProductizationTemplate/ProductizationTemplate.csproj | 3
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 221 ++++++++++++++++++++++++
11 files changed, 436 insertions(+), 84 deletions(-)
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..16da040
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,4 @@
+锘縖*.cs]
+
+# IDE0055: 淇鏍煎紡
+dotnet_diagnostic.IDE0055.severity = none
diff --git a/ProductizationTemplate.sln b/ProductizationTemplate.sln
index 975c3b0..dd84759 100644
--- a/ProductizationTemplate.sln
+++ b/ProductizationTemplate.sln
@@ -43,6 +43,11 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.TimedTaskPlugIn", "src\BLL\Demo.TimedTaskPlugIn\Demo.TimedTaskPlugIn.csproj", "{3B5437EE-F19C-4B69-90A4-88866841337B}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{20A267C5-DE2B-4929-B29B-E3A16670E30E}"
+ ProjectSection(SolutionItems) = preProject
+ .editorconfig = .editorconfig
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
index 10b45cd..991f457 100644
--- a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
+++ b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
@@ -24,7 +24,6 @@
public override void OnLoad(EventArgs e)
{
base.OnLoad(e);
-
if (this.View.OpenParameter.GetCustomParameter("FHMainICMOInterID") == null)
{
SearchList();
@@ -33,47 +32,32 @@
{
if (did)
return;
-
string FHMainICMOInterIDr = this.View.OpenParameter.GetCustomParameter("FHMainICMOInterID").ToString();//涓荤敓浜ц鍗曚富鍐呯爜
string FHMainICMOEntryID = this.View.OpenParameter.GetCustomParameter("FHMainICMOEntryID").ToString();// 涓荤敓浜ц鍗曞瓙鍐呯爜
string FHICMOInterID = this.View.OpenParameter.GetCustomParameter("FHICMOInterID").ToString();//鏃ヨ鍒掕鍗曚富鍐呯爜
- //string FMatrailId_Id = this.View.OpenParameter.GetCustomParameter("FMatrailId_Id").ToString();
-
- //string FBillNo = this.View.OpenParameter.GetCustomParameter("FBillNo").ToString();
- string sql = string.Format(@"/*dialect*/select * from JIT_MOMaterReadysBill where FHMainICMOInterIDr ='{0}' and FHMainICMOEntryID ='{1}' and FHICMOInterID='{2}' and FIDENTIFICAT=1 ", FHMainICMOInterIDr, FHMainICMOEntryID, FHICMOInterID);
+ string sql = string.Format(@"/*dialect*/select * from JIT_MOMaterReadysBill where FHMainICMOInterIDr ='{0}' and FHMainICMOEntryID ='{1}' and FHICMOInterID='{2}' ", FHMainICMOInterIDr, FHMainICMOEntryID, FHICMOInterID);
DataTable dt = DBServiceHelper.ExecuteDataSet(this.Context, sql).Tables[0];
if (dt.Rows.Count > 0)
{
for (int i = 0; i < dt.Rows.Count; i++)
{
- /*
- 璁″垝鍙戞枡鏁伴噺 = 璁″垝鎬绘暟閲� * 鍗曚綅鐢ㄦ枡
- 榻愬鏁伴噺 = 榻愬鏁� * 鍗曚綅鐢ㄦ枡锛堣�冭檻鍒嗗眰绾�* 鐖剁骇锛�
- 缂烘枡鏁伴噺 = 1 - 2
- 鏄惁榻愬 = 缂烘枡 < 0 ?
- */
- decimal FPlanIssueCount = Convert.ToDecimal(dt.Rows[i]["FSumPlanCount"]) * Convert.ToDecimal(dt.Rows[i]["FUNITDOSAGE"]);//璁″垝鍙戞枡鏁伴噺
- decimal FCompleteCount = Convert.ToDecimal(dt.Rows[i]["FCompleteCount"]) * Convert.ToDecimal(dt.Rows[i]["FUNITDOSAGE"]);//榻愬鏁伴噺
- decimal FLackCount = FPlanIssueCount - FCompleteCount;//缂烘枡鏁伴噺
this.Model.CreateNewEntryRow("FEntity");
this.Model.SetValue("FSEQ", i + 1, i);//搴忓彿
this.Model.SetValue("FMateralDetailId", dt.Rows[i]["FHMATERID"], i);
- this.Model.SetValue("FPlanIssueCount", FPlanIssueCount, i);//璁″垝鍙戞枡鏁伴噺
- this.Model.SetValue("FCompleteCount", FCompleteCount, i);//榻愬鏁伴噺
- this.Model.SetValue("FLackCount", FLackCount, i);//缂烘枡鏁伴噺
+ this.Model.SetValue("FPlanIssueCount", dt.Rows[i]["FSumPlanCount"], i);//璁″垝鍙戞枡鏁伴噺
+ this.Model.SetValue("FCompleteCount", dt.Rows[i]["FCompleteCount"], i);//榻愬鏁伴噺
+ this.Model.SetValue("FLackCount", dt.Rows[i]["FLackCount"], i);//缂烘枡鏁伴噺
this.Model.SetValue("FPassableCount", dt.Rows[i]["FHLeftQty"].ToString(), i);//鍙敤鏁伴噺
this.Model.SetValue("FMateralCount", dt.Rows[i]["FHLeftQty"].ToString(), i);//鐗╂枡鏁伴噺
- this.Model.SetValue("FCompleteDetailStatus", FLackCount > 0 ? "鏈綈濂�" : "榻愬", i);//鏄惁榻愬
+ this.Model.SetValue("FCompleteDetailStatus", dt.Rows[i]["FComPlete"].ToString(), i);//鏄惁榻愬
this.Model.SetValue("FHMainICMOInterIDr", dt.Rows[i]["FHMainICMOInterIDr"].ToString(), i);//鐢熶骇璁㈠崟鍐呯爜
this.Model.SetValue("FPRDBillNo", dt.Rows[i]["FPRDBillNo"].ToString(), i);//鐢熶骇璁㈠崟鍐呯爜
+ this.Model.SetValue("FPlanDate", dt.Rows[i]["FPlanDate"].ToString(), i);//鏃ヨ鍒掓棩鏈�
}
}
-
did = true;
}
}
-
-
public override void BarItemClick(BarItemClickEventArgs e)
{
base.BarItemClick(e);
@@ -93,19 +77,15 @@
base.EntityRowClick(e);
DynamicFormShowParameter formPa = new DynamicFormShowParameter();
formPa.FormId = "paez_CompleteAnalysisMateriel";
-
/* jsonModel.Add("FHMainICMOInterID", FMainInterID);//涓荤敓浜ц鍗曚富鍐呯爜
jsonModel.Add("FHMainICMOEntryID", FMainEntryID);//涓荤敓浜ц鍗曞瓙鍐呯爜
jsonModel.Add("FHICMOInterID", FDayPlanWorkID);//鏃ヨ鍒掕鍗曚富鍐呯爜
current["FMatrailId_Id"].ToString(), current["FHMainSourceInterID"].ToString(), current["FHMainSourceEntryID"].ToString(), current["FDayPlanWorkID"].ToString())
-
*/
-
formPa.CustomParams.Add("FHMainICMOInterIDr", Convert.ToString(this.View.Model.GetValue("FHMainICMOInterIDr", e.Row).ToString()));
formPa.CustomParams.Add("FMatrailId", Convert.ToString((this.View.Model.GetValue("FMateralDetailId", e.Row) as DynamicObject)["Id"].ToString()));
this.View.ShowForm(formPa);
}
-
/// <summary>
/// 鏌ヨ浜嬩欢
/// </summary>
@@ -118,10 +98,10 @@
select FSumPlanCount*FUNITDOSAGE as FPlanIssueCountS,FCompleteCount*FUNITDOSAGE FCompleteCountS,(FSumPlanCount-FCompleteCount)*FUNITDOSAGE FLackCountS,case when FSumPlanCount>FCompleteCount then '鏈綈濂�' else '榻愬' end CompleteStatus,
t2.FBillNo PRDBillNo,
t1.* from JIT_MOMaterReadysBill T1
-JOIN T_PRD_MO t2 on t1.FHMainICMOInterIDr=t2.FID where FIDENTIFICAT=1
+JOIN T_PRD_MO t2 on t1.FHMainICMOInterIDr=t2.FID
)AS T
";
-
+ sql = string.Format(@"/*dialect*/select * from JIT_MOMaterReadysBill");
//鐗╂枡
if ((this.Model.GetValue("FMateralId") as DynamicObject) != null)
{
@@ -153,18 +133,18 @@
this.Model.CreateNewEntryRow("FEntity");
this.Model.SetValue("FSEQ", i + 1, i);//搴忓彿
this.Model.SetValue("FMateralDetailId", dt.Rows[i]["FHMATERID"], i);
- this.Model.SetValue("FPlanIssueCount", dt.Rows[i]["FPlanIssueCountS"], i);//璁″垝鍙戞枡鏁伴噺
- this.Model.SetValue("FCompleteCount", dt.Rows[i]["FCompleteCountS"], i);//榻愬鏁伴噺
- this.Model.SetValue("FLackCount", dt.Rows[i]["FLackCountS"], i);//缂烘枡鏁伴噺
+ this.Model.SetValue("FPlanIssueCount", dt.Rows[i]["FSumPlanCount"], i);//璁″垝鍙戞枡鏁伴噺
+ this.Model.SetValue("FCompleteCount", dt.Rows[i]["FCompleteCount"], i);//榻愬鏁伴噺
+ this.Model.SetValue("FLackCount", dt.Rows[i]["FLackCount"], i);//缂烘枡鏁伴噺
this.Model.SetValue("FPassableCount", dt.Rows[i]["FHLeftQty"].ToString(), i);//鍙敤鏁伴噺
this.Model.SetValue("FMateralCount", dt.Rows[i]["FHLeftQty"].ToString(), i);//鐗╂枡鏁伴噺
- this.Model.SetValue("FCompleteDetailStatus", dt.Rows[i]["CompleteStatus"].ToString(), i);//鏄惁榻愬
+ this.Model.SetValue("FCompleteDetailStatus", dt.Rows[i]["FComPlete"].ToString(), i);//鏄惁榻愬
this.Model.SetValue("FHMainICMOInterIDr", dt.Rows[i]["FHMainICMOInterIDr"].ToString(), i);//鐢熶骇璁㈠崟鍐呯爜
this.Model.SetValue("FPRDBillNo", dt.Rows[i]["FPRDBillNo"].ToString(), i);//鐢熶骇璁㈠崟鍐呯爜
+ this.Model.SetValue("FPlanDate", dt.Rows[i]["FPlanDate"].ToString(), i);//鏃ヨ鍒掓棩鏈�
}
}
this.View.UpdateView();
-
did = true;
}
}
diff --git a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
index 6ae34c7..dd6efae 100644
--- a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
+++ b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
@@ -23,11 +23,9 @@
{
bool did = false;
string FMatrailId = "";
-
public override void OnLoad(EventArgs e)
{
base.OnLoad(e);
-
if (this.View.OpenParameter.GetCustomParameter("FHMainICMOInterIDr") == null)
{
SearchList();
@@ -38,47 +36,32 @@
return;
string FHMainICMOInterIDr = this.View.OpenParameter.GetCustomParameter("FHMainICMOInterIDr").ToString();//涓荤敓浜ц鍗曚富鍐呯爜
FMatrailId = this.View.OpenParameter.GetCustomParameter("FMatrailId").ToString();//鐗╂枡
-
//string FBillNo = this.View.OpenParameter.GetCustomParameter("FBillNo").ToString();
string sql = string.Format(@"/*dialect*/select a.*,b.FBILLNO FBILLNOs from JIT_MOMaterReadysBill a
left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID
where FHMainICMOInterIDr ='{0}' and FIDENTIFICAT=2 and FHMATERID ='{1}'", FHMainICMOInterIDr, FMatrailId);
sql = string.Format(@"/*dialect*/select a.*,b.FBILLNO FBILLNOs from JIT_MOMaterReadysBill a
left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID
- where FIDENTIFICAT=2 and FHMATERID ='{0}'", FMatrailId);
+ where FHMATERID ='{0}'", FMatrailId);
DataTable dt = DBServiceHelper.ExecuteDataSet(this.Context, sql).Tables[0];
if (dt.Rows.Count > 0)
{
for (int i = 0; i < dt.Rows.Count; i++)
{
- /*
- 璁″垝鍙戞枡鏁伴噺 = 璁″垝鎬绘暟閲� * 鍗曚綅鐢ㄦ枡
- 榻愬鏁伴噺 = 榻愬鏁� * 鍗曚綅鐢ㄦ枡锛堣�冭檻鍒嗗眰绾�* 鐖剁骇锛�
- 缂烘枡鏁伴噺 = 1 - 2
- 鏄惁榻愬 = 缂烘枡 < 0 ?
- */
- decimal FPlanIssueCount = Convert.ToDecimal(dt.Rows[i]["FSumPlanCount"]) * Convert.ToDecimal(dt.Rows[i]["FUNITDOSAGE"]);//璁″垝鍙戞枡鏁伴噺
- decimal FCompleteCount = Convert.ToDecimal(dt.Rows[i]["FCompleteCount"]) * Convert.ToDecimal(dt.Rows[i]["FUNITDOSAGE"]);//榻愬鏁伴噺
-
- decimal FLackCount = FPlanIssueCount - FCompleteCount;//缂烘枡鏁伴噺
this.Model.CreateNewEntryRow("FEntity");
this.Model.SetValue("FSEQ", i + 1, i);//搴忓彿
this.Model.SetValue("FMateralDetailId", dt.Rows[i]["FHMATERID"], i);
- this.Model.SetValue("FScOrderNoDetail", dt.Rows[i]["FBILLNOs"], i);//鐢熶骇璁㈠崟鍙�
- this.Model.SetValue("FOccupyCount", dt.Rows[i]["FHUseQty"], i);//
+ this.Model.SetValue("FScOrderNoDetail", dt.Rows[i]["FBILLNOs"], i);//鐢熶骇璁㈠崟鍙�
+ this.Model.SetValue("FOccupyCount", dt.Rows[i]["FCompleteCount"], i);//
this.Model.SetValue("FCurrentCount", dt.Rows[i]["FHStockQty"], i);//褰撳墠搴撳瓨鎯呭喌
-
this.Model.SetValue("FOrgId", dt.Rows[i]["FHStockOrgID"], i);//搴撳瓨缁勭粐
this.Model.SetValue("FOwnerTypeId", dt.Rows[i]["FOwnerTypeId"], i);//璐т富绫诲瀷
this.Model.SetValue("FOwnerId", dt.Rows[i]["FOwnerId"], i);//璐т富
+ this.Model.SetValue("FPlanDate", dt.Rows[i]["FPlanDate"].ToString(), i);//鏃ヨ鍒掓棩鏈�
}
}
-
did = true;
-
}
-
-
}
/// <summary>
@@ -86,19 +69,16 @@
/// </summary>
public void SearchList()
{
- string sqlwhere = " and 1=1";
+ string sqlwhere = " where 1=1";
string sql = string.Format(@"/*dialect*/select a.*,b.FBILLNO FBILLNOs from JIT_MOMaterReadysBill a
- left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID where FIDENTIFICAT=2
+ left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID
");
-
//鐢熶骇璁㈠崟鍙�
string PRDBillNo = Convert.ToString(this.Model.GetValue("FScOrderNo"));
if (!string.IsNullOrEmpty(PRDBillNo))
sqlwhere += $" and FPRDBillNo='{PRDBillNo}'";
-
if (FMatrailId != "")
sqlwhere += $" and FHMATERID='{FMatrailId}'";
-
sql += sqlwhere;
DataTable dt = DBServiceHelper.ExecuteDataSet(this.Context, sql).Tables[0];
this.Model.DeleteEntryData("FEntity");
@@ -106,38 +86,23 @@
{
for (int i = 0; i < dt.Rows.Count; i++)
{
- /*
- 璁″垝鍙戞枡鏁伴噺 = 璁″垝鎬绘暟閲� * 鍗曚綅鐢ㄦ枡
- 榻愬鏁伴噺 = 榻愬鏁� * 鍗曚綅鐢ㄦ枡锛堣�冭檻鍒嗗眰绾�* 鐖剁骇锛�
- 缂烘枡鏁伴噺 = 1 - 2
- 鏄惁榻愬 = 缂烘枡 < 0 ?
- */
- decimal FPlanIssueCount = Convert.ToDecimal(dt.Rows[i]["FSumPlanCount"]) * Convert.ToDecimal(dt.Rows[i]["FUNITDOSAGE"]);//璁″垝鍙戞枡鏁伴噺
- decimal FCompleteCount = Convert.ToDecimal(dt.Rows[i]["FCompleteCount"]) * Convert.ToDecimal(dt.Rows[i]["FUNITDOSAGE"]);//榻愬鏁伴噺
-
- decimal FLackCount = FPlanIssueCount - FCompleteCount;//缂烘枡鏁伴噺
this.Model.CreateNewEntryRow("FEntity");
this.Model.SetValue("FSEQ", i + 1, i);//搴忓彿
this.Model.SetValue("FMateralDetailId", dt.Rows[i]["FHMATERID"], i);
this.Model.SetValue("FScOrderNoDetail", dt.Rows[i]["FBILLNOs"], i);//鐢熶骇璁㈠崟鍙�
- this.Model.SetValue("FOccupyCount", dt.Rows[i]["FHUseQty"], i);//
-
+ this.Model.SetValue("FOccupyCount", dt.Rows[i]["FCompleteCount"], i);//
this.Model.SetValue("FCurrentCount", dt.Rows[i]["FHStockQty"], i);//褰撳墠搴撳瓨鎯呭喌
this.Model.SetValue("FOrgId", dt.Rows[i]["FHStockOrgID"], i);//搴撳瓨缁勭粐
this.Model.SetValue("FOwnerTypeId", dt.Rows[i]["FOwnerTypeId"], i);//搴撳瓨缁勭粐
-
this.Model.SetValue("FOrgId", dt.Rows[i]["FHStockOrgID"], i);//搴撳瓨缁勭粐
this.Model.SetValue("FOwnerTypeId", dt.Rows[i]["FOwnerTypeId"], i);//璐т富绫诲瀷
this.Model.SetValue("FOwnerId", dt.Rows[i]["FOwnerId"], i);//璐т富
-
+ this.Model.SetValue("FPlanDate", dt.Rows[i]["FPlanDate"].ToString(), i);//鏃ヨ鍒掓棩鏈�
}
}
this.View.UpdateView();
-
did = true;
}
-
-
public override void BarItemClick(BarItemClickEventArgs e)
{
base.BarItemClick(e);
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index 562a6ed..fd6be72 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -147,9 +147,9 @@
this.Model.SetItemValueByNumber("FResourcesId", dt.Rows[i][4].ToString(), i);
// this.Model.SetValue("FMatrailId", dt.Rows[i][5].ToString(), i);
this.Model.SetItemValueByNumber("FMatrailId", dt.Rows[i][5].ToString(), i);
- this.Model.SetValue("FMatrailName", dt.Rows[i][6].ToString(), i);
- this.Model.SetValue("FModel", dt.Rows[i][7].ToString(), i);
- this.Model.SetValue("FUnit", dt.Rows[i][8].ToString(), i);
+ // this.Model.SetValue("FMatrailName", dt.Rows[i][6].ToString(), i);
+ // this.Model.SetValue("FModel", dt.Rows[i][7].ToString(), i);
+ // this.Model.SetValue("FUnit", dt.Rows[i][8].ToString(), i);
this.Model.SetValue("FBatch", dt.Rows[i][9].ToString(), i);
this.Model.SetValue("FSalOrderCount", dt.Rows[i][10].ToString(), i);
this.Model.SetValue("FCompleteSetCount", dt.Rows[i][12].ToString(), i);
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 605431d..080462a 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -25,6 +25,7 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
+using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
@@ -95,7 +96,8 @@
if (e.BarItemKey.ToUpper() == "TBCOMPLETE")
{
- COMPLETEMAIN();
+ CompleteSetAnalysis();
+ //COMPLETEMAIN();
// COMPLETE();
}
//鎻愭枡璁″垝
@@ -122,7 +124,7 @@
/// <summary>
/// 琛屽弻鍑� 璺冲嚭榻愬鍒嗘瀽鏄庣粏鍒楄〃
/// </summary>
- /// <param name="e"></param>
+ /// <param name="e"></param>
public override void EntityRowDoubleClick(Kingdee.BOS.Core.DynamicForm.PlugIn.Args.EntityRowClickEventArgs e)
{
var m = e.Row;
@@ -515,7 +517,6 @@
else
{
grid.SetForecolor("FT" + "" + i + "", "#FF0000", m);
-
}
}
@@ -544,7 +545,7 @@
/// <param name="FMainInterID"> 鐢熶骇璁㈠崟涓荤爜</param>
/// <param name="FMainEntryID"> 鐢熶骇璁㈠崟瀛愮爜</param>
/// <param name="FDayPlanWorkID"> 鏃ヨ鍒掑伐鍗旻ID</param>
- /// <param name="FDayPlanWorkID"> 璁″垝鎬绘暟閲�</param>
+ /// <param name="SumPlan"> 璁″垝鎬绘暟閲�</param>
/// <param name="FStockOrgId"> 搴撳瓨缁勭粐</param>
/// <returns></returns>
public string SumGetComplete(string FMATERIALID, string FMainInterID, string FMainEntryID, string FDayPlanWorkID, decimal SumPlan, string FStockOrgId)
@@ -755,6 +756,204 @@
+ ///榻愬鍒嗘瀽
+
+ public void CompleteSetAnalysis()
+ {
+ Stopwatch sw = new Stopwatch();
+ sw.Start();//寮�濮嬭鏃�
+ //鑾峰彇褰撳墠鍗虫椂搴撳瓨 鎸夌収鐗╂枡+搴撳瓨缁勭粐+璐т富+搴撳瓨鏁伴噺
+ DataSet ds = DBServiceHelper.ExecuteDataSet(Context, @"
+/*dialect*/
+ select isnull(a.FBASEQTY,0)-ISNULL(b.FHUseQty,0) FBASEQTY,T1.FStockOrgId,T1.FMATERIALID,a.FOWNERID,c.FNUMBER from
+(
+select a.FHPRDORGID FStockOrgId,T2.FMATERIALID from SC_WORKBILLSORTBILLMAIN a
+join SC_WORKBILLSORTBILLSub b on a.FID = b.FID
+join T_PRD_PPBOM T1 on a.FPRDMOMAINID = t1.FMoId and a.FPRDMOENTYID = t1.FMOENTRYID
+LEFT JOIN(select FID,FMATERIALID from T_PRD_PPBOMENTRY
+group by FMATERIALID,FID) T2 on T1.FID = t2.FID
+group by a.FHPRDORGID,T2.FMATERIALID
+) T1
+LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID
+LEFT JOIN JIT_MOMaterReadysBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID and a.FOwnerId = b.FOwnerId
+LEFT join T_ORG_Organizations c on a.FOWNERID = c.FORGID
+where isnull(a.FBASEQTY,0)-ISNULL(b.FHUseQty,0)>0
+");
+ ListInventory = ds.ToModelList<PRD_Inventory>();
+
+ //鎬诲簱瀛� 鐗╂枡+搴撳瓨缁勭粐+搴撳瓨鏁伴噺
+ ds = DBServiceHelper.ExecuteDataSet(Context, @"
+/*dialect*/
+ select sum(isnull(a.FBASEQTY,0)-ISNULL(b.FHUseQty,0))FBASEQTY,T1.FStockOrgId,T1.FMATERIALID from
+(
+select a.FHPRDORGID FStockOrgId,T2.FMATERIALID from SC_WORKBILLSORTBILLMAIN a
+join SC_WORKBILLSORTBILLSub b on a.FID = b.FID
+join T_PRD_PPBOM T1 on a.FPRDMOMAINID = t1.FMoId and a.FPRDMOENTYID = t1.FMOENTRYID
+LEFT JOIN(select FID,FMATERIALID from T_PRD_PPBOMENTRY
+group by FMATERIALID,FID) T2 on T1.FID = t2.FID
+group by a.FHPRDORGID,T2.FMATERIALID
+) T1
+LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID
+LEFT JOIN JIT_MOMaterReadysBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID
+group by T1.FStockOrgId,T1.FMATERIALID
+
+");
+ ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
+
+
+ //闇�瑕侀綈濂楀垎鏋愮殑鏁版嵁
+ string sql = @"
+/*dialect*/
+select a.FPRDMOMAINID,a.FPRDMOENTYID,a.FID,b.FEntryID,a.FHPRDORGID FStockOrgId,t5.FNUMBER as OrgFnumber,a.FHOrderLev,b.FHQTY,b.FHMASTERDATE,T1.FBillNo,T1.FMOBillNO,T1.FMOEntrySeq,T1.FMoId,T1.FMaterialID,T1.FQty,
+T2.FMATERIALID FMATERIALID2, T4.FNumber,T2.FNeedQty,FNeedQty/FQty dwyl,FHQTY*(FNeedQty/FQty) PlanCount from SC_WORKBILLSORTBILLMAIN a
+join SC_WORKBILLSORTBILLSub b on a.FID = b.FID
+join T_PRD_PPBOM T1 on a.FPRDMOMAINID = t1.FMoId and a.FPRDMOENTYID = t1.FMOENTRYID
+LEFT JOIN(select FID, MAX(FENTRYID) FENTRYID, SUM(FNeedQty) FNeedQty, FMATERIALID from T_PRD_PPBOMENTRY
+group by FMATERIALID, FID ) T2 on T1.FID = t2.FID
+ --LEFT JOIN T_STK_Inventory T3 on t2.FMATERIALID = t3.FMATERIALID
+JOIN T_BD_MATERIAL T4 on T2.FMATERIALID = T4.FMATERIALID
+JOIN T_ORG_Organizations t5 on a.FHPRDORGID = t5.FORGID
+--where FPRDMOMAINID = 100010
+ORDER BY b.FHMASTERDATE,a.FHOrderLev ";
+ ds = DBServiceHelper.ExecuteDataSet(Context, sql);
+ List<PRD_PPBOM> BomList = ds.ToModelList<PRD_PPBOM>();
+
+ //鏃ヨ鍒�+鐢熶骇璁㈠崟瀛愯〃缂栫爜ID
+ var DatePlanList = BomList.GroupBy(p => new { p.FHMASTERDATE, p.FPRDMOENTYID }).Select(x => new PRD_PPBOM { FHMASTERDATE = x.Key.FHMASTERDATE, FPRDMOENTYID = x.Key.FPRDMOENTYID }).ToList();
+
+ //CompleteAnalysisTempModel 鐢ㄤ簬瀛樺偍涓存椂闇�瑕佹彃鍏ユ暟鎹�
+ List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>();
+ foreach (var item in DatePlanList)
+ {
+ //绛涢�夊嚭褰撴棩璁″垝鏁版嵁
+ var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList();
+ foreach (var _item in _BomList)
+ {
+ //璇ユ棩璁″垝鐗╂枡闇�瑕佹暟
+ decimal need = _item.PlanCount;
+ //瀹為檯鎬诲簱瀛�
+ decimal sjkc = 0;
+ var sjkcList = ListInventoryByStockOrgId.Where(x => x.FMATERIALID == _item.FMATERIALID2 && x.FStockOrgId == _item.FStockOrgId).FirstOrDefault();
+ sjkc = sjkcList.FBASEQTY;
+ //鐪熸闇�瑕佸彇璁＄畻鐨勬暟閲忥紙鎷嗗垎璐т富锛�
+ //璐т富鍖归厤
+ List<PRD_Inventory> _ListInventory = ListInventory.Where(c => c.FMATERIALID == _item.FMATERIALID2 && c.FStockOrgId == _item.FStockOrgId && c.FBASEQTY > 0).ToList();
+ if (_ListInventory.Count > 0)
+ {
+ foreach (var Inventory in _ListInventory)
+ {
+ if (need == 0)
+ break;
+ decimal fCompleteCount = need >= Inventory.FBASEQTY ? Inventory.FBASEQTY : need;//榻愬鏁伴噺
+ decimal fLackCount = _item.PlanCount - fCompleteCount;//缂烘枡鏁伴噺
+ completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
+ {
+ FHMainICMOInterIDr = _item.FPRDMOMAINID,
+ FHMainICMOEntryID = _item.FPRDMOENTYID,
+ FHICMOInterID = _item.FID.ToString(),
+ FHICMOEntryID = _item.FEntryID.ToString(),
+ FHMaterID = _item.FNumber,
+ FHStockOrgID = _item.OrgFnumber,
+ FHPRDORGID = _item.OrgFnumber,
+ FPRDBillNo = _item.FMOBillNO,
+ FOwnerTypeId = "BD_OwnerOrg",
+ FOwnerId = Inventory.Fnumber,
+ FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
+ FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
+ FCompleteCount = fCompleteCount, //榻愬鏁伴噺
+ FLackCount = fLackCount,//缂烘枡鏁伴噺
+ FHStockQty = sjkcList.FBASEQTY,//鍗虫椂搴撳瓨
+ FHLeftQty = sjkcList.FBASEQTY,//鍙敤鏁伴噺
+ FComPlete = fLackCount > 0 ? "鏈綈濂�" : "榻愬",
+ FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+ });
+
+ //鎵ｅ噺鎬诲簱瀛樻暟閲�
+ sjkcList.FBASEQTY = sjkc - fCompleteCount > 0 ? sjkc - fCompleteCount : 0;
+ need = need >= Inventory.FBASEQTY ? need - Inventory.FBASEQTY : 0;
+ }
+ }
+ else
+ {
+ completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
+ {
+ FHMainICMOInterIDr = _item.FPRDMOMAINID,
+ FHMainICMOEntryID = _item.FPRDMOENTYID,
+ FHICMOInterID = _item.FID.ToString(),
+ FHICMOEntryID = _item.FEntryID.ToString(),
+ FHMaterID = _item.FNumber,
+ FHStockOrgID = _item.OrgFnumber,
+ FHPRDORGID = _item.OrgFnumber,
+ FPRDBillNo = _item.FMOBillNO,
+ FOwnerTypeId = "BD_OwnerOrg",
+ FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
+ FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
+ FCompleteCount = 0, //榻愬鏁伴噺
+ FLackCount = _item.PlanCount,//缂烘枡鏁伴噺
+ FHStockQty = 0,//鍗虫椂搴撳瓨
+ FHLeftQty = 0,//鍙敤鏁伴噺
+ FComPlete = "鏈綈濂�",
+ FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+ });
+ }
+ }
+ }
+ foreach (var item in completeAnalysisTempModel)
+ {
+
+ JObject jsonRoot = new JObject();
+ jsonRoot.Add("Creator", "");
+ jsonRoot.Add("NeedUpDateFields", new JArray());
+ jsonRoot.Add("NeedReturnFields", new JArray());
+ jsonRoot.Add("IsDeleteEntry", "true");
+ jsonRoot.Add("SubSystemId", "");
+ jsonRoot.Add("IsVerifyBaseDataField", "");
+
+ JObject jsonModel = new JObject();
+ jsonModel.Add("FHMainICMOInterIDr", item.FHMainICMOInterIDr);
+ jsonModel.Add("FHMainICMOEntryID", item.FHMainICMOEntryID);
+ jsonModel.Add("FHICMOInterID", item.FHICMOInterID);
+ jsonModel.Add("FHICMOEntryID", item.FHICMOEntryID);
+ jsonModel.Add("FHMaterID", new JObject() { ["FNUMBER"] = item.FHMaterID });
+ jsonModel.Add("FHUseQty", item.FHUseQty);
+ jsonModel.Add("FHStockOrgID", new JObject() { ["FNUMBER"] = item.FHStockOrgID });
+ jsonModel.Add("FHStockQty", item.FHStockQty);
+ jsonModel.Add("FHLeftQty", item.FHLeftQty);
+ jsonModel.Add("FHPRDORGID", new JObject() { ["FNUMBER"] = item.FHStockOrgID });
+ jsonModel.Add("FUnitDosage", item.FUnitDosage);
+ jsonModel.Add("FSumPlanCount", item.FSumPlanCount);
+ jsonModel.Add("FCompleteCount", item.FCompleteCount);
+ jsonModel.Add("FPRDBillNo", item.FPRDBillNo);
+ jsonModel.Add("FOwnerTypeId", item.FOwnerTypeId);
+ jsonModel.Add("FComPlete", item.FComPlete);
+ jsonModel.Add("FPlanDate", item.FPlanDate);
+ if (item.FOwnerId != null)
+ jsonModel.Add("FOwnerId", new JObject() { ["FNUMBER"] = item.FOwnerId });
+
+
+ jsonRoot.Add("Model", jsonModel);
+
+ CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+ var result = cloudClient.Save("paez_CompleteAnalysisTemp", jsonRoot.ToString());
+ JObject saveObj = JObject.Parse(result);
+ string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+
+ if (saveIsSuc != "TRUE")
+ {
+ LogHelper.Error(jsonRoot.ToString());
+ }
+ }
+ //鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
+ DBServiceHelper.Execute(Context, @"
+/*dialect*/update Sc_WorkBillSortBillSub set FComplete = '涓嶉綈濂�' where FEntryID IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�')
+");
+ sw.Stop();//缁撴潫璁℃椂
+ LogHelper.Info("杩愯鎬绘椂闀匡細" + sw.Elapsed);
+
+ }
+
+
+
/// <summary>
/// 鏌ヨ
/// </summary>
@@ -808,6 +1007,7 @@
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
DateTime DateNow = DateTime.Now;//鑾峰彇褰撳墠鏃ユ湡
this.Model.DeleteEntryData("FEntity");
+ EntryGrid grid = this.View.GetControl<EntryGrid>("FEntity");
for (int i = 0; i < dt.Rows.Count; i++)
{
this.Model.CreateNewEntryRow("FEntity");
@@ -840,6 +1040,7 @@
sql = @"/*dialect*/SELECT * FROM Sc_WorkBillSortBillSub WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0 and FID=" + dt.Rows[i]["FID"].ToString();
DataTable _dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+
foreach (DataRow dr in _dt.Rows)
{
/*
@@ -855,6 +1056,8 @@
this.Model.SetValue("FT" + getDay.Days.ToString(), dr["FHQTY"].ToString(), i);//鏃ヨ鍒掑伐鍗旻ID
if (dr["FHLockedSub"].ToString() == "1")
this.View.GetFieldEditor("FT" + getDay.Days.ToString(), i).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
+
+
}
@@ -876,6 +1079,16 @@
if (dr["FHLockedSub"].ToString() == "1")
this.View.GetFieldEditor("FT" + getDay.Days.ToString(), j).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
+ if (dr["FCOMPLETE"].ToString() == "鏈綈濂�")
+ {
+ this.View.GetFieldEditor("FT" + getDay.Days.ToString(), j).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
+ grid.SetForecolor("FT" + "" + getDay.Days.ToString() + "", "#FF0000", j);
+ }
+ else
+ {
+ this.View.GetFieldEditor("FT" + getDay.Days.ToString(), j).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
+ grid.SetForecolor("FT" + "" + getDay.Days.ToString() + "", "#00FF00", j);
+ }
}
}
diff --git a/src/Model/Demo.Model/Demo.Model.csproj b/src/Model/Demo.Model/Demo.Model.csproj
index bc5194d..600691f 100644
--- a/src/Model/Demo.Model/Demo.Model.csproj
+++ b/src/Model/Demo.Model/Demo.Model.csproj
@@ -45,6 +45,7 @@
<Compile Include="Entity\SCM\SAL_SaleOrder.cs" />
<Compile Include="Infrastructure\IBillHead.cs" />
<Compile Include="Infrastructure\IBillEntry.cs" />
+ <Compile Include="Model\CompleteAnalysisTempModel.cs" />
<Compile Include="Model\PODemandPlan\DayPlanPpbom.cs" />
<Compile Include="Model\PODemandPlan\PODemandPlanTemp.cs" />
<Compile Include="Model\PODemandPlan\PurchaseInventory.cs" />
diff --git a/src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs b/src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs
new file mode 100644
index 0000000..c0a359f
--- /dev/null
+++ b/src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs
@@ -0,0 +1,128 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Demo.Model.Model
+{
+ public class CompleteAnalysisTempModel
+ {
+ // "FHMainICMOInterIDr": 1,
+ //"FHMainICMOEntryID": 1,
+ //"FHICMOInterID": 1,
+ //"FHICMOEntryID": 1,
+ //"FHMaterID": {
+ // "FNUMBER": "CCCCC"
+ //},
+ //"FHUseQty": 100.0,
+ //"FHStockOrgID": {
+ // "FNumber": "100"
+ //},
+ //"FHStockQty": 200.0,
+ //"FHLeftQty": 200.0,
+ //"FHPRDORGID": {
+ // "FNumber": "100"
+ //},
+ //"FUnitDosage": 20.0,
+ //"FSumPlanCount": 500.0,
+ //"FCompleteCount": 500,
+ //"FPRDBillNo": "1008611",
+ //"FOwnerTypeId": "BD_OwnerOrg",
+ //"FIdentificat": "2"
+ /// <summary>
+ /// 涓荤敓浜ц鍗曚富鍐呯爜锛欶HMainICMOInterIDr
+ /// </summary>
+ public string FHMainICMOInterIDr { get; set; }
+ /// <summary>
+ /// 涓荤敓浜ц鍗曞瓙鍐呯爜锛欶HMainICMOEntryID
+ /// </summary>
+ public string FHMainICMOEntryID { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掕鍗曚富鍐呯爜锛欶HICMOInterID
+ /// </summary>
+ public string FHICMOInterID { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掕鍗曞瓙鍐呯爜锛欶HICMOEntryID
+ /// </summary>
+ public string FHICMOEntryID { get; set; }
+ /// <summary>
+ /// 瀛愪欢鐗╂枡锛欶HMaterID
+ /// </summary>
+ public string FHMaterID { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨缁勭粐锛欶HStockOrgID
+ /// </summary>
+ public string FHStockOrgID { get; set; }
+
+ /// <summary>
+ ///鐢熶骇缁勭粐锛欶HPRDORGID
+ /// </summary>
+ public string FHPRDORGID { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇璁㈠崟鍙凤細FPRDBillNo
+ /// </summary>
+ public string FPRDBillNo { get; set; }
+
+
+ /// <summary>
+ /// 鏍囪瘑
+ /// </summary>
+ public string FIdentificat { get; set; }
+ /// <summary>
+ /// 璐т富鍚嶇О锛欶OwnerName
+ /// </summary>
+ public string FOwnerName { get; set; }
+ /// <summary>
+ /// 璐т富缂栫爜锛欶OwnerId
+ /// </summary>
+ public string FOwnerId { get; set; }
+ /// <summary>
+ /// 璐т富绫诲瀷锛欶OwnerTypeId
+ /// </summary>
+ public string FOwnerTypeId { get; set; }
+ /// <summary>
+ /// 榻愬鐘舵��
+ /// </summary>
+ public string FComPlete { get; set; }
+
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public string FHUseQty { get; set; }
+ /// <summary>
+ /// 鍙婃椂搴撳瓨鏁伴噺锛欶HStockQty
+ /// </summary>
+ public decimal FHStockQty { get; set; }
+ /// <summary>
+ ///鍙敤鏁伴噺锛欶HLeftQty
+ /// </summary>
+ public decimal FHLeftQty { get; set; }
+
+ /// <summary>
+ /// 缂烘枡鏁伴噺
+ /// </summary>
+ public decimal FLackCount { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅鐢ㄩ噺锛欶UnitDosage
+ /// </summary>
+ public string FUnitDosage { get; set; }
+ /// <summary>
+ /// 璁″垝鎬绘暟閲忥細FSumPlanCount
+ /// </summary>
+ public string FSumPlanCount { get; set; }
+ /// <summary>
+ /// 榻愬鏁伴噺锛欶CompleteCount q
+ /// </summary>
+ public decimal FCompleteCount { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掓棩鏈�
+ /// </summary>
+ public DateTime FPlanDate { get; set; }
+
+ }
+}
diff --git a/src/Model/Demo.Model/Model/PRD_Inventory.cs b/src/Model/Demo.Model/Model/PRD_Inventory.cs
index 8af18e3..e59af85 100644
--- a/src/Model/Demo.Model/Model/PRD_Inventory.cs
+++ b/src/Model/Demo.Model/Model/PRD_Inventory.cs
@@ -29,5 +29,10 @@
/// 搴撳瓨璐т富
/// </summary>
public string FOwnerId { get; set; }
+
+ /// <summary>
+ /// 璐т富缂栫爜
+ /// </summary>
+ public string Fnumber { get; set; }
}
}
diff --git a/src/Model/Demo.Model/Model/PRD_PPBOM.cs b/src/Model/Demo.Model/Model/PRD_PPBOM.cs
index 315612b..665a63a 100644
--- a/src/Model/Demo.Model/Model/PRD_PPBOM.cs
+++ b/src/Model/Demo.Model/Model/PRD_PPBOM.cs
@@ -13,9 +13,13 @@
{
/// <summary>
- /// 涓婚敭
+ /// 鏃ヨ鍒掑伐鍗旻ID
/// </summary>
public long FID { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掓槑缁咶EntryID
+ /// </summary>
+ public long FEntryID { get; set; }
/// <summary>
/// 鐢熶骇鐢ㄦ枡娓呭崟鍗曞彿
/// </summary>
@@ -53,6 +57,50 @@
/// </summary>
public decimal FBASEQTY { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟涓荤爜
+ /// </summary>
+ public string FPRDMOMAINID { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟瀛愮爜
+ /// </summary>
+ public string FPRDMOENTYID { get; set; }
+
+ /// <summary>
+ /// 鏃ヨ鍒掓暟閲�
+ /// </summary>
+ public string FHQTY { get; set; }
+
+ /// <summary>
+ /// 鏃ヨ鍒掓棩鏈�
+ /// </summary>
+ public DateTime FHMASTERDATE { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟绛夌骇
+ /// </summary>
+ public string FHOrderLev { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨缁勭粐
+ /// </summary>
+ public string FStockOrgId { get; set; }
+ /// <summary>
+ /// 缁勭粐鍚嶇О
+ /// </summary>
+ public string OrgFnumber { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅鐢ㄩ噺
+ /// </summary>
+ public decimal dwyl { get; set; }
+
+ /// <summary>
+ /// 棰勮娑堣�楃敤閲�
+ /// </summary>
+ public decimal PlanCount { get; set; }
+
}
+
}
diff --git a/src/ProductizationTemplate/ProductizationTemplate.csproj b/src/ProductizationTemplate/ProductizationTemplate.csproj
index a082d6c..f4083cc 100644
--- a/src/ProductizationTemplate/ProductizationTemplate.csproj
+++ b/src/ProductizationTemplate/ProductizationTemplate.csproj
@@ -169,6 +169,9 @@
<Compile Include="Untity\XhHttpClient.cs" />
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\.editorconfig">
+ <Link>.editorconfig</Link>
+ </None>
<None Include="app.config" />
<None Include="Config\kdapi.config" />
<None Include="packages.config" />
--
Gitblit v1.9.1