|
|
@ -881,7 +881,7 @@ func (impl *CustOrderServiceImplement) LockCustOrder(user *global.User, custOrde |
|
|
|
for _, product := range productLi { |
|
|
|
// 获取生产使用的产线
|
|
|
|
var resourceId string |
|
|
|
if !product.MultiWorkLineToggle { |
|
|
|
if product.MultiWorkLineToggle { |
|
|
|
relateWorkLineLi, err := productWorkLineDao.Select([]grmi.Predicate{ |
|
|
|
meMeta.ProductWorkLineLst_ProductId.NewPredicate(grmi.Equal, product.ProductId), |
|
|
|
meMeta.ProductWorkLineLst_ProjectId.NewPredicate(grmi.Equal, product.ProjectId), |
|
|
@ -910,6 +910,8 @@ func (impl *CustOrderServiceImplement) LockCustOrder(user *global.User, custOrde |
|
|
|
_ = session.Rollback() |
|
|
|
return grmi.NewBusinessError("未获取到可生产的产线") |
|
|
|
} |
|
|
|
} else { |
|
|
|
resourceId = product.DefaultWorkLineId |
|
|
|
} |
|
|
|
serialOrderId := product.MachineCode + serialNumber + product.ProductType + product.ColorValue |
|
|
|
planStartTime := orderData.PlanStartTime.Restore().Add(time.Duration(int(perDuration)*current) * time.Second) |
|
|
|