From 25632191501a3ff800078ed79813da0c06787347 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 19 May 2022 13:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A3=85=E5=B7=A5=E5=8D=95=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E5=8F=B7=E6=8C=89=E6=97=A5=E6=9C=9F=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../om/implments/SerialOrder.Logic.impl.go | 2 +- .../implments/CustOrderLogic.service.impl.go | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/services/om/implments/SerialOrder.Logic.impl.go b/services/om/implments/SerialOrder.Logic.impl.go index 176d5ad..9ee36b6 100644 --- a/services/om/implments/SerialOrder.Logic.impl.go +++ b/services/om/implments/SerialOrder.Logic.impl.go @@ -230,7 +230,7 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use impl.ReplaceData(&serialOrder, serialNumber, false) for index, preOrder := range serialOrder.PreOrderLi { preOrder.MainOrderId = serialOrder.SerialOrderId - serialNumber, err = snrDao.GetNextSnr(project.PreOrderSnr) + serialNumber, err = snrDao.GetNextSnrWithTime(project.PreOrderSnr, serialOrder.PlanStartTime.Restore()) if err != nil { _ = session.Rollback() return grmi.NewBusinessError("获取流水号失败，错误:" + err.Error()) diff --git a/services/pln/implments/CustOrderLogic.service.impl.go b/services/pln/implments/CustOrderLogic.service.impl.go index e764954..86869c8 100644 --- a/services/pln/implments/CustOrderLogic.service.impl.go +++ b/services/pln/implments/CustOrderLogic.service.impl.go @@ -728,11 +728,22 @@ func (impl *CustOrderServiceImplement) ReleaseCustOrder(user *global.User, custO _ = session.Rollback() return grmi.NewBusinessError("生成工单流水号失败, error:" + err.Error()) } - preSerialNumber, err := snrDao.GetNextSnr(project.PreOrderSnr) - if err != nil { - _ = session.Rollback() - return grmi.NewBusinessError("获取流水号失败，错误:" + err.Error()) + var needPreOrder bool + for _, serialOrder := range waitReleaseSerialOrderLi { + if len(serialOrder.PreOrderLi) != 0 { + needPreOrder = true + break + } } + var preSerialNumber string + if needPreOrder { + preSerialNumber, err = snrDao.GetNextSnrWithTime(project.PreOrderSnr, waitReleaseSerialOrderLi[0].PlanStartTime.Restore()) + if err != nil { + _ = session.Rollback() + return grmi.NewBusinessError("获取流水号失败，错误:" + err.Error()) + } + } + for _, serialOrder := range waitReleaseSerialOrderLi { serialOrderSvr.ReplaceData(&serialOrder, serialNumber, false) for index, preOrder := range serialOrder.PreOrderLi {