|
@@ -2003,9 +2003,28 @@
|
|
|
isTimeAfterDeliveryDate(row.executionEndTime, deadline)
|
|
isTimeAfterDeliveryDate(row.executionEndTime, deadline)
|
|
|
);
|
|
);
|
|
|
},
|
|
},
|
|
|
|
|
+ /** 是否为最后一道工序(工序数量不固定,按当前任务列表顺序判断) */
|
|
|
|
|
+ isLastPlanTask(row) {
|
|
|
|
|
+ const list = this.taskList || [];
|
|
|
|
|
+ if (!row || !list.length) {
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ const lastTask = list[list.length - 1];
|
|
|
|
|
+ if (row === lastTask) {
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
|
|
+ // 班组排程下同一道工序会有多条工位行,按工序分组比较
|
|
|
|
|
+ if (!this.isOrderScheduling) {
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ const lastKey = this.getTaskSequenceGroupKey(lastTask);
|
|
|
|
|
+ return !!lastKey && this.getTaskSequenceGroupKey(row) === lastKey;
|
|
|
|
|
+ },
|
|
|
|
|
+ /** 仅最后一道工序执行结束时间晚于计划结束时间时标红 */
|
|
|
isExecutionEndOverPlanEnd(row) {
|
|
isExecutionEndOverPlanEnd(row) {
|
|
|
const planEnd = this.currentPlan?.endTime;
|
|
const planEnd = this.currentPlan?.endTime;
|
|
|
return (
|
|
return (
|
|
|
|
|
+ this.isLastPlanTask(row) &&
|
|
|
!!planEnd &&
|
|
!!planEnd &&
|
|
|
!!row?.executionEndTime &&
|
|
!!row?.executionEndTime &&
|
|
|
isEndAfterPlanEnd(row.executionEndTime, planEnd)
|
|
isEndAfterPlanEnd(row.executionEndTime, planEnd)
|