From 99b85a43de68895a9f73a28768e273b78a52975e Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 18 十二月 2020 13:33:04 +0800
Subject: [PATCH] 提料计划报表代码提交
---
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 1077 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 758 insertions(+), 319 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 472cc10..ec48004 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;
@@ -45,8 +46,8 @@
{
string _OutServicePath = "";
string PathName = "鏃ヨ鍒掑鍏ユā鏉�.xlsx";
- List<PRD_Inventory> ListInventory;
-
+ List<PRD_Inventory> ListInventory;//搴撳瓨鏄庣粏
+ List<PRD_Inventory> ListInventoryByStockOrgId;//鐗╂枡鎬诲簱瀛�
public override void BarItemClick(BarItemClickEventArgs e)
{
base.BarItemClick(e);
@@ -82,7 +83,11 @@
{
Lock();
}
-
+ //瑙ｉ攣
+ if (e.BarItemKey.ToUpper() == "TBRELIEVELOCK")
+ {
+ RelieveLock();
+ }
if (e.BarItemKey.ToUpper() == "BTNSAVE")
{
Save();
@@ -90,7 +95,8 @@
if (e.BarItemKey.ToUpper() == "TBCOMPLETE")
{
- COMPLETEMAIN();
+ CompleteSetAnalysis();
+ //COMPLETEMAIN();
// COMPLETE();
}
//鎻愭枡璁″垝
@@ -111,13 +117,13 @@
if (e.BarItemKey.ToUpper() == "TBEDIT")
{
- SearchList222();
+ SearchListEdit();
}
}
/// <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;
@@ -139,7 +145,6 @@
formPa.CustomParams.Add("FMatrailId_Id", Convert.ToString((this.View.Model.GetValue("FMatrailId", e.Row) as DynamicObject)["Id"].ToString()));
this.View.ShowForm(formPa);
}
-
/// <summary>
/// 瀵煎嚭鏁版嵁鍒癊xcel
/// </summary>
@@ -223,8 +228,6 @@
}
}
-
-
private string _fileId = string.Empty;
/// <summary>
/// 寮瑰嚭涓嬭浇鎻愮ず绐楋紝涓嬭浇鏂囦欢鑷冲鎴风鏈湴銆�
@@ -245,7 +248,6 @@
jObject.Put("urltitle", "杩欐槸鏂囦欢鍚�");
this.View.AddAction(JSAction.openUrlWindow, new JSONArray { jObject });
}
-
/// <summary>
/// 閿佸畾
/// </summary>
@@ -270,8 +272,49 @@
string sql;
foreach (var item in entityDataObjoct)
{
+ sql = $"/*dialect*/update t1 set t1.FHLockedSub=1 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate()) and t1.FID = { Convert.ToString(item["FDayPlanWorkID"])} ";
- sql = $"/*dialect*/update Sc_WorkBillSortBillSub set FHLockedSub=1 where FEntryID in (select TOP({day}) FEntryID from Sc_WorkBillSortBillSub where FHLOCKEDSUB = 0 AND FID = { Convert.ToString(item["FDayPlanWorkID"])} AND DATEDIFF(DAY, GETDATE(), FHMASTERDATE) >= 0 ORDER BY FEntryID) ";
+ //sql = $"/*dialect*/update Sc_WorkBillSortBillSub set FHLockedSub=1 where FEntryID in (select TOP({day}) FEntryID from Sc_WorkBillSortBillSub where FHLOCKEDSUB = 0 AND FID = { Convert.ToString(item["FDayPlanWorkID"])} AND DATEDIFF(DAY, GETDATE(), FHMASTERDATE) >= 0 ORDER BY FEntryID) ";
+ sqlList.Add(sql);
+
+ }
+
+ int result = DBServiceHelper.ExecuteBatch(Context, sqlList);
+ if (result > 0)
+ {
+ SearchList222();
+ this.View.ShowMessage("鎿嶄綔鎴愬姛");
+ }
+ else
+ this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
+ }
+ /// <summary>
+ /// 瑙ｉ攣
+ /// </summary>
+ public void RelieveLock()
+ {
+ int day = Convert.ToInt32(this.Model.GetValue("FLockDays"));
+
+ string sqlwhere = " and 1=1";
+ string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder")));
+ if (string.IsNullOrEmpty(FSalOrder))
+ {
+
+ }
+ else
+ sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";
+
+ //鑾峰彇鍗曟嵁浣撲俊鎭�
+ Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
+ //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
+ DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
+ List<string> sqlList = new List<string>();
+ string sql;
+ foreach (var item in entityDataObjoct)
+ {
+ sql = $"/*dialect*/update t1 set t1.FHLockedSub=0 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate()) and t1.FID = { Convert.ToString(item["FDayPlanWorkID"])} ";
+
+ //sql = $"/*dialect*/update Sc_WorkBillSortBillSub set FHLockedSub=1 where FEntryID in (select TOP({day}) FEntryID from Sc_WorkBillSortBillSub where FHLOCKEDSUB = 0 AND FID = { Convert.ToString(item["FDayPlanWorkID"])} AND DATEDIFF(DAY, GETDATE(), FHMASTERDATE) >= 0 ORDER BY FEntryID) ";
sqlList.Add(sql);
}
@@ -287,7 +330,7 @@
}
/// <summary>
/// 淇濆瓨鍔熻兘
- /// </summary>
+ /// </summary>
public void Save()
{
@@ -298,8 +341,25 @@
//鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
DateTime date = DateTime.Now;
+
+ string _result = "";
+
foreach (DynamicObject current in entityDataObjoct)
{
+ if (Convert.ToInt32(current["FNoScheduled"]) < 0)
+ _result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鏃ヨ鍒掓�绘暟閲忚秴鍑虹敓浜ц鍗曟暟閲�";
+
+ }
+ if (_result != "")
+ {
+ this.View.ShowErrMessage(_result);
+ return;
+ }
+
+ foreach (DynamicObject current in entityDataObjoct)
+ {
+ sql = $"/*dialect*/ update Sc_WorkBillSortBillMain set FOrderQuantity={current["FOrderQuantity"]},FDayPlanQuantity={current["FDayPlanQuantity"]},FNoScheduled={current["FNoScheduled"]} where FID = {current["FDayPlanWorkID"]}";
+ sqlList.Add(sql);
DateTime FBzDate = Convert.ToDateTime(Convert.ToDateTime(current["FBzDate"]));
DateTime end = Convert.ToDateTime(Convert.ToDateTime(current["FBzDate"]).AddDays(60).ToShortDateString());//鏈�澶ф棩鏈�
for (int i = 0; i <= 60; i++)
@@ -326,7 +386,6 @@
this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
}
-
/// <summary>
/// 榻愬鍒嗘瀽
/// </summary>
@@ -383,9 +442,28 @@
}
public void COMPLETEMAIN()
{
- //鑾峰彇褰撳墠鍗虫椂搴撳瓨
- DataSet ds = DBServiceHelper.ExecuteDataSet(Context, " /*dialect*/ select DISTINCT FBASEQTY,FMATERIALID from T_STK_Inventory");
+ //鑾峰彇褰撳墠鍗虫椂搴撳瓨 鎸夌収鐗╂枡+璐т富+搴撳瓨 灞曠幇
+ DataSet ds = DBServiceHelper.ExecuteDataSet(Context, @" /*dialect*/ select DISTINCT (a.FBASEQTY- ISNULL(FHUseQty,0)) as FBASEQTY,a.FMATERIALID,a.FStockOrgId,a.FOwnerId from T_STK_Inventory a
+left join
+ (
+ select FHMaterID,FHUseQty,FHStockOrgID,FOwnerId from JIT_MOMaterReadysBill
+ where FIdentificat = 2
+ ) b on a.FMATERIALID=b.FHMaterID and a.FStockOrgId=b.FHStockOrgID and a.FOwnerId = b.FOwnerId
+ order by FBASEQTY");
ListInventory = ds.ToModelList<PRD_Inventory>();
+
+ ds = DBServiceHelper.ExecuteDataSet(Context, @" /*dialect*/ select sum(FBASEQTY)FBASEQTY,FMATERIALID,FStockOrgId from
+ (
+ select DISTINCT (a.FBASEQTY- ISNULL(FHUseQty,0)) as FBASEQTY,a.FMATERIALID,a.FStockOrgId,a.FOwnerId from T_STK_Inventory a
+left join
+ (
+ select FHMaterID,FHUseQty,FHStockOrgID,FOwnerId from JIT_MOMaterReadysBill
+ where FIdentificat = 2
+ ) b on a.FMATERIALID=b.FHMaterID and a.FStockOrgId=b.FHStockOrgID and a.FOwnerId = b.FOwnerId
+
+ ) TT
+group by FMATERIALID, FStockOrgId ");
+ ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
//鑾峰彇鍗曟嵁浣撲俊鎭�
Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
@@ -396,6 +474,14 @@
if (entityDataObjoct.Count > 0)
{
int m = 0;
+
+ //鍒犻櫎榻愬鏁伴噺
+ foreach (DynamicObject current in entityDataObjoct)
+ {
+ //FDayPlanWorkID鏃ヨ鍒掑伐鍗旾D鍘诲垹闄ょ幇鏈夌殑榻愬鍒嗘瀽鏁版嵁
+ DBServiceHelper.Execute(Context, "/*dialect*/delete JIT_MOMaterReadysBill where FHICMOInterID = '" + current["FDayPlanWorkID"].ToString() + "'");
+ }
+
foreach (DynamicObject current in entityDataObjoct)
{
//璁″垝鎬绘暟閲�
@@ -406,11 +492,11 @@
}
double Sum = 100;
- Sum = Convert.ToDouble(SumGetComplete(current["FMatrailId_Id"].ToString(), current["FHMainSourceInterID"].ToString(), current["FHMainSourceEntryID"].ToString(), current["FDayPlanWorkID"].ToString(), SumPlan, current["FORGID"].ToString()));
+ Sum = Convert.ToDouble(SumGetComplete(current["FMatrailId_Id"].ToString(), current["FHMainSourceInterID"].ToString(), current["FHMainSourceEntryID"].ToString(), current["FDayPlanWorkID"].ToString(), SumPlan, current["FORGID_Id"].ToString()));
this.View.Model.SetValue("FCompleteSetCount", Sum, m);
this.View.UpdateView("FCompleteSetCount");
//淇濆瓨榻愬鏁�
- DBServiceHelper.Execute(Context, "/*dialect*/ update Sc_WorkBillSortBillMain set FCompleteCount='" + Sum + "',FPlanCount='" + SumPlan + "' where FID=" + current["FDayPlanWorkID"].ToString());
+ DBServiceHelper.Execute(Context, "/*dialect*/ update Sc_WorkBillSortBillMain set FCompleteCount='" + Sum + "',FDayPlanQuantity='" + SumPlan + "' where FID=" + current["FDayPlanWorkID"].ToString());
for (int i = 0; i <= 60; i++)
{
this.View.GetFieldEditor("FT" + i.ToString(), m).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
@@ -423,7 +509,6 @@
else
{
grid.SetForecolor("FT" + "" + i + "", "#FF0000", m);
-
}
}
@@ -444,7 +529,6 @@
}
}
-
/// <summary>
/// 璁＄畻鏈�澶ч綈濂楁暟閲�
/// </summary>
@@ -452,9 +536,10 @@
/// <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 sc)
+ public string SumGetComplete(string FMATERIALID, string FMainInterID, string FMainEntryID, string FDayPlanWorkID, decimal SumPlan, string FStockOrgId)
{
//FDayPlanWorkID鏃ヨ鍒掑伐鍗旾D鍘诲垹闄ょ幇鏈夌殑榻愬鍒嗘瀽鏁版嵁
DBServiceHelper.Execute(Context, "/*dialect*/delete JIT_MOMaterReadysBill where FHICMOInterID = '" + FDayPlanWorkID + "'");
@@ -478,11 +563,12 @@
/*dialect*/
--鐢熶骇鐢ㄦ枡娓呭崟鍒楄〃
SELECT T1.FID,T1.FBillNo,T1.FMOBillNO,T1.FMOEntrySeq,T1.FMoId,T1.FMaterialID,T1.FQty,
-T2.FMATERIALID FMATERIALID2,T4.FNumber,T2.FNeedQty,isnull(t3.FBASEQTY,0)FBASEQTY
+T2.FMATERIALID FMATERIALID2,T4.FNumber,T2.FNeedQty
+--,isnull(t3.FBASEQTY,0)FBASEQTY
FROM T_PRD_PPBOM T1
LEFT JOIN (select FID,MAX(FENTRYID)FENTRYID,SUM(FNeedQty)FNeedQty,FMATERIALID from T_PRD_PPBOMENTRY where FMoId='{0}'
group by FMATERIALID,FID ) T2 on T1.FID=t2.FID
-LEFT JOIN T_STK_Inventory T3 on t2.FMATERIALID = t3.FMATERIALID
+--LEFT JOIN T_STK_Inventory T3 on t2.FMATERIALID = t3.FMATERIALID
LEFT JOIN T_BD_MATERIAL T4 on T2.FMATERIALID=T4.FMATERIALID
where t1.FMoId='{0}' and T1.FMaterialID='{1}'
", FMainInterID, FMATERIALID);
@@ -496,7 +582,7 @@
List<decimal> list = new List<decimal>();
foreach (var t in PpbomList)
{
- var ls = ListInventory.Where(c => c.FMATERIALID == t.FMATERIALID2).FirstOrDefault();
+ var ls = ListInventoryByStockOrgId.Where(c => c.FMATERIALID == t.FMATERIALID2 && c.FStockOrgId == FStockOrgId).FirstOrDefault();
if (ls == null)
{
list.Add(0);
@@ -513,59 +599,352 @@
SumGetComplete = SumPlan;
foreach (var item in PpbomList)
{
+ decimal jskc = 0;
+ var ls = ListInventoryByStockOrgId.Where(c => c.FMATERIALID == item.FMATERIALID2 && c.FStockOrgId == FStockOrgId).FirstOrDefault();
+ if (ls != null)
+ jskc = ls.FBASEQTY;
/*
鍙婃椂搴撳瓨鏁伴噺 = 绯荤粺鐜版湁搴撳瓨
鍙敤鏁伴噺 = 鍙婃椂搴撳瓨鏁伴噺
鏁伴噺瀛楁 = 榻愬閲� * 鍗曚綅鐢ㄦ枡
*/
- decimal UnitDosage = item.FNeedQty / item.FQty;
- var ls = ListInventory.Where(c => c.FMATERIALID == item.FMATERIALID2).FirstOrDefault();
- if (ls != null)
- ls.FBASEQTY -= SumGetComplete * (UnitDosage);
- // var _ls = ListInventory.Where(c => c.FMATERIALID == item.FMATERIALID2).DefaultIfEmpty();
- 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", FMainInterID);//涓荤敓浜ц鍗曚富鍐呯爜
- jsonModel.Add("FHMainICMOEntryID", FMainEntryID);//涓荤敓浜ц鍗曚富鍐呯爜
+ decimal UnitDosage = item.FNeedQty / item.FQty;//鍗曚綅鐢ㄩ噺
+ decimal xhsl = SumGetComplete * (UnitDosage);///娑堣�楁暟閲�
- jsonModel.Add("FHICMOInterID", FDayPlanWorkID);//鏃ヨ鍒掕鍗曚富鍐呯爜
+ 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", FMainInterID);//涓荤敓浜ц鍗曚富鍐呯爜
+ _jsonModel.Add("FHMainICMOEntryID", FMainEntryID);//涓荤敓浜ц鍗曚富鍐呯爜
+ _jsonModel.Add("FHICMOInterID", FDayPlanWorkID);//鏃ヨ鍒掕鍗曚富鍐呯爜
- JObject HMaterID = new JObject();
- HMaterID.Add("FNumber", item.FNumber);
- jsonModel.Add("FHMaterID", HMaterID);//FHMaterID 鐗╂枡
+ JObject _HMaterID = new JObject();
+ _HMaterID.Add("FNumber", item.FNumber);
+ _jsonModel.Add("FHMaterID", _HMaterID);//FHMaterID 鐗╂枡
- jsonModel.Add("FHStockQty", Convert.ToDecimal(item.FBASEQTY));//鍙婃椂搴撳瓨鏁伴噺
- jsonModel.Add("FHUseQty", Convert.ToDecimal(SumGetComplete * (UnitDosage)));//鏁伴噺
- jsonModel.Add("FHLeftQty", Convert.ToDecimal(item.FBASEQTY));//鍙敤鏁伴噺
- jsonModel.Add("FUnitDosage", Convert.ToDecimal(UnitDosage));//鍗曚綅鐢ㄩ噺 .
+ _jsonModel.Add("FHStockQty", Convert.ToDecimal(jskc));//鍙婃椂搴撳瓨鏁伴噺
+ _jsonModel.Add("FHUseQty", Convert.ToDecimal(xhsl));//鏁伴噺
+ _jsonModel.Add("FHLeftQty", Convert.ToDecimal(jskc));//鍙敤鏁伴噺
+ _jsonModel.Add("FUnitDosage", Convert.ToDecimal(UnitDosage));//鍗曚綅鐢ㄩ噺 .
- jsonModel.Add("FSumPlanCount", Convert.ToDecimal(SumPlan));//FSumPlanCount 璁″垝鎬绘暟閲�
- jsonModel.Add("FCompleteCount", Convert.ToDecimal(SumGetComplete));//FCompleteCount 榻愬鏁伴噺
- jsonModel.Add("FPRDBILLNO", item.FMOBillNO);//FPRDBILLNO 宸ュ崟缂栧彿
+ _jsonModel.Add("FSumPlanCount", Convert.ToDecimal(SumPlan));//FSumPlanCount 璁″垝鎬绘暟閲�
+ _jsonModel.Add("FCompleteCount", Convert.ToDecimal(SumGetComplete));//FCompleteCount 榻愬鏁伴噺
+ _jsonModel.Add("FPRDBILLNO", item.FMOBillNO);//FPRDBILLNO 宸ュ崟缂栧彿
+ _jsonModel.Add("FIdentificat", "1");//鏍囪瘑
- jsonRoot.Add("Model", jsonModel);
+ _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();
+ 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")
+ if (_saveIsSuc != "TRUE")
{
this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
}
+
+ //鎵ｉ櫎鎬诲簱瀛樼殑鏁伴噺
+
+ if (ls != null)
+ ls.FBASEQTY -= xhsl;
+
+
+
+ List<PRD_Inventory> _ListInventory = ListInventory.Where(c => c.FMATERIALID == item.FMATERIALID2 && c.FStockOrgId == FStockOrgId && c.FBASEQTY > 0).ToList();
+ foreach (var Inventory in _ListInventory)
+ {
+ //鎵ｉ櫎搴撳瓨鏁伴噺
+ // Inventory.FBASEQTY;
+ if (xhsl <= 0)
+ break;
+
+ // var _ls = ListInventory.Where(c => c.FMATERIALID == item.FMATERIALID2).DefaultIfEmpty();
+ 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", FMainInterID);//涓荤敓浜ц鍗曚富鍐呯爜
+ jsonModel.Add("FHMainICMOEntryID", FMainEntryID);//涓荤敓浜ц鍗曚富鍐呯爜
+ jsonModel.Add("FHICMOInterID", FDayPlanWorkID);//鏃ヨ鍒掕鍗曚富鍐呯爜
+
+ JObject HMaterID = new JObject();
+ HMaterID.Add("FNumber", item.FNumber);
+ jsonModel.Add("FHMaterID", HMaterID);//FHMaterID 鐗╂枡
+
+
+ DataTable dt = DBServiceHelper.ExecuteDataSet(Context, @"
+select FNUMBER
+ from T_ORG_Organizations where FORGID='" + FStockOrgId + "'").Tables[0];
+ JObject FHStockOrgID = new JObject();
+ FHStockOrgID.Add("FNumber", dt.Rows[0]["FNUMBER"].ToString());
+ jsonModel.Add("FHStockOrgID", FHStockOrgID);//FHStockOrgID 搴撳瓨缁勭粐
+
+ jsonModel.Add("FOwnerTypeId", "BD_OwnerOrg");//FHStockOrgID 璐т富绫诲瀷
+
+ dt = DBServiceHelper.ExecuteDataSet(Context, @"
+select FNUMBER
+ from T_ORG_Organizations where FORGID='" + Inventory.FOwnerId + "'").Tables[0];
+
+ JObject FOwnerId = new JObject();
+ FOwnerId.Add("FNumber", dt.Rows[0]["FNUMBER"].ToString());
+ jsonModel.Add("FOwnerId", FOwnerId);//FOwnerId 璐т富
+
+ jsonModel.Add("FHStockQty", Convert.ToDecimal(Inventory.FBASEQTY));//鍙婃椂搴撳瓨鏁伴噺
+ jsonModel.Add("FHUseQty", Convert.ToDecimal(xhsl > Inventory.FBASEQTY ? Inventory.FBASEQTY : xhsl));//鏁伴噺
+ jsonModel.Add("FHLeftQty", Convert.ToDecimal(Inventory.FBASEQTY));//鍙敤鏁伴噺
+ jsonModel.Add("FUnitDosage", Convert.ToDecimal(UnitDosage));//鍗曚綅鐢ㄩ噺 .
+
+ jsonModel.Add("FSumPlanCount", Convert.ToDecimal(SumPlan));//FSumPlanCount 璁″垝鎬绘暟閲�
+ jsonModel.Add("FCompleteCount", Convert.ToDecimal(SumGetComplete));//FCompleteCount 榻愬鏁伴噺
+ jsonModel.Add("FPRDBILLNO", item.FMOBillNO);//FPRDBILLNO 宸ュ崟缂栧彿
+ jsonModel.Add("FIdentificat", "2");//鏍囪瘑
+
+
+ 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")
+ {
+ this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
+ }
+
+
+ if (xhsl >= Inventory.FBASEQTY)
+ {
+ xhsl = xhsl - Inventory.FBASEQTY;
+ Inventory.FBASEQTY = 0;
+
+ }
+ else
+ {
+ Inventory.FBASEQTY -= xhsl;
+ xhsl = 0;
+ }
+
+
+
+
+
+ }
+
}
return SumGetComplete.ToString();
}
-
-
-
+ /// <summary>
+ /// 榻愬鍒嗘瀽
+ /// </summary>
+ public void CompleteSetAnalysis()
+ {
+ try
+ {
+ Stopwatch sw = new Stopwatch();
+ sw.Start();//寮�濮嬭鏃�
+ //娓呯┖榻愬涓存椂琛�
+ DBServiceHelper.Execute(Context, "/*dialect*/ delete JIT_MOMaterReadysBill ");
+ //鑾峰彇褰撳墠鍗虫椂搴撳瓨 鎸夌収鐗╂枡+搴撳瓨缁勭粐+璐т富+搴撳瓨鏁伴噺
+ 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 T1.FMATERIALID in (105773)
+");
+ 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
+where T1.FMATERIALID in (105773)
+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
+where t4.FMATERIALID in (105773
+)
+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();
+ //鐪熸闇�瑕佸彇璁＄畻鐨勬暟閲忥紙鎷嗗垎璐т富锛�
+ //璐т富鍖归厤
+ List<PRD_Inventory> _ListInventory = ListInventory.Where(c => c.FMATERIALID == _item.FMATERIALID2 && c.FStockOrgId == _item.FStockOrgId && c.FBASEQTY > 0).ToList();
+ if (_ListInventory.Count > 0)
+ {
+ decimal _fLackCount = _item.PlanCount > sjkcList.FBASEQTY ? (_item.PlanCount - sjkcList.FBASEQTY) : 0;//缂烘枡鏁伴噺
+ foreach (var Inventory in _ListInventory)
+ {
+ if (need == 0)
+ break;
+ decimal fCompleteCount = need >= Inventory.FBASEQTY ? Inventory.FBASEQTY : need;//榻愬鏁伴噺
+ //鎬昏鍒掓暟閲� 鍜� 鎬诲簱瀛樻暟閲忔瘮瀵�
+ 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 = Inventory.FBASEQTY,//鍙敤鏁伴噺
+ FComPlete = sjkcList.FBASEQTY >= _item.PlanCount ? "榻愬" : "鏈綈濂�",
+ FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+ });
+ //鎵ｅ噺鎬诲簱瀛樻暟閲�
+ sjkcList.FBASEQTY = sjkcList.FBASEQTY >= fCompleteCount ? sjkcList.FBASEQTY - fCompleteCount : 0;
+ //鍓╀綑鏃ヨ鍒掗渶姹傛暟閲�
+ need = need >= Inventory.FBASEQTY ? need - Inventory.FBASEQTY : 0;
+ //鎵ｅ噺娑堣�楀簱瀛�
+ Inventory.FBASEQTY = Inventory.FBASEQTY - fCompleteCount;
+ }
+ }
+ 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("FLackCount", item.FLackCount);
+ 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,'鏈綈濂�') ='鏈綈濂�')
+");
+ DBServiceHelper.Execute(Context, @"
+/*dialect*/update Sc_WorkBillSortBillSub set FComplete = '榻愬' where FEntryID NOT IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�')
+");
+ sw.Stop();//缁撴潫璁℃椂
+ LogHelper.Info("杩愯鎬绘椂闀匡細" + sw.Elapsed);
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message.ToString());
+ }
+ }
/// <summary>
/// 鏌ヨ
/// </summary>
@@ -619,6 +998,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");
@@ -628,8 +1008,8 @@
this.Model.SetValue("FSalOrderCount", dt.Rows[i]["FHSeOrderBillNo"].ToString(), i);//閿�鍞鍗曟暟閲�
this.Model.SetValue("FBatch", dt.Rows[i]["FBatch"].ToString(), i);//鎵规鍙�
this.Model.SetValue("FUnit", dt.Rows[i]["FHUnitID"].ToString(), i);//璁￠噺鍗曚綅
- this.Model.SetValue("FMatrailId", dt.Rows[i]["FHMaterID"].ToString(), i);//浜у搧浠ｇ爜
this.Model.SetValue("FORGID", dt.Rows[i]["FHPRDORGID"].ToString(), i);//鐢熶骇缁勭粐
+ this.Model.SetValue("FMatrailId", dt.Rows[i]["FHMaterID"].ToString(), i);//浜у搧浠ｇ爜
this.Model.SetValue("FDeliverydate", dt.Rows[i]["FHOrderCommitDate"].ToString(), i);//浜よ揣鏃ユ湡
this.Model.SetValue("FOrderLevel", dt.Rows[i]["FHOrderLev"].ToString(), i);//璁㈠崟绛夌骇
this.Model.SetValue("FSCOrderNo", dt.Rows[i]["FSCOrderNo"].ToString(), i);//鐢熶骇璁㈠崟鍙�
@@ -643,9 +1023,15 @@
this.Model.SetValue("FResourcesId", dt.Rows[i]["FHSourceID"].ToString(), i);//鐢熶骇璧勬簮
this.Model.SetValue("FProductWorkShopId", dt.Rows[i]["FHWorkShopID"].ToString(), i);//鐢熶骇杞﹂棿
+ this.Model.SetValue("FCompleteSetCount", dt.Rows[i]["FCompleteCount"].ToString(), i);//榻愬鏁伴噺
+ this.Model.SetValue("FOrderQuantity", dt.Rows[i]["FOrderQuantity"].ToString(), i);//鐢熶骇璁㈠崟鏁伴噺
+ this.Model.SetValue("FDayPlanQuantity", dt.Rows[i]["FDayPlanQuantity"].ToString(), i);//鏃ヨ鍒掓暟閲�
+ this.Model.SetValue("FNoScheduled", dt.Rows[i]["FNoScheduled"].ToString(), i);//鏈帓鏁伴噺
+
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)
{
/*
@@ -661,11 +1047,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; //鍗曟嵁浣撹閿佸畾瀛楁
-
}
-
this.View.InvokeFieldUpdateService("FMatrailId", i);//璋冪敤鏁伴噺鍊兼洿鏂�
-
}
this.View.UpdateView();
for (int j = 0; j < dt.Rows.Count; j++)
@@ -682,6 +1065,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 if (dr["FCOMPLETE"].ToString() == "榻愬")
+ {
+ this.View.GetFieldEditor("FT" + getDay.Days.ToString(), j).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
+ grid.SetForecolor("FT" + "" + getDay.Days.ToString() + "", "#00FF00", j);
+ }
}
}
@@ -696,152 +1089,129 @@
}
- }
+ }
+ /// <summary>
+ /// 缂栬緫
+ /// </summary>
+ public void SearchListEdit()
+ {
+ string sqlwhere = " where 1=1";
+
+ if ((this.Model.GetValue("FProWorkShopId") as DynamicObject) != null)
+ {
+ string FProWorkShopId = (this.Model.GetValue("FProWorkShopId") as DynamicObject)["Id"].ToString();
+ if (!string.IsNullOrEmpty(FProWorkShopId))
+ sqlwhere += $" and FHWorkShopID='{FProWorkShopId}'";
+ }
+ //閿�鍞鍗曞彿
+ string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder")));
+ if (string.IsNullOrEmpty(FSalOrder))
+ {
+
+ }
+ else
+ sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";
+ //鐢熶骇璁㈠崟鍙�
+ string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo")));
+ if (string.IsNullOrEmpty(FScOrderMainNo))
+ {
+
+ }
+ else
+ sqlwhere += $" and FSCORDERNO='{FScOrderMainNo}'";
+
+ //鐗╂枡
+ if ((this.Model.GetValue("FMatralId") as DynamicObject) != null)
+ {
+ string FMatralId = (this.Model.GetValue("FMatralId") as DynamicObject)["Number"].ToString();
+ if (!string.IsNullOrEmpty(FMatralId))
+ sqlwhere += $" and t3.FNumber='{FMatralId}'";
+ }
+ //缂栧埗鏃ユ湡
+ string FPreparatDate = Convert.ToString((this.Model.GetValue("FPreparatDate")));
+ if (!string.IsNullOrEmpty(FPreparatDate))
+ sqlwhere += $" and FPreparatDate='{FPreparatDate}'";
+ try
+ {
+ string sql = @"/*dialect*/select t1.* from Sc_WorkBillSortBillMain t1
+ left join T_BD_MATERIAL t3 on t1.FHMaterID=t3.FMATERIALID
+" + sqlwhere;
+ 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");
+ this.Model.SetValue("FSEQ", i + 1, i);//搴忓彿
+ this.Model.SetValue("FCompleteSetCount", "", i);//鎬婚綈濂楁暟閲�
+ this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//鐢熶骇璁㈠崟鏁伴噺
+ this.Model.SetValue("FSalOrderCount", dt.Rows[i]["FHSeOrderBillNo"].ToString(), i);//閿�鍞鍗曟暟閲�
+ this.Model.SetValue("FBatch", dt.Rows[i]["FBatch"].ToString(), i);//鎵规鍙�
+ this.Model.SetValue("FUnit", dt.Rows[i]["FHUnitID"].ToString(), i);//璁￠噺鍗曚綅
+ this.Model.SetValue("FORGID", dt.Rows[i]["FHPRDORGID"].ToString(), i);//鐢熶骇缁勭粐
+ this.Model.SetValue("FMatrailId", dt.Rows[i]["FHMaterID"].ToString(), i);//浜у搧浠ｇ爜
+ this.Model.SetValue("FDeliverydate", dt.Rows[i]["FHOrderCommitDate"].ToString(), i);//浜よ揣鏃ユ湡
+ this.Model.SetValue("FOrderLevel", dt.Rows[i]["FHOrderLev"].ToString(), i);//璁㈠崟绛夌骇
+ this.Model.SetValue("FSCOrderNo", dt.Rows[i]["FSCOrderNo"].ToString(), i);//鐢熶骇璁㈠崟鍙�
+ this.Model.SetValue("FSalOrderNo", dt.Rows[i]["FHSEORDERBILLNO"].ToString(), i);//閿�鍞鍗曞彿
+ this.Model.SetValue("FBzDate", dt.Rows[i]["FPreparatDate"].ToString(), i);//缂栧埗鏃ユ湡
+ this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//鐢熶骇璁㈠崟鏁伴噺
+ this.Model.SetValue("FHMainSourceInterID", dt.Rows[i]["FPRDMOMAINID"].ToString(), i);//婧愬崟涓诲唴鐮丗HMainSourceInterID
+ 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("FResourcesId", dt.Rows[i]["FHSourceID"].ToString(), i);//鐢熶骇璧勬簮
+ this.Model.SetValue("FProductWorkShopId", dt.Rows[i]["FHWorkShopID"].ToString(), i);//鐢熶骇杞﹂棿
+ this.Model.SetValue("FCompleteSetCount", dt.Rows[i]["FCompleteCount"].ToString(), i);//榻愬鏁伴噺
+ this.Model.SetValue("FOrderQuantity", dt.Rows[i]["FOrderQuantity"].ToString(), i);//鐢熶骇璁㈠崟鏁伴噺
+ this.Model.SetValue("FDayPlanQuantity", dt.Rows[i]["FDayPlanQuantity"].ToString(), i);//鏃ヨ鍒掓暟閲�
+ this.Model.SetValue("FNoScheduled", dt.Rows[i]["FNoScheduled"].ToString(), i);//鏈帓鏁伴噺
+ 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)
+ {
+ DateTime start = Convert.ToDateTime(DateNow.ToShortDateString());
+ DateTime end = Convert.ToDateTime(Convert.ToDateTime(dr["FHMASTERDATE"]).ToShortDateString());
+ TimeSpan getDay = end.Subtract(start);
+ if (getDay.Days > 60)
+ continue;
+ 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; //鍗曟嵁浣撹閿佸畾瀛楁
+ }
+ this.View.InvokeFieldUpdateService("FMatrailId", i);//璋冪敤鏁伴噺鍊兼洿鏂�
+ }
+ this.View.UpdateView();
+ for (int j = 0; j < dt.Rows.Count; j++)
+ {
+ sql = @"/*dialect*/SELECT * FROM Sc_WorkBillSortBillSub WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0 and FID=" + dt.Rows[j]["FID"].ToString();
+ DataTable _dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ foreach (DataRow dr in _dt.Rows)
+ {
+ DateTime start = Convert.ToDateTime(DateNow.ToShortDateString());
+ DateTime end = Convert.ToDateTime(Convert.ToDateTime(dr["FHMASTERDATE"]).ToShortDateString());
+ TimeSpan getDay = end.Subtract(start);
+ if (getDay.Days > 60)
+ continue;
+ if (dr["FHLockedSub"].ToString() == "1")
+ this.View.GetFieldEditor("FT" + getDay.Days.ToString(), j).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
+ }
+ }
+ for (int m = 0; m <= 60; m++)
+ {
+ this.View.GetControl("FT" + "" + m + "").Text = DateNow.AddDays(m).ToShortDateString();
+ }
+ }
+ catch (Exception ex)
+ {
+ this.View.ShowErrMessage(ex.Message.ToString());
+ }
+
+ }
/// <summary>
/// 鎻愭枡璁″垝
/// </summary>
-
- public void Extraction2()
- {
-
- //鑾峰彇鍗曟嵁浣撲俊鎭�
- Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
- //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
- DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
- EntryGrid grid = this.View.GetControl<EntryGrid>("FEntity");
- if (entityDataObjoct.Count == 0)
- {
- this.View.ShowMessage("璇峰厛鍔犺浇鏁版嵁锛�");
- }
- else
- {
- foreach (DynamicObject current in entityDataObjoct)
- {
-
- string FDayPlanWorkID = Convert.ToString(current["FDayPlanWorkID"]);//鏃ュ伐鍗旾D
- string FPRDMOMAINID = Convert.ToString(current["FHMainSourceInterID"]);//鐢熶骇璁㈠崟id
- //鏄惁鏈夎繃榻愬鍒嗘瀽 鎵惧嚭榻愬鏁伴噺 鏃ヨ鍒掓暟閲�
- string sql = string.Format(@"
-/*dialect*/
- SELECT T1.FID,FHMATERID,FHMASTERDATE,FHQTY,FCOMPLETECOUNT,FPRDMOMAINID,T2.FENTRYID,T1.FBILLNO FROM SC_WORKBILLSORTBILLMAIN T1
-JOIN SC_WORKBILLSORTBILLSUB T2 ON T1.FID=T2.FID
-WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0
-AND FPLANCOUNT>FCOMPLETECOUNT
-AND T1.FID='{0}' AND FPRDMOMAINID='{1}'
-", FDayPlanWorkID, FPRDMOMAINID);
- DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
- DataTable dt = ds.Tables[0];
- if (dt.Rows.Count > 0)
- {
- string FMATERIALID = dt.Rows[0]["FHMaterID"].ToString();//鐗╂枡缂栫爜
- decimal FCompleteCount = Convert.ToDecimal(dt.Rows[0]["FCompleteCount"].ToString());//榻愬鏁伴噺
-
- //鎸変富鐗╂枡鏌ヨ瀛愮墿鏂欏崟浣嶇敤鏂� 鏈�灏忛噰璐� 鍜� 鎻愬墠鏈�
- sql = string.Format(@"
-/*dialect*/
-SELECT FNeedQty,t5.FFIXLEADTIME,t5.FMAXPOQTY,t5.FMINPOQTY,t2.FMATERIALID,t3.FNumber FROM T_PRD_PPBOM T1
-LEFT JOIN(SELECT FID, MAX(FENTRYID) FENTRYID, SUM(convert(decimal(18, 2), FBASENUMERATOR / FBASEDENOMINATOR))FNeedQty, FMATERIALID from T_PRD_PPBOMENTRY where FMoId = '{0}'
-group by FMATERIALID, FID) T2 on T1.FID = t2.FID
-JOIN T_BD_MATERIAL T3 ON T2.FMATERIALID = t3.FMATERIALID
-join t_BD_MaterialBase t4 on t3.FMATERIALID = t4.FMATERIALID
-join t_BD_MaterialPlan t5 on t3.FMATERIALID = t5.FMATERIALID
-WHERE T1.FMaterialID = '{1}'
-AND FMoId = '{0}'
-AND FERPCLSID=1
-", FPRDMOMAINID, FMATERIALID);
- DataTable _dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
- //鏍规嵁bom鍘诲惊鐜�
- foreach (DataRow drDetail in _dt.Rows)
- {
- string DetailFmaterialID = drDetail["FNumber"].ToString();//瀛愮墿鏂�
- int FfixleadTime = Convert.ToInt32(drDetail["FFIXLEADTIME"].ToString());//鎻愬墠澶╂暟
- decimal FminPoqty = Convert.ToDecimal(drDetail["FMINPOQTY"].ToString());//鏈�灏忛噰璐噺
- decimal FNeedQty = Convert.ToDecimal(drDetail["FNeedQty"].ToString());//鍗曚綅鐢ㄦ枡
-
- //鏃ヨ鍒掓暟閲�(濂楁暟)
- decimal FHQTY = 0;
- foreach (DataRow dr in dt.Rows)
- {
- //鏃ヨ鍒掓暟閲�
- decimal DayFHQTY = Convert.ToDecimal(dr["FHQTY"].ToString());
- if (FCompleteCount >= DayFHQTY)
- {
- FCompleteCount -= DayFHQTY;
- continue;
- }
- else if (FCompleteCount != 0)
- {
- FHQTY = DayFHQTY - FCompleteCount;
- FCompleteCount = 0;
- }
- //鎻愭枡璁″垝鏃ユ湡
- DateTime FHDate;
- //濂楁暟*鍗曚綅鐢ㄦ枡鏄惁婊¤冻鏈�灏忛渶姹傞噺
- if (FHQTY * FNeedQty >= FminPoqty)
- {
- FHDate = Convert.ToDateTime(dr["FHMASTERDATE"]);
-
- JObject model = new JObject();
- model.Add("FHDate", FHDate.AddDays(-FfixleadTime));
- model.Add("FHRemark", "鐢熶骇璁㈠崟鍙凤細" + "娴嬭瘯鍛㈠憿");
-
- JArray Fentity = new JArray();
- JObject FentityModel = new JObject();
- FentityModel.Add("FHMaterID", new JObject() { ["Fnumber"] = DetailFmaterialID });//鐗╂枡
- FentityModel.Add("FHQty", FHQTY * FNeedQty);//鏁伴噺
- FentityModel.Add("FHSourceInterID", dr["FID"].ToString());//鏃ヨ鍒掑伐鍗旻ID
- FentityModel.Add("FHSourceEntryID", dr["FENTRYID"].ToString());//鏃ヨ鍒掑伐鍗旻ENTRYID
- FentityModel.Add("FHSourceBillNo", dr["FBILLNO"].ToString());//鏃ヨ鍒掑伐鍗曞崟鍙�
- FentityModel.Add("FHSourceBillType", "");//鏃ヨ鍒掑伐鍗曠被鍨�
- Fentity.Add(FentityModel);
-
- model.Add("FEntity", Fentity);
- JObject jsonRoot = new JObject()
- {
- ["Creator"] = "",
- ["NeedUpDateFields"] = new JArray(),
- ["NeedReturnFields"] = new JArray(),
- ["IsDeleteEntry"] = "false",
- ["SubSystemId"] = "",
- ["IsVerifyBaseDataField"] = "false",
- ["Model"] = model
- };
-
- CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
- var result = cloudClient.Save("paez_PODemandPlan", jsonRoot.ToString());
- JObject saveObj = JObject.Parse(result);
- string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
-
- if (saveIsSuc == "TRUE")
- {
- //娓呯┖鍊�
- FHQTY = 0;
- LogHelper.Info("鍗曟嵁鏃ユ湡:" + FHDate.AddDays(-FfixleadTime).ToString());
- }
- else
- {
- LogHelper.Error(saveIsSuc);
-
- }
-
- }
- else
- {
- FHQTY += DayFHQTY;
- continue;
- }
-
- }
-
- }
-
- }
- }
- }
-
- }
-
public void Extraction3()
{
@@ -874,16 +1244,23 @@
DBServiceHelper.Execute(Context, sql);
//閲囪喘璁㈠崟鏁版嵁
- sql = @"select t1.FID,t1.FBillNo,t2.FENTRYID,t1.FSUPPLIERID,t3.fnumber,t2.FMATERIALID,(t2.FQTY-t2.FPODemandPlanCount)FQTY from t_PUR_POOrder t1
+ sql = @"
+ /*dialect*/
+select t1.FID,t1.FBillNo,t2.FENTRYID,t1.FSUPPLIERID,t3.fnumber,t2.FMATERIALID,(t2.FQTY-t2.FPODemandPlanCount)FQTY,FPurchaseOrgId FStockOrgId,t5.FNUMBER FORGNumber,FSTOCKINQTY,FReceiveQty,FCloseStatus,FMRPCLOSESTATUS from t_PUR_POOrder t1
join t_PUR_POOrderEntry t2 on t1.FID = t2.FID
join t_BD_Supplier t3 on t1.FSUPPLIERID = t3.FSUPPLIERID
+join T_PUR_POORDERENTRY_R t4 on t2.FENTRYID = t4.FENTRYID
+join T_ORG_Organizations t5 on t1.FPurchaseOrgId = t5.FORGID
where t2.FQTY-t2.FPODemandPlanCount>0
+ and FCloseStatus in('A') and FMRPCLOSESTATUS in('A')
";
List<PurchaseInventory> PurchaseInventory = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<PurchaseInventory>();
+ LogHelper.Info("閲囪喘璁㈠崟鏁版嵁" + sql);
+
sql = string.Format(@"
/*dialect*/
- SELECT T1.FID,FHMATERID,FHMASTERDATE,FHQTY,FCOMPLETECOUNT,FPRDMOMAINID,T2.FENTRYID,T1.FBILLNO, FNeedQty,t5.FFIXLEADTIME,t5.FMAXPOQTY,t5.FMINPOQTY,t3.FMATERIALID,t6.FNumber,FHQTY*FNeedQty NeedQty FROM SC_WORKBILLSORTBILLMAIN T1
+ SELECT T1.FID,FHMATERID,FHMASTERDATE,FHQTY,FCOMPLETECOUNT,FPRDMOMAINID,T2.FENTRYID,T1.FBILLNO, FNeedQty,t5.FFIXLEADTIME,t5.FMAXPOQTY,t5.FMINPOQTY,t3.FMATERIALID,t6.FNumber,FHQTY*FNeedQty NeedQty,FHPRDORGID FStockOrgId FROM SC_WORKBILLSORTBILLMAIN T1
JOIN SC_WORKBILLSORTBILLSUB T2 ON T1.FID=T2.FID
LEFT JOIN(SELECT T1.FID,max(t2.FMATERIALID)FMATERIALIDMAIN, max(t2.FMoId)FMoId,MAX(FENTRYID) FENTRYID, SUM(convert(decimal(18, 2), FBASENUMERATOR / FBASEDENOMINATOR))FNeedQty, T1.FMATERIALID from T_PRD_PPBOMENTRY T1
JOIN T_PRD_PPBOM T2 on t1.FID = t2.FID
@@ -892,21 +1269,55 @@
join t_BD_MaterialBase t4 on t3.FMATERIALID = t4.FMATERIALID
join t_BD_MaterialPlan t5 on t3.FMATERIALID = t5.FMATERIALID
WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0
-AND FPLANCOUNT>FCOMPLETECOUNT
+AND FDayPlanQuantity>FCOMPLETECOUNT
AND FERPCLSID=1
AND T2.FENTRYID not in (select distinct FHSOURCEENTRYID from CG_PODEMANDPLANBILLSUB where FHSOURCEINTERID IN ({0}))
AND T1.FID in ({0})
order by FHMASTERDATE
", FDayPlanWorkID);
-
+ LogHelper.Info("鎻愭枡鏁版嵁" + sql);
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>();
- sql = @"select T1.FID,FPLANCOUNT,FCOMPLETECOUNT,t2.FHQTY from SC_WORKBILLSORTBILLMAIN T1
-JOIN SC_WORKBILLSORTBILLSUB T2 ON T1.FID=T2.FID WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0 AND FPLANCOUNT>FCOMPLETECOUNT AND T1.FID in (" + FDayPlanWorkID + ")";
+ //鎵�鏈夌墿鏂欑殑搴撳瓨
+ ds = DBServiceHelper.ExecuteDataSet(Context, @" /*dialect*/ select sum(FBASEQTY)FBASEQTY,FMATERIALID,FStockOrgId from T_STK_Inventory group by FMATERIALID, FStockOrgId ");
+ ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
+ List<PODemandPlanTemp> deleteList = new List<PODemandPlanTemp>();
+ foreach (var item in DayPlanPpbom)
+ {
+ string FmaterialID = item.FMATERIALID;
+ string FStockOrgId = item.FStockOrgId.ToString();
+ decimal NeedQty = item.NeedQty;
+ var kcList = ListInventoryByStockOrgId.Where(c => c.FMATERIALID == FmaterialID && c.FStockOrgId == FStockOrgId && c.FBASEQTY > 0).FirstOrDefault();
+ if (kcList != null)
+ {
+ if (kcList.FBASEQTY >= NeedQty)
+ {
+ deleteList.Add(new PODemandPlanTemp
+ {
+ FENTRYID = item.FENTRYID,
+ FMATERIALID = item.FMATERIALID
+ });
+ kcList.FBASEQTY = kcList.FBASEQTY - NeedQty;
+ }
+ else
+ {
+ item.NeedQty -= kcList.FBASEQTY;
+ kcList.FBASEQTY = 0;
+ }
+ }
+ }
+ foreach (var item in deleteList)
+ {
+ DayPlanPpbom.RemoveAll(p => p.FENTRYID == item.FENTRYID && p.FMATERIALID == item.FMATERIALID);
+ }
+
+
+
+ sql = @"select T1.FID,FDayPlanQuantity,FCOMPLETECOUNT,t2.FHQTY, FHPRDORGID FStockOrgId from SC_WORKBILLSORTBILLMAIN T1
+JOIN SC_WORKBILLSORTBILLSUB T2 ON T1.FID=T2.FID WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0 AND FDayPlanQuantity>FCOMPLETECOUNT AND T1.FID in (" + FDayPlanWorkID + ")";
DataSet Complete = DBServiceHelper.ExecuteDataSet(Context, sql);
List<DayPlanPpbom> CompleteList = ds.ToModelList<DayPlanPpbom>();
-
#region
/*
//FID闆嗗悎
@@ -946,14 +1357,22 @@
//鐗╂枡闆嗗悎 鐢辩墿鏂欏幓鍒嗙粍
- List<string> MaterialIDList = DayPlanPpbom.Select(x => x.FMATERIALID).Distinct().ToList();
+ // List<string> MaterialIDList = DayPlanPpbom.Select(x => x.FMATERIALID).Distinct().ToList();
+
+ var MaterialIDList = DayPlanPpbom.GroupBy(p => new { p.FMATERIALID, p.FStockOrgId }).Select(x => new PODemandPlanTemp { FMATERIALID = x.Key.FMATERIALID, FStockOrgId = x.Key.FStockOrgId }).ToList();
+ var _MaterialIDList = MaterialIDList.Where(p => p.FMATERIALID == "105773").ToList();
+
+ LogHelper.Info("鐗╂枡琛屾暟" + MaterialIDList.Count);
+
//鎻愭枡璁″垝鏁版嵁闆嗕复鏃跺瓨鍌ㄩ泦鍚�
List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>();
//sql闆嗗悎 鏇存柊閲囪喘璁㈠崟鍗犵敤鐨勬彁鏂欒鍒掓暟閲�
List<string> sqlList = new List<string>();
- foreach (string item in MaterialIDList)
+ //MaterialIDList = new List<string> { "105773" };
+ foreach (var item in MaterialIDList)
{
- List<DayPlanPpbom> _DayPlanPpbom = DayPlanPpbom.Where(x => x.FMATERIALID == item).ToList();
+ LogHelper.Info(item.FMATERIALID.ToString());
+ List<DayPlanPpbom> _DayPlanPpbom = DayPlanPpbom.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId).ToList();
decimal FMINPOQTY = _DayPlanPpbom.FirstOrDefault().FMINPOQTY;//鏈�灏忚捣璁㈤噺
double FFIXLEADTIME = _DayPlanPpbom.FirstOrDefault().FFIXLEADTIME;//鎻愬墠鏈�
@@ -964,6 +1383,7 @@
List<int> FEntryIdList = new List<int>();
foreach (var _item in _DayPlanPpbom)
{
+
if (NeedQty == 0)
DATE = Convert.ToDateTime(_item.FHMASTERDATE).AddDays(-FFIXLEADTIME);
@@ -972,7 +1392,7 @@
NeedQty += _item.NeedQty;
if (NeedQty >= FMINPOQTY)
{
- List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item && x.FQTY > 0).ToList();
+ List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList();
if (_PurchaseInventory.Count == 0)
{
NeedQty = 0;
@@ -981,6 +1401,9 @@
foreach (var Purchase in _PurchaseInventory)
{
+ LogHelper.Info("Purchase");
+ LogHelper.Info("鐗╂枡锛�" + Purchase.FMATERIALID + ",鏁伴噺锛�" + Purchase.FQTY);
+
if (Purchase.FQTY >= NeedQty)
{
List<int> mmm = new List<int>();
@@ -1005,7 +1428,9 @@
FSUPPLIERID = Purchase.FSUPPLIERID,
PurchseFNUMBER = Purchase.FNUMBER,
PurchseFBillNo = Purchase.FBillNo,
- PurchseFqty = Purchase.FQTY
+ PurchseFqty = Purchase.FQTY,
+ FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
+ FORGNumber = Purchase.FORGNumber
});
//鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
@@ -1050,7 +1475,9 @@
FSUPPLIERID = Purchase.FSUPPLIERID,
PurchseFNUMBER = Purchase.FNUMBER,
PurchseFBillNo = Purchase.FBillNo,
- PurchseFqty = Purchase.FQTY
+ PurchseFqty = Purchase.FQTY,
+ FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
+ FORGNumber = Purchase.FORGNumber
});
@@ -1083,121 +1510,124 @@
}
NeedQty = 0;
}
+
+ #region 鍓╀笅涓嶈冻鏃舵寜鏈�灏忛噰璐壒娆＄敓鎴�
//鍓╀笅涓嶈冻鏃舵寜鏈�灏忛噰璐壒娆＄敓鎴�
- else if (i == _DayPlanPpbom.Count && NeedQty > 0)
- {
- NeedQty = FMINPOQTY;
- List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item && x.FQTY > 0).ToList();
- if (_PurchaseInventory.Count == 0)
- {
- NeedQty = 0;
- break;
- }
+ //else if (i == _DayPlanPpbom.Count && NeedQty > 0)
+ //{
+ // NeedQty = FMINPOQTY;
+ // List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList();
+ // if (_PurchaseInventory.Count == 0)
+ // {
+ // NeedQty = 0;
+ // break;
+ // }
- foreach (var Purchase in _PurchaseInventory)
- {
- if (Purchase.FQTY >= NeedQty)
- {
+ // foreach (var Purchase in _PurchaseInventory)
+ // {
+ // if (Purchase.FQTY >= NeedQty)
+ // {
- List<int> mmm = new List<int>();
- foreach (int id in FEntryIdList)
- {
- mmm.Add(id);
- var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
- PODemandPlanTemp.Add(new Demo.Model.Model.PODemandPlan.PODemandPlanTemp
- {
- FID = DayPlanPpbomls.FID,
- FHMASTERDATE = DATE,
- FQty = DayPlanPpbomls.NeedQty,
- FBILLNO = DayPlanPpbomls.FBILLNO,
- FENTRYID = DayPlanPpbomls.FENTRYID,
- FMATERIALID = DayPlanPpbomls.FMATERIALID,
- FNumber = DayPlanPpbomls.FNumber,
- OLDDATE = DayPlanPpbomls.FHMASTERDATE,
- FFIXLEADTIME = FFIXLEADTIME,
+ // List<int> mmm = new List<int>();
+ // foreach (int id in FEntryIdList)
+ // {
+ // mmm.Add(id);
+ // var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
+ // PODemandPlanTemp.Add(new Demo.Model.Model.PODemandPlan.PODemandPlanTemp
+ // {
+ // FID = DayPlanPpbomls.FID,
+ // FHMASTERDATE = DATE,
+ // FQty = DayPlanPpbomls.NeedQty,
+ // FBILLNO = DayPlanPpbomls.FBILLNO,
+ // FENTRYID = DayPlanPpbomls.FENTRYID,
+ // FMATERIALID = DayPlanPpbomls.FMATERIALID,
+ // FNumber = DayPlanPpbomls.FNumber,
+ // OLDDATE = DayPlanPpbomls.FHMASTERDATE,
+ // FFIXLEADTIME = FFIXLEADTIME,
- PurchseFID = Purchase.FID,
- PurchseFentryID = Purchase.FENTRYID,
- FSUPPLIERID = Purchase.FSUPPLIERID,
- PurchseFNUMBER = Purchase.FNUMBER,
- PurchseFBillNo = Purchase.FBillNo,
- PurchseFqty = Purchase.FQTY
+ // PurchseFID = Purchase.FID,
+ // PurchseFentryID = Purchase.FENTRYID,
+ // FSUPPLIERID = Purchase.FSUPPLIERID,
+ // PurchseFNUMBER = Purchase.FNUMBER,
+ // PurchseFBillNo = Purchase.FBillNo,
+ // PurchseFqty = Purchase.FQTY
- });
- //鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
- DayPlanPpbomls.NeedQty = 0;
- }
- FEntryIdList.Clear();
- //鏇存柊閲囪喘璁㈠崟
- sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount =isnull(FPODemandPlanCount,0)+ '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
- //鎵ｉ櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
- var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
- ls.FQTY -= NeedQty;
- break;
- }
- else
- {
- NeedQty = NeedQty - Purchase.FQTY;
- decimal _NeedQty = Purchase.FQTY;//閲囪喘璁㈠崟鏁伴噺
- List<int> mmm = new List<int>();
- foreach (int id in FEntryIdList)
- {
+ // });
+ // //鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
+ // DayPlanPpbomls.NeedQty = 0;
+ // }
+ // FEntryIdList.Clear();
+ // //鏇存柊閲囪喘璁㈠崟
+ // sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount =isnull(FPODemandPlanCount,0)+ '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
+ // //鎵ｉ櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
+ // var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
+ // ls.FQTY -= NeedQty;
+ // break;
+ // }
+ // else
+ // {
+ // NeedQty = NeedQty - Purchase.FQTY;
+ // decimal _NeedQty = Purchase.FQTY;//閲囪喘璁㈠崟鏁伴噺
+ // List<int> mmm = new List<int>();
+ // foreach (int id in FEntryIdList)
+ // {
- var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
- decimal Qty = DayPlanPpbomls.NeedQty;
- if (Qty > _NeedQty)
- Qty = _NeedQty;
- _NeedQty = _NeedQty - DayPlanPpbomls.NeedQty;
- PODemandPlanTemp.Add(new Demo.Model.Model.PODemandPlan.PODemandPlanTemp
- {
- FID = DayPlanPpbomls.FID,
- FHMASTERDATE = DATE,
- FQty = Qty,
- FBILLNO = DayPlanPpbomls.FBILLNO,
- FENTRYID = DayPlanPpbomls.FENTRYID,
- FMATERIALID = DayPlanPpbomls.FMATERIALID,
- FNumber = DayPlanPpbomls.FNumber,
- OLDDATE = DayPlanPpbomls.FHMASTERDATE,
- FFIXLEADTIME = FFIXLEADTIME,
+ // var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
+ // decimal Qty = DayPlanPpbomls.NeedQty;
+ // if (Qty > _NeedQty)
+ // Qty = _NeedQty;
+ // _NeedQty = _NeedQty - DayPlanPpbomls.NeedQty;
+ // PODemandPlanTemp.Add(new Demo.Model.Model.PODemandPlan.PODemandPlanTemp
+ // {
+ // FID = DayPlanPpbomls.FID,
+ // FHMASTERDATE = DATE,
+ // FQty = Qty,
+ // FBILLNO = DayPlanPpbomls.FBILLNO,
+ // FENTRYID = DayPlanPpbomls.FENTRYID,
+ // FMATERIALID = DayPlanPpbomls.FMATERIALID,
+ // FNumber = DayPlanPpbomls.FNumber,
+ // OLDDATE = DayPlanPpbomls.FHMASTERDATE,
+ // FFIXLEADTIME = FFIXLEADTIME,
- PurchseFID = Purchase.FID,
- PurchseFentryID = Purchase.FENTRYID,
- FSUPPLIERID = Purchase.FSUPPLIERID,
- PurchseFNUMBER = Purchase.FNUMBER,
- PurchseFBillNo = Purchase.FBillNo,
- PurchseFqty = Purchase.FQTY
+ // PurchseFID = Purchase.FID,
+ // PurchseFentryID = Purchase.FENTRYID,
+ // FSUPPLIERID = Purchase.FSUPPLIERID,
+ // PurchseFNUMBER = Purchase.FNUMBER,
+ // PurchseFBillNo = Purchase.FBillNo,
+ // PurchseFqty = Purchase.FQTY
- });
- DayPlanPpbomls.NeedQty -= Qty;
- //鏇存柊閲囪喘璁㈠崟
- sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount = isnull(FPODemandPlanCount,0)+ '{Qty}' where FENTRYID = {Purchase.FENTRYID}");
+ // });
+ // DayPlanPpbomls.NeedQty -= Qty;
+ // //鏇存柊閲囪喘璁㈠崟
+ // sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount = isnull(FPODemandPlanCount,0)+ '{Qty}' where FENTRYID = {Purchase.FENTRYID}");
- //鏇存柊Model
- var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
- ls.FQTY -= Qty;
+ // //鏇存柊Model
+ // var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
+ // ls.FQTY -= Qty;
- if (_NeedQty < 0)
- {
- foreach (var mm in mmm)
- {
- FEntryIdList.Remove(mm);
- }
- break;
- }
+ // if (_NeedQty < 0)
+ // {
+ // foreach (var mm in mmm)
+ // {
+ // FEntryIdList.Remove(mm);
+ // }
+ // break;
+ // }
- mmm.Add(id);
- }
- foreach (var mm in mmm)
- {
- FEntryIdList.Remove(mm);
- }
+ // mmm.Add(id);
+ // }
+ // foreach (var mm in mmm)
+ // {
+ // FEntryIdList.Remove(mm);
+ // }
- }
- }
- NeedQty = 0;
- }
+ // }
+ // }
+ // NeedQty = 0;
+ //}
+ #endregion
i++;
}
}
@@ -1222,6 +1652,9 @@
foreach (var _item in _PODemandPlanList)
{
JObject FentityModel = new JObject();
+
+ FentityModel.Add("FHPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });//閲囪喘缁勭粐
+
FentityModel.Add("FHMaterID", new JObject() { ["Fnumber"] = _item.FNumber });//鐗╂枡
FentityModel.Add("FHQty", _item.FQty);//鏁伴噺
FentityModel.Add("FHSourceInterID", _item.FID);//鏃ヨ鍒掑伐鍗旻ID
@@ -1232,6 +1665,8 @@
FentityModel.Add("FHRelationQty", _item.PurchseFqty);//鍏宠仈鏁伴噺
FentityModel.Add("FFIXLEADTIME", _item.FFIXLEADTIME);//鎻愬墠鏈�
+
+ FentityModel.Add("FPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });//閲囪喘缁勭粐
FentityModel.Add("FHPOOrderInterID", _item.PurchseFID);// 閲囪喘璁㈠崟鍐呯爜锛欶HPOOrderInterID
FentityModel.Add("FHPOOrderEntryID", _item.PurchseFentryID); //閲囪喘璁㈠崟瀛愬唴鐮侊細FHPOOrderEntryID
FentityModel.Add("FHPOOrderBillNo", _item.PurchseFBillNo); //閲囪喘璁㈠崟鍙凤細FHPOOrderBillNo
@@ -1254,6 +1689,8 @@
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+ LogHelper.Info("鏈�鍚�");
+ LogHelper.Info(jsonRoot.ToString());
if (saveIsSuc == "TRUE")
{
}
@@ -1270,3 +1707,5 @@
}
}
}
+
+
--
Gitblit v1.9.1