|
@ -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()) |
|
|