|
@ -401,7 +401,6 @@ func (impl *SerialOrderServiceImplement) InsertFromWorkOrder(user *models.Userta |
|
|
log.Error("InsertFromWorkOrder SerialOrder InsertFromWorkOrder generate serial order id failed, error: " + err.Error()) |
|
|
log.Error("InsertFromWorkOrder SerialOrder InsertFromWorkOrder generate serial order id failed, error: " + err.Error()) |
|
|
return nil, err |
|
|
return nil, err |
|
|
} |
|
|
} |
|
|
planStartDate := workOrder.PlanStartDate.Restore().Format("20060102") |
|
|
|
|
|
article, exist := artMap[workOrder.ArtId] |
|
|
article, exist := artMap[workOrder.ArtId] |
|
|
if !exist { |
|
|
if !exist { |
|
|
article, err = articleDao.SelectOne(workOrder.ArtId) |
|
|
article, err = articleDao.SelectOne(workOrder.ArtId) |
|
@ -416,7 +415,7 @@ func (impl *SerialOrderServiceImplement) InsertFromWorkOrder(user *models.Userta |
|
|
return nil, err |
|
|
return nil, err |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
prefix := article.PartId + baseModel.PlantName + planStartDate |
|
|
|
|
|
|
|
|
prefix := article.PartId + baseModel.PlantName + time.Now().Format("20060102") |
|
|
serialOrderId := strings.Replace(serialNum, "SO-", prefix, 1) |
|
|
serialOrderId := strings.Replace(serialNum, "SO-", prefix, 1) |
|
|
var planEndTime time.Time |
|
|
var planEndTime time.Time |
|
|
if perDuration != 0 { |
|
|
if perDuration != 0 { |
|
|