goods: outbound update

model/outbound_detail.go

@@ -49,9 +49,13 @@ func NewOutboundDetailList(outboundId int64, req []*pasturePb.OutboundApplyGoods
 
 type OutboundDetailSlice []*OutboundDetail
 
-func (o OutboundDetailSlice) ToPB() []*pasturePb.OutboundApplyGoodsItem {
+func (o OutboundDetailSlice) ToPB(unitMap map[pasturePb.Unit_Kind]string) []*pasturePb.OutboundApplyGoodsItem {
 	res := make([]*pasturePb.OutboundApplyGoodsItem, len(o))
 	for i, v := range o {
+		unitName := ""
+		if unit, ok := unitMap[v.Unit]; ok {
+			unitName = unit
+		}
 		res[i] = &pasturePb.OutboundApplyGoodsItem{
 			GoodsId:     int32(v.GoodsId),
 			GoodsName:   v.GoodsName,
@@ -60,6 +64,7 @@ func (o OutboundDetailSlice) ToPB() []*pasturePb.OutboundApplyGoodsItem {
 			BatchNumber: v.BatchNumber,
 			Price:       float32(v.Price) / 100,
 			Unit:        v.Unit,
+			UnitName:    unitName,
 			Quantity:    uint32(v.Quantity),
 		}
 	}

module/backend/goods.go

@@ -553,6 +553,8 @@ func (s *StoreEntry) OutboundDetail(ctx context.Context, id int64) (*pasturePb.O
 	if outbound.ExamineAt > 0 {
 		examineAtFormat = time.Unix(outbound.ExamineAt, 0).Local().Format(model.LayoutTime)
 	}
+
+	unitMap := s.UnitMap()
 	return &pasturePb.OutboundDetailResponse{
 		Code: http.StatusOK,
 		Msg:  "ok",
@@ -571,7 +573,7 @@ func (s *StoreEntry) OutboundDetail(ctx context.Context, id int64) (*pasturePb.O
 			ExamineAtFormat:   examineAtFormat,
 			GoodsItem: &pasturePb.OutboundApplyItem{
 				OutType:          outbound.OutType,
-				Goods:            model.OutboundDetailSlice(outboundLogs).ToPB(),
+				Goods:            model.OutboundDetailSlice(outboundLogs).ToPB(unitMap),
 				ApplicantRemarks: outbound.ApplicantRemarks,
 			},
 		},