|
|
@ -375,6 +375,29 @@ func (impl *GoodsReceiptHeadServiceImplement) SelectOne(user *models.Usertab, go |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
|
|
|
|
dao2 := dal.NewGoodsReceiptDetailDAO(session, user.Userid) |
|
|
|
result2, err := dao2.Select([]grmi.Predicate{meta.GoodsReceiptDetail_GoodsReceiptId.NewPredicate(grmi.Equal,goodsReceiptId)}, nil) |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
|
|
|
|
dao3 := dal.NewGoodsReceiptLstDAO(session, user.Userid) |
|
|
|
result3, err := dao3.Select([]grmi.Predicate{meta.GoodsReceiptLst_GoodsReceiptId.NewPredicate(grmi.Equal,goodsReceiptId)}, nil) |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
|
|
|
|
result.GoodsReceiptDetail = result2 |
|
|
|
|
|
|
|
for _, info3 := range result3{ |
|
|
|
for index, info2 := range result.GoodsReceiptDetail{ |
|
|
|
if info3.GRPos == info2.GRPos{ |
|
|
|
result.GoodsReceiptDetail[index].GoodsReceiptLst = append(info2.GoodsReceiptLst, info3) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return result, nil |
|
|
|
} |
|
|
|
|
|
|
|