代码提交

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

@@ -1288,14 +1288,14 @@ namespace Business.SystemJobManagement
                 DateTime start = DateTime.Now.Date.AddDays(-1);
 
                 //销售订单取过去两天和当天的记录，已发出的数据，进行清理库存占用表记录
-                var ASNBOLdtls = _ASNBOLShipperDetail.Select(x => x.Domain == domain && x.IsActive && x.shtype == "SH" && x.Typed != "S" && x.RealQty > 0 && x.UpdateTime >= start).ToList();
+                /*var ASNBOLdtls = _ASNBOLShipperDetail.Select(x => x.Domain == domain && x.IsActive && x.shtype == "SH" && x.Typed != "S" && x.RealQty > 0 && x.UpdateTime >= start).ToList();
                 var ordnbr = ASNBOLdtls.Select(x => x.OrdNbr).ToList();
-                var alldtls = ASNBOLdtls.Where(x => ordnbr.Contains(x.OrdNbr)).ToList();
+                var alldtls = ASNBOLdtls.Where(x => ordnbr.Contains(x.OrdNbr)).ToList();*/
 
                 List<ic_item_stockoccupy> dellist = new List<ic_item_stockoccupy>();
                 List<ic_item_stockoccupy> updtelist = new List<ic_item_stockoccupy>();
 
-                var seorderentrys = _mysql_crm_seorderentry.GetListAsync(x => x.factory_id.ToString() == domain && ordnbr.Contains(x.bill_no)).Result;
+                /*var seorderentrys = _mysql_crm_seorderentry.GetListAsync(x => x.factory_id.ToString() == domain && ordnbr.Contains(x.bill_no)).Result;
                 var occupys = _ic_item_stockoccupy.GetListAsync(x => x.factory_id.ToString() == domain && seorderentrys.Select(c => c.Id).Contains(x.orderentry_id.GetValueOrDefault())).Result;
                 foreach (var se in seorderentrys)
                 {
@@ -1319,7 +1319,7 @@ namespace Business.SystemJobManagement
                             }
                         }
                     }
-                }
+                }*/
                 //工单按领料单已出库完成记录，清理掉库存占用记录
                 List<NbrMaster> nbrlist = _nbrMaster.Select(x => x.Domain == domain && x.Type.ToUpper() == "SM" && x.UpdateTime >= start).ToList();
                
@@ -1331,7 +1331,7 @@ namespace Business.SystemJobManagement
                     var dtls = nbrDtls.Where(x => x.NbrRecID == nbr.RecID).ToList();
                     foreach (var dtl in dtls)
                     {
-                        var occ = occupy.Find(x => x.icitem_number == dtl.ItemNum);
+                        var occ = occupy.Find(x => x.icitem_number == dtl.ItemNum && x.morder_mo == nbr.WorkOrd);
                         if (occ != null)
                         {
                             decimal differ = dtl.QtyOrd - dtl.QtyRec;