From 7369171fc373bb436434d5f7f8a1277ea597a6ed Mon Sep 17 00:00:00 2001 From: zhangxin Date: Wed, 15 Jun 2022 15:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E5=8F=B7=E8=A7=84=E5=88=99=E4=BB=8E=E6=80=BB=E6=88=90?= =?UTF-8?q?=E4=B8=8A=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/pln/implments/CustOrderLogic.service.impl.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/services/pln/implments/CustOrderLogic.service.impl.go b/services/pln/implments/CustOrderLogic.service.impl.go index 110d28e..abf0000 100644 --- a/services/pln/implments/CustOrderLogic.service.impl.go +++ b/services/pln/implments/CustOrderLogic.service.impl.go @@ -742,11 +742,7 @@ func (impl *CustOrderServiceImplement) ReleaseCustOrder(user *global.User, custO if err = session.Begin(); err != nil { return grmi.NewBusinessError("开启事务失败, 错误:" + err.Error()) } - serialNumber, err := snrDao.GetNextSnrWithTime(project.SerialOrderSnr, waitReleaseSerialOrderLi[0].PlanStartTime.Restore()) - if err != nil { - _ = session.Rollback() - return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error()) - } + var needPreOrder bool for _, serialOrder := range waitReleaseSerialOrderLi { if len(serialOrder.PreOrderLi) != 0 { @@ -769,6 +765,11 @@ func (impl *CustOrderServiceImplement) ReleaseCustOrder(user *global.User, custO if product.CtrlStr1 == meModel.PRODUCT_TYPE_PRE { isPre = true } + serialNumber, err := snrDao.GetNextSnrWithTime(product.SerialOrderSnr, waitReleaseSerialOrderLi[0].PlanStartTime.Restore()) + if err != nil { + _ = session.Rollback() + return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error()) + } serialOrderSvr.ReplaceData(&serialOrder, serialNumber, isPre) for index, preOrder := range serialOrder.PreOrderLi { preOrder.MainOrderId = serialOrder.SerialOrderId