在途计算不考虑日期

MicroServices/Business/Business.Application/ResourceExamineManagement/PurchaseOrderAppService.cs

@@ -95,12 +95,12 @@ namespace Business.ResourceExamineManagement
             DateTime toTime = DateTime.Now.Date;
 
             //先查询出满足日期，并且数量可满足占用的数据
-            var poDetails = poDetailList.Where(x => toTime < x.rarrdate.GetValueOrDefault() && x.rarrdate.GetValueOrDefault() < DeliverDate && x.qty - x.rqty - x.esqty -
+            var poDetails = poDetailList.Where(x => x.rarrdate.GetValueOrDefault() < DeliverDate && x.qty - x.rqty - x.esqty -
                 poOccupys.Where(p => p.polist_id == x.mysql_id)?.Sum(m => m.qty) > Quantity).OrderByDescending(x => x.rarrdate).ToList();
             //未满足则查询出满足日期的订单
             if (poDetails.Count == 0)
             {
-                poDetails = poDetailList.Where(x => toTime < x.rarrdate.GetValueOrDefault() && x.rarrdate.GetValueOrDefault() < DeliverDate).OrderByDescending(x => x.rarrdate).ToList();
+                poDetails = poDetailList.Where(x => x.rarrdate.GetValueOrDefault() < DeliverDate).OrderByDescending(x => x.rarrdate).ToList();
             }
             var QuantityNumber = 0.00m;
             foreach (var item in poDetails)
@@ -134,7 +134,7 @@ namespace Business.ResourceExamineManagement
             //代表PO还未占用完
             if (Quantity > 0)
             {
-                var prlist  = srm_Pr_Mains.Where(x => x.icitem_id.Value == icitem_id && toTime < x.pr_sarrive_date && x.pr_sarrive_date < DeliverDate && x.pr_mono != mes_morder.morder_no).OrderByDescending(f => f.pr_sarrive_date).ToList();
+                var prlist  = srm_Pr_Mains.Where(x => x.icitem_id.Value == icitem_id && x.pr_sarrive_date < DeliverDate && x.pr_mono != mes_morder.morder_no).OrderByDescending(f => f.pr_sarrive_date).ToList();
                 if (supplier_id != null)
                 {
                     prlist = prlist.Where(x => x.pr_purchaseid == supplier_id).ToList();

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

@@ -1176,6 +1176,7 @@ namespace Business.SystemJobManagement
                             plist.total_price = dtl.QtyOrded * dtl.PurCost.GetValueOrDefault();
                             //plist.taxamount = item.pr_orderprice.GetValueOrDefault() - podetail.netmoney;
                             plist.plan_qty = dtl.QtyOrded;
+                            plist.rqty = dtl.RctQty;
                             plist.unit = icitem.unit;
                             plist.rarrdate = dtl.DueDate;
                             plist.rnumber = 0;