From e83fad46b5beb4def9f090b0992fcd8cc445f231 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 28 Jul 2022 17:38:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B4=BE=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=20=E5=BE=80=E9=98=9F=E5=88=97=E9=87=8C=E9=9D=A2=E6=94=BE?= =?UTF-8?q?=E7=BD=AE=E4=BB=BB=E5=8A=A1=E9=9C=80=E8=A6=81=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=BF=9B=E8=A1=8C=E6=97=B6=E9=97=B4=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../implments/CustOrderLogic.service.impl.go | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/services/pln/implments/CustOrderLogic.service.impl.go b/services/pln/implments/CustOrderLogic.service.impl.go index 782b8f1..041e621 100644 --- a/services/pln/implments/CustOrderLogic.service.impl.go +++ b/services/pln/implments/CustOrderLogic.service.impl.go @@ -1250,6 +1250,8 @@ func (impl *CustOrderServiceImplement) RepairReleaseFailedTask(user *global.User custOrderStatusDao := dal.NewCustOrderStatusDAO(session, user.PlantNr, user.UserId) statusHistoryDao := dal.NewCustOrderStatusHistoryDAO(session, user.PlantNr, user.UserId) custOrderDao := dal.NewCustOrderDAO(session, user.PlantNr, user.UserId) + configDao := dal.NewReleaseTaskConfigDAO(session, user.PlantNr, user.UserId) + configMap := make(map[string]model.ReleaseTaskConfig) statusLi, err := custOrderStatusDao.Select([]grmi.Predicate{ meta.CustOrderStatus_Status.NewPredicate(grmi.Equal, baseModel.WO_STATUS_RELEASE_FAILED), }, nil) @@ -1298,7 +1300,27 @@ func (impl *CustOrderServiceImplement) RepairReleaseFailedTask(user *global.User _ = session.Rollback() return grmi.NewBusinessError("查询需要派工的客户订单失败, 错误:" + err.Error()) } + configLi, err := configDao.Select([]grmi.Predicate{meta.ReleaseTaskConfig_BusinessObjType.NewPredicate(grmi.Equal, model.CONFIG_TYPE_WORK_LINE)}, nil) + if err != nil { + return err + } + if err != nil { + _ = session.Rollback() + return grmi.NewBusinessError("查询派工配置失败, 错误:" + err.Error()) + } + for _, config := range configLi { + configMap[config.BusinessObjId] = config + } for _, custOrder := range custOrderLi { + config, exist := configMap[custOrder.WorkLineId] + if !exist { + _ = session.Rollback() + return grmi.NewBusinessError(fmt.Sprintf("客户订单%s的产线%s的派工配置不存在", custOrder.CustOrderId, custOrder.WorkLineId)) + } + duration := utils.CalcDurationByUom(float64(config.LeadTime), config.TimeUomId) + if custOrder.PlanStartTime.Restore().Add(-duration*time.Second).Unix() > time.Now().Unix() { + continue + } mk := fmt.Sprintf("%d-%s", custOrder.PlantNr, custOrder.CustOrderId) common.ReleasingTaskMap.Store(mk, nil) err = channel.SendData(custOrder)