|
|
@ -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) |
|
|
|