From 3e7c7fc6e1a2221f6f4005dcfa1f499c0799df04 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Fri, 29 Jul 2022 09:23:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8B=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/pln/implments/CustOrderLogic.service.impl.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/pln/implments/CustOrderLogic.service.impl.go b/services/pln/implments/CustOrderLogic.service.impl.go index 9c3707e..c1da43c 100644 --- a/services/pln/implments/CustOrderLogic.service.impl.go +++ b/services/pln/implments/CustOrderLogic.service.impl.go @@ -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]