Browse Source

修复启动派工没有走派工配置

temp
zhangxin 2 years ago
parent
commit
4e597ffbc2
1 changed files with 19 additions and 0 deletions
  1. +19
    -0
      services/pln/implments/CustOrderLogic.service.impl.go

+ 19
- 0
services/pln/implments/CustOrderLogic.service.impl.go View File

@ -1208,16 +1208,35 @@ func (impl *CustOrderServiceImplement) ReleaseTask() error {
UserId: userId, UserId: userId,
} }
custOrderDao := dal.NewCustOrderDAO(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)
custOrderLi, err := custOrderDao.SelectNeedReleaseCustOrder() custOrderLi, err := custOrderDao.SelectNeedReleaseCustOrder()
if err != nil { if err != nil {
return err 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] channel, exist := common.ReleaseTaskChannel[user.PlantNr]
if !exist { if !exist {
channel = channelModel.NewTaskChannel("ReleaseTask-PlantNr:" + strconv.Itoa(user.PlantNr)) channel = channelModel.NewTaskChannel("ReleaseTask-PlantNr:" + strconv.Itoa(user.PlantNr))
common.ReleaseTaskChannel[user.PlantNr] = channel common.ReleaseTaskChannel[user.PlantNr] = channel
} }
for _, custOrder := range custOrderLi { 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) mk := fmt.Sprintf("%d-%s", custOrder.PlantNr, custOrder.CustOrderId)
common.ReleasingTaskMap.Store(mk, nil) common.ReleasingTaskMap.Store(mk, nil)
err = channel.SendData(custOrder) err = channel.SendData(custOrder)


Loading…
Cancel
Save