feed: 牧场端饲料配方详情数据同步

model/feed_formula_detail.go

@@ -8,7 +8,7 @@ type FeedFormulaDetail struct {
 	PastureName     string                  `json:"pasture_name"`
 	PastureDataId   int64                   `json:"pasture_data_id"`
 	FeedFormulaId   int64                   `json:"feed_formula_id"`
-	ForgeId         int64                   `json:"forge_id"`
+	ForageId        int64                   `json:"forage_id"`
 	ForageName      string                  `json:"forage_name"`
 	ForageGroupName string                  `json:"forage_group_name"`
 	Weight          int32                   `json:"weight"`
@@ -20,6 +20,6 @@ type FeedFormulaDetail struct {
 	UpdatedAt       int64                   `json:"updated_at"`
 }
 
-func (f *FeedTemplateDetail) TableName() string {
+func (f *FeedFormulaDetail) TableName() string {
 	return "feed_formula_detail"
 }

model/pasture_data.go

@@ -188,7 +188,7 @@ type FeedTemplateDetail struct {
 	PastureId      int64   `json:"pasture_id"`
 	FtId           int64   `json:"ft_id"`
 	FId            int64   `json:"f_id"`
-	FdName         string  `json:"fd_name"`
+	FName          string  `json:"f_name"`
 	LWeight        float64 `json:"l_weight"`
 	FWeight        float64 `json:"f_weight"`
 	IsLockCount    int32   `json:"is_lock_count"`

module/backend/mock/kptservice.go

@@ -96,6 +96,20 @@ func (mr *MockKptServiceMockRecorder) Auth(arg0, arg1 interface{}) *gomock.Call
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Auth", reflect.TypeOf((*MockKptService)(nil).Auth), arg0, arg1)
 }
 
+// CancelDistributeFeedFormula mocks base method.
+func (m *MockKptService) CancelDistributeFeedFormula(arg0 context.Context, arg1 *operationPb.DistributeFeedFormulaRequest) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "CancelDistributeFeedFormula", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// CancelDistributeFeedFormula indicates an expected call of CancelDistributeFeedFormula.
+func (mr *MockKptServiceMockRecorder) CancelDistributeFeedFormula(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CancelDistributeFeedFormula", reflect.TypeOf((*MockKptService)(nil).CancelDistributeFeedFormula), arg0, arg1)
+}
+
 // CategoryDeleteData mocks base method.
 func (m *MockKptService) CategoryDeleteData(arg0 context.Context, arg1 *operationPb.CategoryDeleteRequest) error {
 	m.ctrl.T.Helper()
@@ -434,6 +448,21 @@ func (mr *MockKptServiceMockRecorder) EditGroupPasture(arg0, arg1 interface{}) *
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EditGroupPasture", reflect.TypeOf((*MockKptService)(nil).EditGroupPasture), arg0, arg1)
 }
 
+// EditRecodeFeedFormula mocks base method.
+func (m *MockKptService) EditRecodeFeedFormula(arg0 context.Context, arg1 *operationPb.EditRecodeFeedFormulaRequest) (*operationPb.EditRecodeFeedFormulaResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "EditRecodeFeedFormula", arg0, arg1)
+	ret0, _ := ret[0].(*operationPb.EditRecodeFeedFormulaResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// EditRecodeFeedFormula indicates an expected call of EditRecodeFeedFormula.
+func (mr *MockKptServiceMockRecorder) EditRecodeFeedFormula(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EditRecodeFeedFormula", reflect.TypeOf((*MockKptService)(nil).EditRecodeFeedFormula), arg0, arg1)
+}
+
 // EditSystemMenu mocks base method.
 func (m *MockKptService) EditSystemMenu(arg0 context.Context, arg1 *operationPb.AddMenuRequest) error {
 	m.ctrl.T.Helper()
@@ -608,6 +637,20 @@ func (mr *MockKptServiceMockRecorder) FeedChartStatistics(arg0, arg1 interface{}
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FeedChartStatistics", reflect.TypeOf((*MockKptService)(nil).FeedChartStatistics), arg0, arg1)
 }
 
+// FeedFormulaDetailListSyncData mocks base method.
+func (m *MockKptService) FeedFormulaDetailListSyncData(arg0 context.Context, arg1 *operationPb.FeedFormulaSyncRequest) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "FeedFormulaDetailListSyncData", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// FeedFormulaDetailListSyncData indicates an expected call of FeedFormulaDetailListSyncData.
+func (mr *MockKptServiceMockRecorder) FeedFormulaDetailListSyncData(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FeedFormulaDetailListSyncData", reflect.TypeOf((*MockKptService)(nil).FeedFormulaDetailListSyncData), arg0, arg1)
+}
+
 // FeedFormulaSyncData mocks base method.
 func (m *MockKptService) FeedFormulaSyncData(arg0 context.Context, arg1 *operationPb.FeedFormulaSyncRequest) error {
 	m.ctrl.T.Helper()
@@ -623,11 +666,12 @@ func (mr *MockKptServiceMockRecorder) FeedFormulaSyncData(arg0, arg1 interface{}
 }
 
 // FeedFormulaUsage mocks base method.
-func (m *MockKptService) FeedFormulaUsage(arg0 context.Context, arg1 *operationPb.FeedFormulaUsageRequest) error {
+func (m *MockKptService) FeedFormulaUsage(arg0 context.Context, arg1 *operationPb.FeedFormulaUsageRequest) (*operationPb.FeedFormulaUsageResponse, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "FeedFormulaUsage", arg0, arg1)
-	ret0, _ := ret[0].(error)
-	return ret0
+	ret0, _ := ret[0].(*operationPb.FeedFormulaUsageResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
 }
 
 // FeedFormulaUsage indicates an expected call of FeedFormulaUsage.
@@ -651,6 +695,20 @@ func (mr *MockKptServiceMockRecorder) FeedMixedAndTmrName(arg0, arg1 interface{}
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FeedMixedAndTmrName", reflect.TypeOf((*MockKptService)(nil).FeedMixedAndTmrName), arg0, arg1)
 }
 
+// FeedSyncData mocks base method.
+func (m *MockKptService) FeedSyncData(arg0 context.Context, arg1 *operationPb.FeedFormulaSyncRequest) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "FeedSyncData", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// FeedSyncData indicates an expected call of FeedSyncData.
+func (mr *MockKptServiceMockRecorder) FeedSyncData(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FeedSyncData", reflect.TypeOf((*MockKptService)(nil).FeedSyncData), arg0, arg1)
+}
+
 // ForageEnumList mocks base method.
 func (m *MockKptService) ForageEnumList(arg0 context.Context) *operationPb.ForageEnumListResponse {
 	m.ctrl.T.Helper()
@@ -769,6 +827,21 @@ func (mr *MockKptServiceMockRecorder) GetUserInfo(arg0, arg1 interface{}) *gomoc
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserInfo", reflect.TypeOf((*MockKptService)(nil).GetUserInfo), arg0, arg1)
 }
 
+// GetUserName mocks base method.
+func (m *MockKptService) GetUserName(arg0 context.Context) (string, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetUserName", arg0)
+	ret0, _ := ret[0].(string)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetUserName indicates an expected call of GetUserName.
+func (mr *MockKptServiceMockRecorder) GetUserName(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserName", reflect.TypeOf((*MockKptService)(nil).GetUserName), arg0)
+}
+
 // InventoryStatisticsExcelExport mocks base method.
 func (m *MockKptService) InventoryStatisticsExcelExport(arg0 context.Context, arg1 *operationPb.SearchInventoryStatisticsRequest) (*bytes.Buffer, error) {
 	m.ctrl.T.Helper()

module/backend/pasture_sync_service.go

@@ -341,14 +341,16 @@ func (s *StoreEntry) FeedFormulaDetailInsert(ctx context.Context, groupPasture *
 		if data.Id <= 0 {
 			continue
 		}
+
 		res = append(res, &model.FeedFormulaDetail{
 			PastureId:       groupPasture.PastureId,
 			PastureName:     groupPasture.Name,
 			PastureDataId:   data.Id,
-			ForgeId:         data.FId,
+			ForageId:        data.FId,
 			FeedFormulaId:   data.FtId,
 			Weight:          int32(data.FWeight * 100),
 			ForageGroupName: data.FeedGroup,
+			ForageName:      data.FName,
 			StirDelay:       data.AutoSecond,
 			AllowError:      data.Deviation,
 			IsShow:          operationPb.IsShow_OK,
@@ -356,7 +358,7 @@ func (s *StoreEntry) FeedFormulaDetailInsert(ctx context.Context, groupPasture *
 		})
 	}
 
-	if err := s.DB.Model(new(model.Forage)).Create(res).Error; err != nil {
+	if err := s.DB.Model(new(model.FeedFormulaDetail)).Create(res).Debug().Error; err != nil {
 		return xerr.WithStack(err)
 	}
 	return nil