From a4143935b0d4a9d06bbafd5d9d9e92e5f32c42e1 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 2 Sep 2021 10:03:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/base/implments/WorkLine.service.impl.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/base/implments/WorkLine.service.impl.go b/services/base/implments/WorkLine.service.impl.go index 6bbee53..2035560 100644 --- a/services/base/implments/WorkLine.service.impl.go +++ b/services/base/implments/WorkLine.service.impl.go @@ -54,6 +54,8 @@ var DefaultConditionOfWorkLine = grmi.NewCondition( meta.WorkLine_ReleaseTimeParameter.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ReleaseTimeParameter, grmi.Approximate, false), meta.WorkLine_ReleaseCtrlParameter.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ReleaseCtrlParameter, grmi.Equal, false), meta.WorkLine_ReleaseDurationParameter.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_ReleaseDurationParameter, grmi.Equal, false), + meta.WorkLine_PrintAddress.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_PrintAddress, grmi.Equal, false), + meta.WorkLine_PrintTemplate.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_PrintTemplate, grmi.Equal, false), meta.WorkLine_LastModify.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_LastModify, grmi.Approximate, false), meta.WorkLine_LastUser.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_LastUser, grmi.Equal, false), meta.WorkLine_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.WorkLine_CreateTime, grmi.Approximate, false), @@ -1009,7 +1011,7 @@ func (impl *WorkLineServiceImplement) SaveWorkLineScheduler(user *models.Usertab //如果存在已计划的订单 for _, v := range data.PlannedTaskArray { //过滤订单状态大于20的订单 - if v.WorkOrderStatus.Status > model.WO_STATUS_PLANNED{ + if v.WorkOrderStatus.Status > model.WO_STATUS_PLANNED { continue } //1.更新WorkOrder表的时间 @@ -1057,7 +1059,7 @@ func (impl *WorkLineServiceImplement) SaveWorkLineScheduler(user *models.Usertab } for _, v := range data.UnPlannedTaskArray { //过滤订单状态大于20的订单 - if v.WorkOrderStatus.Status > model.WO_STATUS_PLANNED{ + if v.WorkOrderStatus.Status > model.WO_STATUS_PLANNED { continue } //1.更新WorkOrder表的时间