Explorar o código

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

Murphy %!s(int64=2) %!d(string=hai) anos
pai
achega
a6fd7f5d2a

+ 3 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

@@ -402,7 +402,8 @@ namespace Business.ResourceExamineManagement
                         sumTimes = CalcTimeMins(curRecord.StartTime, scheTime, item.ProdLine);
                         sumTimes = CalcTimeMins(curRecord.StartTime, scheTime, item.ProdLine);
                     }
                     }
                 }
                 }
-                else {
+                else if(curOp.Last != null)
+                {
                     //工单有报工记录,取最新报工时间到当前时间的有效时长
                     //工单有报工记录,取最新报工时间到当前时间的有效时长
                     sumTimes = CalcTimeMins(curOp.Last.GetValueOrDefault(), scheTime, item.ProdLine);
                     sumTimes = CalcTimeMins(curOp.Last.GetValueOrDefault(), scheTime, item.ProdLine);
                 }
                 }
@@ -908,7 +909,7 @@ namespace Business.ResourceExamineManagement
                                 sumWorkTimes = CalcTimeMins(curRecord.StartTime, workStartTime, item.ProdLine);
                                 sumWorkTimes = CalcTimeMins(curRecord.StartTime, workStartTime, item.ProdLine);
                             }
                             }
                         }
                         }
-                        else
+                        else if(curOp.Last != null)
                         {
                         {
                             //工单有报工记录,取最新报工时间到当前时间的有效时长
                             //工单有报工记录,取最新报工时间到当前时间的有效时长
                             sumWorkTimes = CalcTimeMins(curOp.Last.GetValueOrDefault(), workStartTime, item.ProdLine);
                             sumWorkTimes = CalcTimeMins(curOp.Last.GetValueOrDefault(), workStartTime, item.ProdLine);