Merge pull request '修改流水号获取方式' (#32) from feature_honda into develop

Reviewed-on: #32

dao/me/implments/ProductFamily.dao.impl.go

@@ -214,11 +214,27 @@ func (impl *ProductFamilyDAOImplement) SelectAndRelate(predicates []string) ([]m
 	for _, v := range relateList {
 		relateMap[v.ProjectId+"[|]"+v.ProductFamilyId] = append(relateMap[v.ProjectId+"[|]"+v.ProductFamilyId], v)
 	}
+	var projectId []string
 	for k, v := range data {
 		info, ok := relateMap[v.ProjectId+"[|]"+v.ProductFamilyId]
 		if ok {
 			data[k].Relate = info
 		}
+		projectId = append(projectId, v.ProjectId)
+	}
+
+	//查询车型
+	var project []model.Project
+	err = impl.session.Table(meta.Project.TableName).In(meta.Project_ProjectId.Name, projectId).Find(&project)
+	projectMap := make(map[string]model.Project)
+	for _, v := range project {
+		projectMap[v.ProjectId] = v
+	}
+	for k, v := range data {
+		info, ok := projectMap[v.ProjectId]
+		if ok {
+			data[k].Project = info
+		}
 	}
 	return data, nil
 }

models/me/ProductFamily.model.go

@@ -42,6 +42,7 @@ type ProductFamily struct {
 	CreateTime        grmi.DateTime         `xorm:"datetime 'CreateTime' not null created" json:"ME_ProductFamily-CreateTime"`
 	Product           []Product             `xorm:"-" json:"ME_ProductFamily-Product"`
 	Relate            []ProductFamilyRelate `xorm:"-" json:"-"`
+	Project           Project               `xorm:"-" json:"-"`
 }
 
 /******************************************************************************

services/pln/implments/HondaDemand.service.impl.go

@@ -179,6 +179,7 @@ func (impl *HondaDemandServiceImplement) InsertOne(user *global.User, entity *mo
 	}
 	//添加主数据
 	snrDao := baseDal.NewSnrDAO(session, user.PlantNr, user.UserId)
+
 	entity.DemandId, err = snrDao.GetNextSnr("HondaID")
 	if err != nil {
 		log.Error("HondaID InsertOne get HondaDemand DemandId failed, error: " + err.Error())
@@ -257,6 +258,7 @@ func (impl *HondaDemandServiceImplement) AnalysisFile(info utils.ChannelsInfo) (
 	errDao := dal.NewHondaDemandErrorLstDAO(session, baseModel.PlantNr, "system")
 	dao := dal.NewHondaDemandDAO(session, baseModel.PlantNr, "system")
 	infoDao := dal.NewHondaDemandItemLstDAO(session, baseModel.PlantNr, "system")
+
 	//配置
 	familyDao := dalMe.NewProductFamilyDAO(session, baseModel.PlantNr, "system")
 	//流水号
@@ -344,7 +346,8 @@ func (impl *HondaDemandServiceImplement) AnalysisFile(info utils.ChannelsInfo) (
 		familyInfo, ok := familyMap[v.ProductFamilyId]
 		if ok {
 			for _, val := range familyInfo.Relate {
-				custOrderId, err := snrDao.GetNextSnr("custOrderID")
+
+				custOrderId, err := snrDao.GetNextSnr(familyInfo.Project.CustOrderSnr)
 				if err != nil {
 					errData := model.HondaDemandErrorLst{
 						DemandId:    entity.DemandId,