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

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

@@ -6883,7 +6883,7 @@ namespace Business.Replenishment
                     info.Icdsid = demandplans[i].Id;
                     info.ItemNum = demandplans[i].itemnum;
                     info.CreateTime = DateTime.Now;
-                    info.Remark = "物料需求计划[" + demandplans[i].itemnum + ":" + demandplans[i].requestdate.ToString("yyyy-MM-dd") + "]的采购明细可用数量不足，无法转交货单";
+                    info.Remark = "物料需求计划[" + demandplans[i].itemnum + ":" + demandplans[i].requestdate.ToString("yyyy-MM-dd") + "]的采购明细缺"+(demandplans[i].tosechedqty - restQty) +"，无法转交货单";
                     info.OptTime = optime;
                     exceptions.Add(info);
                     continue;
@@ -6974,7 +6974,7 @@ namespace Business.Replenishment
                         info.Icdsid = demandplans[i].Id;
                         info.ItemNum = demandplans[i].itemnum;
                         info.CreateTime = DateTime.Now;
-                        info.Remark = "物料需求计划[" + demandplans[i].itemnum + ":" + demandplans[i].requestdate.ToString("yyyy-MM-dd") + "]对应供应商[" + curChaes[j].supplier_name + "]采购明细可用数量不足，无法转交货单";
+                        info.Remark = "物料需求计划[" + demandplans[i].itemnum + ":" + demandplans[i].requestdate.ToString("yyyy-MM-dd") + "]对应供应商[" + curChaes[j].supplier_name + "]采购明细缺"+ (needQty-restQty) + "，无法转交货单";
                         info.OptTime = optime;
                         exceptions.Add(info);
 

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

@@ -384,7 +384,7 @@ namespace Business.ResourceExamineManagement
                 //特殊工单工序
                 var curOp = tsWoRoutings.Where(p => p.WorkOrd == item.WorkOrd).OrderByDescending(p => p.OP).First();
                 //特殊工单排产开始时间
-                DateTime tStartTime = item.OrdDate.GetValueOrDefault();
+                DateTime tStartTime = item.OrdDate.GetValueOrDefault() < scheTime ? scheTime : item.OrdDate.GetValueOrDefault();
                 //获取特殊工单开始排产时间记录
                 var curRecord = timeRecords.FirstOrDefault(p=>p.WorkOrd == item.WorkOrd && p.Op == curOp.OP);
                 if (curRecord == null)
@@ -623,43 +623,6 @@ namespace Business.ResourceExamineManagement
                         var ins2 = scheduleMasters.Where(p => wscWorkords.Contains(p.WorkOrd) && p.WorkDate >= scheTime.Date).ToList();
                         _scheduleResultOpMaster.Insert(scheduleMasters.Where(p => wscWorkords.Contains(p.WorkOrd) && p.WorkDate >= scheTime.Date).ToList());
                     }
-
-                    //获取计划日期在当前日期之前且报工数量为0的日计划
-                    List<PeriodSequenceDet> oldSequenceDets = _periodSequenceDet.Select(p => p.Domain == domain && p.PlanDate < scheTime.Date && p.CompQty == 0).ToList();
-                    List<ScheduleResultOpMaster> oldSchedules = new List<ScheduleResultOpMaster>();
-                    if (oldSequenceDets.Any())
-                    {
-                        var oldWorkords = oldSequenceDets.Select(p => p.WorkOrds).ToList();
-                        var oldDate = oldSequenceDets.Select(p => p.PlanDate).ToList();
-                        var oldOps = oldSequenceDets.Select(p => p.Op).ToList();
-
-                        //更新计划日期为当前日期
-                        foreach (var oldItem in oldSequenceDets)
-                        {
-                            var curSche = _scheduleResultOpMaster.Select(p => p.Domain == domain && p.WorkOrd == oldItem.WorkOrds && p.WorkDate == oldItem.PlanDate && p.Op == oldItem.Op).FirstOrDefault();
-                            if (curSche != null)
-                            {
-                                oldSchedules.Add(curSche);
-                            }
-                            oldItem.PlanDate = scheTime.Date;
-                        }
-                        string strScheTime = scheTime.Date.ToString("yyyy-MM-dd");
-                        foreach (var oldItem in oldSchedules)
-                        {
-                            oldItem.WorkDate = scheTime.Date;
-                            oldItem.WorkStartTime = Convert.ToDateTime(oldItem.WorkStartTime.ToString("yyyy-MM-dd HH:mm:ss").Replace(oldItem.WorkStartTime.ToString("yyyy-MM-dd"), strScheTime));
-                            oldItem.WorkEndTime = Convert.ToDateTime(oldItem.WorkEndTime.ToString("yyyy-MM-dd HH:mm:ss").Replace(oldItem.WorkEndTime.ToString("yyyy-MM-dd"), strScheTime));
-                        }
-                    }
-                    //更新过期日计划的计划开工日期
-                    if (oldSequenceDets.Any())
-                    {
-                        _periodSequenceDet.Update(oldSequenceDets);
-                    }
-                    if (oldSchedules.Any())
-                    {
-                        _scheduleResultOpMaster.Update(oldSchedules);
-                    }
                     scope.Complete();
                 }
                 catch (Exception ex)
@@ -924,7 +887,7 @@ namespace Business.ResourceExamineManagement
                         var first = fstWOMasters.First();
                         if (item != first)
                         {
-                            tsStartTime = item.OrdDate.GetValueOrDefault();
+                            tsStartTime = item.OrdDate.GetValueOrDefault() < scheTime ? scheTime : item.OrdDate.GetValueOrDefault();
                         }
                         //特殊工单工序
                         var curOp = tsWoRoutings.Where(p => p.WorkOrd == item.WorkOrd).OrderByDescending(p => p.OP).First();