Browse Source

添加GAAS的处理

feature_specialship
zhangxin 2 years ago
parent
commit
c09b7690eb
2 changed files with 7 additions and 0 deletions
  1. +1
    -0
      models/me/const.go
  2. +6
    -0
      services/pln/implments/CustOrderLogic.service.impl.go

+ 1
- 0
models/me/const.go View File

@ -7,4 +7,5 @@ const (
PRODUCT_TYPE_60 = "60%" // 60% PRODUCT_TYPE_60 = "60%" // 60%
PRODUCT_TYPE_CUSHION = "CUSHION" // 坐垫 PRODUCT_TYPE_CUSHION = "CUSHION" // 坐垫
PRODUCT_TYPE_PRE = "PRE" // 预装 PRODUCT_TYPE_PRE = "PRE" // 预装
PRODUCT_TYPE_GAAS = "GAAS" // GAAS
) )

+ 6
- 0
services/pln/implments/CustOrderLogic.service.impl.go View File

@ -610,6 +610,8 @@ func (impl *CustOrderServiceImplement) ReleaseCustOrder(user *global.User, custO
var serialOrderId string var serialOrderId string
if product.CtrlStr1 == meModel.PRODUCT_TYPE_PRE { if product.CtrlStr1 == meModel.PRODUCT_TYPE_PRE {
serialOrderId = strings.Replace(product.ProductId, "-", "", -1) + "$date$" + "$serialNumber$" serialOrderId = strings.Replace(product.ProductId, "-", "", -1) + "$date$" + "$serialNumber$"
} else if product.CtrlStr1 == meModel.PRODUCT_TYPE_GAAS {
serialOrderId = product.ProductId + "$serialNumber$"
} else { } else {
serialOrderId = product.MachineCode + "$serialNumber$" + product.ProductType + product.ColorValue serialOrderId = product.MachineCode + "$serialNumber$" + product.ProductType + product.ColorValue
} }
@ -750,6 +752,10 @@ func (impl *CustOrderServiceImplement) ReleaseCustOrder(user *global.User, custO
break break
} }
} }
//prefix := article.PartId + baseModel.PlantName + time.Now().Format("20060102")
//serialOrderId := strings.Replace(serialNum, "SO-", prefix, 1)
var preSerialNumber string var preSerialNumber string
if needPreOrder { if needPreOrder {
preSerialNumber, err = snrDao.GetNextSnrWithTime(project.PreOrderSnr, waitReleaseSerialOrderLi[0].PlanStartTime.Restore()) preSerialNumber, err = snrDao.GetNextSnrWithTime(project.PreOrderSnr, waitReleaseSerialOrderLi[0].PlanStartTime.Restore())


Loading…
Cancel
Save