|
|
@ -69,11 +69,9 @@ func (impl *CustOrderServiceImplement) LockCustOrder(user *global.User, custOrde |
|
|
|
meta.ReleaseTaskConfig_BusinessObjId.NewPredicate(grmi.Equal, orderData.WorkLineId), |
|
|
|
}, nil) |
|
|
|
if err != nil { |
|
|
|
_ = session.Rollback() |
|
|
|
return grmi.NewBusinessError(fmt.Sprintf("查询产线%s的派工配置失败, 错误:%v", orderData.WorkLineId, err)) |
|
|
|
} |
|
|
|
if len(configLi) == 0 { |
|
|
|
_ = session.Rollback() |
|
|
|
return grmi.NewBusinessError(fmt.Sprintf("产线%s的派工配置不存在", orderData.WorkLineId)) |
|
|
|
} |
|
|
|
workLineConfigMap[orderData.WorkLineId] = configLi[0] |
|
|
@ -322,6 +320,9 @@ func (impl *CustOrderServiceImplement) AnalysisPlanFromExcel(user *global.User, |
|
|
|
custOrderWorkLineMap[workLineId] = append(custOrderWorkLineMap[workLineId], custOrder) |
|
|
|
} |
|
|
|
releaseCustOrderLi := make([]model.CustOrder, 0) |
|
|
|
if err = session.Begin(); err != nil { |
|
|
|
return err |
|
|
|
} |
|
|
|
for workLineId, custOrderLi := range custOrderWorkLineMap { |
|
|
|
for index, custOrder := range custOrderLi { |
|
|
|
project := projectMap[custOrder.ProjectId] |
|
|
|