交货计划修改

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

@@ -5769,7 +5769,8 @@ namespace Business.ResourceExamineManagement
                                 itemds.requestdate = requestdate.GetValueOrDefault();
                                 itemds.arrivaldate = requestdate.GetValueOrDefault().AddDays(-1).AddDays(-itemNum.InsLT).AddDays(-(int)Math.Ceiling(itemNum.MFGMTTR));
                                 itemds.shortqty =d.LackQty;
-                                itemds.mesqty =d.NeedQty- pickBills.Where(a=> workItem.Select(s=>s.WorkOrd).Contains(a.WorkOrd) && a.ItemNum== d.ItemNum).Sum(q=>q.QtyRec);
+                                //工单需求+已下达工单领料单待发料
+                                itemds.mesqty =d.NeedQty + pickBills.Where(a=> workItem.Select(s=>s.WorkOrd).Contains(a.WorkOrd) && a.ItemNum== d.ItemNum).Sum(q=>q.QtyOrd-q.QtyRec);
                                 itemds.locqty = itemListStock.Where(a=>a.MATNR==d.ItemNum).Sum(a=>a.LABST+a.INSME);
                                 //累计在途数量
                                 itemds.sechedqty = dsList.Where(a => a.requestdate<itemds.arrivaldate && a.itemnum==d.ItemNum).Sum(a=>a.schedqty-a.sentqty);

MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs

@@ -1331,7 +1331,7 @@ namespace Business.SystemJobManagement
                         var occ = occupy.Find(x => x.icitem_number == dtl.ItemNum);
                         if (occ != null)
                         {
-                            occ.quantity = dtl.QtyOrd.GetValueOrDefault();
+                            occ.quantity = dtl.QtyOrd;
                             decimal differ = occ.quantity - dtl.QtyFrom.GetValueOrDefault();
                             if (differ > 0)
                             {

MicroServices/Business/Business.Domain/StructuredDB/MES/IC/NbrDetail.cs

@@ -78,7 +78,7 @@ namespace Business.Domain
         /// 订单数量
         /// </summary>
         [Comment("订单数量")]
-        public decimal? QtyOrd { get; set; }
+        public decimal QtyOrd { get; set; }
 
         /// <summary>
         /// 工单需求数量