From bc4fb58104ec4cc7991c553f85c8b4762403e379 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 02 三月 2021 17:29:39 +0800
Subject: [PATCH] 日计划用料清单增加是否替代料

---
 src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 1757 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 1,202 insertions(+), 555 deletions(-)

diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 1325b4a..c0e6ba3 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -1,9 +1,8 @@
 锘縰sing Demo.Model.Model;
 using Demo.Model.Model.PODemandPlan;
 using K3Cloud.Extend.Utils;
-using Kingdee.BOS.App.Data;
 using Kingdee.BOS.Core;
-using Kingdee.BOS.Core.Bill.PlugIn;
+using Kingdee.BOS.Core.Bill;
 using Kingdee.BOS.Core.Const;
 using Kingdee.BOS.Core.DynamicForm;
 using Kingdee.BOS.Core.DynamicForm.PlugIn;
@@ -21,22 +20,14 @@
 using Kingdee.K3.SCM.ServiceHelper;
 using Newtonsoft.Json.Linq;
 using NPOI.HSSF.UserModel;
-using NPOI.SS.Formula.Functions;
 using NPOI.SS.UserModel;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
-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;
 using ZD.Cloud.Logger;
 using ZD.Cloud.WebApi;
 using ZD.Share.Common;
@@ -51,11 +42,33 @@
         string PathName = "鏃ヨ鍒掑鍏ユā鏉�.xlsx";
         List<PRD_Inventory> ListInventory;//搴撳瓨鏄庣粏
         List<PRD_Inventory> ListInventoryByStockOrgId;//鐗╂枡鎬诲簱瀛�
+
+        private bool isSearched = false;
+        public override void DataChanged(DataChangedEventArgs e)
+        {
+            if (!isSearched) return;
+            base.DataChanged(e);
+            var columns = new List<string>() { "", "" };
+            for (int i = 0; i < 100; i++)
+            {
+                columns.Add("FT" + i.ToString());
+            }
+            var model = this.View.Model;
+            if (columns.Contains(e.Field.Key))
+            {
+                var sum = columns.Select(x => Convert.ToDouble(model.GetValue(x, e.Row))).Sum();//鏃ヨ鍒掓�诲拰
+                var scOrderCount = Convert.ToDouble(model.GetValue("FOrderQuantity", e.Row));//鐢熶骇璁㈠崟鏁伴噺
+                var FQTYLS = Convert.ToDouble(model.GetValue("FQTYLS", e.Row));//鍘嗗彶
+                this.View.Model.SetValue("FNoScheduled", scOrderCount - sum - FQTYLS, e.Row);
+                this.View.Model.SetValue("FDayPlanQuantity", sum, e.Row);
+            }
+        }
         public override void BarItemClick(BarItemClickEventArgs e)
         {
             base.BarItemClick(e);
             try
             {
+                LogHelper.Info("鐢熶骇璁″垝骞冲彴鎸夐挳");
                 if (e.BarItemKey.ToUpper() == "BTEXPORT")
                 {
                     ExportExcel();
@@ -69,7 +82,9 @@
                 }
                 if (e.BarItemKey.ToUpper() == "TBSEARCH")
                 {
+                    isSearched = false;
                     SearchList();
+                    isSearched = true;
                 }
                 if (e.BarItemKey.ToUpper() == "TBLOCK")
                 {
@@ -80,25 +95,33 @@
                 {
                     RelieveLock();
                 }
+                //淇濆瓨
                 if (e.BarItemKey.ToUpper() == "BTNSAVE")
                 {
                     Save();
                 }
-
+                //榻愬鍒嗘瀽
                 if (e.BarItemKey.ToUpper() == "TBCOMPLETE")
                 {
-                    //CompleteSetAnalysis();
-                    //COMPLETEMAIN();
                     COMPLETE();
-                    SearchList();
+                }
+                //tbXnqt铏氭嫙榻愬
+                if (e.BarItemKey.ToUpper() == "TBXNQT")
+                {
+                    Xnqt();
+                }
+                //tb_CKXNQT 鏌ョ湅铏氭嫙榻愬
+                if (e.BarItemKey.ToUpper() == "TB_CKXNQT")
+                {
+                    XnqtLook();
                 }
                 //鎻愭枡璁″垝
                 if (e.BarItemKey.ToUpper() == "TBEXTRACTION")
                 {
                     try
                     {
-                        COMPLETE();
-                        DayPlanPPBomBill();
+                        CompleteSetAnalysisBySQL();
+                        DayPlanPPBomBillBatch();
                         Extraction();
                     }
                     catch (Exception ex)
@@ -108,9 +131,7 @@
                     finally
                     {
                         this.View.ShowMessage("鎿嶄綔鎴愬姛锛�");
-
                     }
-
                 }
                 //棰勭暀
                 if (e.BarItemKey.ToUpper() == "TBRESERVE")
@@ -120,9 +141,9 @@
                 //閲婃斁
                 if (e.BarItemKey.ToUpper() == "TBRELEASE")
                 {
-
                     Release();
                 }
+
             }
             catch (Exception ex)
             {
@@ -134,7 +155,47 @@
             base.EntryBarItemClick(e);
             if (e.BarItemKey.ToUpper() == "TBEDIT")
             {
+                isSearched = false;
                 SearchListEdit();
+                isSearched = true;
+            }
+        }
+        /// <summary>
+        /// button鎸夐挳鐐瑰嚮浜嬩欢
+        /// </summary>
+        /// <param name="e"></param>
+        public override void ButtonClick(ButtonClickEventArgs e)
+        {
+            base.ButtonClick(e);
+            if (e.Key.ToUpper() == "FTBXNQT")
+            {
+                try
+                {
+                    List<string> sqlList = new List<string>();
+                    string sql = $"truncate table Sc_WorkBillMainXnqt";
+                    sqlList.Add(sql);
+                    sql = $"truncate table Sc_WorkBillSubXnqt";
+                    sqlList.Add(sql);
+                    string columnName = DBServiceHelper.ExecuteScalar<string>(Context, "/*dialect*/ select stuff((select ',' + name  from syscolumns Where id = object_Id('Sc_WorkBillMainXnqt') for xml path('')),1,1,'') as name ", "");
+                    sql = $"insert into  Sc_WorkBillMainXnqt({columnName}) select {columnName} from  Sc_WorkBillSortBillMain";
+                    LogHelper.Info("娴嬭瘯1锛�" + sql);
+                    sqlList.Add(sql);
+                    columnName = DBServiceHelper.ExecuteScalar<string>(Context, "/*dialect*/ select stuff((select ',' + name  from syscolumns Where id = object_Id('Sc_WorkBillSubXnqt') for xml path('')),1,1,'') as name ", "");
+                    sql = $"insert into  Sc_WorkBillSubXnqt({columnName}) select {columnName} from  Sc_WorkBillSortBillSub";
+                    LogHelper.Info("娴嬭瘯1锛�" + sql);
+
+                    sqlList.Add(sql);
+                    sql = $"update Sc_WorkBillSubXnqt set  FComplete=''";
+                    sqlList.Add(sql);
+
+                    DBServiceHelper.ExecuteBatch(Context, sqlList);
+                }
+                catch (Exception ex)
+                {
+                    this.View.ShowErrMessage(ex.Message);
+                    return;
+                }
+                this.View.ShowMessage("鎿嶄綔鎴愬姛");
             }
         }
         /// <summary>
@@ -143,25 +204,56 @@
         /// <param name="e"></param>    
         public override void EntityRowDoubleClick(Kingdee.BOS.Core.DynamicForm.PlugIn.Args.EntityRowClickEventArgs e)
         {
+            LogHelper.Info("[琛屽弻鍑讳簨浠禲");
+
             base.EntityRowClick(e);
-
             DynamicFormShowParameter formPa = new DynamicFormShowParameter();
-
             if (e.ColKey == "FDELAYLNUM")
             {
                 //鐢熶骇璁″垝骞冲彴鎷栨湡鏄庣粏璺宠浆
                 formPa.FormId = "paez_TardinessDetails";
                 formPa.CustomParams.Add("FID", Convert.ToString(this.View.Model.GetValue("FDayPlanWorkID", e.Row).ToString()));
+                this.View.ShowForm(formPa);
+            }
+            else if (e.ColKey == "FQTYLS")
+            {
+                //鐢熶骇璁″垝骞冲彴
+                string pageId = Guid.NewGuid().ToString();
+                BillShowParameter showParameter = new BillShowParameter();
+                showParameter.FormId = "Paez_Sc_WorkBillAutoSortBill";
+                showParameter.OpenStyle.ShowType = ShowType.MainNewTabPage;
+                showParameter.PageId = pageId;
+                showParameter.Status = OperationStatus.EDIT;
+                // 浼犲叆闇�瑕佷慨鏀圭殑鏃ヨ鍒掑伐鍗曞唴鐮侊紝 
+                showParameter.PKey = Convert.ToString(this.View.Model.GetValue("FDayPlanWorkID", e.Row).ToString());
+                this.View.ShowForm(showParameter);
+
             }
             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()));
+                this.View.ShowForm(formPa);
             }
+
+        }
+        /// <summary>
+        /// 鏌ョ湅铏氭嫙榻愬
+        /// </summary>
+        public void XnqtLook()
+        {
+            var _key = this.View.Model.GetEntryCurrentRowIndex("FEntity");
+            if (_key < 0)
+            {
+                this.View.ShowErrMessage("璇烽�夋嫨闇�瑕佹煡鐪嬬殑鍗曟嵁琛岋紒");
+                return;
+            }
+            DynamicFormShowParameter formPa = new DynamicFormShowParameter();
+            //榻愬鍒嗘瀽鏄庣粏鍒楄〃璺宠浆
+            formPa.FormId = "paez_CompleteAnalysisDetail";
+            formPa.CustomParams.Add("FHICMOInterID", Convert.ToString(this.View.Model.GetValue("FDayPlanWorkID", _key).ToString()));
+            formPa.CustomParams.Add("tempName", "JIT_MOMaterReadysBillXn");
             this.View.ShowForm(formPa);
         }
         /// <summary>
@@ -169,13 +261,20 @@
         /// </summary>
         public void ExportExcel()
         {
-            string[] Title = new string[] {"閿�鍞鍗曞彿", "鐢熶骇璁㈠崟鍙�", "鐢熶骇缁勭粐", "鐢熶骇杞﹂棿", "鐢熶骇璧勬簮", "浜у搧浠g爜", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "璁¢噺鍗曚綅",
-                "鎵规鍙�","閿�鍞鍗曟暟閲�","鐢熶骇璁㈠崟鏁伴噺","鎬婚綈濂楁暟閲�","浜よ揣鏃ユ湡","璁㈠崟绛夌骇","T0","T1","T2","T3","T4","T5","T6","T7",
+            List<string> Title = new List<string> {"閿�鍞鍗曞彿", "鐢熶骇璁㈠崟鍙�*","鐢熶骇璁㈠崟鏄庣粏琛屽彿*", "鐢熶骇杞﹂棿*", "鐢熶骇璧勬簮", "浜у搧浠g爜*", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "璁¢噺鍗曚綅",
+                "鎵规鍙�","閿�鍞鍗曟暟閲�","鐢熶骇璁㈠崟鏁伴噺","鎬婚綈濂楁暟閲�","浜よ揣鏃ユ湡*","璁㈠崟绛夌骇*"};
+            /*
+             ,"T0","T1","T2","T3","T4","T5","T6","T7",
                 "T8","T9","T10","T11","T12","T13","T14","T15","T16","T17",
                 "T18","T19","T20","T21","T22","T23","T24","T25","T26","T27","T28","T29",
                 "T30","T31","T32","T33","T34","T35","T36","T37","T38","T39","T40","T41","T42",
-                "T43","T44","T45","T46","T47","T48","T49","T50","T51","T52","T53","T54","T55","T56","T57","T58","T59","T60"};
-
+                "T43","T44","T45","T46","T47","T48","T49","T50","T51","T52","T53","T54","T55","T56","T57","T58","T59","T60"
+             */
+            DateTime date = DateTime.Now;
+            for (int i = 0; i < 61; i++)
+            {
+                Title.Add(date.AddDays(i).ToString("yyyy-MM-dd"));
+            }
             string sheetname = "鏃ヨ鍒掑鍏ユā鏉�.xlsx";
             string file = "";
             file = @"D:\鍔炲叕\K3Cloud\WebSite\TempfilePath\" + sheetname;
@@ -224,7 +323,7 @@
 
             //璁剧疆鍒楀悕
             HSSFRow row = (HSSFRow)sheet.CreateRow(0);
-            for (int i = 0; i < Title.Length; i++)
+            for (int i = 0; i < Title.Count; i++)
             {
                 ICell cell = (ICell)row.CreateCell(i);
                 var rowName = Title[i];
@@ -234,7 +333,7 @@
 
             //鍗曞厓鏍艰祴鍊�
             //鍒楀鑷�傚簲锛屽彧瀵硅嫳鏂囧拰鏁板瓧鏈夋晥
-            for (int i = 0; i <= Title.Length; i++)
+            for (int i = 0; i <= Title.Count; i++)
             {
                 sheet.AutoSizeColumn(i);
             }
@@ -277,16 +376,16 @@
             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)
-            {
-                //閿佸畾鍚庣敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟 鍙� 鎻愭枡璁″垝
-                DayPlanPPBomBill();
-                Extraction();
-                SearchList();
-                this.View.ShowMessage("鎿嶄綔鎴愬姛");
-            }
-            else
-                this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
+            //if (result > 0)
+            //{
+            //閿佸畾鍚庣敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟 鍙� 鎻愭枡璁″垝
+            DayPlanPPBomBillBatch();
+            Extraction();
+            SearchList();
+            this.View.ShowMessage("鎿嶄綔鎴愬姛");
+            //}
+            //else
+            //    this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
         }
         /// <summary>
         /// 瑙i攣
@@ -305,72 +404,80 @@
                 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"])} ";
                 sqlList.Add(sql);
             }
-            int result = DBServiceHelper.ExecuteBatch(Context, sqlList);
-            if (result > 0)
-            {
-                SearchList();
-                this.View.ShowMessage("鎿嶄綔鎴愬姛");
-            }
-            else
-                this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
+            SearchList();
+            this.View.ShowMessage("鎿嶄綔鎴愬姛");
+
         }
         /// <summary>
         /// 淇濆瓨鍔熻兘
         /// </summary>  
         public void Save()
         {
-
             List<string> sqlList = new List<string>();
             string sql;
             //鑾峰彇鍗曟嵁浣撲俊鎭�
             Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
             //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
             DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
-            DateTime date = DateTime.Now;
-
+            DateTime date = Convert.ToDateTime(DateTime.Now.ToString("d"));
             string _result = "";
-
             foreach (DynamicObject current in entityDataObjoct)
             {
                 if (Convert.ToInt32(current["FNoScheduled"]) < 0)
                     _result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鏃ヨ鍒掓�绘暟閲忚秴鍑虹敓浜ц鍗曟暟閲�";
-
             }
             if (_result != "")
             {
                 this.View.ShowErrMessage(_result);
                 return;
             }
-
             foreach (DynamicObject current in entityDataObjoct)
             {
-                sql = $"/*dialect*/ update Sc_WorkBillSortBillMain set FOrderQuantity={current["FOrderQuantity"]},FDayPlanQuantity={current["FDayPlanQuantity"]},FNoScheduled={current["FNoScheduled"]} where FID = {current["FDayPlanWorkID"]}";
-                sqlList.Add(sql);
-                DateTime FBzDate = Convert.ToDateTime(Convert.ToDateTime(current["FBzDate"]));
-                DateTime end = Convert.ToDateTime(Convert.ToDateTime(current["FBzDate"]).AddDays(60).ToShortDateString());//鏈�澶ф棩鏈�
+                JObject jsonRoot = new JObject();
+                jsonRoot.Add("Creator", "");
+                jsonRoot.Add("NeedUpDateFields", new JArray());
+                jsonRoot.Add("NeedReturnFields", new JArray());
+                jsonRoot.Add("IsDeleteEntry", "false");
+                jsonRoot.Add("SubSystemId", "");
+                jsonRoot.Add("IsVerifyBaseDataField", "");
+                JObject jsonModel = new JObject();
+                jsonModel.Add("FID", Convert.ToString(current["FDayPlanWorkID"]));
+                jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"]));
+                jsonModel.Add("FDayPlanQuantity", Convert.ToDecimal(current["FDayPlanQuantity"]) + Convert.ToDecimal(current["FQTYLS"]));
+                jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"]));
+                sql = $" /*dialect*/ select FEntryID, FHMASTERDATE from SC_WORKBILLSORTBILLSub  where FID={Convert.ToString(current["FDayPlanWorkID"])} ";
+                List<DayPlanModel> dayPlanModel = new List<DayPlanModel>();
+                dayPlanModel = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<DayPlanModel>();
+                JArray Entry = new JArray();
                 for (int i = 0; i <= 60; i++)
                 {
-                    DateTime start = Convert.ToDateTime(date.AddDays(i).ToShortDateString());
-                    TimeSpan getDay = end.Subtract(start);
-                    //缂栧埗鏃ユ湡+61澶�>date.AddDays(i).ToShortDateString() continue
-                    if (getDay.Days < 0)
-                        break;
-                    sql = $"/*dialect*/update t1 set FHQTY='{Convert.ToString(current["FT" + "" + i + ""])}' from Sc_WorkBillSortBillSub t1 join " +
-                        $" Sc_WorkBillSortBillMain t2 on  t1.FID = t2.FID where FHMASTERDATE='{date.AddDays(i).ToShortDateString()}' and t2.FID='{Convert.ToString(current["FDayPlanWorkID"])}'";
-                    sqlList.Add(sql);
+                    if (Convert.ToString(current["FT" + "" + i + ""]) == "" || Convert.ToString(current["FT" + "" + i + ""]) == "0")
+                        continue;
+                    JObject jsonFPOOrderEntry = new JObject();
+                    jsonFPOOrderEntry.Add("FHMasterDate", date.AddDays(i).ToShortDateString()); ;//涓绘棩鏈�
+                    jsonFPOOrderEntry.Add("FHQty ", Convert.ToString(current["FT" + "" + i + ""])); ;//鏃ヨ鍒掓暟閲�
+                    List<DayPlanModel> _dayPlanModel = dayPlanModel.Where(x => x.FHMASTERDATE == date.AddDays(i)).ToList();
+                    if (_dayPlanModel.Count > 0)
+                    {
+                        jsonFPOOrderEntry.Add("FEntryID", _dayPlanModel.FirstOrDefault().FEntryID); ;//搴忓彿
+                    }
+                    Entry.Add(jsonFPOOrderEntry);
                 }
-
+                jsonModel.Add("FEntity", Entry);
+                jsonRoot.Add("Model", jsonModel);
+                CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
+                var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
+                JObject saveObj = JObject.Parse(result);
+                string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+                if (saveIsSuc != "TRUE")
+                {
+                    LogHelper.Error("鐢熶骇璁″垝骞冲彴淇濆瓨澶辫触:" + jsonRoot.ToString());
+                    this.View.ShowMessage("鏁版嵁鍌ㄥ瓨澶辫触锛佽鑱旂郴绠$悊鍛橈紒");
+                }
             }
 
-            int result = DBServiceHelper.ExecuteBatch(Context, sqlList);
-            if (result > 0)
-            {
-                this.View.ShowMessage("鎿嶄綔鎴愬姛");
-                SearchList();
-            }
-            else
-                this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
-
+            this.View.ShowMessage("鎿嶄綔鎴愬姛");
+            SearchList();
         }
         /// <summary>
         /// 榻愬鍒嗘瀽
@@ -403,7 +510,7 @@
                 {
                     // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
                     // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
-                    this.CompleteSetAnalysis();
+                    this.CompleteSetAnalysisBySQL();
                 }
                 finally
                 {
@@ -419,310 +526,6 @@
                 }
             },
             (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>
         /// 榻愬鍒嗘瀽
@@ -753,6 +556,8 @@
 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>();
@@ -770,24 +575,28 @@
 ) 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>();
                 //闇�瑕侀綈濂楀垎鏋愮殑鏁版嵁
                 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-ISNULL(FProductNum,0))*(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 (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);
@@ -851,12 +660,13 @@
                                     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;
                                 //鍓╀綑鏃ヨ鍒掗渶姹傛暟閲�
@@ -890,7 +700,9 @@
                                 FHLeftQty = 0,//鍙敤鏁伴噺
                                 FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
                                 FComPlete = "鏈綈濂�",
-                                FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+                                FPlanDate = item.FHMASTERDATE, // 鏃ヨ鍒掓棩鏈�
+                                FErpClsID = _item.FErpClsID
+
                             });
                         }
                     }
@@ -901,6 +713,7 @@
                 }
                 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);
@@ -932,10 +745,11 @@
                     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);
-                    CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+                    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();
@@ -961,6 +775,703 @@
                 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();//寮�濮嬭鏃�
+                //娓呯┖榻愬涓存椂琛�
+                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>();
+                LogHelper.Info("榻愬鍒嗘瀽鍑嗗鏁版嵁瀹屾垚锛�" + sw.Elapsed);
+                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 Xnqt()
+        {
+            LogHelper.Info("铏氭嫙榻愬鍒嗘瀽sql妯″紡寮�濮嬪噯澶囨暟鎹細");
+            string sql = "";
+            try
+            {
+                Stopwatch sw = new Stopwatch();
+                sw.Start();//寮�濮嬭鏃�
+                LogHelper.Info("铏氭嫙榻愬鍒嗘瀽寮�濮嬪噯澶囨暟鎹細" + sw.Elapsed);
+                //娓呯┖榻愬涓存椂琛�
+                DBServiceHelper.Execute(Context, "/*dialect*/  delete JIT_MOMaterReadysBillXn ");
+                ////鏇存柊鐘舵��
+                //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_MOMaterReadysBillXn 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_MOMaterReadysBillXn 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_MOMaterReadysBillXn
+insert into z_JIT_MOMaterReadysBillXn (column1)
+values('')
+insert into JIT_MOMaterReadysBillXn
+(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_MOMaterReadysBillXn
+delete   z_JIT_MOMaterReadysBillXn
+", 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_MOMaterReadysBillXn where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�')
+                //");
+                //                DBServiceHelper.Execute(Context, @"
+                ///*dialect*/update Sc_WorkBillSortBillSub set FComplete = '榻愬' where FEntryID NOT IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBillXn where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�')
+                //");
+                sw.Stop();//缁撴潫璁℃椂
+                LogHelper.Info("铏氭嫙榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
+            }
+            catch (Exception ex)
+            {
+                this.View.ShowErrMessage("寮傚父锛�" + ex.Message.ToString());
+                LogHelper.Error("铏氭嫙榻愬鍒嗘瀽璺冲嚭锛�" + ex.Message.ToString());
+            }
+            finally
+            {
+                this.View.ShowMessage("鎵ц瀹屾垚锛�");
+            }
+        }
+
         /// <summary>
         /// 鏌ヨ
         /// </summary>
@@ -976,11 +1487,11 @@
             //閿�鍞鍗曞彿
             string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder")));
             if (!string.IsNullOrEmpty(FSalOrder))
-                sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";
+                sqlwhere += $" and FHSeOrderBillNo like '%{FSalOrder}%'";
             //鐢熶骇璁㈠崟鍙�
             string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo")));
             if (!string.IsNullOrEmpty(FScOrderMainNo))
-                sqlwhere += $" and FSCORDERNO='{FScOrderMainNo}'";
+                sqlwhere += $" and FSCORDERNO like '%{FScOrderMainNo}%'";
             //鐗╂枡
             if ((this.Model.GetValue("FMatralId") as DynamicObject) != null)
             {
@@ -994,7 +1505,8 @@
                 sqlwhere += $" and FPreparatDate='{FPreparatDate}'";
             try
             {
-                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
+                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 ,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS 
+ from  Sc_WorkBillSortBillMain t1
  left join T_BD_MATERIAL t3 on t1.FHMaterID=t3.FMATERIALID
 " + sqlwhere;
                 DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
@@ -1005,9 +1517,11 @@
                 {
                     this.Model.CreateNewEntryRow("FEntity");
                     this.Model.SetValue("FSEQ", i + 1, i);//搴忓彿
+                    this.Model.SetValue("FMOFBILLTYPE", Convert.ToString(dt.Rows[i]["FMOFBILLTYPE"]), 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("FSRCBILLENTRYSEQ", dt.Rows[i]["FSRCBILLENTRYSEQ"].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);//鐢熶骇缁勭粐
@@ -1025,7 +1539,8 @@
                     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("FDayPlanQuantity", Convert.ToDecimal(dt.Rows[i]["FDAYPLANQUANTITY"]) - Convert.ToDecimal(dt.Rows[i]["FQTYLS"]), i);//鏃ヨ鍒掓暟閲�
+                    this.Model.SetValue("FQTYLS", dt.Rows[i]["FQTYLS"].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();
@@ -1041,7 +1556,7 @@
                         if (dr["FHLockedSub"].ToString() == "1")
                             this.View.GetFieldEditor("FT" + getDay.Days.ToString(), i).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
                     }
-                    this.View.InvokeFieldUpdateService("FMatrailId", i);//璋冪敤鏁伴噺鍊兼洿鏂�
+                    this.View.InvokeFieldUpdateService("FMatrailId", i);//GetControl
                 }
                 this.View.UpdateView();
                 for (int j = 0; j < dt.Rows.Count; j++)
@@ -1095,20 +1610,12 @@
             }
             //閿�鍞鍗曞彿
             string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder")));
-            if (string.IsNullOrEmpty(FSalOrder))
-            {
-
-            }
-            else
-                sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";
+            if (!string.IsNullOrEmpty(FSalOrder))
+                sqlwhere += $" and FHSeOrderBillNo like '%{FSalOrder}%'";
             //鐢熶骇璁㈠崟鍙�
             string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo")));
-            if (string.IsNullOrEmpty(FScOrderMainNo))
-            {
-
-            }
-            else
-                sqlwhere += $" and FSCORDERNO='{FScOrderMainNo}'";
+            if (!string.IsNullOrEmpty(FScOrderMainNo))
+                sqlwhere += $" and FSCORDERNO like '%{FScOrderMainNo}%'";
 
             //鐗╂枡
             if ((this.Model.GetValue("FMatralId") as DynamicObject) != null)
@@ -1123,7 +1630,8 @@
                 sqlwhere += $" and FPreparatDate='{FPreparatDate}'";
             try
             {
-                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
+                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 ,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS 
+ from  Sc_WorkBillSortBillMain t1
  left join T_BD_MATERIAL t3 on t1.FHMaterID=t3.FMATERIALID
 " + sqlwhere;
                 DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
@@ -1134,9 +1642,11 @@
                 {
                     this.Model.CreateNewEntryRow("FEntity");
                     this.Model.SetValue("FSEQ", i + 1, i);//搴忓彿
+                    this.Model.SetValue("FMOFBILLTYPE", Convert.ToString(dt.Rows[i]["FMOFBILLTYPE"]), 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("FSRCBILLENTRYSEQ", dt.Rows[i]["FSRCBILLENTRYSEQ"].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);//鐢熶骇缁勭粐
@@ -1154,7 +1664,8 @@
                     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("FDayPlanQuantity", Convert.ToDecimal(dt.Rows[i]["FOrderQuantity"]) - Convert.ToDecimal(dt.Rows[i]["FQTYLS"]), i);//鏃ヨ鍒掓暟閲�
+                    this.Model.SetValue("FQTYLS", dt.Rows[i]["FQTYLS"].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();
@@ -1203,20 +1714,30 @@
         /// <summary>
         /// 鏃ヨ鍒掔敤鏂欐竻鍗曠敓鎴�
         /// </summary>
-        public void DayPlanPPBomBill()
+        public void DayPlanPPBomBillBatch()
         {
-            LogHelper.Info("鐢熶骇鐢ㄦ枡娓呭崟鍑嗗鏁版嵁");
-
+            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
+select t1.FID,t1.FSEQ FDayPlanFSEQ,t1.FEntryID,T2.FBILLNO AS FDayPlanFBILLNO,t3.FMATERIALID,T5.FNUMBER,t1.FHMASTERDATE,t1.FHQTY,t4.FMATERIALID FMATERIALID2,T6.FNUMBER FNUMBER2,T7.FNUMBER FUNITNUMBER,FNumerator,FDenominator,convert(decimal(18,2),(t4.FMustQty/T3.FQTY) *t1.FHQTY) FHQtyMust,T4.FUnitID,t8.FNUMBER FUNITNUMBER2,T3.FID FPPBOM,T4.FENTRYID FPPBOMENTRYID,isnull(T9.FBillNo,'')FBillNo,t10.FNUMBER FORGNUMBER,t11.FNUMBER FHSOURCENUMBER,FSCRAPRATE,FFIXSCRAPQTY,T9.FID AS DayPlanFID,t2.FSCORDERNO,
+t3.FMOENTRYID,t3.FBILLNO FPPBOMBILLNO,T4.FSEQ,tc.FOWNERTYPEID,tc.FOWNERID,tc.FEntrustPickOrgId,torg.FNUMBER as FORGNUMBER,t3.FMOID,FIssueType,FMaterialType,td.FNUMBER as FWORKSHOPID,t4.FReplaceGroup,isnull(ttt.FrowCount,0)FIsTDL,t4.FUseRate
 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
+left join
+(
+	select FREPLACEGROUP,COUNT(*) FrowCount,FID  from T_PRD_PPBOMENTRY
+	GROUP BY FREPLACEGROUP,FID
+	having count(*) >1
+) ttt on t4.FID = ttt.FID and  t4.FREPLACEGROUP =ttt.FREPLACEGROUP 
+JOIN T_PRD_PPBOMENTRY_C Tc ON T4.FENTRYID=Tc.FENTRYID
+join T_ORG_Organizations torg ON tc.FOWNERID = torg.FORGID 
 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
@@ -1224,8 +1745,19 @@
  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
+ left join T_BD_DEPARTMENT td on t3.FWORKSHOPID=td.FDEPTID
+ WHERE t1.FEntryID not in 
+(
+select distinct FDAYPLANFID from Sc_DayPlanPPBomBillMain where FID IN (
+select distinct FDAYPLANFID from T_PRD_PICKMTRLDATA)
+)
+-- and T4.FMustQty>0
+-- (
+-- select  FDayPlanFID FROM Sc_DayPlanPPBomBillMain WHERE FID IN ( select distinct FID from  Sc_DayPlanPPBomBillSub WHERE FTranslateQty >0 or FPickedQty >0)
+-- )
 "
 );
+                LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曞噯澶囨暟鎹畇ql:" + sql);
                 DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
                 DataTable dt = ds.Tables[0];
                 List<DayPlanMaterial> DayPlanMaterial = new List<DayPlanMaterial>();
@@ -1249,20 +1781,41 @@
                             FHQtyMust = dr["FHQtyMust"].ToString(),
                             FHQtySub = dr["FHQtyMust"].ToString(),
                             FHPPBomInterID = dr["FPPBOM"].ToString(),
-                            FHPPBomEntryID = dr["FENTRYID"].ToString(),
+                            FHPPBomEntryID = dr["FPPBOMENTRYID"].ToString(),
                             FHSourceID = dr["FHSOURCENUMBER"].ToString(),
                             FNumerator = dr["FNumerator"].ToString(),
                             FDenominator = dr["FDenominator"].ToString(),
                             FFIXSCRAPQTY = dr["FFIXSCRAPQTY"].ToString(),
                             FHQtyScrap = dr["FSCRAPRATE"].ToString(),
+                            FMOBILLNO = dr["FSCORDERNO"].ToString(),
+                            FMOENTRYID = dr["FMOENTRYID"].ToString(),
+                            FPPBOMBILLNO = dr["FPPBOMBILLNO"].ToString(),
+                            FPPBOMFSEQ = dr["FSEQ"].ToString(),
+                            FOwnerTypeId = dr["FOWNERTYPEID"].ToString(),
+                            FOwnerID = dr["FORGNUMBER"].ToString(),
+                            FEntrustPickOrgId = dr["FORGNUMBER"].ToString(),
+                            FMOID = dr["FMOID"].ToString(),
+                            FIssueType = dr["FIssueType"].ToString(),
+                            FMaterialType = dr["FMaterialType"].ToString(),
+                            FDayPlanFSEQ = dr["FDayPlanFSEQ"].ToString(),
+                            FDayPlanFBILLNO = dr["FDayPlanFBILLNO"].ToString(),
+                            FWORKSHOPID = dr["FWORKSHOPID"].ToString(),
+                            FReplaceGroup = dr["FReplaceGroup"].ToString(),
+                            FUseRate = dr["FUseRate"].ToString(),
+                            FIsTDL = dr["FIsTDL"].ToString()
                         });
                     }
+                    LogHelper.Info($"鏃ヨ鍒掔敤鏂欐竻鍗曪紝鏁版嵁鍑嗗瀹屾垚锛屼繚瀛樺埌Model瀹炰綋锛屾�昏鏁帮細{DayPlanMaterial.Count}锛岃�楁椂锛�" + sw.Elapsed);
                     var fidList = DayPlanMaterial.Select(x => x.FEntryID).Distinct().ToList();
-                    LogHelper.Error("鐢熶骇鐢ㄦ枡娓呭崟鍑嗗鏁版嵁" + fidList.Count);
+                    int i = 1;
+                    JArray Fentity = new JArray();
                     foreach (var item in fidList)
                     {
-                        var _DayPlanMaterial = DayPlanMaterial.Where(x => x.FEntryID == item).ToList();
+                        var _DayPlanMaterial = DayPlanMaterial.Where(x => x.FEntryID == item).OrderBy(x => Convert.ToInt32(x.FReplaceGroup)).ToList();
                         JObject model = new JObject();
+
+                        if (!string.IsNullOrEmpty(_DayPlanMaterial[0].FID))
+                            model.Add("FID", _DayPlanMaterial[0].FID);
                         model.Add("FHDate", DateTime.Now);
                         model.Add("FOrgId", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FOrgId });//鍙戞枡缁勭粐
                         model.Add("FHMaterID", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FHMaterID });//鐗╂枡
@@ -1270,7 +1823,10 @@
                         model.Add("FHQty", _DayPlanMaterial[0].FHQty);//涓讳骇鍝佹暟閲忥細FHQty 
                         model.Add("FHUnitID", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FHUnitID });//鍗曚綅锛欶HUnitID 
                         model.Add("FDayPlanFID", _DayPlanMaterial[0].FDayPlanFID);//鏃ヨ鍒掑伐鍗曞唴鐮� 
+                        model.Add("FDayPlanFSEQ", _DayPlanMaterial[0].FDayPlanFSEQ);//鏃ヨ鍒掑伐鍗曟槑缁嗚鍙�
+                        model.Add("FDayPlanFBillNo", _DayPlanMaterial[0].FDayPlanFBILLNO);//鏃ヨ鍒掑伐鍗曞崟鎹紪鍙�
                         JArray Entry = new JArray();
+                        int FSEQ = 1;
                         foreach (var _item in _DayPlanMaterial)
                         {
                             JObject ModelEnty = new JObject();
@@ -1286,49 +1842,87 @@
                             ModelEnty.Add("FDwyl", Convert.ToDecimal(_item.FNumerator) / Convert.ToDecimal(_item.FDenominator));//鍗曚綅鐢ㄦ枡
                             ModelEnty.Add("FFIXSCRAPQTY", _item.FFIXSCRAPQTY);//鍥哄畾鎹熻��
                             ModelEnty.Add("FHQtyScrap", _item.FHQtyScrap);//鍙樺姩鎹熻�楃巼%
+                            ModelEnty.Add("FMOBILLNO", _item.FMOBILLNO);//  
+                            ModelEnty.Add("FMOENTRYIDINT", _item.FMOENTRYID);//  
+                            ModelEnty.Add("FPPBOMBILLNO", _item.FPPBOMBILLNO);//  
+                            ModelEnty.Add("FPPBOMFSEQINT", _item.FPPBOMFSEQ);//  
+                            ModelEnty.Add("FOwnerTypeId", _item.FOwnerTypeId);//  
+                            ModelEnty.Add("FOwnerID", new JObject() { ["Fnumber"] = _item.FOwnerID });// 
+                            ModelEnty.Add("FEntrustPickOrgId", new JObject() { ["Fnumber"] = _item.FEntrustPickOrgId });// 
+                            ModelEnty.Add("FMOID", _item.FMOID);//  
+                            ModelEnty.Add("FISSUETYPE", _item.FIssueType);//  
+                            ModelEnty.Add("FMaterialType", _item.FMaterialType);//  
+                            ModelEnty.Add("FWORKSHOPID", new JObject() { ["Fnumber"] = _item.FWORKSHOPID });// 
+                            ModelEnty.Add("FReplaceGroup", _item.FReplaceGroup);// 
+                            ModelEnty.Add("FUseRate", _item.FUseRate);// 
+                            ModelEnty.Add("FIsTDL", Convert.ToInt32(_item.FIsTDL) > 0 ? 1 : 0);// 
                             Entry.Add(ModelEnty);
+                            FSEQ++;
                         }
                         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")
+                        Fentity.Add(model);
+                        if ((i >= 20 || i == fidList.Count) && (i % 20 == 0 || i == fidList.Count))
                         {
-                            LogHelper.Error(jsonRoot.ToString());
-
+                            LogHelper.Info("鏃ヨ鍒掔敤鏂欐竻鍗曟壒閲忔墽琛岋紝璁板綍寰幆鐨勫綋鍓嶆潯鏁�" + i);
+                            JObject jsonRoot = new JObject()
+                            {
+                                ["Creator"] = "",
+                                ["NeedUpDateFields"] = new JArray(),
+                                ["NeedReturnFields"] = new JArray(),
+                                ["IsDeleteEntry"] = "true",
+                                ["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")
+                            {
+                                var Success = saveObj["Result"]["ResponseStatus"]["SuccessEntitys"].ToString().TrimStart('{').TrimEnd('}');
+                                var allList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Success);
+                                List<string> ls = new List<string>();
+                                foreach (var it in allList)
+                                {
+                                    it.TryGetValue("Id", out string value);
+                                    ls.Add(value);
+                                }
+                                var resultAA = String.Join(",", ls.ToArray());
+                                string resSql = string.Format(@"/*dialect*/ update Sc_WorkBillSortBillSub set Sc_WorkBillSortBillSub.FDAYPLANPPBOMBILLNO = Sc_DayPlanPPBomBillMain.FBILLNO from Sc_WorkBillSortBillSub   join Sc_DayPlanPPBomBillMain   on Sc_WorkBillSortBillSub.FEntryID = Sc_DayPlanPPBomBillMain.FDayPlanFID where Sc_DayPlanPPBomBillMain.FID in ({0})", resultAA);
+                                DBServiceHelper.Execute(Context, resSql);
+                            }
+                            if (saveIsSuc != "TRUE")
+                            {
+                                LogHelper.Error("鏃ヨ鍒掔敤鏂欐竻鍗曞垪琛ㄧ敓鎴愬け璐�:" + jsonRoot.ToString());
+                                this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
+                            }
+                            Fentity = new JArray();
                         }
+                        i++;
                     }
                 }
+                sw.Stop();//缁撴潫璁℃椂
+                LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曡繍琛屾�绘椂闀匡細" + sw.Elapsed);
             }
             catch (Exception ex)
             {
-                LogHelper.Error(ex.Message.ToString());
+                LogHelper.Error("鏃ヨ鍒掔敤鏂欐竻鍗�+" + ex.Message.ToString());
             }
         }
+
         /// <summary>
         /// 鎻愭枡璁″垝
         /// </summary>
         public void Extraction()
         {
+            LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]锛氭祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇�");
             try
             {
                 Stopwatch sw = new Stopwatch();
                 sw.Start();//寮�濮嬭鏃�
-                string sql = string.Format(@"/*dialect*/ select t1.FID from Sc_WorkBillSortBillMain t1");
+                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)
@@ -1342,16 +1936,18 @@
  exec [鎻愭枡璁″垝棰勫鐞哴 '{0}'
  ", FDayPlanWorkID.Replace(",", "-"));
                 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
+ select t1.FID,t1.FBillNo,t2.FENTRYID,t1.FSUPPLIERID,t3.fnumber,t2.FMATERIALID,(t2.FQTY-t2.FPODemandPlanCount)FQTY,FPurchaseOrgId FStockOrgId,t5.FNUMBER FORGNumber,FSTOCKINQTY,FReceiveQty,FCloseStatus,FMRPCLOSESTATUS from t_PUR_POOrder t1
 join t_PUR_POOrderEntry t2 on t1.FID = t2.FID
 join t_BD_Supplier t3 on t1.FSUPPLIERID = t3.FSUPPLIERID
 join  T_PUR_POORDERENTRY_R t4 on t2.FENTRYID = t4.FENTRYID
 join T_ORG_Organizations t5 on t1.FPurchaseOrgId = t5.FORGID
 where t2.FQTY-t2.FPODemandPlanCount>0
  and FCloseStatus in('A') and FMRPCLOSESTATUS in('A')
+ and t1.FBillTypeID in('83d822ca3e374b4ab01e5dd46a0062bd','6d01d059713d42a28bb976c90a121142')
 ";
                 List<PurchaseInventory> PurchaseInventory = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<PurchaseInventory>();
                 LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鍙敤閲囪喘璁㈠崟鏁版嵁sql锛�" + sql);
@@ -1372,12 +1968,29 @@
 AND T1.FID in ({0}) 
 order by FHMASTERDATE
 ", FDayPlanWorkID);
+                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 ,FErpClsID
+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 in ('1','3') 
+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 == "105773").ToList();
+                var _MaterialIDList = MaterialIDList.Where(p => p.FMATERIALID == "163165").ToList();
                 LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鎬荤墿鏂欒鏁�" + MaterialIDList.Count);
                 //鎻愭枡璁″垝鏁版嵁闆嗕复鏃跺瓨鍌ㄩ泦鍚�
                 List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>();
@@ -1387,14 +2000,14 @@
                 foreach (var item in MaterialIDList)
                 {
                     //褰撳墠鐗╂枡娌℃湁閲囪喘璁㈠崟鏃� 鐩存帴璺冲嚭
-                    List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList();
+                    List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x => x.FENTRYID).ToList();
                     if (_PurchaseInventory.Count == 0)
                     {
                         LogHelper.Info("[鎻愭枡璁″垝寮�濮媇褰撳墠鐗╂枡鏃犻噰璐俊鎭細" + item.FMATERIALID + " 搴撳瓨缁勭粐锛�" + item.FStockOrgId);
                         continue;
                     }
                     //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;//鎻愬墠鏈�
@@ -1403,127 +2016,146 @@
                     string FJITSafeStock = _DayPlanPpbom.FirstOrDefault().FJITSafeStock; //JIT瀹夊叏搴撳瓨
                     decimal NeedQty = 0;
                     DateTime DATE = _DayPlanPpbom.FirstOrDefault().FHMASTERDATE;//绗竴涓璐ц捣濮嬫棩鏈�
-                    int i = 1;
+                    int i = 0;
                     //璁板綍鍦ㄦ渶灏忛噰璐噺闇�姹備笅鐨勬棩璁″垝鏄庣粏FentyrID
                     List<int> FEntryIdList = new List<int>();
                     foreach (var _item in _DayPlanPpbom)
                     {
+                        i++;
+                        _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x => x.FENTRYID).ToList();
+                        if (_PurchaseInventory.Count == 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;
-                        if ((FJITmaterialGroup == "鎬婚噺鎺у埗瑙勬牸绫�" || FJITmaterialGroup == "璁㈠崟涓撶敤涓�х被") && FEntryIdList.Count < Convert.ToInt32(FJITMaterielDemand)) //璁㈠崟涓撶敤涓�х被
-                            continue;
-                        if (NeedQty >= FMINPOQTY)
+
+                        //LogHelper.Info("璁板綍鏄庣粏id锛�" + _item.FENTRYID + "");
+                        //LogHelper.Info("鎬婚渶姹傞噺锛�" + NeedQty + "");
+                        //LogHelper.Info("鏈�灏忚捣璁㈤噺锛�" + FMINPOQTY + "");
+                        if (NeedQty <= FMINPOQTY)
                         {
-                            /*淇敼鍓� 鍒ゆ柇鏂瑰紡
-                            List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList();
-                            if (_PurchaseInventory.Count == 0)
+                            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.FBillNo);
+                            //LogHelper.Info("鐗╂枡锛�" + Purchase.FMATERIALID + ",閲囪喘璁㈠崟鏁伴噺锛�" + Purchase.FQTY);
+                            if (Purchase.FQTY >= NeedQty)
                             {
-                                NeedQty = 0;
+                                foreach (int id in FEntryIdList)
+                                {
+                                    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,
+                                        FErpClsID = DayPlanPpbomls.FErpClsID,
+
+                                        PurchseFID = Purchase.FID,
+                                        PurchseFentryID = Purchase.FENTRYID,
+                                        FSUPPLIERID = Purchase.FSUPPLIERID,
+                                        PurchseFNUMBER = Purchase.FNUMBER,
+                                        PurchseFBillNo = Purchase.FBillNo,
+                                        PurchseFqty = Purchase.FQTY,
+                                        FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
+                                        FORGNumber = Purchase.FORGNumber
+                                    });
+                                    //鎵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;
                             }
-                            */
-                            foreach (var Purchase in _PurchaseInventory)
+                            else
                             {
-                                //LogHelper.Info("Purchase");
-                                //LogHelper.Info("鐗╂枡锛�" + Purchase.FMATERIALID + ",鏁伴噺锛�" + Purchase.FQTY);
-                                if (Purchase.FQTY >= NeedQty)
+                                //鏇存柊鎬婚渶姹傛暟閲�
+                                NeedQty = NeedQty - Purchase.FQTY;
+                                //閲囪喘璁㈠崟鏁伴噺
+                                decimal _NeedQty = Purchase.FQTY;
+                                List<int> mmm = new List<int>();
+                                foreach (int id in FEntryIdList)
                                 {
-                                    foreach (int id in FEntryIdList)
-                                    {
-                                        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,
+                                    var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
+                                    decimal Qty = DayPlanPpbomls.NeedQty;//璁㈠崟鏁伴噺
+                                    //if (Qty == 0)
+                                    //    LogHelper.Info("璁㈠崟鏁伴噺涓�0");
+                                    if (Qty > _NeedQty)
+                                        Qty = _NeedQty; //璁㈠崟鏁伴噺>閲囪喘璁㈠崟鏁伴噺 鍙栭噰璐鍗�
 
-                                            PurchseFID = Purchase.FID,
-                                            PurchseFentryID = Purchase.FENTRYID,
-                                            FSUPPLIERID = Purchase.FSUPPLIERID,
-                                            PurchseFNUMBER = Purchase.FNUMBER,
-                                            PurchseFBillNo = Purchase.FBillNo,
-                                            PurchseFqty = Purchase.FQTY,
-                                            FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
-                                            FORGNumber = Purchase.FORGNumber
-                                        });
-                                        //鎵i櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
-                                        DayPlanPpbomls.NeedQty = 0;
-                                    }
-                                    FEntryIdList.Clear();
+                                    //if (_NeedQty == 0)
+                                    //    LogHelper.Info("璁㈠崟鏁伴噺涓�0");
+
+                                    _NeedQty = _NeedQty - Qty;
+                                    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,
+                                        FErpClsID = DayPlanPpbomls.FErpClsID,
+
+                                        PurchseFID = Purchase.FID,
+                                        PurchseFentryID = Purchase.FENTRYID,
+                                        FSUPPLIERID = Purchase.FSUPPLIERID,
+                                        PurchseFNUMBER = Purchase.FNUMBER,
+                                        PurchseFBillNo = Purchase.FBillNo,
+                                        PurchseFqty = Purchase.FQTY,
+                                        FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
+                                        FORGNumber = Purchase.FORGNumber
+                                    });
+                                    //鏇存柊璁″垝鏁伴噺锛堝墿浣欓渶瑕佹帓鐨勶級 缁х画鍘昏绠椾笅涓�涓噰璐鍗�
+                                    DayPlanPpbomls.NeedQty -= Qty;
                                     //鏇存柊閲囪喘璁㈠崟
-                                    sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount  =isnull(FPODemandPlanCount,0)+  '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
-                                    //鎵i櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
+                                    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 -= NeedQty;
-                                    break;
-                                }
-                                else
-                                {
-                                    //鏇存柊鎬婚渶姹傛暟閲�
-                                    NeedQty = NeedQty - Purchase.FQTY;
-                                    decimal _NeedQty = Purchase.FQTY;//閲囪喘璁㈠崟鏁伴噺
-                                    List<int> mmm = new List<int>();
-                                    foreach (int id in FEntryIdList)
+                                    ls.FQTY -= Qty;
+                                    if (_NeedQty <= 0)
                                     {
-                                        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
+                                        foreach (var mm in mmm)
                                         {
-                                            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,
-                                            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)
-                                        {
-                                            foreach (var mm in mmm)
-                                            {
-                                                FEntryIdList.Remove(mm);
-                                            }
-                                            break;
+                                            FEntryIdList.Remove(mm);
                                         }
-                                        mmm.Add(id);
+                                        break;
                                     }
-                                    foreach (var mm in mmm)
-                                    {
-                                        FEntryIdList.Remove(mm);
-                                    }
+                                    mmm.Add(id);
                                 }
+                                //foreach (var mm in mmm)
+                                //{
+                                //    FEntryIdList.Remove(mm);
+                                //}
                             }
-                            NeedQty = 0;
                         }
+                        NeedQty = 0;
+                        //}
                         #region 鍓╀笅涓嶈冻鏃舵寜鏈�灏忛噰璐壒娆$敓鎴�
                         //鍓╀笅涓嶈冻鏃舵寜鏈�灏忛噰璐壒娆$敓鎴�
                         //else if (i == _DayPlanPpbom.Count && NeedQty > 0)
@@ -1628,22 +2260,26 @@
                         //    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("FSettleCurrId", new JObject() { ["Fnumber"] = "PRE001" });
                     model.Add("FSupplierID", new JObject() { ["Fnumber"] = PurchseFNUMBER });
+
                     JArray Fentity = new JArray();
                     List<PODemandPlanTemp> _PODemandPlanList = PODemandPlanTemp.Where(x => x.FHMASTERDATE == date && x.PurchseFNUMBER == PurchseFNUMBER).ToList();
+                    int FSEQ = 1;
                     foreach (var _item in _PODemandPlanList)
                     {
                         JObject FentityModel = new JObject();
@@ -1661,28 +2297,39 @@
                         FentityModel.Add("FHPOOrderInterID", _item.PurchseFID);// 閲囪喘璁㈠崟鍐呯爜锛欶HPOOrderInterID
                         FentityModel.Add("FHPOOrderEntryID", _item.PurchseFentryID); //閲囪喘璁㈠崟瀛愬唴鐮侊細FHPOOrderEntryID
                         FentityModel.Add("FHPOOrderBillNo", _item.PurchseFBillNo); //閲囪喘璁㈠崟鍙凤細FHPOOrderBillNo
+                        FentityModel.Add("FERPCLSID", _item.FErpClsID); //鍙戞枡鏂瑰紡
+                        //FentityModel.Add("FSEQ", FSEQ); //鍙戞枡鏂瑰紡
+                        FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = "Pcs" }); //鍙戞枡鏂瑰紡
+
                         Fentity.Add(FentityModel);
+                        FSEQ++;
                     }
                     model.Add("FEntity", Fentity);
-                    JObject jsonRoot = new JObject()
+                    FinalyResult.Add(model);
+                    if ((tlmmm >= 20 || tlmmm == PODemandPlanList.Count) && (tlmmm % 20 == 0 || tlmmm == PODemandPlanList.Count))
                     {
-                        ["Creator"] = "",
-                        ["NeedUpDateFields"] = new JArray(),
-                        ["NeedReturnFields"] = new JArray(),
-                        ["IsDeleteEntry"] = "false",
-                        ["SubSystemId"] = "",
-                        ["IsVerifyBaseDataField"] = "false",
-                        ["Model"] = model
-                    };
-                    CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
-                    var result = cloudClient.Save("paez_PODemandPlan", jsonRoot.ToString());
-                    JObject saveObj = JObject.Parse(result);
-                    string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
-                    if (saveIsSuc != "TRUE")
-                    {
-                        LogHelper.Info(jsonRoot.ToString());
-                        LogHelper.Error(saveIsSuc);
+                        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);

--
Gitblit v1.9.1