交货计划调整

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -1,3 +1,4 @@
+using Amazon.Runtime.Internal;
 using Business.Core.Enum;
 using Business.Core.Utilities;
 using Business.Domain;
@@ -5722,9 +5723,13 @@ namespace Business.ResourceExamineManagement
                 //需要测试工单没有做资源检查会不会报错
                 var examineIds = workExamineResult.Select(s => s.examineId).ToList();
                 var examines=_mysql_bom_child_examine.GetListAsync(a => examineIds.Contains(a.examine_id.Value) && a.erp_cls==3 && a.is_use && a.factory_id.ToString() == domain).Result;
-                var pickBills = _nbrDetail.Select(a => workordListPickBill.Contains(a.WorkOrd) && a.Type.ToUpper()=="SM" && a.Domain == domain);
+                var pickBills = _nbrDetail.Select(a => workordListPickBill.Contains(a.WorkOrd) && a.Type.ToUpper()=="SM" && (a.QtyOrd - a.QtyRec)>0 && a.Domain == domain);
                 var dsList=_srm_polist_ds.Select(a => a.requestdate <= endTime && a.domain==domain);
-                var itemList = _itemMaster.Select(a => examines.Select(e=>e.item_number).Distinct().ToList().Contains(a.ItemNum) && a.Domain == domain);
+                var items = examines.Select(e => e.item_number).Distinct().ToList();
+                var itempickbills=pickBills.Select(s => s.ItemNum);
+                items.AddRange(itempickbills);
+                items = items.Distinct().ToList();
+                var itemList = _itemMaster.Select(a => items.Contains(a.ItemNum) && a.Domain == domain);
                 var locationRange = _configurationItem.Select(x => x.FldName == "MRPLocationRange" && x.Domain == domain).FirstOrDefault();
 
                 List<string> locationList = new List<string> { "1000", "1001", "5007", "5008"};
@@ -5732,10 +5737,9 @@ namespace Business.ResourceExamineManagement
                 {
                     locationList = locationRange.Val.SplitToArray(",").ToList();
                 }
-                var itemListStock = _SAPInv.Select(a => examines.Select(e => e.item_number).Distinct().ToList().Contains(a.MATNR) && locationList.Contains(a.LGORT) && a.WERKS == domain);
+                var itemListStock = _SAPInv.Select(a => items.Contains(a.MATNR) && locationList.Contains(a.LGORT) && a.WERKS == domain);
                 List<ic_demandschedule> ds = new List<ic_demandschedule>();
                 Dictionary<string, decimal> weekStockQty = new Dictionary<string, decimal>();
-                Dictionary<string, bool> weekPickBillQty = new Dictionary<string, bool>();
                 foreach (var item in itemListStock)
                 {
                     if(!weekStockQty.ContainsKey(item.MATNR))
@@ -5782,7 +5786,6 @@ namespace Business.ResourceExamineManagement
                                     new NLogHelper("ResourceExamineAppService").WriteLog("CreateDemandSchedule", "生成交货计划：" + item.WorkOrd + "找不到资源检查记录", _currentTenant.Id.ToString());
                                 }
                             }
-                            
                         }
                         var requestdate = workItem.Min(a => a.OrdDate);
  
@@ -5800,16 +5803,15 @@ namespace Business.ResourceExamineManagement
                                 itemds.arrivaldate = requestdate.GetValueOrDefault().AddDays(-1).AddDays(-itemNum.InsLT).AddDays(-(int)Math.Ceiling(itemNum.MFGMTTR));
                                 itemds.shortqty =d.LackQty;
                                 //工单需求+已下达工单领料单待发料(只算第一次)
-                                if (weekPickBillQty.ContainsKey(d.ItemNum))
+                                if(i==0)
                                 {
-                                    itemds.mesqty = d.NeedQty;
+                                    itemds.mesqty = d.NeedQty + pickBills.Where(a => a.ItemNum == d.ItemNum).Sum(q => q.QtyOrd - q.QtyRec);
+                                    pickBills.RemoveAll(a => a.ItemNum == d.ItemNum);
                                 }
                                 else
                                 {
-                                    itemds.mesqty = d.NeedQty + pickBills.Where(a => a.ItemNum == d.ItemNum).Sum(q => q.QtyOrd - q.QtyRec);
-                                    weekPickBillQty.Add(d.ItemNum, true);
+                                    itemds.mesqty = d.NeedQty;
                                 }
-                                
                                 //库存需要做扣减
                                 if(weekStockQty.ContainsKey(d.ItemNum))
                                 {
@@ -5830,15 +5832,60 @@ namespace Business.ResourceExamineManagement
                                 itemds.tosechedqty = itemds.mesqty-(itemds.locqty + itemds.sechedqty);
                                 itemds.status = "";
                                 itemds.remarks = "";
-                                itemds.tenant_id = examines[0].tenant_id;
-                                itemds.company_id = examines[0].company_id;
-                                itemds.factory_id = examines[0].factory_id;
+                                itemds.tenant_id = examines.Count>0?examines[0].tenant_id:1000;
+                                itemds.company_id = examines.Count > 0 ? examines[0].company_id:1000;
+                                itemds.factory_id = examines.Count > 0 ? examines[0].factory_id:8010;
                                 itemds.create_time = DateTime.Now;
                                 itemds.update_time= DateTime.Now;
                                 ds.Add(itemds);
                             }
                         }
                     }
+                    if(i==0)
+                    {
+                        var pickbillItems= pickBills.Select(a=>a.ItemNum).Distinct().ToList();
+                        foreach(var item in pickbillItems)
+                        {
+                            var itemNum = itemList.Find(a => a.ItemNum == item);
+                            ic_demandschedule itemds = new ic_demandschedule();
+                            itemds.GenerateNewId(help.NextId());
+                            itemds.itemnum = item;
+                            itemds.fversion = itemNum.Rev;
+                            itemds.drawing = itemNum.Drawing;
+                            itemds.requestdate = itemBegin;
+                            itemds.arrivaldate = itemBegin.AddDays(-1).AddDays(-itemNum.InsLT).AddDays(-(int)Math.Ceiling(itemNum.MFGMTTR));
+                            itemds.shortqty = 0;
+                            itemds.mesqty = pickBills.Where(a => a.ItemNum == item).Sum(q => q.QtyOrd - q.QtyRec);
+                            //库存需要做扣减
+                            if (weekStockQty.ContainsKey(item))
+                            {
+                                itemds.locqty = weekStockQty[item];
+                                if (itemds.mesqty >= itemds.locqty)
+                                {
+                                    weekStockQty[item] = 0;
+                                }
+                                else
+                                {
+                                    weekStockQty[item] -= itemds.mesqty;
+                                }
+                            }
+                            else
+                            {
+                                itemds.locqty = 0;
+                            }
+                            //累计在途数量
+                            itemds.sechedqty = dsList.Where(a => a.requestdate < itemds.arrivaldate && a.itemnum == item).Sum(a => a.schedqty - a.sentqty);
+                            itemds.tosechedqty = itemds.mesqty - (itemds.locqty + itemds.sechedqty);
+                            itemds.status = "";
+                            itemds.remarks = "";
+                            itemds.tenant_id = examines.Count > 0 ? examines[0].tenant_id : 1000;
+                            itemds.company_id = examines.Count > 0 ? examines[0].company_id : 1000;
+                            itemds.factory_id = examines.Count > 0 ? examines[0].factory_id : 8010;
+                            itemds.create_time = DateTime.Now;
+                            itemds.update_time = DateTime.Now;
+                            ds.Add(itemds);
+                        }
+                    }
                 }
                 await _mysql_ic_demandschedule.HardDeleteAsync(a => a.status != "P");
                 _srm_polist_ds.Delete(a=>a.status=="N");