feed: 配方版本控制

model/pasture_data.go

@@ -1,5 +1,7 @@
 package model
 
+import operationPb "kpt-tmr-group/proto/go/backend/operation"
+
 type DistributeFeedFormulaRequest struct {
 	PastureId         int64                `json:"pasture_id"`
 	FeedFormula       []*FeedFormula       `json:"feed_formula"`
@@ -204,9 +206,10 @@ type FeedTemplateDetail struct {
 }
 
 type FeedFormulaUpdateVersionRequest struct {
-	FeedTemplateId int64 `json:"feed_template_id"` // 配方id
-	Version        int64 `json:"version"`          // 版本号
-	Belong         int32 `json:"belong"`           // 配方归属  0 无效 1 归属集团端 2 归属牧场端
+	FeedTemplateId int64                               `json:"feed_template_id"` // 配方id
+	Version        int64                               `json:"version"`          // 版本号
+	Belong         int32                               `json:"belong"`           // 配方归属  0 无效 1 归属集团端 2 归属牧场端
+	Data           []*operationPb.AddFeedFormulaDetail `json:"data"`
 }
 
 type FeedFormulaUpdateVersionResponse struct {

module/backend/feed_service.go

@@ -1043,7 +1043,7 @@ func (s *StoreEntry) UpdateFeedFormalVersion(ctx context.Context, req *model.Fee
 		Where("feed_formula_id = ?", req.Id).
 		Where("is_show = ?", operationPb.IsShow_OK).
 		Group("pasture_id").
-		Find(&feedFormulaDistributeLogList).Debug().Error; err != nil {
+		Find(&feedFormulaDistributeLogList).Error; err != nil {
 		if !errors.Is(err, gorm.ErrRecordNotFound) {
 			zaplog.Error("UpdateFeedFormalVersion-feedFormulaDistributeLog", zap.Any("err", err))
 		}
@@ -1083,11 +1083,20 @@ func (s *StoreEntry) UpdatePastureFeedDetailVersionLog(ctx context.Context, dist
 		feedTemplateId = req.PastureDataId
 	}
 
+	list := make([]*operationPb.AddFeedFormulaDetail, 0)
+	if err = s.DB.Model(new(model.FeedFormulaDetail)).Where("feed_formula_id = ?", req.Id).Find(&list).Error; err != nil {
+		zaplog.Error("UpdatePastureFeedDetailVersionLog-getFeedFormulaDetail",
+			zap.Any("err", err),
+			zap.Any("feed_formula_id", req.Id))
+		return
+	}
+
 	response := &model.FeedFormulaUpdateVersionResponse{}
 	body := &model.FeedFormulaUpdateVersionRequest{
 		FeedTemplateId: feedTemplateId,
 		Version:        req.Version,
 		Belong:         belong,
+		Data:           make([]*operationPb.AddFeedFormulaDetail, 0),
 	}
 
 	zaplog.Info("UpdateFeedFormalVersion", zap.Any("body", body))