From d3835d49a3c673a37c78a79600320e287d4d320b Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期六, 06 三月 2021 10:54:38 +0800
Subject: [PATCH] 日计划导入增加删除用料清单审核状态验证 齐套信息明细 颜色渲染更改

---
 src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs |  813 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 586 insertions(+), 227 deletions(-)

diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 529135e..615552b 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -1,15 +1,12 @@
 锘縰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.Const;
 using Kingdee.BOS.Core.DynamicForm;
 using Kingdee.BOS.Core.DynamicForm.PlugIn;
 using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
 using Kingdee.BOS.Core.DynamicForm.PlugIn.ControlModel;
-using Kingdee.BOS.Core.Metadata;
 using Kingdee.BOS.Core.Metadata.EntityElement;
 using Kingdee.BOS.JSON;
 using Kingdee.BOS.KDThread;
@@ -21,22 +18,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,6 +40,27 @@
         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);
@@ -69,7 +79,9 @@
                 }
                 if (e.BarItemKey.ToUpper() == "TBSEARCH")
                 {
+                    isSearched = false;
                     SearchList();
+                    isSearched = true;
                 }
                 if (e.BarItemKey.ToUpper() == "TBLOCK")
                 {
@@ -80,13 +92,25 @@
                 {
                     RelieveLock();
                 }
+                //淇濆瓨
                 if (e.BarItemKey.ToUpper() == "BTNSAVE")
                 {
                     Save();
                 }
+                //榻愬鍒嗘瀽
                 if (e.BarItemKey.ToUpper() == "TBCOMPLETE")
                 {
                     COMPLETE();
+                }
+                //tbXnqt铏氭嫙榻愬
+                if (e.BarItemKey.ToUpper() == "TBXNQT")
+                {
+                    Xnqt();
+                }
+                //tb_CKXNQT 鏌ョ湅铏氭嫙榻愬
+                if (e.BarItemKey.ToUpper() == "TB_CKXNQT")
+                {
+                    XnqtLook();
                 }
                 //鎻愭枡璁″垝
                 if (e.BarItemKey.ToUpper() == "TBEXTRACTION")
@@ -116,6 +140,7 @@
                 {
                     Release();
                 }
+
             }
             catch (Exception ex)
             {
@@ -127,7 +152,9 @@
             base.EntryBarItemClick(e);
             if (e.BarItemKey.ToUpper() == "TBEDIT")
             {
+                isSearched = false;
                 SearchListEdit();
+                isSearched = true;
             }
         }
         /// <summary>
@@ -136,10 +163,10 @@
         /// <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")
             {
                 //鐢熶骇璁″垝骞冲彴鎷栨湡鏄庣粏璺宠浆
@@ -150,11 +177,26 @@
             {
                 //榻愬鍒嗘瀽鏄庣粏鍒楄〃璺宠浆
                 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>
@@ -162,13 +204,20 @@
         /// </summary>
         public void ExportExcel()
         {
-            string[] Title = new string[] {"閿�鍞鍗曞彿", "鐢熶骇璁㈠崟鍙�", "鐢熶骇缁勭粐", "鐢熶骇杞﹂棿", "鐢熶骇璧勬簮", "浜у搧浠ｇ爜", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "璁￠噺鍗曚綅",
-                "鎵规鍙�","閿�鍞鍗曟暟閲�","鐢熶骇璁㈠崟鏁伴噺","鎬婚綈濂楁暟閲�","浜よ揣鏃ユ湡","璁㈠崟绛夌骇","T0","T1","T2","T3","T4","T5","T6","T7",
+            List<string> Title = new List<string> {"閿�鍞鍗曞彿", "鐢熶骇璁㈠崟鍙�*","鐢熶骇璁㈠崟鏄庣粏琛屽彿*", "鐢熶骇杞﹂棿*", "鐢熶骇璧勬簮", "浜у搧浠ｇ爜*", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "璁￠噺鍗曚綅",
+                "鎵规鍙�","閿�鍞鍗曟暟閲�","鐢熶骇璁㈠崟鏁伴噺","鎬婚綈濂楁暟閲�","浜よ揣鏃ユ湡*","璁㈠崟绛夌骇*"};
+            /*
+             ,"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;
@@ -217,7 +266,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];
@@ -227,7 +276,7 @@
 
             //鍗曞厓鏍艰祴鍊�
             //鍒楀鑷�傚簲锛屽彧瀵硅嫳鏂囧拰鏁板瓧鏈夋晥
-            for (int i = 0; i <= Title.Length; i++)
+            for (int i = 0; i <= Title.Count; i++)
             {
                 sheet.AutoSizeColumn(i);
             }
@@ -270,16 +319,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)
-            {
-                //閿佸畾鍚庣敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟 鍙� 鎻愭枡璁″垝
-                DayPlanPPBomBillBatch();
-                Extraction();
-                SearchList();
-                this.View.ShowMessage("鎿嶄綔鎴愬姛");
-            }
-            else
-                this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
+            //if (result > 0)
+            //{
+            //閿佸畾鍚庣敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟 鍙� 鎻愭枡璁″垝
+            DayPlanPPBomBillBatch();
+            Extraction();
+            SearchList();
+            this.View.ShowMessage("鎿嶄綔鎴愬姛");
+            //}
+            //else
+            //    this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
         }
         /// <summary>
         /// 瑙ｉ攣
@@ -298,72 +347,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>
         /// 榻愬鍒嗘瀽
@@ -413,7 +470,6 @@
             },
             (t) => { });
         }
-
         /// <summary>
         /// 榻愬鍒嗘瀽
         /// </summary>
@@ -470,18 +526,20 @@
                 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);
@@ -545,12 +603,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 // 鏃ヨ鍒掓棩鏈�
-                                });
+                                }); ;
                                 //鎵ｅ噺鎬诲簱瀛樻暟閲�
                                 sjkcList.FBASEQTY = sjkcList.FBASEQTY >= fCompleteCount ? sjkcList.FBASEQTY - fCompleteCount : 0;
                                 //鍓╀綑鏃ヨ鍒掗渶姹傛暟閲�
@@ -584,7 +643,9 @@
                                 FHLeftQty = 0,//鍙敤鏁伴噺
                                 FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
                                 FComPlete = "鏈綈濂�",
-                                FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+                                FPlanDate = item.FHMASTERDATE, // 鏃ヨ鍒掓棩鏈�
+                                FErpClsID = _item.FErpClsID
+
                             });
                         }
                     }
@@ -627,10 +688,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();
@@ -710,18 +772,20 @@
                 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);
@@ -735,7 +799,6 @@
                 Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
                 foreach (var item in DatePlanList)
                 {
-                    this.View.Session["ProcessRateValue"] = Convert.ToInt32(this.View.Session["ProcessRateValue"]) + Convert.ToInt32((decimal)(1.0 / DatePlanList.Count));
                     //绛涢�夊嚭褰撴棩璁″垝鏁版嵁
                     var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList();
                     foreach (var _item in _BomList)
@@ -785,6 +848,7 @@
                                     FHStockQty = sjkcList.FBASEQTY,//鍗虫椂搴撳瓨
                                     FHLeftQty = Inventory.FBASEQTY,//鍙敤鏁伴噺
                                     FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+                                    FErpClsID = _item.FErpClsID,
                                     /* 2021 1.26 鏇存敼涓簄eed
                                     FComPlete = sjkcList.FBASEQTY >= _item.PlanCount ? "榻愬" : "鏈綈濂�",
                                     */
@@ -817,6 +881,7 @@
                                 FOwnerTypeId = "BD_OwnerOrg",
                                 FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
                                 FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
+                                FErpClsID = _item.FErpClsID,
                                 FCompleteCount = 0, //榻愬鏁伴噺
                                 FCompleteCount1 = 0, //榻愬鏁伴噺
                                 FLackCount = _item.PlanCount,//缂烘枡鏁伴噺
@@ -861,6 +926,7 @@
                     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);
@@ -877,7 +943,7 @@
                             ["IsVerifyBaseDataField"] = "false",
                             ["Model"] = Fentity
                         };
-                        CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+                        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();
@@ -934,8 +1000,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
+join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+where d.FAvailableComplete<>0
 --where T1.FMATERIALID in (105773)
 ");
                 ListInventory = ds.ToModelList<PRD_Inventory>();
@@ -953,23 +1019,24 @@
 ) 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
+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*/
+ /*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
@@ -987,7 +1054,7 @@
                 Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
                 foreach (var item in DatePlanList)
                 {
-                    this.View.Session["ProcessRateValue"] = Convert.ToInt32(this.View.Session["ProcessRateValue"]) + Convert.ToInt32((decimal)(1.0 / DatePlanList.Count));
+
                     //绛涢�夊嚭褰撴棩璁″垝鏁版嵁
                     var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList();
                     foreach (var _item in _BomList)
@@ -1026,6 +1093,7 @@
                                     FHMaterID = _item.FMATERIALID2,
                                     FHStockOrgID = _item.FStockOrgId,
                                     FHPRDORGID = _item.FStockOrgId,
+                                    FErpClsID = _item.FErpClsID,
                                     FPRDBillNo = _item.FMOBillNO,
                                     FOwnerTypeId = "BD_OwnerOrg",
                                     FOwnerId = Inventory.FOwnerId,
@@ -1064,6 +1132,7 @@
                                 FHICMOInterID = _item.FID.ToString(),
                                 FHICMOEntryID = _item.FEntryID.ToString(),
                                 FHMaterID = _item.FMATERIALID2,
+                                FErpClsID = _item.FErpClsID,
                                 FHStockOrgID = _item.FStockOrgId,
                                 FHPRDORGID = _item.FStockOrgId,
                                 FPRDBillNo = _item.FMOBillNO,
@@ -1096,10 +1165,10 @@
 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)
-select id, '', 'A', '{0}', '{1}', '{2}', '{3}', '{4}', '{5}', '{6}', '{7}', '{8}', '{9}', '{10}', '{11}', '{12}', 'BD_OwnerOrg', '','{13}','{14}','{15}','{16}','{17}' from z_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.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++;
@@ -1121,6 +1190,233 @@
 
             }
         }
+
+        /// <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 // 鏃ヨ鍒掓棩鏈�
+                                });
+                                //鎵ｅ噺鎬诲簱瀛樻暟閲�
+                                sjkcList.FBASEQTY = sjkcList.FBASEQTY >= fCompleteCount ? sjkcList.FBASEQTY - fCompleteCount : 0;
+                                //鍓╀綑鏃ヨ鍒掗渶姹傛暟閲�
+                                need = need >= Inventory.FBASEQTY ? need - Inventory.FBASEQTY : 0;
+                                //鎵ｅ噺娑堣�楀簱瀛�
+                                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>
@@ -1136,11 +1432,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)
             {
@@ -1154,7 +1450,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];
@@ -1165,9 +1462,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);//鐢熶骇缁勭粐
@@ -1185,7 +1484,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();
@@ -1201,7 +1501,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++)
@@ -1255,20 +1555,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)
@@ -1283,7 +1575,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];
@@ -1294,9 +1587,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);//鐢熶骇缁勭粐
@@ -1314,7 +1609,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();
@@ -1465,7 +1761,7 @@
                             ["Model"] = model
                         };
 
-                        CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+                        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();
@@ -1494,11 +1790,14 @@
             {
                 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),(FNumerator/FDenominator) *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
 FROM Sc_WorkBillSortBillSub t1
 JOIN Sc_WorkBillSortBillMAIN t2 on t1.FID = t2.FID
 JOIN T_PRD_PPBOM T3 on T2.FPRDMOMAINID=t3.FMOID AND T2.FPRDMOENTYID=T3.FMOENTRYID
 JOIN T_PRD_PPBOMENTRY T4 ON T3.FID=T4.FID
+JOIN T_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
@@ -1533,12 +1832,24 @@
                             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()
                         });
                     }
                     LogHelper.Info($"鏃ヨ鍒掔敤鏂欐竻鍗曪紝鏁版嵁鍑嗗瀹屾垚锛屼繚瀛樺埌Model瀹炰綋锛屾�昏鏁帮細{DayPlanMaterial.Count}锛岃�楁椂锛�" + sw.Elapsed);
@@ -1549,6 +1860,9 @@
                     {
                         var _DayPlanMaterial = DayPlanMaterial.Where(x => x.FEntryID == item).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 });//鐗╂枡
@@ -1556,7 +1870,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();
@@ -1572,11 +1889,23 @@
                             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("FSEQ", FSEQ);//  
                             Entry.Add(ModelEnty);
+                            FSEQ++;
+
                         }
                         model.Add("FEntity", Entry);
-                        //if (!string.IsNullOrEmpty(_DayPlanMaterial[0].FID))
-                        //    model.Add("FID", _DayPlanMaterial[0].FID);
+
                         Fentity.Add(model);
                         if ((i >= 20 || i == fidList.Count) && (i % 20 == 0 || i == fidList.Count))
                         {
@@ -1586,18 +1915,18 @@
                                 ["Creator"] = "",
                                 ["NeedUpDateFields"] = new JArray(),
                                 ["NeedReturnFields"] = new JArray(),
-                                ["IsDeleteEntry"] = "false",
+                                ["IsDeleteEntry"] = "true",
                                 ["SubSystemId"] = "",
                                 ["IsVerifyBaseDataField"] = "false",
                                 ["Model"] = Fentity
                             };
-                            CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+                            CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
                             var result = cloudClient.BatchSave("Paez_Sc_DayPlanPPBomBill", jsonRoot.ToString());
                             JObject saveObj = JObject.Parse(result);
                             string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
                             if (saveIsSuc != "TRUE")
                             {
-                                LogHelper.Error(jsonRoot.ToString());
+                                LogHelper.Error(saveObj.ToString());
                             }
                             Fentity = new JArray();
                         }
@@ -1618,11 +1947,12 @@
         /// </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)
@@ -1636,16 +1966,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);
@@ -1668,15 +2000,16 @@
 ", 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 
+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 
+select FHICMOINTERID FID,FHICMOENTRYID FEntryID,FPlanDate FHMASTERDATE,FLackCount NeedQty,FHMATERID FMATERIALID,FHStockOrgID FStockOrgId,FPRDBILLNO FBillNo,FSumPlanCount FNeedQty from JIT_MOMaterReadysBill a
+right join (select max(FID)FID from JIT_MOMaterReadysBill GROUP BY FHICMOENTRYID,FHMATERID) b on a.FID = b.FID
 )T1
 JOIN T_BD_MATERIAL T6 ON T1.FMATERIALID = T6.FMATERIALID
 join t_BD_MaterialBase t4 on T1.FMATERIALID = t4.FMATERIALID
 join t_BD_MaterialPlan t5 on T1.FMATERIALID = t5.FMATERIALID
 WHERE  DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0
-AND FERPCLSID=1 
+AND 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}) 
@@ -1687,7 +2020,7 @@
                 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>();
@@ -1697,14 +2030,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;//鎻愬墠鏈�
@@ -1713,127 +2046,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
+                                    });
+                                    //鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
+                                    DayPlanPpbomls.NeedQty = 0;
+                                }
+                                FEntryIdList.Clear();
+                                //鏇存柊閲囪喘璁㈠崟
+                                sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount  =isnull(FPODemandPlanCount,0)+  '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
+                                //鎵ｉ櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
+                                var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
+                                ls.FQTY -= NeedQty;
                                 break;
                             }
-                            */
-                            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
-                                        });
-                                        //鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
-                                        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}");
-                                    //鎵ｉ櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
+                                    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)
@@ -1938,12 +2290,12 @@
                         //    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瀹炰綋锛屾�昏鏁帮細{PODemandPlanList.Count}锛岃�楁椂锛�" + sw.Elapsed);
+                LogHelper.Info($"鎻愭枡璁″垝锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{PODemandPlanTemp.Count}锛岃�楁椂锛�" + sw.Elapsed);
                 int tlmmm = 1;
                 JArray FinalyResult = new JArray();
                 foreach (var item in PODemandPlanList)
@@ -1952,10 +2304,12 @@
                     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();
@@ -1973,13 +2327,18 @@
                         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);
                     FinalyResult.Add(model);
                     if ((tlmmm >= 20 || tlmmm == PODemandPlanList.Count) && (tlmmm % 20 == 0 || tlmmm == PODemandPlanList.Count))
                     {
-                        LogHelper.Info("榻愬鍒嗘瀽鎵归噺鎵ц锛岃褰曞惊鐜殑褰撳墠鏉℃暟" + tlmmm);
+                        LogHelper.Info("鎻愭枡璁″垝鏂板鎵归噺鎵ц锛岃褰曞惊鐜殑褰撳墠鏉℃暟" + tlmmm);
                         JObject jsonRoot = new JObject()
                         {
                             ["Creator"] = "",
@@ -1990,7 +2349,7 @@
                             ["IsVerifyBaseDataField"] = "false",
                             ["Model"] = FinalyResult
                         };
-                        CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+                        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();

--
Gitblit v1.9.1