|
|
@@ -432,36 +432,36 @@ namespace Business.ResourceExamineManagement
|
|
|
//处理工单计划开始日期、计划结束日期
|
|
|
foreach (var item in workOrds)
|
|
|
{
|
|
|
- //如果工单正在投产，则不需要回写
|
|
|
- if (item.Status.ToUpper() == "W")
|
|
|
- {
|
|
|
- continue;
|
|
|
- }
|
|
|
- List<ScheduleResultOpMaster> scheduleList = scheduleMasters.Where(s => s.WorkOrd == item.WorkOrd).ToList();
|
|
|
- if (scheduleList.Any())
|
|
|
- {
|
|
|
- item.OrdDate = scheduleList.Min(s => s.WorkStartTime);
|
|
|
- item.DueDate = scheduleList.Max(s => s.WorkEndTime);
|
|
|
- }
|
|
|
+ //2024-01-02调整：不回写工单计划开工日期，计划结束日期
|
|
|
+ //List<ScheduleResultOpMaster> scheduleList = scheduleMasters.Where(s => s.WorkOrd == item.WorkOrd).ToList();
|
|
|
+ //if (scheduleList.Any())
|
|
|
+ //{
|
|
|
+ // item.OrdDate = scheduleList.Min(s => s.WorkStartTime);
|
|
|
+ // item.DueDate = scheduleList.Max(s => s.WorkEndTime);
|
|
|
+ //}
|
|
|
//当前工单正在投产，则需要回写优先级
|
|
|
- var curInfo = dbWorkOrds.FirstOrDefault(p => p.WorkOrd == item.WorkOrd);
|
|
|
- if (curInfo != null)
|
|
|
+ if (!string.IsNullOrEmpty(item.Status) && item.Status.ToUpper() == "W")
|
|
|
{
|
|
|
- item.Priority = curInfo.Priority;
|
|
|
- }
|
|
|
- }
|
|
|
- var mesMorder = _mysql_mes_morder.GetListAsync(s => workOrds.Select(x => x.WorkOrd).Contains(s.morder_no) && s.factory_id.ToString() == domain).Result;
|
|
|
- if(mesMorder.Any()) {
|
|
|
- foreach (var mo in mesMorder)
|
|
|
- {
|
|
|
- var wo = workOrds.Find(s => s.WorkOrd == mo.morder_no);
|
|
|
- if (wo != null)
|
|
|
+ var curInfo = dbWorkOrds.FirstOrDefault(p => p.WorkOrd == item.WorkOrd);
|
|
|
+ if (curInfo != null)
|
|
|
{
|
|
|
- mo.moentry_sys_stime = wo.OrdDate;
|
|
|
- mo.moentry_sys_etime = wo.DueDate;
|
|
|
+ item.Priority = curInfo.Priority;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ //2024-01-02调整：不回写工单计划开工日期，计划结束日期
|
|
|
+ //var mesMorder = _mysql_mes_morder.GetListAsync(s => workOrds.Select(x => x.WorkOrd).Contains(s.morder_no) && s.factory_id.ToString() == domain).Result;
|
|
|
+ //if(mesMorder.Any()) {
|
|
|
+ // foreach (var mo in mesMorder)
|
|
|
+ // {
|
|
|
+ // var wo = workOrds.Find(s => s.WorkOrd == mo.morder_no);
|
|
|
+ // if (wo != null)
|
|
|
+ // {
|
|
|
+ // mo.moentry_sys_stime = wo.OrdDate;
|
|
|
+ // mo.moentry_sys_etime = wo.DueDate;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ //}
|
|
|
|
|
|
//取数开始时间为当前日期
|
|
|
DateTime beginDate = DateTime.Now.Date;
|
|
|
@@ -527,13 +527,14 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
|
_scheduleExceptionMaster.Insert(exceptions);
|
|
|
}
|
|
|
- //更新工单计划开工时间、计划结束时间
|
|
|
+ //更新工单优先级
|
|
|
_workOrdMaster.Update(workOrds);
|
|
|
- if (mesMorder.Any())
|
|
|
- {
|
|
|
- await _mysql_mes_morder.UpdateManyAsync(mesMorder);
|
|
|
- }
|
|
|
-
|
|
|
+ //2024-01-02调整：不回写工单计划开工日期，计划结束日期
|
|
|
+ //if (mesMorder.Any())
|
|
|
+ //{
|
|
|
+ // await _mysql_mes_morder.UpdateManyAsync(mesMorder);
|
|
|
+ //}
|
|
|
+
|
|
|
//添加工单工序准备开始时间记录
|
|
|
if (inserts.Any())
|
|
|
{
|
