From 4e597ffbc2498e5b7f702efff48af632ad9ee246 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 28 Jul 2022 18:36:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8=E6=B4=BE?= =?UTF-8?q?=E5=B7=A5=E6=B2=A1=E6=9C=89=E8=B5=B0=E6=B4=BE=E5=B7=A5=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../implments/CustOrderLogic.service.impl.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/services/pln/implments/CustOrderLogic.service.impl.go b/services/pln/implments/CustOrderLogic.service.impl.go index 8b559b6..9c3707e 100644 --- a/services/pln/implments/CustOrderLogic.service.impl.go +++ b/services/pln/implments/CustOrderLogic.service.impl.go @@ -1208,16 +1208,35 @@ func (impl *CustOrderServiceImplement) ReleaseTask() error { UserId: userId, } custOrderDao := dal.NewCustOrderDAO(session, user.PlantNr, user.UserId) + configDao := dal.NewReleaseTaskConfigDAO(session, user.PlantNr, user.UserId) + configMap := make(map[string]model.ReleaseTaskConfig) custOrderLi, err := custOrderDao.SelectNeedReleaseCustOrder() if err != nil { return err } + configLi, err := configDao.Select([]grmi.Predicate{meta.ReleaseTaskConfig_BusinessObjType.NewPredicate(grmi.Equal, model.CONFIG_TYPE_WORK_LINE)}, nil) + if err != nil { + _ = session.Rollback() + return grmi.NewBusinessError("查询派工配置失败, 错误:" + err.Error()) + } + for _, config := range configLi { + configMap[config.BusinessObjId] = config + } channel, exist := common.ReleaseTaskChannel[user.PlantNr] if !exist { channel = channelModel.NewTaskChannel("ReleaseTask-PlantNr:" + strconv.Itoa(user.PlantNr)) common.ReleaseTaskChannel[user.PlantNr] = channel } 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)