|
@ -820,8 +820,7 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o |
|
|
if len(packOrderIds) <2{ |
|
|
if len(packOrderIds) <2{ |
|
|
return nil,grmi.NewBusinessError("生成包装流水号格式错误!") |
|
|
return nil,grmi.NewBusinessError("生成包装流水号格式错误!") |
|
|
} |
|
|
} |
|
|
qty := utils.ConvInt2FormatString(packTemplate.PlanQty,2) |
|
|
|
|
|
packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + qty + packOrderIds[1] |
|
|
|
|
|
|
|
|
packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + packOrderIds[1] |
|
|
|
|
|
|
|
|
packTemplateItemlstDAO := dal.NewPackTemplateItemlstDAO(session, user.Pid, user.Userid) |
|
|
packTemplateItemlstDAO := dal.NewPackTemplateItemlstDAO(session, user.Pid, user.Userid) |
|
|
|
|
|
|
|
@ -1058,8 +1057,7 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *models.Usertab, ord |
|
|
if len(packOrderIds) <2{ |
|
|
if len(packOrderIds) <2{ |
|
|
return nil,grmi.NewBusinessError("生成包装流水号格式错误!") |
|
|
return nil,grmi.NewBusinessError("生成包装流水号格式错误!") |
|
|
} |
|
|
} |
|
|
qty := utils.ConvInt2FormatString(packTemplate.PlanQty,2) |
|
|
|
|
|
packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + qty + packOrderIds[1] |
|
|
|
|
|
|
|
|
packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + packOrderIds[1] |
|
|
packTemplateItemlstDAO := dal.NewPackTemplateItemlstDAO(session, user.Pid, user.Userid) |
|
|
packTemplateItemlstDAO := dal.NewPackTemplateItemlstDAO(session, user.Pid, user.Userid) |
|
|
|
|
|
|
|
|
packTemplateItems, err := packTemplateItemlstDAO.Select([]grmi.Predicate{ |
|
|
packTemplateItems, err := packTemplateItemlstDAO.Select([]grmi.Predicate{ |
|
@ -1179,8 +1177,8 @@ func (self *PackOrderServiceImplement) CreatePackOrderByTemplate(user *models.Us |
|
|
if len(packOrderIds) <2{ |
|
|
if len(packOrderIds) <2{ |
|
|
return grmi.NewBusinessError("生成包装流水号格式错误!") |
|
|
return grmi.NewBusinessError("生成包装流水号格式错误!") |
|
|
} |
|
|
} |
|
|
qty := utils.ConvInt2FormatString(packTemplate.PlanQty,2) |
|
|
|
|
|
packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + qty + packOrderIds[1] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + packOrderIds[1] |
|
|
|
|
|
|
|
|
packOrderDAO := dal.NewPackOrderDAO(session, user.Pid, user.Userid) |
|
|
packOrderDAO := dal.NewPackOrderDAO(session, user.Pid, user.Userid) |
|
|
err = packOrderDAO.InsertOne(&model.PackOrder{ |
|
|
err = packOrderDAO.InsertOne(&model.PackOrder{ |
|
|