From 2e5a31b54bc716a9dcaf28df6870b372f9af795c Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 23 二月 2021 09:23:30 +0800
Subject: [PATCH] 问题更改上传

---
 src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 2149 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1,349 insertions(+), 800 deletions(-)

diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index ec48004..723e9a5 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -17,6 +17,9 @@
 using Kingdee.BOS.ServiceHelper;
 using Kingdee.BOS.ServiceHelper.FileServer;
 using Kingdee.BOS.Util;
+using Kingdee.K3.Core.SCM.STK;
+using Kingdee.K3.SCM.ServiceHelper;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NPOI.HSSF.UserModel;
 using NPOI.SS.Formula.Functions;
@@ -31,6 +34,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using System.Windows.Documents;
@@ -56,29 +60,18 @@
                 if (e.BarItemKey.ToUpper() == "BTEXPORT")
                 {
                     ExportExcel();
-                    //this.View.ShowMessage("娴嬭瘯鍟�");
-
-
                     string path = PathUtils.GetServerPath(KeyConst.TEMPFILEPATH, PathName);
-
                     DynamicFormShowParameter dynamicForm = new DynamicFormShowParameter();
                     dynamicForm.FormId = "BOS_FileDownLoad";
                     dynamicForm.OpenStyle.ShowType = ShowType.Modal;
                     dynamicForm.CustomParams.Add("IsExportData", "true");
                     dynamicForm.CustomParams.Add("url", path);
-
                     this.View.ShowForm(dynamicForm);
-
-
-                    //ShowDownload();
-
                 }
-
                 if (e.BarItemKey.ToUpper() == "TBSEARCH")
                 {
-                    SearchList222();
+                    SearchList();
                 }
-
                 if (e.BarItemKey.ToUpper() == "TBLOCK")
                 {
                     Lock();
@@ -92,19 +85,38 @@
                 {
                     Save();
                 }
-
                 if (e.BarItemKey.ToUpper() == "TBCOMPLETE")
                 {
-                    CompleteSetAnalysis();
-                    //COMPLETEMAIN();
-                    //  COMPLETE();
+                    COMPLETE();
                 }
                 //鎻愭枡璁″垝
                 if (e.BarItemKey.ToUpper() == "TBEXTRACTION")
                 {
-                    Extraction3();
+                    try
+                    {
+                        CompleteSetAnalysisBySQL();
+                        DayPlanPPBomBillBatch();
+                        Extraction();
+                    }
+                    catch (Exception ex)
+                    {
+                        this.View.ShowErrMessage(ex.Message.ToString());
+                    }
+                    finally
+                    {
+                        this.View.ShowMessage("鎿嶄綔鎴愬姛锛�");
+                    }
                 }
-
+                //棰勭暀
+                if (e.BarItemKey.ToUpper() == "TBRESERVE")
+                {
+                    Reserve();
+                }
+                //閲婃斁
+                if (e.BarItemKey.ToUpper() == "TBRELEASE")
+                {
+                    Release();
+                }
             }
             catch (Exception ex)
             {
@@ -114,7 +126,6 @@
         public override void EntryBarItemClick(BarItemClickEventArgs e)
         {
             base.EntryBarItemClick(e);
-
             if (e.BarItemKey.ToUpper() == "TBEDIT")
             {
                 SearchListEdit();
@@ -126,23 +137,26 @@
         /// <param name="e"></param>    
         public override void EntityRowDoubleClick(Kingdee.BOS.Core.DynamicForm.PlugIn.Args.EntityRowClickEventArgs e)
         {
-            var m = e.Row;
-            var n = e.Key;
+            LogHelper.Info("[琛屽弻鍑讳簨浠禲");
+
             base.EntityRowClick(e);
             DynamicFormShowParameter formPa = new DynamicFormShowParameter();
-            formPa.FormId = "paez_CompleteAnalysisDetail";
+            if (e.ColKey == "FDELAYLNUM")
+            {
+                //鐢熶骇璁″垝骞冲彴鎷栨湡鏄庣粏璺宠浆
+                formPa.FormId = "paez_TardinessDetails";
+                formPa.CustomParams.Add("FID", Convert.ToString(this.View.Model.GetValue("FDayPlanWorkID", e.Row).ToString()));
+            }
+            else
+            {
+                //榻愬鍒嗘瀽鏄庣粏鍒楄〃璺宠浆
+                formPa.FormId = "paez_CompleteAnalysisDetail";
+                formPa.CustomParams.Add("FHMainICMOInterID", Convert.ToString(this.View.Model.GetValue("FHMainSourceInterID", e.Row).ToString()));
+                formPa.CustomParams.Add("FHMainICMOEntryID", Convert.ToString(this.View.Model.GetValue("FHMainSourceEntryID", e.Row).ToString()));
+                formPa.CustomParams.Add("FHICMOInterID", Convert.ToString(this.View.Model.GetValue("FDayPlanWorkID", e.Row).ToString()));
+                formPa.CustomParams.Add("FMatrailId_Id", Convert.ToString((this.View.Model.GetValue("FMatrailId", e.Row) as DynamicObject)["Id"].ToString()));
 
-            /* 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("FHMainICMOInterID", Convert.ToString(this.View.Model.GetValue("FHMainSourceInterID", e.Row).ToString()));
-            formPa.CustomParams.Add("FHMainICMOEntryID", Convert.ToString(this.View.Model.GetValue("FHMainSourceEntryID", e.Row).ToString()));
-            formPa.CustomParams.Add("FHICMOInterID", Convert.ToString(this.View.Model.GetValue("FDayPlanWorkID", e.Row).ToString()));
-            formPa.CustomParams.Add("FMatrailId_Id", Convert.ToString((this.View.Model.GetValue("FMatrailId", e.Row) as DynamicObject)["Id"].ToString()));
+            }
             this.View.ShowForm(formPa);
         }
         /// <summary>
@@ -254,35 +268,16 @@
         public void Lock()
         {
             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=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)  ";
-                sqlList.Add(sql);
-
-            }
-
+            string 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())";
+            sqlList.Add(sql);
             int result = DBServiceHelper.ExecuteBatch(Context, sqlList);
             if (result > 0)
             {
-                SearchList222();
+                //閿佸畾鍚庣敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟 鍙� 鎻愭枡璁″垝
+                DayPlanPPBomBillBatch();
+                Extraction();
+                SearchList();
                 this.View.ShowMessage("鎿嶄綔鎴愬姛");
             }
             else
@@ -294,16 +289,6 @@
         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");
             //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
@@ -313,16 +298,12 @@
             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);
-
             }
-
             int result = DBServiceHelper.ExecuteBatch(Context, sqlList);
             if (result > 0)
             {
-                SearchList222();
+                SearchList();
                 this.View.ShowMessage("鎿嶄綔鎴愬姛");
             }
             else
@@ -380,7 +361,7 @@
             if (result > 0)
             {
                 this.View.ShowMessage("鎿嶄綔鎴愬姛");
-                SearchList222();
+                SearchList();
             }
             else
                 this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
@@ -392,16 +373,12 @@
         /// 
         private void COMPLETE()
         {
-
             // 鏄剧ず涓�涓繘搴︽樉绀虹晫闈細鏄剧ず涓�涓笉鍋滄粴鍔ㄧ殑妯℃嫙杩涘害
-
             // bUseTruePro鍙傛暟锛氭槸鍚︽樉绀虹湡瀹炵殑杩涘害銆�
             // bUseTruePro = false 锛�
             // 鏄剧ず涓�涓笉鍋滄粴鍔ㄧ殑妯℃嫙杩涘害锛屼笌瀹為檯澶勭悊杩涘害娌℃湁鍏宠仈銆�
             // 姝ゆ柟妗堜紭鐐癸細瀹為檯澶勭悊浠g爜鏃犻渶璁$畻杩涘害
             // 姝ゆ柟妗堢己鐐癸細杩涘害涓嶅噯纭紝涓旇繘搴﹂〉闈笉浼氳嚜鍔ㄥ叧闂��
-
-
             // bUseTruePro = true: 杩涘害鐣岄潰鏄剧ず鐪熷疄杩涘害
             // 姝ゆ柟妗堜紭鐐癸細杩涘害鐪熷疄
             // 姝ゆ柟妗堢己鐐癸細闇�瑕佸湪澶勭悊浠g爜涓紝涓嶆柇鐨勬洿鏂扮湡瀹炶繘搴︼紝鏇存柊璇彞
@@ -420,15 +397,13 @@
                 try
                 {
                     // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
-
                     // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
-                    this.COMPLETEMAIN();
+                    this.CompleteSetAnalysisBySQL();
                 }
                 finally
                 {
                     // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100%
                     this.View.Session["ProcessRateValue"] = 100;
-
                     // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈�
                     var processView = this.View.GetView(processForm.PageId);
                     if (processView != null)
@@ -440,310 +415,7 @@
             },
             (t) => { });
         }
-        public void COMPLETEMAIN()
-        {
-            //鑾峰彇褰撳墠鍗虫椂搴撳瓨 鎸夌収鐗╂枡+璐т富+搴撳瓨 灞曠幇
-            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");
-            //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
-            DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
-            EntryGrid grid = this.View.GetControl<EntryGrid>("FEntity");
-
-            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)
-                {
-                    //璁″垝鎬绘暟閲�
-                    decimal SumPlan = 0;
-                    for (int i = 0; i <= 60; i++)
-                    {
-                        SumPlan += Convert.ToDecimal(current["FT" + "" + i + ""]);
-                    }
-
-                    double Sum = 100;
-                    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 + "',FDayPlanQuantity='" + SumPlan + "' where FID=" + current["FDayPlanWorkID"].ToString());
-                    for (int i = 0; i <= 60; i++)
-                    {
-                        this.View.GetFieldEditor("FT" + i.ToString(), m).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
-                        Sum = Sum - Convert.ToDouble(current["FT" + "" + i + ""]);
-                        if (Sum >= 0)
-                        {
-
-                            grid.SetForecolor("FT" + "" + i + "", "#00FF00", m);
-                        }
-                        else
-                        {
-                            grid.SetForecolor("FT" + "" + i + "", "#FF0000", m);
-                        }
-
-                    }
-                    m++;
-                    //grid = this.View.GetControl[EntryGrid]("FSaleOrderEntry")#闇�瑕佽缃殑鍗曟嵁浣撴爣璇咾ey
-                    //grid.SetRowBackcolor("#FFFF00", 0)#璁剧疆鏁磋鑳屾櫙棰滆壊
-                    //grid.SetForecolor("FMaterialName", "#FF0000", 0)#闇�瑕佽缃瓧娈垫爣璇咾ey[/code]
-                    // grid.SetBackcolor("FT" + "" + i + "", "#FF0000", m); 
-
-                    //this.View.Session["ProcessRateValue"] = Convert.ToInt32(this.View.Session["ProcessRateValue"]) + Convert.ToInt32(1 / entityDataObjoct.Count * 90);
-
-                }
-
-            }
-            else
-            {
-                this.View.ShowMessage("璇峰厛鍔犺浇鏁版嵁锛�");
-            }
-
-        }
-        /// <summary>
-        /// 璁$畻鏈�澶ч綈濂楁暟閲�
-        /// </summary>
-        /// <param name="FMATERIALID"> 鐗╂枡Number</param>
-        /// <param name="FMainInterID"> 鐢熶骇璁㈠崟涓荤爜</param>
-        /// <param name="FMainEntryID"> 鐢熶骇璁㈠崟瀛愮爜</param>
-        /// <param name="FDayPlanWorkID"> 鏃ヨ鍒掑伐鍗旻ID</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)
-        {
-            //FDayPlanWorkID鏃ヨ鍒掑伐鍗旾D鍘诲垹闄ょ幇鏈夌殑榻愬鍒嗘瀽鏁版嵁
-            DBServiceHelper.Execute(Context, "/*dialect*/delete JIT_MOMaterReadysBill where FHICMOInterID = '" + FDayPlanWorkID + "'");
-
-            #region 鏁版嵁搴撶洿鎺ョ畻鍑烘墍浠ラ渶瑕佹暟鎹瓧娈�
-            /*
-            --鐢熶骇鐢ㄦ枡娓呭崟鍒楄〃
-SELECT T1.FID,T1.FBillNo,T1.FMOBillNO,T1.FMOEntrySeq,T1.FMoId,T1.FMaterialID,T1.FQty,
-T2.FMATERIALID FMATERIALID2,T4.FNumber,T2.FNeedQty,t3.FBASEQTY,convert(decimal(18,3),FNeedQty/t1.FQty)UnitDosage,
-floor(t3.FBASEQTY/convert(decimal(18,3),FNeedQty/t1.FQty)) SumGetComplete
- FROM T_PRD_PPBOM T1
-LEFT JOIN (select FID,MAX(FENTRYID)FENTRYID,SUM(FNeedQty)FNeedQty,FMATERIALID  from T_PRD_PPBOMENTRY where FMoId='100007'
-group by FMATERIALID,FID ) T2 on T1.FID=t2.FID
-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='100007' and T1.FMaterialID='105771'
-             */
-            #endregion
-
-            string sql = string.Format(@"
-/*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
- 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_BD_MATERIAL T4 on T2.FMATERIALID=T4.FMATERIALID
-where t1.FMoId='{0}' and T1.FMaterialID='{1}'
-", FMainInterID, FMATERIALID);
-            DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
-            var PpbomList = ds.ToModelList<PRD_PPBOM>();
-            //褰撳墠鏈�澶ч綈濂楁暟 涓嬪眰闇�姹傛暟閲�/鐖剁骇闇�姹傛暟閲�=鍗曚綅鐢ㄦ枡
-            //var SumGetComplete = Math.Floor(PpbomList.Min(t => t.FBASEQTY / (t.FNeedQty / t.FQty)));
-
-            //鏈�澶ч綈濂楁暟
-            decimal SumGetComplete;
-            List<decimal> list = new List<decimal>();
-            foreach (var t in PpbomList)
-            {
-                var ls = ListInventoryByStockOrgId.Where(c => c.FMATERIALID == t.FMATERIALID2 && c.FStockOrgId == FStockOrgId).FirstOrDefault();
-                if (ls == null)
-                {
-                    list.Add(0);
-                    continue;
-                }
-
-                SumGetComplete = Math.Floor(ls.FBASEQTY / (t.FNeedQty / t.FQty));
-                list.Add(SumGetComplete);
-            }
-            //娌℃湁鐗╂枡鐨勫簱瀛樹俊鎭�
-            SumGetComplete = list.Min();
-
-            if (SumGetComplete > SumPlan)//绯荤粺鍙敓浜ф渶澶ч綈濂楁暟澶т簬璁″垝闇�姹傞噺鏃讹紝鍙栬鍒�
-                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;//鍗曚綅鐢ㄩ噺
-                decimal xhsl = SumGetComplete * (UnitDosage);///娑堣�楁暟閲�
-
-                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 鐗╂枡
-
-                _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("FIdentificat", "1");//鏍囪瘑 
-
-                _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("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
-                }
-
-                //鎵i櫎鎬诲簱瀛樼殑鏁伴噺
-
-                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)
-                {
-                    //鎵i櫎搴撳瓨鏁伴噺
-                    // 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>
@@ -753,8 +425,11 @@
             {
                 Stopwatch sw = new Stopwatch();
                 sw.Start();//寮�濮嬭鏃�
+                LogHelper.Info("榻愬鍒嗘瀽寮�濮嬪噯澶囨暟鎹細" + sw.Elapsed);
                 //娓呯┖榻愬涓存椂琛�
                 DBServiceHelper.Execute(Context, "/*dialect*/  delete JIT_MOMaterReadysBill ");
+                //鏇存柊鐘舵��
+                DBServiceHelper.Execute(Context, "/*dialect*/  update Sc_WorkBillSortBillsub set FCOMPLETE='' ");
                 //鑾峰彇褰撳墠鍗虫椂搴撳瓨 鎸夌収鐗╂枡+搴撳瓨缁勭粐+璐т富+搴撳瓨鏁伴噺  
                 DataSet ds = DBServiceHelper.ExecuteDataSet(Context, @" 
 /*dialect*/ 
@@ -770,7 +445,9 @@
 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)
+join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+where d.FAvailableComplete<>0
+--where T1.FMATERIALID in (105773)
 ");
                 ListInventory = ds.ToModelList<PRD_Inventory>();
                 //鎬诲簱瀛� 鐗╂枡+搴撳瓨缁勭粐+搴撳瓨鏁伴噺
@@ -787,42 +464,48 @@
 ) 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)
+join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+where d.FAvailableComplete<>0
+--where T1.FMATERIALID in (105773)
 group by T1.FStockOrgId,T1.FMATERIALID
 ");
                 ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
                 //闇�瑕侀綈濂楀垎鏋愮殑鏁版嵁
                 string sql = @"
-/*dialect*/
+ /*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
+T2.FMATERIALID FMATERIALID2, T4.FNumber,T2.FNeedQty,FNeedQty/FQty dwyl,(FHQTY-ISNULL(FProductNum,0))*(FNeedQty/FQty) PlanCount,TBase.FErpClsID  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_BD_MaterialBase TBase on T2.FMATERIALID = TBase.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  ";
+--鏉′欢涓轰粖澶╁線鍚庣殑鏃ヨ鍒� + 浠婂ぉ涔嬪墠鏈叧闂殑鏃ヨ鍒�
+where (FHEntryCloseDate is null and DATEDIFF(D,GETDATE(),FHMASTERDATE)<0)or DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0
+and b.FHQTY>0
+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>();
+                int i = 1;
+                //鍒涘缓瀛楀吀 鐢ㄤ簬鍌ㄥ瓨鐗╂枡 + 鍗犵敤鏁伴噺
+                Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
                 foreach (var item in DatePlanList)
                 {
+                    this.View.Session["ProcessRateValue"] = Convert.ToInt32(this.View.Session["ProcessRateValue"]) + Convert.ToInt32((decimal)(1.0 / DatePlanList.Count));
                     //绛涢�夊嚭褰撴棩璁″垝鏁版嵁
                     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();
                         //鐪熸闇�瑕佸彇璁$畻鐨勬暟閲忥紙鎷嗗垎璐т富锛�
                         //璐т富鍖归厤
@@ -832,10 +515,20 @@
                             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;//榻愬鏁伴噺
-                                //鎬昏鍒掓暟閲� 鍜� 鎬诲簱瀛樻暟閲忔瘮瀵� 
+                                decimal occupyMaterial = 0;
+                                if (!occupyDic.ContainsKey(_item.FMATERIALID2))
+                                {
+                                    occupyDic.Add(_item.FMATERIALID2, fCompleteCount);
+                                }
+                                else
+                                {
+                                    occupyMaterial = occupyDic[_item.FMATERIALID2];
+                                    occupyDic[_item.FMATERIALID2] = occupyMaterial + fCompleteCount;
+                                }
                                 completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
                                 {
                                     FHMainICMOInterIDr = _item.FPRDMOMAINID,
@@ -851,12 +544,18 @@
                                     FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
                                     FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
                                     FCompleteCount = fCompleteCount, //榻愬鏁伴噺
+                                    FCompleteCount1 = fCompleteCount, //榻愬鏁伴噺
                                     FLackCount = _fLackCount,//缂烘枡鏁伴噺
                                     FHStockQty = sjkcList.FBASEQTY,//鍗虫椂搴撳瓨
                                     FHLeftQty = Inventory.FBASEQTY,//鍙敤鏁伴噺
+                                    FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+                                    FErpClsID = _item.FErpClsID,
+                                    /* 2021 1.26 鏇存敼涓簄eed
                                     FComPlete = sjkcList.FBASEQTY >= _item.PlanCount ? "榻愬" : "鏈綈濂�",
+                                    */
+                                    FComPlete = sjkcList.FBASEQTY >= need ? "榻愬" : "鏈綈濂�",
                                     FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
-                                });
+                                }); ;
                                 //鎵e噺鎬诲簱瀛樻暟閲�
                                 sjkcList.FBASEQTY = sjkcList.FBASEQTY >= fCompleteCount ? sjkcList.FBASEQTY - fCompleteCount : 0;
                                 //鍓╀綑鏃ヨ鍒掗渶姹傛暟閲�
@@ -867,6 +566,9 @@
                         }
                         else
                         {
+                            decimal occupyMaterial = 0;
+                            if (occupyDic.ContainsKey(_item.FMATERIALID2))
+                                occupyMaterial = occupyDic[_item.FMATERIALID2];
                             completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
                             {
                                 FHMainICMOInterIDr = _item.FPRDMOMAINID,
@@ -881,17 +583,29 @@
                                 FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
                                 FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
                                 FCompleteCount = 0, //榻愬鏁伴噺
+                                FCompleteCount1 = 0, //榻愬鏁伴噺
                                 FLackCount = _item.PlanCount,//缂烘枡鏁伴噺
                                 FHStockQty = 0,//鍗虫椂搴撳瓨
                                 FHLeftQty = 0,//鍙敤鏁伴噺
+                                FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
                                 FComPlete = "鏈綈濂�",
-                                FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+                                FPlanDate = item.FHMASTERDATE, // 鏃ヨ鍒掓棩鏈�
+                                FErpClsID = _item.FErpClsID
+
                             });
                         }
                     }
+                    //Thread.Sleep(100);
+                    // this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(40) / DatePlanList.Count) * i);
+                    i++;
+
                 }
+                LogHelper.Info($"榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
+                i = 1;
+
                 foreach (var item in completeAnalysisTempModel)
                 {
+                    // this.View.Session["ProcessRateValue"] = Convert.ToInt32(this.View.Session["ProcessRateValue"]) + Convert.ToInt32(1 / completeAnalysisTempModel.Count * 90);
                     JObject jsonRoot = new JObject();
                     jsonRoot.Add("Creator", "");
                     jsonRoot.Add("NeedUpDateFields", new JArray());
@@ -913,11 +627,14 @@
                     jsonModel.Add("FUnitDosage", item.FUnitDosage);
                     jsonModel.Add("FSumPlanCount", item.FSumPlanCount);
                     jsonModel.Add("FCompleteCount", item.FCompleteCount);
+                    jsonModel.Add("FCompleteCount1", item.FCompleteCount1);
                     jsonModel.Add("FPRDBillNo", item.FPRDBillNo);
                     jsonModel.Add("FOwnerTypeId", item.FOwnerTypeId);
                     jsonModel.Add("FComPlete", item.FComPlete);
                     jsonModel.Add("FLackCount", item.FLackCount);
+                    jsonModel.Add("FOccupyCount", item.FOccupyCount);
                     jsonModel.Add("FPlanDate", item.FPlanDate);
+                    jsonModel.Add("FErpClsID", item.FErpClsID);
                     if (item.FOwnerId != null)
                         jsonModel.Add("FOwnerId", new JObject() { ["FNUMBER"] = item.FOwnerId });
                     jsonRoot.Add("Model", jsonModel);
@@ -929,6 +646,8 @@
                     {
                         LogHelper.Error(jsonRoot.ToString());
                     }
+                    this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(100) / completeAnalysisTempModel.Count) * i);
+                    i++;
                 }
                 //鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
                 DBServiceHelper.Execute(Context, @"
@@ -938,20 +657,491 @@
 /*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);
+                LogHelper.Info("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
             }
             catch (Exception ex)
             {
-                LogHelper.Error(ex.Message.ToString());
+                LogHelper.Error("榻愬鍒嗘瀽璺冲嚭锛�" + ex.Message.ToString());
+            }
+        }
+        public void CompleteSetAnalysisBatch()
+        {
+            LogHelper.Info("榻愬鍒嗘瀽鎵归噺寮�濮嬪噯澶囨暟鎹細");
+            try
+            {
+                Stopwatch sw = new Stopwatch();
+                sw.Start();//寮�濮嬭鏃�
+                LogHelper.Info("榻愬鍒嗘瀽寮�濮嬪噯澶囨暟鎹細" + sw.Elapsed);
+                //娓呯┖榻愬涓存椂琛�
+                DBServiceHelper.Execute(Context, "/*dialect*/  delete JIT_MOMaterReadysBill ");
+                //鏇存柊鐘舵��
+                DBServiceHelper.Execute(Context, "/*dialect*/  update Sc_WorkBillSortBillsub set FCOMPLETE='' ");
+                //鑾峰彇褰撳墠鍗虫椂搴撳瓨 鎸夌収鐗╂枡+搴撳瓨缁勭粐+璐т富+搴撳瓨鏁伴噺  
+                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
+--join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+--where d.FAvailableComplete<>0
+--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)
+--join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+--where d.FAvailableComplete<>0
+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-ISNULL(FProductNum,0))*(FNeedQty/FQty) PlanCount,TBase.FErpClsID  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_BD_MaterialBase TBase on T2.FMATERIALID = TBase.FMATERIALID
+JOIN T_ORG_Organizations t5 on a.FHPRDORGID = t5.FORGID
+--鏉′欢涓轰粖澶╁線鍚庣殑鏃ヨ鍒� + 浠婂ぉ涔嬪墠鏈叧闂殑鏃ヨ鍒�
+where (FHEntryCloseDate is null and DATEDIFF(D,GETDATE(),FHMASTERDATE)<0)or DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0
+and b.FHQTY>0
+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>();
+                int i = 1;
+                //鍒涘缓瀛楀吀 鐢ㄤ簬鍌ㄥ瓨鐗╂枡 + 鍗犵敤鏁伴噺
+                Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
+                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;
+                        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;//榻愬鏁伴噺
+                                decimal occupyMaterial = 0;
+                                if (!occupyDic.ContainsKey(_item.FMATERIALID2))
+                                {
+                                    occupyDic.Add(_item.FMATERIALID2, fCompleteCount);
+                                }
+                                else
+                                {
+                                    occupyMaterial = occupyDic[_item.FMATERIALID2];
+                                    occupyDic[_item.FMATERIALID2] = occupyMaterial + 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, //榻愬鏁伴噺
+                                    FCompleteCount1 = fCompleteCount, //榻愬鏁伴噺
+                                    FLackCount = _fLackCount,//缂烘枡鏁伴噺
+                                    FHStockQty = sjkcList.FBASEQTY,//鍗虫椂搴撳瓨
+                                    FHLeftQty = Inventory.FBASEQTY,//鍙敤鏁伴噺
+                                    FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+                                    FErpClsID = _item.FErpClsID,
+                                    /* 2021 1.26 鏇存敼涓簄eed
+                                    FComPlete = sjkcList.FBASEQTY >= _item.PlanCount ? "榻愬" : "鏈綈濂�",
+                                    */
+                                    FComPlete = sjkcList.FBASEQTY >= need ? "榻愬" : "鏈綈濂�",
+                                    FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+                                });
+                                //鎵e噺鎬诲簱瀛樻暟閲�
+                                sjkcList.FBASEQTY = sjkcList.FBASEQTY >= fCompleteCount ? sjkcList.FBASEQTY - fCompleteCount : 0;
+                                //鍓╀綑鏃ヨ鍒掗渶姹傛暟閲�
+                                need = need >= Inventory.FBASEQTY ? need - Inventory.FBASEQTY : 0;
+                                //鎵e噺娑堣�楀簱瀛�
+                                Inventory.FBASEQTY = Inventory.FBASEQTY - fCompleteCount;
+                            }
+                        }
+                        else
+                        {
+                            decimal occupyMaterial = 0;
+                            if (occupyDic.ContainsKey(_item.FMATERIALID2))
+                                occupyMaterial = occupyDic[_item.FMATERIALID2];
+                            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(),//璁″垝鎬绘暟閲�
+                                FErpClsID = _item.FErpClsID,
+                                FCompleteCount = 0, //榻愬鏁伴噺
+                                FCompleteCount1 = 0, //榻愬鏁伴噺
+                                FLackCount = _item.PlanCount,//缂烘枡鏁伴噺
+                                FHStockQty = 0,//鍗虫椂搴撳瓨
+                                FHLeftQty = 0,//鍙敤鏁伴噺
+                                FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+                                FComPlete = "鏈綈濂�",
+                                FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+                            });
+                        }
+                    }
+                    //Thread.Sleep(100);
+                    // this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(40) / DatePlanList.Count) * i);
+                    i++;
+
+                }
+                LogHelper.Info($"榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
+                i = 1;
+
+
+                JArray Fentity = new JArray();
+                foreach (var item in completeAnalysisTempModel)
+                {
+                    JObject FBatchModel = new JObject();
+                    FBatchModel.Add("FHMainICMOInterIDr", item.FHMainICMOInterIDr);
+                    FBatchModel.Add("FHMainICMOEntryID", item.FHMainICMOEntryID);
+                    FBatchModel.Add("FHICMOInterID", item.FHICMOInterID);
+                    FBatchModel.Add("FHICMOEntryID", item.FHICMOEntryID);
+                    FBatchModel.Add("FHMaterID", new JObject() { ["FNUMBER"] = item.FHMaterID });
+                    FBatchModel.Add("FHUseQty", item.FHUseQty);
+                    FBatchModel.Add("FHStockOrgID", new JObject() { ["FNUMBER"] = item.FHStockOrgID });
+                    FBatchModel.Add("FHStockQty", item.FHStockQty);
+                    FBatchModel.Add("FHLeftQty", item.FHLeftQty);
+                    FBatchModel.Add("FHPRDORGID", new JObject() { ["FNUMBER"] = item.FHStockOrgID });
+                    FBatchModel.Add("FUnitDosage", item.FUnitDosage);
+                    FBatchModel.Add("FSumPlanCount", item.FSumPlanCount);
+                    FBatchModel.Add("FCompleteCount", item.FCompleteCount);
+                    FBatchModel.Add("FCompleteCount1", item.FCompleteCount1);
+                    FBatchModel.Add("FPRDBillNo", item.FPRDBillNo);
+                    FBatchModel.Add("FOwnerTypeId", item.FOwnerTypeId);
+                    FBatchModel.Add("FComPlete", item.FComPlete);
+                    FBatchModel.Add("FLackCount", item.FLackCount);
+                    FBatchModel.Add("FOccupyCount", item.FOccupyCount);
+                    FBatchModel.Add("FPlanDate", item.FPlanDate);
+                    FBatchModel.Add("FErpClsID", item.FErpClsID);
+                    if (item.FOwnerId != null)
+                        FBatchModel.Add("FOwnerId", new JObject() { ["FNUMBER"] = item.FOwnerId });
+                    Fentity.Add(FBatchModel);
+                    if ((i >= 20 || i == completeAnalysisTempModel.Count) && (i % 20 == 0 || i == completeAnalysisTempModel.Count))
+                    {
+                        LogHelper.Info("榻愬鍒嗘瀽鎵归噺鎵ц锛岃褰曞惊鐜殑褰撳墠鏉℃暟" + i);
+                        JObject jsonRoot = new JObject()
+                        {
+                            ["Creator"] = "",
+                            ["NeedUpDateFields"] = new JArray(),
+                            ["NeedReturnFields"] = new JArray(),
+                            ["IsDeleteEntry"] = "false",
+                            ["SubSystemId"] = "",
+                            ["IsVerifyBaseDataField"] = "false",
+                            ["Model"] = Fentity
+                        };
+                        CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+                        var result = cloudClient.BatchSave("paez_CompleteAnalysisTemp", jsonRoot.ToString());
+                        JObject saveObj = JObject.Parse(result);
+                        string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+                        if (saveIsSuc != "TRUE")
+                        {
+                            LogHelper.Error(jsonRoot.ToString());
+                        }
+                        Fentity = new JArray();
+                    }
+
+                    this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(100) / completeAnalysisTempModel.Count) * i);
+                    i++;
+                }
+                //鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
+                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());
+            }
+        }
+        public void CompleteSetAnalysisBySQL()
+        {
+            LogHelper.Info("榻愬鍒嗘瀽sql妯″紡寮�濮嬪噯澶囨暟鎹細");
+            string sql = "";
+            try
+            {
+                Stopwatch sw = new Stopwatch();
+                sw.Start();//寮�濮嬭鏃�
+                LogHelper.Info("榻愬鍒嗘瀽寮�濮嬪噯澶囨暟鎹細" + sw.Elapsed);
+                //娓呯┖榻愬涓存椂琛�
+                DBServiceHelper.Execute(Context, "/*dialect*/  delete JIT_MOMaterReadysBill ");
+                //鏇存柊鐘舵��
+                DBServiceHelper.Execute(Context, "/*dialect*/  update Sc_WorkBillSortBillsub set FCOMPLETE='' ");
+                //鑾峰彇褰撳墠鍗虫椂搴撳瓨 鎸夌収鐗╂枡+搴撳瓨缁勭粐+璐т富+搴撳瓨鏁伴噺  
+                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
+--join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+--where d.FAvailableComplete<>0
+--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
+--join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+--where d.FAvailableComplete<>0
+--where T1.FMATERIALID in (105773)
+group by T1.FStockOrgId,T1.FMATERIALID
+");
+                ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
+                //闇�瑕侀綈濂楀垎鏋愮殑鏁版嵁
+                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-ISNULL(FProductNum,0))*(FNeedQty/FQty) PlanCount,TBase.FErpClsID  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_BD_MaterialBase TBase on T2.FMATERIALID = TBase.FMATERIALID
+JOIN T_ORG_Organizations t5 on a.FHPRDORGID = t5.FORGID
+--鏉′欢涓轰粖澶╁線鍚庣殑鏃ヨ鍒� + 浠婂ぉ涔嬪墠鏈叧闂殑鏃ヨ鍒�
+where (FHEntryCloseDate is null and DATEDIFF(D,GETDATE(),FHMASTERDATE)<0)or DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0
+and b.FHQTY>0
+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>();
+                int i = 1;
+                //鍒涘缓瀛楀吀 鐢ㄤ簬鍌ㄥ瓨鐗╂枡 + 鍗犵敤鏁伴噺
+                Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
+                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;
+                        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;//榻愬鏁伴噺
+                                decimal occupyMaterial = 0;
+                                if (!occupyDic.ContainsKey(_item.FMATERIALID2))
+                                {
+                                    occupyDic.Add(_item.FMATERIALID2, fCompleteCount);
+                                }
+                                else
+                                {
+                                    occupyMaterial = occupyDic[_item.FMATERIALID2];
+                                    occupyDic[_item.FMATERIALID2] = occupyMaterial + fCompleteCount;
+                                }
+                                completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
+                                {
+                                    FHMainICMOInterIDr = _item.FPRDMOMAINID,
+                                    FHMainICMOEntryID = _item.FPRDMOENTYID,
+                                    FHICMOInterID = _item.FID.ToString(),
+                                    FHICMOEntryID = _item.FEntryID.ToString(),
+                                    FHMaterID = _item.FMATERIALID2,
+                                    FHStockOrgID = _item.FStockOrgId,
+                                    FHPRDORGID = _item.FStockOrgId,
+                                    FErpClsID = _item.FErpClsID,
+                                    FPRDBillNo = _item.FMOBillNO,
+                                    FOwnerTypeId = "BD_OwnerOrg",
+                                    FOwnerId = Inventory.FOwnerId,
+                                    FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
+                                    FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
+                                    FCompleteCount1 = fCompleteCount, //榻愬鏁伴噺
+                                    FLackCount = _fLackCount,//缂烘枡鏁伴噺
+                                    FHStockQty = sjkcList.FBASEQTY,//鍗虫椂搴撳瓨
+                                    FHLeftQty = Inventory.FBASEQTY,//鍙敤鏁伴噺
+                                    FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+                                    /* 2021 1.26 鏇存敼涓簄eed
+                                    FComPlete = sjkcList.FBASEQTY >= _item.PlanCount ? "榻愬" : "鏈綈濂�",
+                                    */
+                                    FComPlete = sjkcList.FBASEQTY >= need ? "榻愬" : "鏈綈濂�",
+                                    FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+                                });
+                                //鎵e噺鎬诲簱瀛樻暟閲�
+                                sjkcList.FBASEQTY = sjkcList.FBASEQTY >= fCompleteCount ? sjkcList.FBASEQTY - fCompleteCount : 0;
+                                //鍓╀綑鏃ヨ鍒掗渶姹傛暟閲�
+                                need = need >= Inventory.FBASEQTY ? need - Inventory.FBASEQTY : 0;
+                                //鎵e噺娑堣�楀簱瀛�
+                                Inventory.FBASEQTY = Inventory.FBASEQTY - fCompleteCount;
+                            }
+                        }
+                        else
+                        {
+                            decimal occupyMaterial = 0;
+                            if (occupyDic.ContainsKey(_item.FMATERIALID2))
+                            {
+                                occupyMaterial = occupyDic[_item.FMATERIALID2];
+                            }
+                            completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
+                            {
+                                FHMainICMOInterIDr = _item.FPRDMOMAINID,
+                                FHMainICMOEntryID = _item.FPRDMOENTYID,
+                                FHICMOInterID = _item.FID.ToString(),
+                                FHICMOEntryID = _item.FEntryID.ToString(),
+                                FHMaterID = _item.FMATERIALID2,
+                                FErpClsID = _item.FErpClsID,
+                                FHStockOrgID = _item.FStockOrgId,
+                                FHPRDORGID = _item.FStockOrgId,
+                                FPRDBillNo = _item.FMOBillNO,
+                                FOwnerTypeId = "BD_OwnerOrg",
+                                FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
+                                FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
+                                FCompleteCount1 = 0, //榻愬鏁伴噺
+                                FLackCount = _item.PlanCount,//缂烘枡鏁伴噺
+                                FHStockQty = 0,//鍗虫椂搴撳瓨
+                                FHLeftQty = 0,//鍙敤鏁伴噺
+                                FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+                                FComPlete = "鏈綈濂�",
+                                FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+                            });
+                        }
+                    }
+                    //Thread.Sleep(100);
+                    // this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(40) / DatePlanList.Count) * i);
+                    i++;
+
+                }
+                LogHelper.Info($"榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
+                List<string> sqlList = new List<string>();
+                int jdtmmm = 1;
+                foreach (var item in completeAnalysisTempModel)
+                {
+                    sql = string.Format(@"
+/*dialect*/
+delete   z_JIT_MOMaterReadysBill
+insert into z_JIT_MOMaterReadysBill (column1)
+values('')
+insert into JIT_MOMaterReadysBill
+(FID, FBILLNO, FDOCUMENTSTATUS, FHMAINICMOINTERIDR, FHMAINICMOENTRYID, FHICMOINTERID, FHICMOENTRYID, FHMATERID, FHSTOCKORGID, FHSTOCKQTY, FHLEFTQTY,  FHPRDORGID, FUNITDOSAGE, FSUMPLANCOUNT,  FPRDBILLNO, FOWNERID, FOWNERTYPEID, FIDENTIFICAT, FPLANDATE, FCOMPLETE, FLACKCOUNT, FOCCUPYCOUNT, FCOMPLETECOUNT1,FErpClsID)
+select id, '', 'A', '{0}', '{1}', '{2}', '{3}', '{4}', '{5}', '{6}', '{7}', '{8}', '{9}', '{10}', '{11}', '{12}', 'BD_OwnerOrg', '','{13}','{14}','{15}','{16}','{17}',{18} from z_JIT_MOMaterReadysBill
+delete   z_JIT_MOMaterReadysBill
+", item.FHMainICMOInterIDr, item.FHMainICMOEntryID, item.FHICMOInterID, item.FHICMOEntryID, item.FHMaterID, item.FHStockOrgID, item.FHStockQty, item.FHLeftQty, item.FHPRDORGID, item.FUnitDosage, item.FSumPlanCount, item.FPRDBillNo, item.FOwnerId == null ? "0" : item.FOwnerId, item.FPlanDate.ToString("yyyy-MM-dd"), item.FComPlete, item.FLackCount, item.FOccupyCount, item.FCompleteCount1, item.FErpClsID);
+                    sqlList.Add(sql);
+                    this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(98) / completeAnalysisTempModel.Count) * jdtmmm);
+                    jdtmmm++;
+                }
+                DBServiceHelper.ExecuteBatch(Context, sqlList);
+                //鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
+                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>
-        public void SearchList222()
+        public void SearchList()
         {
             string sqlwhere = " where 1=1";
-
             if ((this.Model.GetValue("FProWorkShopId") as DynamicObject) != null)
             {
                 string FProWorkShopId = (this.Model.GetValue("FProWorkShopId") as DynamicObject)["Id"].ToString();
@@ -960,23 +1150,12 @@
             }
             //閿�鍞鍗曞彿
             string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder")));
-            if (string.IsNullOrEmpty(FSalOrder))
-            {
-
-            }
-            else
+            if (!string.IsNullOrEmpty(FSalOrder))
                 sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";
-
-
             //鐢熶骇璁㈠崟鍙�
             string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo")));
-            if (string.IsNullOrEmpty(FScOrderMainNo))
-            {
-
-            }
-            else
+            if (!string.IsNullOrEmpty(FScOrderMainNo))
                 sqlwhere += $" and FSCORDERNO='{FScOrderMainNo}'";
-
             //鐗╂枡
             if ((this.Model.GetValue("FMatralId") as DynamicObject) != null)
             {
@@ -988,12 +1167,10 @@
             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
+                string sql = @"/*dialect*/ select t1.*,isnull((select SUM(isnull(FNotProductNum,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FNotProductNum 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;//鑾峰彇褰撳墠鏃ユ湡
@@ -1005,7 +1182,7 @@
                     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("FSalOrderCount", dt.Rows[i]["FHOrderQty"].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);//鐢熶骇缁勭粐
@@ -1019,26 +1196,17 @@
                     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);//鏈帓鏁伴噺
-
-
+                    this.Model.SetValue("FDelaylnUM", dt.Rows[i]["FNotProductNum"].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)
                     {
-                        /*
-                        this.Model.SetValue(dr["FColumn"].ToString(), dr["FHQTY"].ToString(), i);//鏃ヨ鍒掑伐鍗旻ID
-                        if (dr["FHLockedSub"].ToString() == "1")
-                            this.View.GetFieldEditor(dr["FColumn"].ToString(), i).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
-                        */
                         DateTime start = Convert.ToDateTime(DateNow.ToShortDateString());
                         DateTime end = Convert.ToDateTime(Convert.ToDateTime(dr["FHMASTERDATE"]).ToShortDateString());
                         TimeSpan getDay = end.Subtract(start);
@@ -1077,7 +1245,6 @@
                         }
                     }
                 }
-
                 for (int m = 0; m <= 60; m++)
                 {
                     this.View.GetControl("FT" + "" + m + "").Text = DateNow.AddDays(m).ToShortDateString();
@@ -1087,9 +1254,6 @@
             {
                 this.View.ShowErrMessage(ex.Message.ToString());
             }
-
-
-
         }
         /// <summary>
         /// 缂栬緫
@@ -1134,8 +1298,8 @@
                 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
+                string sql = @"/*dialect*/ select t1.*,isnull((select SUM(isnull(FNotProductNum,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FNotProductNum 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;//鑾峰彇褰撳墠鏃ユ湡
@@ -1147,7 +1311,7 @@
                     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("FSalOrderCount", dt.Rows[i]["FHOrderQty"].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);//鐢熶骇缁勭粐
@@ -1167,6 +1331,7 @@
                     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);//鏈帓鏁伴噺
+                    this.Model.SetValue("FDelaylnUM", dt.Rows[i]["FNotProductNum"].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)
@@ -1209,42 +1374,287 @@
             }
 
         }
+
+        /// <summary>
+        /// 鏃ヨ鍒掔敤鏂欐竻鍗曠敓鎴�
+        /// </summary>
+        public void DayPlanPPBomBill()
+        {
+            Stopwatch sw = new Stopwatch();
+            sw.Start();//寮�濮嬭鏃�
+            LogHelper.Info("鎵归噺锛岀敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟鍑嗗鏁版嵁");
+            //閿佸畾鐨勬棩璁″垝涓嶇敓鎴�
+            try
+            {
+                string sql = string.Format(@"
+/*dialect*/
+select t1.FID,t1.FEntryID,t3.FMATERIALID,T5.FNUMBER,t1.FHMASTERDATE,t1.FHQTY,t4.FMATERIALID FMATERIALID2,T6.FNUMBER FNUMBER2,T7.FNUMBER FUNITNUMBER,FNumerator,FDenominator,convert(decimal(18,2),(FNumerator/FDenominator) *t1.FHQTY) FHQtyMust,T4.FUnitID,t8.FNUMBER FUNITNUMBER2,T3.FID FPPBOM,T4.FENTRYID,isnull(T9.FBillNo,'')FBillNo,t10.FNUMBER FORGNUMBER,t11.FNUMBER FHSOURCENUMBER,FSCRAPRATE,FFIXSCRAPQTY,T9.FID AS DayPlanFID
+FROM Sc_WorkBillSortBillSub t1
+JOIN Sc_WorkBillSortBillMAIN t2 on t1.FID = t2.FID
+JOIN T_PRD_PPBOM T3 on T2.FPRDMOMAINID=t3.FMOID AND T2.FPRDMOENTYID=T3.FMOENTRYID
+JOIN T_PRD_PPBOMENTRY T4 ON T3.FID=T4.FID
+JOIN T_BD_MATERIAL T5 ON T3.FMATERIALID=T5.FMATERIALID
+JOIN T_BD_MATERIAL T6 ON T4.FMATERIALID=T6.FMATERIALID
+LEFT JOIN T_BD_UNIT T7 ON T3.FUNITID = T7.FUNITID
+LEFT JOIN T_BD_UNIT T8 ON T4.FUNITID = T8.FUNITID
+ LEFT JOIN Sc_DayPlanPPBomBillMain T9 ON T1.FEntryID=T9.FDayPlanFID
+ LEFT join T_ORG_Organizations t10 on t2.FHPRDORGID = t10.FORGID
+ LEFT join T_ENG_WORKCENTER t11 on t2.FHSOURCEID = t11.FID
+ WHERE t1.FHQTY>0
+"
+);
+                LogHelper.Info("鎵归噺锛岀敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟鍑嗗鏁版嵁sql:" + sql);
+                DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
+                DataTable dt = ds.Tables[0];
+                List<DayPlanMaterial> DayPlanMaterial = new List<DayPlanMaterial>();
+                if (dt.Rows.Count > 0)
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        DayPlanMaterial.Add(new Demo.Model.Model.DayPlanMaterial
+                        {
+                            FID = dr["DayPlanFID"].ToString(),
+                            FEntryID = dr["FEntryID"].ToString(),
+                            FHDate = DateTime.Now.ToString(),
+                            FOrgId = dr["FORGNUMBER"].ToString(),
+                            FHMaterID = dr["FNUMBER"].ToString(),
+                            FHWorkDate = dr["FHMASTERDATE"].ToString(),
+                            FHQty = dr["FHQTY"].ToString(),
+                            FHUnitID = dr["FUNITNUMBER"].ToString(),
+                            FDayPlanFID = dr["FEntryID"].ToString(),
+                            FHMaterSubID = dr["FNUMBER2"].ToString(),
+                            FHUnitSubID = dr["FUNITNUMBER2"].ToString(),
+                            FHQtyMust = dr["FHQtyMust"].ToString(),
+                            FHQtySub = dr["FHQtyMust"].ToString(),
+                            FHPPBomInterID = dr["FPPBOM"].ToString(),
+                            FHPPBomEntryID = dr["FENTRYID"].ToString(),
+                            FHSourceID = dr["FHSOURCENUMBER"].ToString(),
+                            FNumerator = dr["FNumerator"].ToString(),
+                            FDenominator = dr["FDenominator"].ToString(),
+                            FFIXSCRAPQTY = dr["FFIXSCRAPQTY"].ToString(),
+                            FHQtyScrap = dr["FSCRAPRATE"].ToString(),
+                        });
+                    }
+                    LogHelper.Info($"鎵归噺锛屾棩璁″垝鐢ㄦ枡娓呭崟锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{DayPlanMaterial.Count}锛岃�楁椂锛�" + sw.Elapsed);
+                    var fidList = DayPlanMaterial.Select(x => x.FEntryID).Distinct().ToList();
+                    foreach (var item in fidList)
+                    {
+                        var _DayPlanMaterial = DayPlanMaterial.Where(x => x.FEntryID == item).ToList();
+                        JObject model = new JObject();
+                        model.Add("FHDate", DateTime.Now);
+                        model.Add("FOrgId", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FOrgId });//鍙戞枡缁勭粐
+                        model.Add("FHMaterID", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FHMaterID });//鐗╂枡
+                        model.Add("FHWorkDate", _DayPlanMaterial[0].FHWorkDate);//鏃ュ伐鍗曟棩鏈� FHWorkDate
+                        model.Add("FHQty", _DayPlanMaterial[0].FHQty);//涓讳骇鍝佹暟閲忥細FHQty 
+                        model.Add("FHUnitID", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FHUnitID });//鍗曚綅锛欶HUnitID 
+                        model.Add("FDayPlanFID", _DayPlanMaterial[0].FDayPlanFID);//鏃ヨ鍒掑伐鍗曞唴鐮� 
+                        JArray Entry = new JArray();
+                        foreach (var _item in _DayPlanMaterial)
+                        {
+                            JObject ModelEnty = new JObject();
+                            ModelEnty.Add("FHMaterSubID", new JObject() { ["Fnumber"] = _item.FHMaterSubID });//瀛愮墿鏂橣HMaterSubID
+                            ModelEnty.Add("FHUnitSubID", new JObject() { ["Fnumber"] = _item.FHUnitSubID });//鍗曚綅FHUnitSubID
+                            ModelEnty.Add("FHQtyMust", _item.FHQtyMust);//搴斿彂鏁伴噺FHQtyMust
+                            ModelEnty.Add("FHQtySub", _item.FHQtySub);//鏁伴噺FHQtySub
+                            ModelEnty.Add("FHPPBomInterID", _item.FHPPBomInterID);//鐢ㄦ枡娓呭崟涓诲唴鐮丗HPPBomInterID
+                            ModelEnty.Add("FHPPBomEntryID", _item.FHPPBomEntryID);//鐢ㄦ枡娓呭崟瀛愬唴鐮丗HPPBomEntryID
+                            ModelEnty.Add("FHSourceID", new JObject() { ["Fnumber"] = _item.FHSourceID });//鐢熶骇璧勬簮FHSourceID
+                            ModelEnty.Add("FNumerator", _item.FNumerator);//鍒嗘瘝
+                            ModelEnty.Add("FDenominator", _item.FDenominator);//鍒嗗瓙
+                            ModelEnty.Add("FDwyl", Convert.ToDecimal(_item.FNumerator) / Convert.ToDecimal(_item.FDenominator));//鍗曚綅鐢ㄦ枡
+                            ModelEnty.Add("FFIXSCRAPQTY", _item.FFIXSCRAPQTY);//鍥哄畾鎹熻��
+                            ModelEnty.Add("FHQtyScrap", _item.FHQtyScrap);//鍙樺姩鎹熻�楃巼%
+                            Entry.Add(ModelEnty);
+                        }
+                        model.Add("FEntity", Entry);
+                        //if (!string.IsNullOrEmpty(_DayPlanMaterial[0].FID))
+                        //    model.Add("FID", _DayPlanMaterial[0].FID);
+                        JObject jsonRoot = new JObject()
+                        {
+                            ["Creator"] = "",
+                            ["NeedUpDateFields"] = new JArray(),
+                            ["NeedReturnFields"] = new JArray(),
+                            ["IsDeleteEntry"] = "true",
+                            ["SubSystemId"] = "",
+                            ["IsVerifyBaseDataField"] = "false",
+                            ["Model"] = model
+                        };
+
+                        CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+                        var result = cloudClient.Save("Paez_Sc_DayPlanPPBomBill", jsonRoot.ToString());
+                        JObject saveObj = JObject.Parse(result);
+                        string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+                        if (saveIsSuc != "TRUE")
+                        {
+                            LogHelper.Error(jsonRoot.ToString());
+
+                        }
+                    }
+                }
+                sw.Stop();//缁撴潫璁℃椂
+                LogHelper.Info("鎵归噺锛岀敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟杩愯鎬绘椂闀匡細" + sw.Elapsed);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error("鎵归噺锛岀敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟+" + ex.Message.ToString());
+            }
+        }
+        public void DayPlanPPBomBillBatch()
+        {
+            Stopwatch sw = new Stopwatch();
+            sw.Start();//寮�濮嬭鏃�
+            LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曞噯澶囨暟鎹�");
+            //閿佸畾鐨勬棩璁″垝涓嶇敓鎴�
+            try
+            {
+                string sql = string.Format(@"
+/*dialect*/
+select t1.FID,t1.FEntryID,t3.FMATERIALID,T5.FNUMBER,t1.FHMASTERDATE,t1.FHQTY,t4.FMATERIALID FMATERIALID2,T6.FNUMBER FNUMBER2,T7.FNUMBER FUNITNUMBER,FNumerator,FDenominator,convert(decimal(18,2),(FNumerator/FDenominator) *t1.FHQTY) FHQtyMust,T4.FUnitID,t8.FNUMBER FUNITNUMBER2,T3.FID FPPBOM,T4.FENTRYID,isnull(T9.FBillNo,'')FBillNo,t10.FNUMBER FORGNUMBER,t11.FNUMBER FHSOURCENUMBER,FSCRAPRATE,FFIXSCRAPQTY,T9.FID AS DayPlanFID
+FROM Sc_WorkBillSortBillSub t1
+JOIN Sc_WorkBillSortBillMAIN t2 on t1.FID = t2.FID
+JOIN T_PRD_PPBOM T3 on T2.FPRDMOMAINID=t3.FMOID AND T2.FPRDMOENTYID=T3.FMOENTRYID
+JOIN T_PRD_PPBOMENTRY T4 ON T3.FID=T4.FID
+JOIN T_BD_MATERIAL T5 ON T3.FMATERIALID=T5.FMATERIALID
+JOIN T_BD_MATERIAL T6 ON T4.FMATERIALID=T6.FMATERIALID
+LEFT JOIN T_BD_UNIT T7 ON T3.FUNITID = T7.FUNITID
+LEFT JOIN T_BD_UNIT T8 ON T4.FUNITID = T8.FUNITID
+ LEFT JOIN Sc_DayPlanPPBomBillMain T9 ON T1.FEntryID=T9.FDayPlanFID
+ LEFT join T_ORG_Organizations t10 on t2.FHPRDORGID = t10.FORGID
+ LEFT join T_ENG_WORKCENTER t11 on t2.FHSOURCEID = t11.FID
+ WHERE t1.FHQTY>0
+"
+);
+                LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曞噯澶囨暟鎹畇ql:" + sql);
+                DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
+                DataTable dt = ds.Tables[0];
+                List<DayPlanMaterial> DayPlanMaterial = new List<DayPlanMaterial>();
+                if (dt.Rows.Count > 0)
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        DayPlanMaterial.Add(new Demo.Model.Model.DayPlanMaterial
+                        {
+                            FID = dr["DayPlanFID"].ToString(),
+                            FEntryID = dr["FEntryID"].ToString(),
+                            FHDate = DateTime.Now.ToString(),
+                            FOrgId = dr["FORGNUMBER"].ToString(),
+                            FHMaterID = dr["FNUMBER"].ToString(),
+                            FHWorkDate = dr["FHMASTERDATE"].ToString(),
+                            FHQty = dr["FHQTY"].ToString(),
+                            FHUnitID = dr["FUNITNUMBER"].ToString(),
+                            FDayPlanFID = dr["FEntryID"].ToString(),
+                            FHMaterSubID = dr["FNUMBER2"].ToString(),
+                            FHUnitSubID = dr["FUNITNUMBER2"].ToString(),
+                            FHQtyMust = dr["FHQtyMust"].ToString(),
+                            FHQtySub = dr["FHQtyMust"].ToString(),
+                            FHPPBomInterID = dr["FPPBOM"].ToString(),
+                            FHPPBomEntryID = dr["FENTRYID"].ToString(),
+                            FHSourceID = dr["FHSOURCENUMBER"].ToString(),
+                            FNumerator = dr["FNumerator"].ToString(),
+                            FDenominator = dr["FDenominator"].ToString(),
+                            FFIXSCRAPQTY = dr["FFIXSCRAPQTY"].ToString(),
+                            FHQtyScrap = dr["FSCRAPRATE"].ToString(),
+                        });
+                    }
+                    LogHelper.Info($"鏃ヨ鍒掔敤鏂欐竻鍗曪紝鏁版嵁鍑嗗瀹屾垚锛屼繚瀛樺埌Model瀹炰綋锛屾�昏鏁帮細{DayPlanMaterial.Count}锛岃�楁椂锛�" + sw.Elapsed);
+                    var fidList = DayPlanMaterial.Select(x => x.FEntryID).Distinct().ToList();
+                    int i = 1;
+                    JArray Fentity = new JArray();
+                    foreach (var item in fidList)
+                    {
+                        var _DayPlanMaterial = DayPlanMaterial.Where(x => x.FEntryID == item).ToList();
+                        JObject model = new JObject();
+                        model.Add("FHDate", DateTime.Now);
+                        model.Add("FOrgId", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FOrgId });//鍙戞枡缁勭粐
+                        model.Add("FHMaterID", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FHMaterID });//鐗╂枡
+                        model.Add("FHWorkDate", _DayPlanMaterial[0].FHWorkDate);//鏃ュ伐鍗曟棩鏈� FHWorkDate
+                        model.Add("FHQty", _DayPlanMaterial[0].FHQty);//涓讳骇鍝佹暟閲忥細FHQty 
+                        model.Add("FHUnitID", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FHUnitID });//鍗曚綅锛欶HUnitID 
+                        model.Add("FDayPlanFID", _DayPlanMaterial[0].FDayPlanFID);//鏃ヨ鍒掑伐鍗曞唴鐮� 
+                        JArray Entry = new JArray();
+                        foreach (var _item in _DayPlanMaterial)
+                        {
+                            JObject ModelEnty = new JObject();
+                            ModelEnty.Add("FHMaterSubID", new JObject() { ["Fnumber"] = _item.FHMaterSubID });//瀛愮墿鏂橣HMaterSubID
+                            ModelEnty.Add("FHUnitSubID", new JObject() { ["Fnumber"] = _item.FHUnitSubID });//鍗曚綅FHUnitSubID
+                            ModelEnty.Add("FHQtyMust", _item.FHQtyMust);//搴斿彂鏁伴噺FHQtyMust
+                            ModelEnty.Add("FHQtySub", _item.FHQtySub);//鏁伴噺FHQtySub
+                            ModelEnty.Add("FHPPBomInterID", _item.FHPPBomInterID);//鐢ㄦ枡娓呭崟涓诲唴鐮丗HPPBomInterID
+                            ModelEnty.Add("FHPPBomEntryID", _item.FHPPBomEntryID);//鐢ㄦ枡娓呭崟瀛愬唴鐮丗HPPBomEntryID
+                            ModelEnty.Add("FHSourceID", new JObject() { ["Fnumber"] = _item.FHSourceID });//鐢熶骇璧勬簮FHSourceID
+                            ModelEnty.Add("FNumerator", _item.FNumerator);//鍒嗘瘝
+                            ModelEnty.Add("FDenominator", _item.FDenominator);//鍒嗗瓙
+                            ModelEnty.Add("FDwyl", Convert.ToDecimal(_item.FNumerator) / Convert.ToDecimal(_item.FDenominator));//鍗曚綅鐢ㄦ枡
+                            ModelEnty.Add("FFIXSCRAPQTY", _item.FFIXSCRAPQTY);//鍥哄畾鎹熻��
+                            ModelEnty.Add("FHQtyScrap", _item.FHQtyScrap);//鍙樺姩鎹熻�楃巼%
+                            Entry.Add(ModelEnty);
+                        }
+                        model.Add("FEntity", Entry);
+                        //if (!string.IsNullOrEmpty(_DayPlanMaterial[0].FID))
+                        //    model.Add("FID", _DayPlanMaterial[0].FID);
+                        Fentity.Add(model);
+                        if ((i >= 20 || i == fidList.Count) && (i % 20 == 0 || i == fidList.Count))
+                        {
+                            LogHelper.Info("鏃ヨ鍒掔敤鏂欐竻鍗曟壒閲忔墽琛岋紝璁板綍寰幆鐨勫綋鍓嶆潯鏁�" + i);
+                            JObject jsonRoot = new JObject()
+                            {
+                                ["Creator"] = "",
+                                ["NeedUpDateFields"] = new JArray(),
+                                ["NeedReturnFields"] = new JArray(),
+                                ["IsDeleteEntry"] = "false",
+                                ["SubSystemId"] = "",
+                                ["IsVerifyBaseDataField"] = "false",
+                                ["Model"] = Fentity
+                            };
+                            CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+                            var result = cloudClient.BatchSave("Paez_Sc_DayPlanPPBomBill", jsonRoot.ToString());
+                            JObject saveObj = JObject.Parse(result);
+                            string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+                            if (saveIsSuc != "TRUE")
+                            {
+                                LogHelper.Error(jsonRoot.ToString());
+                            }
+                            Fentity = new JArray();
+                        }
+                        i++;
+                    }
+                }
+                sw.Stop();//缁撴潫璁℃椂
+                LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曡繍琛屾�绘椂闀匡細" + sw.Elapsed);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error("鏃ヨ鍒掔敤鏂欐竻鍗�+" + ex.Message.ToString());
+            }
+        }
+
         /// <summary>
         /// 鎻愭枡璁″垝
         /// </summary>
-        public void Extraction3()
+        public void Extraction()
         {
-
-            //鑾峰彇鍗曟嵁浣撲俊鎭�
-            Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
-            //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
-            DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
-            EntryGrid grid = this.View.GetControl<EntryGrid>("FEntity");
-            string FDayPlanWorkID = "";//鏃ュ伐鍗旾D
-            if (entityDataObjoct.Count == 0)
+            LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]锛氭祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇�");
+            try
             {
-                this.View.ShowMessage("璇峰厛鍔犺浇鏁版嵁锛�");
-                return;
-            }
-            else
-            {
-                foreach (DynamicObject current in entityDataObjoct)
+                Stopwatch sw = new Stopwatch();
+                sw.Start();//寮�濮嬭鏃�
+                string sql = string.Format(@"/*dialect*/  select distinct FHICMOINTERID FID  from  JIT_MOMaterReadysBill ");
+                DataTable fidDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+                string FDayPlanWorkID = "";
+                foreach (DataRow dr in fidDt.Rows)
                 {
-                    FDayPlanWorkID += Convert.ToString(current["FDayPlanWorkID"]) + ",";
+                    FDayPlanWorkID += Convert.ToString(dr["FID"]) + ",";
                 }
-            }
-            FDayPlanWorkID = FDayPlanWorkID.Substring(0, FDayPlanWorkID.Length - 1);
-
-            //鎻愭枡璁″垝棰勫鐞� 娓呯悊鎻愭枡璁″垝鍗曟暟鎹� 鏇存柊閲囪喘璁㈠崟鎻愭枡璁″垝鏁伴噺
-            string sql = string.Format(@"
- /*dialect*/
+                FDayPlanWorkID = FDayPlanWorkID.Substring(0, FDayPlanWorkID.Length - 1);
+                //鎻愭枡璁″垝棰勫鐞� 娓呯悊鎻愭枡璁″垝鍗曟暟鎹� 鏇存柊閲囪喘璁㈠崟鎻愭枡璁″垝鏁伴噺
+                sql = string.Format(@"
+  /*dialect*/
  exec [鎻愭枡璁″垝棰勫鐞哴 '{0}'
  ", FDayPlanWorkID.Replace(",", "-"));
-
-            DBServiceHelper.Execute(Context, sql);
-
-            //閲囪喘璁㈠崟鏁版嵁
-            sql = @"
+                DBServiceHelper.Execute(Context, sql);
+                LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鎻愭枡璁″垝棰勫鐞唖ql锛�" + sql);
+                //閲囪喘璁㈠崟鏁版嵁
+                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
@@ -1254,13 +1664,11 @@
 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(@"
+                List<PurchaseInventory> PurchaseInventory = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<PurchaseInventory>();
+                LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鍙敤閲囪喘璁㈠崟鏁版嵁sql锛�" + 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,FHPRDORGID FStockOrgId FROM  SC_WORKBILLSORTBILLMAIN T1 
+ SELECT T1.FID,FHMATERID,FHMASTERDATE,FHQTY,FCOMPLETECOUNT,FPRDMOMAINID,T2.FENTRYID,T1.FBILLNO, FNeedQty,(FLeadtime+FLeadTtime2)FFIXLEADTIME,t5.FMAXPOQTY,FJITBatch FMINPOQTY,FJITMATERIALGROUP,FJITMaterielDemand,FJITSafeStock,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
@@ -1269,147 +1677,98 @@
 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 FDayPlanQuantity>FCOMPLETECOUNT
+AND FComplete ='鏈綈濂�'
 AND FERPCLSID=1 
-AND T2.FENTRYID not in (select distinct FHSOURCEENTRYID from CG_PODEMANDPLANBILLSUB where FHSOURCEINTERID IN ({0}))
-AND T1.FID in ({0})
+ 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>();
-
-            //鎵�鏈夌墿鏂欑殑搴撳瓨
-            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)
+                sql = string.Format(@"
+ /*dialect*/
+SELECT T1.FID,FHMASTERDATE,t1.FEntryID,T1.FBILLNO, FNeedQty,(FLeadtime+FLeadTtime2)FFIXLEADTIME,t5.FMAXPOQTY,FJITBatch FMINPOQTY,FJITMATERIALGROUP,FJITMaterielDemand,FJITSafeStock,t1.FMATERIALID,t6.FNumber,NeedQty, FStockOrgId 
+FROM   (
+select FHICMOINTERID FID,FHICMOENTRYID FEntryID,FPlanDate FHMASTERDATE,FLackCount NeedQty,FHMATERID FMATERIALID,FHStockOrgID FStockOrgId,FPRDBILLNO FBillNo,FSumPlanCount FNeedQty from JIT_MOMaterReadysBill a
+right join (select max(FID)FID from JIT_MOMaterReadysBill GROUP BY FHICMOENTRYID,FHMATERID) b on a.FID = b.FID
+)T1
+JOIN T_BD_MATERIAL T6 ON T1.FMATERIALID = T6.FMATERIALID
+join t_BD_MaterialBase t4 on T1.FMATERIALID = t4.FMATERIALID
+join t_BD_MaterialPlan t5 on T1.FMATERIALID = t5.FMATERIALID
+WHERE  DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0
+AND FERPCLSID=1 
+AND T1.NeedQty>0
+AND T1.FENTRYID not in (select distinct FHSOURCEENTRYID from CG_PODEMANDPLANBILLSUB where FHSOURCEINTERID IN ({0}))
+AND T1.FID in ({0}) 
+order by FHMASTERDATE
+", FDayPlanWorkID);
+                LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]闇�瑕佹彁鏂欐暟鎹畇ql锛�" + sql);
+                DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
+                List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>();
+                //鐗╂枡+搴撳瓨缁勭粐鍒嗙被
+                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 == "162305").ToList();
+                LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鎬荤墿鏂欒鏁�" + MaterialIDList.Count);
+                //鎻愭枡璁″垝鏁版嵁闆嗕复鏃跺瓨鍌ㄩ泦鍚�
+                List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>();
+                //sql闆嗗悎 鏇存柊閲囪喘璁㈠崟鍗犵敤鐨勬彁鏂欒鍒掓暟閲�
+                List<string> sqlList = new List<string>();
+                //MaterialIDList = new List<string> { "105773" };
+                foreach (var item in MaterialIDList)
                 {
-                    if (kcList.FBASEQTY >= NeedQty)
+                    //褰撳墠鐗╂枡娌℃湁閲囪喘璁㈠崟鏃� 鐩存帴璺冲嚭
+                    List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList();
+                    if (_PurchaseInventory.Count == 0)
                     {
-                        deleteList.Add(new PODemandPlanTemp
-                        {
-                            FENTRYID = item.FENTRYID,
-                            FMATERIALID = item.FMATERIALID
-                        });
-                        kcList.FBASEQTY = kcList.FBASEQTY - NeedQty;
+                        LogHelper.Info("[鎻愭枡璁″垝寮�濮媇褰撳墠鐗╂枡鏃犻噰璐俊鎭細" + item.FMATERIALID + " 搴撳瓨缁勭粐锛�" + item.FStockOrgId);
+                        continue;
                     }
-                    else
+                    //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;//鎻愬墠鏈�
+                    string FJITmaterialGroup = _DayPlanPpbom.FirstOrDefault().FJITmaterialGroup;//jit鐗╂枡鍒嗙被
+                    string FJITMaterielDemand = _DayPlanPpbom.FirstOrDefault().FJITMaterielDemand; //JIT鐗╂枡闇�姹備緵璐у懆鏈�
+                    string FJITSafeStock = _DayPlanPpbom.FirstOrDefault().FJITSafeStock; //JIT瀹夊叏搴撳瓨
+                    decimal NeedQty = 0;
+                    DateTime DATE = _DayPlanPpbom.FirstOrDefault().FHMASTERDATE;//绗竴涓璐ц捣濮嬫棩鏈�
+                    int i = 0;
+                    //璁板綍鍦ㄦ渶灏忛噰璐噺闇�姹備笅鐨勬棩璁″垝鏄庣粏FentyrID
+                    List<int> FEntryIdList = new List<int>();
+                    foreach (var _item in _DayPlanPpbom)
                     {
-                        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闆嗗悎
-            var FIDList = CompleteList.Select(x => x.FID).Distinct().ToList();
-            foreach (var item in FIDList)
-            {
-                var _CompleteList = CompleteList.Where(p => p.FID == item).ToList();
-                decimal FComplete = _CompleteList.FirstOrDefault().FCOMPLETECOUNT;
-                if (FComplete == 0)
-                    continue;
-                foreach (var _item in _CompleteList)
-                {
-                    FComplete = FComplete - _item.FHQTY;
-                    if (FComplete >= 0)
-                    {
-                        DayPlanPpbom.RemoveAll(p => p.FENTRYID == _item.FENTRYID);
-
-                    }
-                    else
-                    {
-                        DayPlanPpbom.FindAll(p => p.FENTRYID == _item.FENTRYID).ForEach(x =>
-                        {
-                            x.NeedQty = -(x.FNeedQty * FComplete);
-                        });
-                        break;
-                    }
-
-
-                }
-
-            }
-            */
-            #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();
-
-            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>();
-            //MaterialIDList = new List<string> { "105773" };
-            foreach (var item in MaterialIDList)
-            {
-                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;//鎻愬墠鏈�
-                decimal NeedQty = 0;
-                DateTime DATE = _DayPlanPpbom.FirstOrDefault().FHMASTERDATE;
-                int i = 1;
-                //璁板綍鍦ㄦ渶灏忛噰璐噺闇�姹備笅鐨勬棩璁″垝鏄庣粏FentyrID
-                List<int> FEntryIdList = new List<int>();
-                foreach (var _item in _DayPlanPpbom)
-                {
-
-                    if (NeedQty == 0)
-                        DATE = Convert.ToDateTime(_item.FHMASTERDATE).AddDays(-FFIXLEADTIME);
-
-                    FEntryIdList.Add(_item.FENTRYID);
-
-                    NeedQty += _item.NeedQty;
-                    if (NeedQty >= FMINPOQTY)
-                    {
-                        List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList();
+                        i++;
+                        _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList();
                         if (_PurchaseInventory.Count == 0)
                         {
-                            NeedQty = 0;
+                            LogHelper.Info("[鎻愭枡璁″垝寮�濮媇褰撳墠鐗╂枡鏄庣粏鏃犻噰璐俊鎭細" + item.FMATERIALID + " 搴撳瓨缁勭粐锛�" + item.FStockOrgId);
                             break;
                         }
 
+                        if (NeedQty == 0)
+                            DATE = Convert.ToDateTime(_item.FHMASTERDATE).AddDays(-FFIXLEADTIME);
+                        FEntryIdList.Add(_item.FENTRYID);
+                        NeedQty += _item.NeedQty;
+
+                        LogHelper.Info("璁板綍鏄庣粏id锛�" + _item.FENTRYID + "");
+                        LogHelper.Info("鎬婚渶姹傞噺锛�" + NeedQty + "");
+                        LogHelper.Info("鏈�灏忚捣璁㈤噺锛�" + FMINPOQTY + "");
+                        if (NeedQty <= FMINPOQTY)
+                        {
+                            LogHelper.Info("[鎻愭枡璁″垝]褰撳墠鐗╂枡鏄庣粏鏃犻噰璐俊鎭細" + item.FMATERIALID + ",鏁伴噺锛�" + NeedQty + "锛屾渶灏忚捣璁㈤噺锛�" + FMINPOQTY + "");
+                        }
+
+                        if ((FJITmaterialGroup == "鎬婚噺鎺у埗瑙勬牸绫�" || FJITmaterialGroup == "璁㈠崟涓撶敤涓�х被") && FEntryIdList.Count < Convert.ToInt32(FJITMaterielDemand) && i < _DayPlanPpbom.Count) //璁㈠崟涓撶敤涓�х被
+                            continue;
+
+                        //if (NeedQty >= FMINPOQTY)
+                        //{
                         foreach (var Purchase in _PurchaseInventory)
                         {
-                            LogHelper.Info("Purchase");
-                            LogHelper.Info("鐗╂枡锛�" + Purchase.FMATERIALID + ",鏁伴噺锛�" + Purchase.FQTY);
-
+                            LogHelper.Info("鐗╂枡锛�" + Purchase.FMATERIALID + ",閲囪喘璁㈠崟鏁伴噺锛�" + Purchase.FQTY);
                             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
                                     {
@@ -1431,7 +1790,6 @@
                                         PurchseFqty = Purchase.FQTY,
                                         FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
                                         FORGNumber = Purchase.FORGNumber
-
                                     });
                                     //鎵i櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
                                     DayPlanPpbomls.NeedQty = 0;
@@ -1446,17 +1804,24 @@
                             }
                             else
                             {
+                                //鏇存柊鎬婚渶姹傛暟閲�
                                 NeedQty = NeedQty - Purchase.FQTY;
-                                decimal _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;
+                                    decimal Qty = DayPlanPpbomls.NeedQty;//璁㈠崟鏁伴噺
+                                    if (Qty == 0)
+                                        LogHelper.Info("璁㈠崟鏁伴噺涓�0");
                                     if (Qty > _NeedQty)
-                                        Qty = _NeedQty;
-                                    _NeedQty = _NeedQty - DayPlanPpbomls.NeedQty;
+                                        Qty = _NeedQty; //璁㈠崟鏁伴噺>閲囪喘璁㈠崟鏁伴噺 鍙栭噰璐鍗�
+
+                                    if (_NeedQty == 0)
+                                        LogHelper.Info("璁㈠崟鏁伴噺涓�0");
+
+                                    _NeedQty = _NeedQty - Qty;
                                     PODemandPlanTemp.Add(new Demo.Model.Model.PODemandPlan.PODemandPlanTemp
                                     {
                                         FID = DayPlanPpbomls.FID,
@@ -1469,7 +1834,6 @@
                                         OLDDATE = DayPlanPpbomls.FHMASTERDATE,
                                         FFIXLEADTIME = FFIXLEADTIME,
 
-
                                         PurchseFID = Purchase.FID,
                                         PurchseFentryID = Purchase.FENTRYID,
                                         FSUPPLIERID = Purchase.FSUPPLIERID,
@@ -1478,19 +1842,15 @@
                                         PurchseFqty = Purchase.FQTY,
                                         FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
                                         FORGNumber = Purchase.FORGNumber
-
-
                                     });
+                                    //鏇存柊璁″垝鏁伴噺锛堝墿浣欓渶瑕佹帓鐨勶級 缁х画鍘昏绠椾笅涓�涓噰璐鍗�
                                     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;
-
-                                    if (_NeedQty < 0)
+                                    if (_NeedQty <= 0)
                                     {
                                         foreach (var mm in mmm)
                                         {
@@ -1498,214 +1858,403 @@
                                         }
                                         break;
                                     }
-
                                     mmm.Add(id);
                                 }
-                                foreach (var mm in mmm)
-                                {
-                                    FEntryIdList.Remove(mm);
-                                }
-
+                                //foreach (var mm in mmm)
+                                //{
+                                //    FEntryIdList.Remove(mm);
+                                //}
                             }
                         }
                         NeedQty = 0;
+                        //}
+                        #region 鍓╀笅涓嶈冻鏃舵寜鏈�灏忛噰璐壒娆$敓鎴�
+                        //鍓╀笅涓嶈冻鏃舵寜鏈�灏忛噰璐壒娆$敓鎴�
+                        //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)
+                        //        {
+                        //            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
+                        //                });
+                        //                //鎵i櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
+                        //                DayPlanPpbomls.NeedQty = 0;
+                        //            }
+                        //            FEntryIdList.Clear();
+                        //            //鏇存柊閲囪喘璁㈠崟
+                        //            sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount  =isnull(FPODemandPlanCount,0)+  '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
+                        //            //鎵i櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
+                        //            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,
+                        //                    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}");
+                        //                //鏇存柊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;
+                        //                }
+                        //                mmm.Add(id);
+                        //            }
+                        //            foreach (var mm in mmm)
+                        //            {
+                        //                FEntryIdList.Remove(mm);
+                        //            }
+                        //        }
+                        //    }
+                        //    NeedQty = 0;
+                        //}
+                        #endregion
+
                     }
-
-                    #region 鍓╀笅涓嶈冻鏃舵寜鏈�灏忛噰璐壒娆$敓鎴�
-                    //鍓╀笅涓嶈冻鏃舵寜鏈�灏忛噰璐壒娆$敓鎴�
-                    //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)
-                    //        {
-
-                    //            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
-
-                    //                });
-                    //                //鎵i櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
-                    //                DayPlanPpbomls.NeedQty = 0;
-                    //            }
-                    //            FEntryIdList.Clear();
-                    //            //鏇存柊閲囪喘璁㈠崟
-                    //            sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount  =isnull(FPODemandPlanCount,0)+  '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
-                    //            //鎵i櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
-                    //            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,
-
-
-                    //                    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}");
-
-                    //                //鏇存柊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;
-                    //                }
-
-                    //                mmm.Add(id);
-                    //            }
-                    //            foreach (var mm in mmm)
-                    //            {
-                    //                FEntryIdList.Remove(mm);
-                    //            }
-
-                    //        }
-                    //    }
-                    //    NeedQty = 0;
-                    //}
-                    #endregion
-                    i++;
                 }
+                var PODemandPlanList222 = PODemandPlanTemp.GroupBy(p => new PODemandPlanTemp { PurchseFNUMBER = p.PurchseFNUMBER, FHMASTERDATE = p.FHMASTERDATE }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE }).ToList();
+                var PODemandPlanList = PODemandPlanTemp.GroupBy(p => new { p.PurchseFNUMBER, p.FHMASTERDATE }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE }).ToList();
+                LogHelper.Info($"鎻愭枡璁″垝锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{PODemandPlanTemp.Count}锛岃�楁椂锛�" + sw.Elapsed);
+                int tlmmm = 1;
+                JArray FinalyResult = new JArray();
+                foreach (var item in PODemandPlanList)
+                {
+                    DateTime date = item.FHMASTERDATE;
+                    string PurchseFNUMBER = item.PurchseFNUMBER;
+                    JObject model = new JObject();
+                    model.Add("FHDate", date);
+                    model.Add("FHRemark", "鐢熶骇璁㈠崟鍙凤細" + "娴嬭瘯鍛㈠憿");
+                    model.Add("FSupplierID", new JObject() { ["Fnumber"] = PurchseFNUMBER });
+                    JArray Fentity = new JArray();
+                    List<PODemandPlanTemp> _PODemandPlanList = PODemandPlanTemp.Where(x => x.FHMASTERDATE == date && x.PurchseFNUMBER == PurchseFNUMBER).ToList();
+                    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
+                        FentityModel.Add("FHSourceEntryID", _item.FENTRYID);//鏃ヨ鍒掑伐鍗旻ENTRYID
+                        FentityModel.Add("FHSourceBillNo", _item.FBILLNO);//鏃ヨ鍒掑伐鍗曞崟鍙�
+                        FentityModel.Add("FHSourceBillType", "");//鏃ヨ鍒掑伐鍗曠被鍨�
+                        FentityModel.Add("FDayPlanDate", _item.OLDDATE);//鏃ヨ鍒掑伐鍗曠被鍨�
+                        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
+                        Fentity.Add(FentityModel);
+                    }
+                    model.Add("FEntity", Fentity);
+                    FinalyResult.Add(model);
+                    if ((tlmmm >= 20 || tlmmm == PODemandPlanList.Count) && (tlmmm % 20 == 0 || tlmmm == PODemandPlanList.Count))
+                    {
+                        LogHelper.Info("鎻愭枡璁″垝鏂板鎵归噺鎵ц锛岃褰曞惊鐜殑褰撳墠鏉℃暟" + tlmmm);
+                        JObject jsonRoot = new JObject()
+                        {
+                            ["Creator"] = "",
+                            ["NeedUpDateFields"] = new JArray(),
+                            ["NeedReturnFields"] = new JArray(),
+                            ["IsDeleteEntry"] = "false",
+                            ["SubSystemId"] = "",
+                            ["IsVerifyBaseDataField"] = "false",
+                            ["Model"] = FinalyResult
+                        };
+                        CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+                        var result = cloudClient.BatchSave("paez_PODemandPlan", jsonRoot.ToString());
+                        JObject saveObj = JObject.Parse(result);
+                        string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+                        if (saveIsSuc != "TRUE")
+                        {
+                            LogHelper.Error(jsonRoot.ToString());
+                        }
+                        FinalyResult = new JArray();
+                    }
+                    tlmmm++;
+                }
+                sw.Stop();//缁撴潫璁℃椂
+                LogHelper.Info("鎻愭枡璁″垝鎵ц瀹屾垚锛岃繍琛屾�绘椂闀匡細" + sw.Elapsed);
+                DBServiceHelper.ExecuteBatch(Context, sqlList);
             }
-
-            var PODemandPlanList222 = PODemandPlanTemp.GroupBy(p => new PODemandPlanTemp { PurchseFNUMBER = p.PurchseFNUMBER, FHMASTERDATE = p.FHMASTERDATE }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE }).ToList();
-
-            var PODemandPlanList = PODemandPlanTemp.GroupBy(p => new { p.PurchseFNUMBER, p.FHMASTERDATE }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE }).ToList();
-
-
-            foreach (var item in PODemandPlanList)
+            catch (Exception ex)
             {
-                DateTime date = item.FHMASTERDATE;
-                string PurchseFNUMBER = item.PurchseFNUMBER;
-
-                JObject model = new JObject();
-                model.Add("FHDate", date);
-                model.Add("FHRemark", "鐢熶骇璁㈠崟鍙凤細" + "娴嬭瘯鍛㈠憿");
-                model.Add("FSupplierID", new JObject() { ["Fnumber"] = PurchseFNUMBER });
-                JArray Fentity = new JArray();
-
-                List<PODemandPlanTemp> _PODemandPlanList = PODemandPlanTemp.Where(x => x.FHMASTERDATE == date && x.PurchseFNUMBER == PurchseFNUMBER).ToList();
-                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
-                    FentityModel.Add("FHSourceEntryID", _item.FENTRYID);//鏃ヨ鍒掑伐鍗旻ENTRYID
-                    FentityModel.Add("FHSourceBillNo", _item.FBILLNO);//鏃ヨ鍒掑伐鍗曞崟鍙�
-                    FentityModel.Add("FHSourceBillType", "");//鏃ヨ鍒掑伐鍗曠被鍨�
-                    FentityModel.Add("FDayPlanDate", _item.OLDDATE);//鏃ヨ鍒掑伐鍗曠被鍨�
-                    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
-                    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();
-
-                LogHelper.Info("鏈�鍚�");
-                LogHelper.Info(jsonRoot.ToString());
-                if (saveIsSuc == "TRUE")
-                {
-                }
-                else
-                {
-                    LogHelper.Error(saveIsSuc);
-
-                }
-
+                LogHelper.Info("鎻愭枡璁″垝璺冲嚭锛�" + ex.Message.ToString());
             }
-            DBServiceHelper.ExecuteBatch(Context, sqlList);
-            this.View.ShowMessage("鎿嶄綔鎴愬姛");
             // var PODemandPlanList22 = PODemandPlanTemp.GroupBy(p => new   {p.FSUPPLIERID,     p.FHMASTERDATE }).ToList();
+        }
+        /// <summary>
+        /// 1.閿佸簱锛屽叿浣撳瓧娈垫牴鎹笟鍔″崟鎹喅瀹氾紝鈥業nv鈥欒〃绀哄嵆鏃跺簱瀛橈紝鈥楩InvDetailID鈥欎负鍗虫椂搴撳瓨ID
+        /// </summary>
+        public void Reserve()
+        {
+            try
+            {
+                decimal ReserveCount = Convert.ToDecimal((this.Model.GetValue("FReservedCount")));
+                if (ReserveCount == 0)
+                {
+                    this.View.ShowMessage("璇疯緭鍏ラ鐣欐暟閲�");
+                    return;
+                }
+                //鑾峰彇鍗曟嵁浣撲俊鎭�
+                Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
+                //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
+                DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
+                DynamicObjectCollection filterResult = entityDataObjoct.Clone();
+                filterResult.Clear();
+                entityDataObjoct.Where(x => Convert.ToBoolean(x["FFOCUS"])).ToList().ForEach(x => filterResult.Add(x));
+                if (filterResult.Count == 0)
+                {
+                    this.View.ShowMessage("璇烽�夋嫨闇�瑕侀鐣欑殑鍗曟嵁锛�");
+                    return;
+                }
+                //鎬诲簱瀛� 鐗╂枡+搴撳瓨缁勭粐+搴撳瓨鏁伴噺
+                DataSet 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>();
+                foreach (DynamicObject current in entityDataObjoct)
+                {
+                    if (Convert.ToString(current["FFOCUS"]) == "False")
+                        continue;
+                    string sql = string.Format(@"
+/*dialect*/
+--鐢熶骇鐢ㄦ枡娓呭崟鍒楄〃
+SELECT T1.FID,T1.FBillNo,T1.FMOBillNO,T1.FMOEntrySeq,T1.FMoId,T1.FMaterialID,T1.FQty,FPRDORGID FStockOrgId,
+T2.FMATERIALID FMATERIALID2,T4.FNumber,T2.FNeedQty,convert(decimal(18,2),FNeedQty/FQty ) as dwyl
+--,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_BD_MATERIAL T4 on T2.FMATERIALID=T4.FMATERIALID
+where t1.FMoId='{0}'    and T1.FMaterialID='{1}'
+", current["FHMainSourceInterID"].ToString(), current["FMatrailId_Id"].ToString());
+                    ds = DBServiceHelper.ExecuteDataSet(Context, sql);
+                    var PpbomList = ds.ToModelList<PRD_PPBOM>();
+                    //褰撳墠鏈�澶ч綈濂楁暟 涓嬪眰闇�姹傛暟閲�/鐖剁骇闇�姹傛暟閲�=鍗曚綅鐢ㄦ枡
+                    //var SumGetComplete = Math.Floor(PpbomList.Min(t => t.FBASEQTY / (t.FNeedQty / t.FQty)));
+                    //鏈�澶ч綈濂楁暟
+                    var result = (from a in PpbomList
+                                  join b in ListInventoryByStockOrgId
+                                  on new { materialId = a.FMATERIALID2, stockOrgId = a.FStockOrgId }
+                                  equals new { materialId = b.FMATERIALID, stockOrgId = b.FStockOrgId }
+                                  into g
+                                  from b in g.DefaultIfEmpty()
+                                  select new
+                                  {
+                                      value = (b?.FBASEQTY / a.dwyl) ?? 0
+                                  }).ToList().Min(x => x.value);
+                    if (result < ReserveCount)
+                    {
+                        this.View.ShowErrMessage("褰撳墠搴撳瓨瓒呭嚭鍙鐣欐渶澶ф暟锛�" + result + "");
+                        return;
+                    };
+                    //灏嗛鐣欐暟閲忓垎閰嶅埌鏃ヨ鍒掑伐鍗�
+                    sql = string.Format(@"/*dialect*/select FEntryID,FHQTY from Sc_WorkBillSortBillSub
+where FID='{0}' and isnull(FCOMPLETE,'鏈綈濂�')='鏈綈濂�'", current["FDayPlanWorkID"].ToString());
+                    DataTable dayPlanDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+                    var count = ReserveCount;
+                    List<string> sqlList = new List<string>();
+                    if (dayPlanDt.Rows.Count > 0)
+                    {
+                        foreach (DataRow dr in dayPlanDt.Rows)
+                        {
+                            if (count > 0)
+                            {
+                                sql = string.Format("/*dialect*/ update Sc_WorkBillSortBillSub set FReservedCount = {0} where FEntryID = {1}", count >= Convert.ToDecimal(dr["FHQTY"]) ? Convert.ToDecimal(dr["FHQTY"]) : count, dr["FEntryID"].ToString());
+                                sqlList.Add(sql);
+                                count = count - Convert.ToDecimal(dr["FHQTY"]);
+                            }
+                            else
+                                break;
+                        }
+                        DBServiceHelper.ExecuteBatch(Context, sqlList);
+                    }
+                    sql = string.Format(@"/*dialect*/
+--鐢熶骇鐢ㄦ枡娓呭崟鍒楄〃
+SELECT T1.FID,T1.FBillNo,T2.FENTRYID,T1.FMOBillNO,T1.FMOEntrySeq,T1.FMoId,T1.FMaterialID,T1.FQty,FPRDORGID FStockOrgId,
+T2.FMATERIALID FMATERIALID2,T4.FNumber,T2.FNeedQty,convert(decimal(18,2),FNeedQty/T1.FQty ) as dwyl,
+t5.FBASEUNITID,t6.FSTOREUNITID,t7.FID FSTKID,t7.FOwnerID,t7.FOwnerTypeID,t7.FSTOCKID,t7.FBASEQTY
+--,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_BD_MATERIAL T4 on T2.FMATERIALID=T4.FMATERIALID
+join t_BD_MaterialBase t5 on t4.FMATERIALID = t5.FMATERIALID
+join t_BD_MaterialStock t6 on t4.FMATERIALID = t6.FMATERIALID
+join T_STK_INVENTORY t7 on t4.FMATERIALID = t7.FMATERIALID and t1.FPRDORGID=t7.FSTOCKORGID
+where t1.FMoId='{0}'    and T1.FMaterialID='{1}'
+", current["FHMainSourceInterID"].ToString(), current["FMatrailId_Id"].ToString());
+                    DataTable skDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+                    //閿佸簱
+                    List<LockStockArgs> list = new List<LockStockArgs>();
+                    foreach (DataRow dr in skDt.Rows)
+                    {
+                        LockStockArgs lockStockArgs = new LockStockArgs();
+                        lockStockArgs.ObjectId = "PRD_PPBOM"; //瀛楁 FDEMANDFORMID = 'PRD_PPBOM'
+                        lockStockArgs.BillId = dr["FID"].ToString(); //鐢熶骇鐢ㄦ枡娓呭崟涓昏〃ID
+                        lockStockArgs.BillDetailID = dr["FENTRYID"].ToString();//鐢熶骇鐢ㄦ枡娓呭崟鏄庣粏琛↖D
+                        lockStockArgs.BillNo = dr["FBillNo"].ToString();//鐢熶骇鐢ㄦ枡娓呭崟鍗曟嵁鍙�
+                        lockStockArgs.FEntryID = Convert.ToInt32(current["FHMainSourceEntryID"]); ;
+                        lockStockArgs.FID = Convert.ToInt32(current["FHMainSourceInterID"]); //鐢熶骇璁㈠崟琛孖D
+                        lockStockArgs.BaseQty = decimal.Parse(dr["FBASEQTY"].ToString());//鍩烘湰鍗曚綅鏁伴噺
+                        lockStockArgs.BaseUnitID = int.Parse(dr["FBASEUNITID"].ToString());//鍩烘湰鍗曚綅
+                        //lockStockArgs.Lot = Convert.ToString(current["FBatch"]); ;//鎵规 FBatch
+                        lockStockArgs.MaterialID = long.Parse(dr["FMATERIALID2"].ToString());
+                        lockStockArgs.OwnerID = long.Parse(dr["FOwnerID"].ToString());
+                        lockStockArgs.OwnerTypeID = dr["FOwnerTypeID"].ToString();
+                        lockStockArgs.Qty = Convert.ToDecimal(dr["dwyl"].ToString()) * ReserveCount;//鏁伴噺
+                        lockStockArgs.STOCKID = long.Parse(dr["FSTOCKID"].ToString());//浠撳簱
+                        lockStockArgs.StockOrgID = long.Parse(dr["FStockOrgId"].ToString());//搴撳瓨缁勭粐
+                        lockStockArgs.UnitID = long.Parse(dr["FSTOREUNITID"].ToString());//鍗曚綅
+                        lockStockArgs.LockBaseQty = Convert.ToDecimal(dr["dwyl"].ToString()) * ReserveCount;
+                        lockStockArgs.LockQty = Convert.ToDecimal(dr["dwyl"].ToString()) * ReserveCount;//鍩烘湰鍗曚綅鏁伴噺
+                        lockStockArgs.FInvDetailID = Convert.ToString(dr["FSTKID"].ToString());
+                        list.Add(lockStockArgs);
+                    }
+                    var sa = StockServiceHelper.SaveLockInfo(Context, list, "Inv", false);
+                    sql = @"/*dialect*/
+                             update a set 
+                             FPARENTFORMID	='PRD_MO',
+                             FPARENTINTERID	=b.FMOID,
+                             FPARENTENTRYID	=b.FMOENTRYID,
+                             FPARENTBILLNO = b.FMOBILLNO,
+                             FSRCFORMID = 'PRD_MO',
+                             FSRCINTERID = b.FMOID,
+                             FSRCENTRYID = b.FMOENTRYID,
+                             FSRCBILLNO = b.FMOBILLNO
+                             from T_PLN_RESERVELINK a 
+                             join T_PRD_PPBOM b on a.FDEMANDINTERID = b.FID
+                             where a.FPARENTINTERID = '' and a.FPARENTENTRYID =''";
+                    DBServiceHelper.Execute(Context, sql);
+                    this.View.ShowMessage("鎿嶄綔鎴愬姛锛�");
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error(ex.Message.ToString());
+                this.View.ShowErrMessage(ex.Message.ToString());
+            }
+        }
+        /// <summary>
+        /// 閲婃斁
+        /// </summary>  
+        public void Release()
+        {
+            try
+            {
+                //鑾峰彇鍗曟嵁浣撲俊鎭�
+                Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
+                //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
+                DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
+                DynamicObjectCollection filterResult = entityDataObjoct.Clone();
+                filterResult.Clear();
+                entityDataObjoct.Where(x => Convert.ToBoolean(x["FFOCUS"])).ToList().ForEach(x => filterResult.Add(x));
+                if (filterResult.Count == 0)
+                {
+                    this.View.ShowMessage("璇烽�夋嫨闇�瑕侀鐣欑殑鍗曟嵁锛�");
+                    return;
+                }
+                foreach (DynamicObject current in filterResult)
+                {
+                    if (Convert.ToString(current["FFOCUS"]) == "False")
+                        continue;
+                    string sql = string.Format(@"/*dialect*/ update Sc_WorkBillSortBillSub set FReservedCount = 0 where FID='{0}'", current["FDayPlanWorkID"].ToString());
+                    DBServiceHelper.Execute(Context, sql);
+
+                    //鍒犻櫎閿佸簱琛�(涓嶇敤鏇存柊搴撳瓨 搴撳瓨琛ㄦ病鏈夋洿)
+                    sql = string.Format(@"/*dialect*/
+delete T_PLN_RESERVELINKENTRY where FID IN (SELECT FID FROM T_PLN_RESERVELINK WHERE FPARENTINTERID='{0}' AND FPARENTENTRYID='{1}')
+delete T_PLN_RESERVELINK WHERE  FPARENTINTERID='{0}' AND FPARENTENTRYID='{1}'", Convert.ToString(current["FHMainSourceInterID"]), Convert.ToString(current["FHMainSourceEntryID"]));
+                }
+                this.View.ShowMessage("鎿嶄綔鎴愬姛锛�");
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error(ex.Message.ToString());
+                this.View.ShowErrMessage(ex.Message.ToString());
+            }
         }
     }
 }
 
 
+//tbReleaseReserve
\ No newline at end of file

--
Gitblit v1.9.1