|
|
@ -10,6 +10,7 @@ import ( |
|
|
|
"LAPP_ACURA_MOM_BACKEND/db" |
|
|
|
"LAPP_ACURA_MOM_BACKEND/global" |
|
|
|
"LAPP_ACURA_MOM_BACKEND/grmi" |
|
|
|
baseMeta "LAPP_ACURA_MOM_BACKEND/meta/base" |
|
|
|
meta "LAPP_ACURA_MOM_BACKEND/meta/jit" |
|
|
|
omMeta "LAPP_ACURA_MOM_BACKEND/meta/om" |
|
|
|
baseModel "LAPP_ACURA_MOM_BACKEND/models/base" |
|
|
@ -182,6 +183,21 @@ func (impl *PackOrderServiceImplement) SelectOne(user *global.User, packOrderId |
|
|
|
if err != nil { |
|
|
|
return nil, grmi.NewBusinessError("查询包装单子项数据失败, error:" + err.Error()) |
|
|
|
} |
|
|
|
artIdLi := make([]interface{}, 0, len(itemLi)) |
|
|
|
for _, item := range itemLi { |
|
|
|
artIdLi = append(artIdLi, item.PartId) |
|
|
|
} |
|
|
|
articleDao := baseDal.NewArticleDAO(session, user.PlantNr, user.UserId) |
|
|
|
articleLi, err := articleDao.Select([]grmi.Predicate{baseMeta.Article_ProjectId.NewPredicate(grmi.Equal, result.ProjectId), baseMeta.Article_ArtId.NewPredicate(grmi.Include, artIdLi...)}, nil) |
|
|
|
if err != nil { |
|
|
|
return nil, grmi.NewBusinessError("查询物料数据失败, error:" + err.Error()) |
|
|
|
} |
|
|
|
artMap := make(map[string]string, len(articleLi)) |
|
|
|
for index, item := range itemLi { |
|
|
|
artDesc := artMap[item.PartId] |
|
|
|
item.ArtDesc = artDesc |
|
|
|
itemLi[index] = item |
|
|
|
} |
|
|
|
result.PackOrderItemLstLi = itemLi |
|
|
|
return result, nil |
|
|
|
} |
|
|
|