MES研发
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
王 垚
2020-12-18 99b85a43de68895a9f73a28768e273b78a52975e 
 src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs


@@ -639,7 +639,7 @@




                _jsonRoot.Add("Model", _jsonModel);




                CloudClient _cloudClient = new CloudClient("http://erp-windows002/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();


@@ -712,7 +712,7 @@




                    jsonRoot.Add("Model", jsonModel);




                    CloudClient cloudClient = new CloudClient("http://erp-windows002/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();


@@ -770,8 +770,7 @@


LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID 


LEFT JOIN JIT_MOMaterReadysBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID and a.FOwnerId = b.FOwnerId 


LEFT join T_ORG_Organizations c on a.FOWNERID = c.FORGID


--where isnull(a.FBASEQTY,0)-ISNULL(b.FHUseQty,0)>0 and  T1.FMATERIALID in (105842,


--105843)


where T1.FMATERIALID in (105773)


");


                ListInventory = ds.ToModelList<PRD_Inventory>();


                //总库存 物料+库存组织+库存数量


@@ -788,10 +787,8 @@


) 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 (105842,


--105843)


where T1.FMATERIALID in (105773)


group by T1.FStockOrgId,T1.FMATERIALID




");


                ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();


                //需要齐套分析的数据


@@ -807,8 +804,8 @@


JOIN T_BD_MATERIAL T4 on T2.FMATERIALID = T4.FMATERIALID


JOIN T_ORG_Organizations t5 on a.FHPRDORGID = t5.FORGID


--where FPRDMOMAINID = 100010


--where  t4.FMATERIALID in (105842,


--105843)


where  t4.FMATERIALID in (105773


)


ORDER BY b.FHMASTERDATE,a.FHOrderLev  ";


                ds = DBServiceHelper.ExecuteDataSet(Context, sql);


                List<PRD_PPBOM> BomList = ds.ToModelList<PRD_PPBOM>();


@@ -827,18 +824,18 @@


                        //实际总库存 


                        decimal sjkc = 0;


                        var sjkcList = ListInventoryByStockOrgId.Where(x => x.FMATERIALID == _item.FMATERIALID2 && x.FStockOrgId == _item.FStockOrgId).FirstOrDefault();


                        sjkc = sjkcList.FBASEQTY;


                        //真正需要取计算的数量（拆分货主）


                        //货主匹配


                        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 _fLackCount = _item.PlanCount - fCompleteCount;//缺料数量


                                //总计划数量 和 总库存数量比对 


                                completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel


                                {


                                    FHMainICMOInterIDr = _item.FPRDMOMAINID,


@@ -856,16 +853,16 @@


                                    FCompleteCount = fCompleteCount, //齐套数量


                                    FLackCount = _fLackCount,//缺料数量


                                    FHStockQty = sjkcList.FBASEQTY,//即时库存


                                    FHLeftQty = sjkcList.FBASEQTY,//可用数量


                                    FComPlete = _fLackCount > 0 ? "未齐套" : "齐套",


                                    FHLeftQty = Inventory.FBASEQTY,//可用数量


                                    FComPlete = sjkcList.FBASEQTY >= _item.PlanCount ? "齐套" : "未齐套",


                                    FPlanDate = item.FHMASTERDATE // 日计划日期


                                });


                                //扣减总库存数量


                                sjkcList.FBASEQTY = sjkc >= fCompleteCount ? sjkc - fCompleteCount : 0;


                                //扣减消耗库存


                                Inventory.FBASEQTY = Inventory.FBASEQTY - fCompleteCount;


                                sjkcList.FBASEQTY = sjkcList.FBASEQTY >= fCompleteCount ? sjkcList.FBASEQTY - fCompleteCount : 0;


                                //剩余日计划需求数量


                                need = need >= Inventory.FBASEQTY ? need - Inventory.FBASEQTY : 0;


                                //扣减消耗库存


                                Inventory.FBASEQTY = Inventory.FBASEQTY - fCompleteCount;


                            }


                        }


                        else


@@ -936,6 +933,9 @@


                //执行完成后 更新日计划工单状态


                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);


@@ -1070,7 +1070,7 @@


                            this.View.GetFieldEditor("FT" + getDay.Days.ToString(), j).Enabled = false; //单据体行锁定字段


                            grid.SetForecolor("FT" + "" + getDay.Days.ToString() + "", "#FF0000", j);


                        }


                        else


                        else if (dr["FCOMPLETE"].ToString() == "齐套")


                        {


                            this.View.GetFieldEditor("FT" + getDay.Days.ToString(), j).Enabled = false; //单据体行锁定字段


                            grid.SetForecolor("FT" + "" + getDay.Days.ToString() + "", "#00FF00", j);


@@ -1209,7 +1209,6 @@


            }




        }




        /// <summary>


        /// 提料计划


        /// </summary>


@@ -1685,7 +1684,7 @@


                    ["Model"] = model


                };




                CloudClient cloudClient = new CloudClient("http://erp-windows002/K3Cloud/");


                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();