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

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

@@ -4175,7 +4175,7 @@ namespace Business.ResourceExamineManagement
             {
                 sumTimes = CalcTimeMins(curRecord.StartTime, lineStart.StartTime, lineStart.Line);
                 //如果当前工单状态为生产中"W",但是，调整了日计划开工时间，则需要重新准备
-                if (workOrd.Status.ToUpper() == "W" && workOrd.JointTyped.ToUpper() == "B")
+                if (workOrd.Status.ToUpper() == "W" && !string.IsNullOrEmpty(workOrd.JointTyped) &&  workOrd.JointTyped.ToUpper() == "B")
                 {
                     sumTimes = 0m;
                 }
@@ -4528,8 +4528,8 @@ namespace Business.ResourceExamineManagement
                         WorkOrd = workOrd.WorkOrd,
                         ItemNum = workOrd.ItemNum,
                         Op = op,
-                        Line = lineStart.Line,
-                        StartTime = lineStart.StartTime,
+                        Line = startDto.Line,
+                        StartTime = startDto.StartTime,
                         CreateTime = DateTime.Now
                     });
                     //记录工序开始准备时间记录
@@ -4539,8 +4539,8 @@ namespace Business.ResourceExamineManagement
                         WorkOrd = workOrd.WorkOrd,
                         ItemNum = workOrd.ItemNum,
                         Op = op,
-                        Line = lineStart.Line,
-                        StartTime = lineStart.StartTime,
+                        Line = startDto.Line,
+                        StartTime = startDto.StartTime,
                         CreateTime = DateTime.Now
                     });
                 }
@@ -4563,7 +4563,7 @@ namespace Business.ResourceExamineManagement
             {
                 sumTimes = CalcTimeMins(curRecord.StartTime, startDto.StartTime, startDto.Line);
                 //如果当前工单状态为生产中"W",但是，调整了日计划开工时间，则需要重新准备
-                if (workOrd.Status.ToUpper() == "W" && workOrd.JointTyped.ToUpper() == "B")
+                if (workOrd.Status.ToUpper() == "W" && !string.IsNullOrEmpty(workOrd.JointTyped) && workOrd.JointTyped.ToUpper() == "B")
                 {
                     sumTimes = 0m;
                 }

MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdMaster.cs

@@ -144,7 +144,7 @@ namespace Business.Domain
         /// <summary>
         /// 正在生产的工单重新排产是否需要考虑产线准备时间：A-连续生产不需要考虑;B-日计划日期调整需要考虑
         /// </summary>
-        [Comment("生产时长")]
+        [Comment("生产状态")]
         public string JointTyped { get; set; }
 
         /// <summary>