Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -3283,7 +3283,7 @@ namespace Business.Replenishment
                 //热封标准工时
                 var HeatSealing = routingOp.Where(x => x.Ufld1 == "热封" && x.MilestoneOp).FirstOrDefault();
                 //包装标准工时
-                var Packaging = routingOp.Where(x => x.Descr == "包装" && x.MilestoneOp).FirstOrDefault();
+                var Packaging = routingOp.Where(x => x.Ufld1 == "包装" && x.MilestoneOp).FirstOrDefault();
                 if (moItem != null)
                 {
                     if (moItem.kitting_times < a.PlanStartDate)
@@ -4904,6 +4904,10 @@ namespace Business.Replenishment
                         var childs = exm.BomChildExamineList.Where(s => s.is_use == true).ToList();
 
                         var child = childs.Find(s => s.item_number == workord.product_code);
+                        if (workord.morder_type == "返工工单")
+                        {
+                            child = childs.Find(s => s.item_number == workord.product_code && s.level == 1);
+                        }
                         if (child == null)
                         {
                             continue;

MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

@@ -444,7 +444,7 @@ namespace Business.ResourceExamineManagement
                         _workOrdSetupTimeRecord.Update(updates);
                     }
                     //已投产的工单，只需要保存当前日期下一天的排产记录
-                    List<string> sczWorkords = workOrds.Where(p => p.Status.ToUpper() == "W").Select(p=>p.WorkOrd).ToList();
+                    List<string> sczWorkords = workOrds.Where(p => p.Status.ToUpper() == "W" || p.Status.ToUpper() == "S").Select(p=>p.WorkOrd).ToList();
                     if (sczWorkords.Any())
                     {
                         //获取计划日期在当前日期之后且已投产的日计划,将其计划开工日期改为当天
@@ -535,7 +535,7 @@ namespace Business.ResourceExamineManagement
 
                     }
                     //未投产的工单，当前日期及以后的排产记录全部删除
-                    List<string> wscWorkords = workOrds.Where(p => p.Status.ToUpper() != "W").Select(p => p.WorkOrd).ToList();
+                    List<string> wscWorkords = workOrds.Where(p => p.Status.ToUpper() != "W" && p.Status.ToUpper() != "S").Select(p => p.WorkOrd).ToList();
                     if (wscWorkords.Any())
                     {
                         //删除当前日期及以后的工单排产记录

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

@@ -4503,7 +4503,7 @@ namespace Business.ResourceExamineManagement
             nbrMasterList.Add(newNbr);
             List<string> headAccount = new List<string>();
             short i = 1;
-            bool typed = !string.IsNullOrEmpty(workord.Typed);
+            //bool typed = !string.IsNullOrEmpty(workord.Typed);
             detail.ForEach(a =>
             {
                 var find = itemLocList?.Find(c => c.ItemNum == a.ItemNum);
@@ -4541,7 +4541,7 @@ namespace Business.ResourceExamineManagement
                             CreateUser = user?.Name,
                             UpdateUser = user?.Name,
                             UM = find.UM,
-                            LotSerial = typed ? a.LotSerial : "",
+                            LotSerial = a.LotSerial,
                             ItemName = find.Descr,
                             Status = ""
                         });

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

@@ -1202,7 +1202,7 @@ namespace Business.SystemJobManagement
                 }
                 if (addPolist.Any())
                 {
-                    var srmPrs = _businessDbContext.srm_pr_main.Where(s => s.company_id.ToString() == companyid && addPolist.Select(x => x.pr_billno).Contains(s.pr_billno) && s.state == 1).ToList();
+                    var srmPrs = _businessDbContext.srm_pr_main.Where(s => s.company_id.ToString() == companyid && addPolist.Select(x => x.pr_billno).Contains(s.pr_billno)).ToList();
                     var occupylist = _mysql_srm_po_occupy.GetListAsync(x => srmPrs.Select(c => c.Id).Contains(x.polist_id.GetValueOrDefault())).Result;
                     /*var occupyListLINQ = _businessDbContext.srm_po_occupy.Where(x => x.company_id.ToString() == companyid && !x.IsDeleted).Join(_businessDbContext.srm_pr_main.Where(s => s.company_id.ToString() == companyid && addPolist.Select(x => x.pr_billno).Contains(s.pr_billno) && s.state == 1), p => p.polist_id, pr => pr.Id, (p, pr) => new { p, pr }).ToList();
                     List<srm_po_occupy> occupylist = new List<srm_po_occupy>();