Merge pull request '修包装单号' (#457) from fix_snrTwo into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/457
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>

services/log/implments/PackOrder.service.impl.go

@@ -816,17 +816,11 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o
 			return nil, grmi.NewBusinessError("生成包装流水号失败!")
 		}
 
-		artId := article.ArtId
-		artInfos := strings.Split(artId, "-")
-		if len(artInfos) >= 2 {
-			artId = artInfos[0] + artInfos[1]
-		}
 		packOrderIds := strings.Split(packOrderId, "-")
 		if len(packOrderIds) <2{
-			packsession.Rollback()
-			return nil, grmi.NewBusinessError("生成包装流水号格式错误!")
+			return nil,grmi.NewBusinessError("生成包装流水号格式错误!")
 		}
-		packOrderId = packOrderIds[0] + "-" + artId + article.Version + packOrderIds[1]
+		packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + packOrderIds[1]
 
 		packTemplateItemlstDAO := dal.NewPackTemplateItemlstDAO(session, user.Pid, user.Userid)
 
@@ -1059,17 +1053,11 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *models.Usertab, ord
 			packsession.Rollback()
 			return nil, grmi.NewBusinessError("生成包装流水号失败!")
 		}
-		artId := article.ArtId
-		artInfos := strings.Split(artId, "-")
-		if len(artInfos) >= 2 {
-			artId = artInfos[0] + artInfos[1]
-		}
 		packOrderIds := strings.Split(packOrderId, "-")
 		if len(packOrderIds) <2{
-			packsession.Rollback()
-			return nil, grmi.NewBusinessError("生成包装流水号格式错误!")
+			return nil,grmi.NewBusinessError("生成包装流水号格式错误!")
 		}
-		packOrderId = packOrderIds[0] + "-" + artId + article.Version + packOrderIds[1]
+		packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + packOrderIds[1]
 		packTemplateItemlstDAO := dal.NewPackTemplateItemlstDAO(session, user.Pid, user.Userid)
 
 		packTemplateItems, err := packTemplateItemlstDAO.Select([]grmi.Predicate{
@@ -1185,16 +1173,12 @@ func (self *PackOrderServiceImplement) CreatePackOrderByTemplate(user *models.Us
 		return grmi.NewBusinessError("生成包装流水号失败!")
 	}
 
-	artId := article.ArtId
-	artInfos := strings.Split(artId, "-")
-	if len(artInfos) >= 2 {
-		artId = artInfos[0] + artInfos[1]
-	}
 	packOrderIds := strings.Split(packOrderId, "-")
 	if len(packOrderIds) <2{
 		return grmi.NewBusinessError("生成包装流水号格式错误!")
 	}
-	packOrderId = packOrderIds[0] + "-" + artId + article.Version + packOrderIds[1]
+
+	packOrderId = packOrderIds[0] + "-" + article.PartId + article.Version + packOrderIds[1]
 
 	packOrderDAO := dal.NewPackOrderDAO(session, user.Pid, user.Userid)
 	err = packOrderDAO.InsertOne(&model.PackOrder{