diff --git a/dao/om/implments/WorkOrderStatus.dao.impl.go b/dao/om/implments/WorkOrderStatus.dao.impl.go index 880a823..ef8b475 100644 --- a/dao/om/implments/WorkOrderStatus.dao.impl.go +++ b/dao/om/implments/WorkOrderStatus.dao.impl.go @@ -128,7 +128,7 @@ func (impl *WorkOrderStatusDAOImplement) UpdateStatusOne(entity *model.WorkOrder return grmi.NewDataBaseError(err) } if result == 0 { - return errors.New("订单状态大于20!") + return errors.New("订单已下达!") } return nil } diff --git a/services/base/implments/WorkLine.service.impl.go b/services/base/implments/WorkLine.service.impl.go index 7d963ea..3cee802 100644 --- a/services/base/implments/WorkLine.service.impl.go +++ b/services/base/implments/WorkLine.service.impl.go @@ -925,6 +925,10 @@ func (impl *WorkLineServiceImplement) SaveWorkLineScheduler(user *models.Usertab recdao := omdal.NewWorkOrderStatusRecLstDAO(session, user.Pid, user.Userid) //如果存在已计划的订单 for _, v := range data.PlannedTaskArray { + //过滤订单状态大于20的订单 + if v.WorkOrderStatus.Status > model.WO_STATUS_PLANNED{ + continue + } //1.更新WorkOrder表的时间 workOrder := new(om.WorkOrder) workOrder.PlantNr = v.PlantNr @@ -969,6 +973,10 @@ func (impl *WorkLineServiceImplement) SaveWorkLineScheduler(user *models.Usertab } } for _, v := range data.UnPlannedTaskArray { + //过滤订单状态大于20的订单 + if v.WorkOrderStatus.Status > model.WO_STATUS_PLANNED{ + continue + } //1.更新WorkOrder表的时间 workOrder := new(om.WorkOrder) workOrder.PlantNr = v.PlantNr