From ee97c386f74d12af74e39a08eae455f2e94288de Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 23 十一月 2020 09:31:20 +0800
Subject: [PATCH] 生产计划导入 平台 测试更改
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 25 ++++++------
src/Model/Demo.Model/Model/PODemandPlan/DayPlanPpbom.cs | 5 ++
src/Model/Demo.Model/Model/PODemandPlan/PODemandPlanTemp.cs | 5 ++
src/Model/Demo.Model/Model/PRD_Inventory.cs | 8 ++++
src/Model/Demo.Model/Model/PODemandPlan/PurchaseInventory.cs | 5 ++
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 19 +++++++--
6 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index 5347640..11a27c6 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -236,7 +236,7 @@
jsonRoot.Add("Creator", "");
jsonRoot.Add("NeedUpDateFields", new JArray());
jsonRoot.Add("NeedReturnFields", new JArray());
- jsonRoot.Add("IsDeleteEntry", "false");
+ jsonRoot.Add("IsDeleteEntry", "true");
jsonRoot.Add("SubSystemId", "");
jsonRoot.Add("IsVerifyBaseDataField", "");
@@ -266,17 +266,17 @@
jsonModel.Add("FHPRDORGID", jsonFHPRDORGID);//FHMaterID 鐢熶骇缁勭粐
}
- if (Convert.ToString(current["FProductWorkShopId_Id"]) != "0")
+ if (Convert.ToString(current["FResourcesId_Id"]) != "0")
{
JObject jsonFProductWorkShopId = new JObject();
- jsonFProductWorkShopId.Add("FNumber", (current["FProductWorkShopId"] as DynamicObject)["Number"].ToString());
+ jsonFProductWorkShopId.Add("FNumber", (current["FResourcesId"] as DynamicObject)["Number"].ToString());
jsonModel.Add("FHSourceID", jsonFProductWorkShopId);//FHSourceID 鐢熶骇杞﹂棿
}
- if (Convert.ToString(current["FResourcesId_Id"]) != "0")
+ if (Convert.ToString(current["FProductWorkShopId_Id"]) != "0")
{
JObject jsonFResourcesId = new JObject();
- jsonFResourcesId.Add("FNumber", (current["FResourcesId"] as DynamicObject)["Number"].ToString());
+ jsonFResourcesId.Add("FNumber", (current["FProductWorkShopId"] as DynamicObject)["Number"].ToString());
jsonModel.Add("FHWorkShopID", jsonFResourcesId);//FHWorkShopID 鐢熶骇璧勬簮
}
JArray Entry = new JArray();
@@ -308,12 +308,11 @@
if (saveIsSuc == "TRUE")
{
- string FDayPlanBillNo = saveObj["Result"]["ResponseStatus"]["SuccessEntitys"]["Number"].ToString();
- string FDayPlanID = saveObj["Result"]["ResponseStatus"]["SuccessEntitys"]["Id"].ToString();
+ string FDayPlanBillNo = saveObj["Result"]["Number"].ToString();
+ string FDayPlanID = saveObj["Result"]["Id"].ToString();
- //this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToString(current["SEQ"]));//
- // this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToString(current["SEQ"]));//
-
+ this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToInt32(current["SEQ"]) - 1);//
+ this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToInt32(current["SEQ"]) - 1);//
this.View.ShowMessage("瀵煎叆鎴愬姛");
@@ -337,8 +336,8 @@
string FDayPlanBillNo = saveObj["Result"]["Number"].ToString();
string FDayPlanID = saveObj["Result"]["Id"].ToString();
- //this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToString(current["SEQ"]));//
- // this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToString(current["SEQ"]));//
+ this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToInt32(current["SEQ"])-1);//
+ this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToInt32(current["SEQ"]) - 1);//
this.View.ShowMessage("瀵煎叆鎴愬姛");
@@ -351,7 +350,7 @@
}
}
-
+ this.View.UpdateView();
}
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 85e5725..472cc10 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -406,7 +406,7 @@
}
double Sum = 100;
- Sum = Convert.ToDouble(SumGetComplete(current["FMatrailId_Id"].ToString(), current["FHMainSourceInterID"].ToString(), current["FHMainSourceEntryID"].ToString(), current["FDayPlanWorkID"].ToString(), SumPlan));
+ Sum = Convert.ToDouble(SumGetComplete(current["FMatrailId_Id"].ToString(), current["FHMainSourceInterID"].ToString(), current["FHMainSourceEntryID"].ToString(), current["FDayPlanWorkID"].ToString(), SumPlan, current["FORGID"].ToString()));
this.View.Model.SetValue("FCompleteSetCount", Sum, m);
this.View.UpdateView("FCompleteSetCount");
//淇濆瓨榻愬鏁�
@@ -454,7 +454,7 @@
/// <param name="FDayPlanWorkID"> 鏃ヨ鍒掑伐鍗旻ID</param>
/// <param name="FDayPlanWorkID"> 璁″垝鎬绘暟閲�</param>
/// <returns></returns>
- public string SumGetComplete(string FMATERIALID, string FMainInterID, string FMainEntryID, string FDayPlanWorkID, decimal SumPlan)
+ public string SumGetComplete(string FMATERIALID, string FMainInterID, string FMainEntryID, string FDayPlanWorkID, decimal SumPlan, string sc)
{
//FDayPlanWorkID鏃ヨ鍒掑伐鍗旾D鍘诲垹闄ょ幇鏈夌殑榻愬鍒嗘瀽鏁版嵁
DBServiceHelper.Execute(Context, "/*dialect*/delete JIT_MOMaterReadysBill where FHICMOInterID = '" + FDayPlanWorkID + "'");
@@ -577,7 +577,7 @@
{
string FProWorkShopId = (this.Model.GetValue("FProWorkShopId") as DynamicObject)["Id"].ToString();
if (!string.IsNullOrEmpty(FProWorkShopId))
- sqlwhere += $" and FProductWorkShopId='{FProWorkShopId}'";
+ sqlwhere += $" and FHWorkShopID='{FProWorkShopId}'";
}
//閿�鍞鍗曞彿
string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder")));
@@ -640,8 +640,8 @@
this.Model.SetValue("FHMainSourceEntryID", dt.Rows[i]["FPRDMOENTYID"].ToString(), i);//婧愬崟瀛愬唴鐮丗HMainSourceEntryID
this.Model.SetValue("FDayPlanWorkID", dt.Rows[i]["FID"].ToString(), i);//鏃ヨ鍒掑伐鍗旻ID
- this.Model.SetValue("FProductWorkShopId", dt.Rows[i]["FHSourceID"].ToString(), i);//鐢熶骇杞﹂棿
- this.Model.SetValue("FResourcesId", dt.Rows[i]["FHWorkShopID"].ToString(), i);//鐢熶骇璧勬簮
+ this.Model.SetValue("FResourcesId", dt.Rows[i]["FHSourceID"].ToString(), i);//鐢熶骇璧勬簮
+ this.Model.SetValue("FProductWorkShopId", dt.Rows[i]["FHWorkShopID"].ToString(), i);//鐢熶骇杞﹂棿
sql = @"/*dialect*/SELECT * FROM Sc_WorkBillSortBillSub WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0 and FID=" + dt.Rows[i]["FID"].ToString();
@@ -906,6 +906,9 @@
JOIN SC_WORKBILLSORTBILLSUB T2 ON T1.FID=T2.FID WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0 AND FPLANCOUNT>FCOMPLETECOUNT AND T1.FID in (" + FDayPlanWorkID + ")";
DataSet Complete = DBServiceHelper.ExecuteDataSet(Context, sql);
List<DayPlanPpbom> CompleteList = ds.ToModelList<DayPlanPpbom>();
+
+ #region
+ /*
//FID闆嗗悎
var FIDList = CompleteList.Select(x => x.FID).Distinct().ToList();
foreach (var item in FIDList)
@@ -935,6 +938,12 @@
}
}
+ */
+ #endregion
+ //鑾峰彇褰撳墠鍗虫椂搴撳瓨
+ DataSet JSKCds = DBServiceHelper.ExecuteDataSet(Context, " /*dialect*/ select DISTINCT FBASEQTY,FMATERIALID,FStockOrgId,FOwnerId from T_STK_Inventory");
+ var InventoryList = ds.ToModelList<PRD_Inventory>();
+
//鐗╂枡闆嗗悎 鐢辩墿鏂欏幓鍒嗙粍
List<string> MaterialIDList = DayPlanPpbom.Select(x => x.FMATERIALID).Distinct().ToList();
diff --git a/src/Model/Demo.Model/Model/PODemandPlan/DayPlanPpbom.cs b/src/Model/Demo.Model/Model/PODemandPlan/DayPlanPpbom.cs
index 062444b..0f2bfaa 100644
--- a/src/Model/Demo.Model/Model/PODemandPlan/DayPlanPpbom.cs
+++ b/src/Model/Demo.Model/Model/PODemandPlan/DayPlanPpbom.cs
@@ -66,5 +66,10 @@
/// 瀹為檯闇�姹�
/// </summary>
public decimal NeedQty { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨缁勭粐
+ /// </summary>
+ public double FStockOrgId { get; set; }
}
}
diff --git a/src/Model/Demo.Model/Model/PODemandPlan/PODemandPlanTemp.cs b/src/Model/Demo.Model/Model/PODemandPlan/PODemandPlanTemp.cs
index 2e1c257..65b38b7 100644
--- a/src/Model/Demo.Model/Model/PODemandPlan/PODemandPlanTemp.cs
+++ b/src/Model/Demo.Model/Model/PODemandPlan/PODemandPlanTemp.cs
@@ -84,5 +84,10 @@
/// </summary>
public double FFIXLEADTIME { get; set; }
+ /// <summary>
+ /// 搴撳瓨缁勭粐
+ /// </summary>
+ public double FStockOrgId { get; set; }
+
}
}
diff --git a/src/Model/Demo.Model/Model/PODemandPlan/PurchaseInventory.cs b/src/Model/Demo.Model/Model/PODemandPlan/PurchaseInventory.cs
index 5a57e5a..6378a42 100644
--- a/src/Model/Demo.Model/Model/PODemandPlan/PurchaseInventory.cs
+++ b/src/Model/Demo.Model/Model/PODemandPlan/PurchaseInventory.cs
@@ -38,5 +38,10 @@
/// </summary>
public decimal FQTY { get; set; }
+ /// <summary>
+ /// 搴撳瓨缁勭粐
+ /// </summary>
+ public double FStockOrgId { get; set; }
+
}
}
diff --git a/src/Model/Demo.Model/Model/PRD_Inventory.cs b/src/Model/Demo.Model/Model/PRD_Inventory.cs
index c181799..8af18e3 100644
--- a/src/Model/Demo.Model/Model/PRD_Inventory.cs
+++ b/src/Model/Demo.Model/Model/PRD_Inventory.cs
@@ -20,6 +20,14 @@
/// </summary>
public decimal FBASEQTY { get; set; }
+ /// <summary>
+ /// 搴撳瓨缁勭粐
+ /// </summary>
+ public string FStockOrgId { get; set; }
+ /// <summary>
+ /// 搴撳瓨璐т富
+ /// </summary>
+ public string FOwnerId { get; set; }
}
}
--
Gitblit v1.9.1