feed: 是否锁定牛头数比例

http/handler/feed/feed_formula.go

@@ -97,17 +97,11 @@ func AddFeedByFeedFormula(c *gin.Context) {
 		return
 	}
 
-	for _, v := range req.List {
-		if err := valid.ValidateStruct(&req,
-			valid.Field(&req.FeedFormulaId, valid.Required, valid.Min(1)),
-			valid.Field(&v.ForageId, valid.Required, valid.Min(1)),
-			valid.Field(&v.ForageName, valid.Required, valid.Length(1, 30)),
-			valid.Field(&v.Weight, valid.Required, valid.Min(1)),
-			valid.Field(&v.Sort, valid.Required, valid.Min(1)),
-		); err != nil {
-			apierr.AbortBadRequest(c, http.StatusBadRequest, err)
-			return
-		}
+	if err := valid.ValidateStruct(&req,
+		valid.Field(&req.FeedFormulaId, valid.Required, valid.Min(1)),
+	); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
 	}
 
 	if err := middleware.BackendOperation(c).OpsService.AddFeedByFeedFormula(c, &req); err != nil {

model/feed_formula_detail.go

@@ -17,7 +17,7 @@ type FeedFormulaDetail struct {
 	Weight              int32                   `json:"weight"`
 	StirDelay           int32                   `json:"stir_delay"`
 	AllowError          int32                   `json:"allow_error"`
-	PreFit              int64                   `json:"pre_fit"`
+	Prefit              int64                   `json:"prefit"`
 	IsShow              operationPb.IsShow_Kind `json:"is_show"`
 	IsLockCowCountRatio operationPb.IsShow_Kind `json:"is_lock_cow_count_ratio"`
 	Sort                int32                   `json:"sort"`
@@ -44,6 +44,7 @@ func (f FeedFormulaDetailSlice) ToPB() []*operationPb.AddFeedFormulaDetail {
 			StirDelay:       v.StirDelay,
 			AllowError:      v.AllowError,
 			CreatedAt:       int32(v.CreatedAt),
+			PreFit:          int32(v.Prefit),
 			CreatedAtFormat: time.Unix(v.CreatedAt, 0).Format(LayoutTime),
 		}
 	}

module/backend/feed_service.go

@@ -84,13 +84,12 @@ func (s *StoreEntry) AddFeedByFeedFormula(ctx context.Context, req *operationPb.
 	if err := s.DB.Model(new(model.FeedFormula)).First(feedFormulaData).Error; err != nil {
 		return xerr.WithStack(err)
 	}
-
 	defer s.addFeedFormulaDetailAddRecode(ctx, req)
 
 	insertData := make([]*model.FeedFormulaDetail, 0)
 	for _, v := range req.List {
-		feedData := &model.Feed{Id: int64(v.ForageId)}
-		if err := s.DB.Model(new(model.Feed)).First(feedData).Error; err != nil {
+		feedData := &model.Forage{Id: int64(v.ForageId)}
+		if err := s.DB.Model(new(model.Forage)).First(feedData).Error; err != nil {
 			return xerr.WithStack(err)
 		}
 		if v.AllowError > v.StirDelay {

module/backend/pasture_sync_service.go

@@ -361,7 +361,7 @@ func (s *StoreEntry) FeedFormulaDetailInsert(ctx context.Context, groupPasture *
 			ForageName:          data.FName,
 			StirDelay:           data.AutoSecond,
 			AllowError:          data.Deviation,
-			PreFit:              data.PreFtId,
+			Prefit:              data.PreFtId,
 			IsShow:              operationPb.IsShow_OK,
 			IsLockCowCountRatio: operationPb.IsShow_Kind(isLockCowCountRatio),
 			Sort:                data.Sort,