From c09b7690eb540c90e8eb5d45627c45b9df21dd4d Mon Sep 17 00:00:00 2001 From: zhangxin Date: Mon, 20 Jun 2022 14:06:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0GAAS=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/me/const.go | 1 + services/pln/implments/CustOrderLogic.service.impl.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/models/me/const.go b/models/me/const.go index bd8a038..458fd32 100644 --- a/models/me/const.go +++ b/models/me/const.go @@ -7,4 +7,5 @@ const ( PRODUCT_TYPE_60 = "60%" // 60% PRODUCT_TYPE_CUSHION = "CUSHION" // 坐垫 PRODUCT_TYPE_PRE = "PRE" // 预装 + PRODUCT_TYPE_GAAS = "GAAS" // GAAS ) diff --git a/services/pln/implments/CustOrderLogic.service.impl.go b/services/pln/implments/CustOrderLogic.service.impl.go index 6b044ad..be16ba1 100644 --- a/services/pln/implments/CustOrderLogic.service.impl.go +++ b/services/pln/implments/CustOrderLogic.service.impl.go @@ -610,6 +610,8 @@ func (impl *CustOrderServiceImplement) ReleaseCustOrder(user *global.User, custO var serialOrderId string if product.CtrlStr1 == meModel.PRODUCT_TYPE_PRE { serialOrderId = strings.Replace(product.ProductId, "-", "", -1) + "$date$" + "$serialNumber$" + } else if product.CtrlStr1 == meModel.PRODUCT_TYPE_GAAS { + serialOrderId = product.ProductId + "$serialNumber$" } else { serialOrderId = product.MachineCode + "$serialNumber$" + product.ProductType + product.ColorValue } @@ -750,6 +752,10 @@ func (impl *CustOrderServiceImplement) ReleaseCustOrder(user *global.User, custO break } } + //prefix := article.PartId + baseModel.PlantName + time.Now().Format("20060102") + //serialOrderId := strings.Replace(serialNum, "SO-", prefix, 1) + + var preSerialNumber string if needPreOrder { preSerialNumber, err = snrDao.GetNextSnrWithTime(project.PreOrderSnr, waitReleaseSerialOrderLi[0].PlanStartTime.Restore())