feat(module/feed module global/import): 添加饲喂管理/饲喂计划模块

添加饲喂管理/饲喂计划模块对配方管理的一些已知问题进行修正使用IDEA自动优化import对整个项目进行了import优化 BREAKING CHANGE: 使用IDEA自动优化import对整个项目进行了import优化
2025-08-17 18:25:43 +08:00 · 2025-08-17 18:25:43 +08:00 · 73468bf675
commit 73468bf675
parent aefd954003
81 changed files with 139 additions and 238 deletions
--- a/zhyc-admin/src/main/java/com/zhyc/SheepApplication.java
+++ b/zhyc-admin/src/main/java/com/zhyc/SheepApplication.java
@ -3,7 +3,6 @@ package com.zhyc;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;

 /**
 * 启动程序
--- a/zhyc-framework/src/main/java/com/zhyc/framework/aspectj/RateLimiterAspect.java
+++ b/zhyc-framework/src/main/java/com/zhyc/framework/aspectj/RateLimiterAspect.java
@ -4,7 +4,6 @@ import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
@ -12,7 +11,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.script.RedisScript;
-import org.springframework.stereotype.Component;
 import com.zhyc.common.annotation.RateLimiter;
 import com.zhyc.common.enums.LimitType;
 import com.zhyc.common.exception.ServiceException;
--- a/zhyc-framework/src/main/java/com/zhyc/framework/config/RedisConfig.java
+++ b/zhyc-framework/src/main/java/com/zhyc/framework/config/RedisConfig.java
@ -1,9 +1,6 @@
 package com.zhyc.framework.config;

 import org.springframework.cache.annotation.CachingConfigurerSupport;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.script.DefaultRedisScript;
--- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java
@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletResponse;

 import com.zhyc.module.base.domain.BasSheep;
 import com.zhyc.module.base.domain.BasSheepVariety;
-import com.zhyc.module.base.mapper.BasSheepMapper;
 import com.zhyc.module.base.service.IBasSheepService;
 import com.zhyc.module.base.service.IBasSheepVarietyService;
 import org.springframework.security.access.prepost.PreAuthorize;
--- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepTypeController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepTypeController.java
@ -1,12 +1,8 @@
 package com.zhyc.module.base.controller;

-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;

-import com.zhyc.module.base.domain.BasSheep;
 import com.zhyc.module.base.service.IBasSheepService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
--- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java
@ -6,7 +6,6 @@ import com.zhyc.common.core.domain.AjaxResult;
 import com.zhyc.common.core.page.TableDataInfo;
 import com.zhyc.common.enums.BusinessType;
 import com.zhyc.common.utils.poi.ExcelUtil;
-import com.zhyc.module.base.domain.BasSheep;
 import com.zhyc.module.base.domain.SheepFile;
 import com.zhyc.module.base.service.ISheepFileService;
 import org.springframework.beans.factory.annotation.Autowired;
--- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java
@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java
@ -5,8 +5,6 @@ import com.zhyc.common.core.domain.TreeEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;

 /**
 * 分组管理对象 bas_sheep_group
--- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java
@ -3,8 +3,6 @@ package com.zhyc.module.base.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java
@ -3,9 +3,6 @@ package com.zhyc.module.base.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

 /**
--- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java
@ -3,8 +3,6 @@ package com.zhyc.module.base.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaRanch.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaRanch.java
@ -3,9 +3,6 @@ package com.zhyc.module.base.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

 /**
--- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java
@ -5,8 +5,6 @@ import com.zhyc.common.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;

 /**
 * 羊舍管理对象 da_sheepfold
--- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java
@ -6,8 +6,6 @@ import com.zhyc.common.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;

 import java.util.Date;

--- a/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepTypeService.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepTypeService.java
@ -2,7 +2,6 @@ package com.zhyc.module.base.service;

 import java.util.List;

-import com.zhyc.module.base.domain.BasSheep;
 import com.zhyc.module.base.domain.BasSheepType;

 /**
--- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepTypeServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepTypeServiceImpl.java
@ -2,7 +2,6 @@ package com.zhyc.module.base.service.impl;

 import java.util.List;

-import com.zhyc.module.base.domain.BasSheep;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zhyc.module.base.mapper.BasSheepTypeMapper;
--- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java
@ -1,6 +1,5 @@
 package com.zhyc.module.base.service.impl;

-import com.zhyc.common.utils.DateUtils;
 import com.zhyc.module.base.domain.SheepFile;
 import com.zhyc.module.base.mapper.SheepFileMapper;
 import com.zhyc.module.base.service.ISheepFileService;
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java
@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java
@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java
@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java
@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java
@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java
@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;
 import org.apache.ibatis.type.Alias;
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java
@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java
@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.TreeEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java
@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java
@ -5,8 +5,6 @@ import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java
@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java
@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java
@ -3,8 +3,6 @@ package com.zhyc.module.biosafety.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java
@ -1,6 +1,5 @@
 package com.zhyc.module.biosafety.domain;

-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

@ -8,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ITreatmentService.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ITreatmentService.java
@ -3,7 +3,6 @@ package com.zhyc.module.biosafety.service;
 import java.util.List;

 import com.zhyc.module.biosafety.domain.Treatment;
-import org.springframework.transaction.annotation.Transactional;

 /**
 * 治疗记录Service接口
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java
@ -10,7 +10,6 @@ import com.zhyc.module.base.mapper.SheepFileMapper;
 import com.zhyc.module.biosafety.domain.Deworm;
 import com.zhyc.module.biosafety.domain.SwMedicineUsage;
 import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails;
-import com.zhyc.module.biosafety.domain.Treatment;
 import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java
@ -5,9 +5,7 @@ import java.util.List;
 import com.zhyc.common.utils.DateUtils;
 import com.zhyc.common.utils.SecurityUtils;
 import com.zhyc.common.utils.bean.BeanUtils;
-import com.zhyc.module.base.domain.SheepFile;
 import com.zhyc.module.base.mapper.SheepFileMapper;
-import com.zhyc.module.biosafety.domain.Deworm;
 import com.zhyc.module.biosafety.domain.SwMedicineUsage;
 import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails;
 import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper;
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java
@ -7,7 +7,6 @@ import com.zhyc.common.utils.SecurityUtils;
 import com.zhyc.common.utils.bean.BeanUtils;
 import com.zhyc.module.base.domain.SheepFile;
 import com.zhyc.module.base.mapper.SheepFileMapper;
-import com.zhyc.module.biosafety.domain.Health;
 import com.zhyc.module.biosafety.domain.SwMedicineUsage;
 import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails;
 import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper;
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java
@ -7,7 +7,6 @@ import com.zhyc.common.utils.SecurityUtils;
 import com.zhyc.common.utils.bean.BeanUtils;
 import com.zhyc.module.base.domain.SheepFile;
 import com.zhyc.module.base.mapper.SheepFileMapper;
-import com.zhyc.module.biosafety.domain.Deworm;
 import com.zhyc.module.biosafety.domain.SwMedicineUsage;
 import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails;
 import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper;
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java
@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 import com.zhyc.common.utils.DateUtils;
 import com.zhyc.common.utils.SecurityUtils;
-import com.zhyc.common.utils.StringUtils;
 import com.zhyc.common.utils.bean.BeanUtils;
 import com.zhyc.module.base.domain.SheepFile;
 import com.zhyc.module.base.service.impl.SheepFileServiceImpl;
--- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java
@ -7,7 +7,6 @@ import com.zhyc.common.utils.SecurityUtils;
 import com.zhyc.common.utils.bean.BeanUtils;
 import com.zhyc.module.base.domain.SheepFile;
 import com.zhyc.module.base.mapper.SheepFileMapper;
-import com.zhyc.module.base.service.impl.SheepFileServiceImpl;
 import com.zhyc.module.biosafety.domain.SwMedicineUsage;
 import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails;
 import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper;
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpMilkInOutStoreController.java
@ -4,7 +4,6 @@ import com.zhyc.common.annotation.Log;
 import com.zhyc.common.core.controller.BaseController;
 import com.zhyc.common.core.domain.AjaxResult;
 import com.zhyc.common.enums.BusinessType;
-import com.zhyc.module.dairyProducts.domain.NpMilkInOutStore;
 import com.zhyc.module.dairyProducts.service.INpMilkInOutStoreService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/RanchController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/RanchController.java
@ -2,13 +2,10 @@ package com.zhyc.module.dairyProducts.controller;

 import com.zhyc.common.core.controller.BaseController;
 import com.zhyc.common.core.domain.AjaxResult;
-import com.zhyc.module.dairyProducts.domain.Ranch;
 import com.zhyc.module.dairyProducts.service.IRanchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

-import java.util.List;
-
@RestController
@RequestMapping("/dairyProducts/ranch")
 public class RanchController extends BaseController {
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzParityCorrectionController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzParityCorrectionController.java
@ -19,7 +19,6 @@ import com.zhyc.common.enums.BusinessType;
 import com.zhyc.module.dairyProducts.domain.XzParityCorrection;
 import com.zhyc.module.dairyProducts.service.IXzParityCorrectionService;
 import com.zhyc.common.utils.poi.ExcelUtil;
-import com.zhyc.common.core.page.TableDataInfo;

 /**
 * 胎次校正Controller
--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java
@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java
@ -347,8 +347,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java
@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java
@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java
@ -3,8 +3,6 @@ package com.zhyc.module.dairyProducts.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java
@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpMilkInOutStoreService.java
@ -1,6 +1,5 @@
 package com.zhyc.module.dairyProducts.service;

-import com.zhyc.module.dairyProducts.domain.NpMilkInOutStore;
 import org.springframework.web.multipart.MultipartFile;

 import java.util.Date;
--- a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedPlanController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgFeedPlanController.java
@ -3,6 +3,8 @@ package com.zhyc.module.feed.controller;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhyc.module.feed.domain.SgFeedPlan;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@ -16,7 +18,6 @@ import com.zhyc.common.annotation.Log;
 import com.zhyc.common.core.controller.BaseController;
 import com.zhyc.common.core.domain.AjaxResult;
 import com.zhyc.common.enums.BusinessType;
-import com.zhyc.module.feed.domain.SgFeedPlan;
 import com.zhyc.module.feed.service.ISgFeedPlanService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
@ -25,12 +26,11 @@ import com.zhyc.common.core.page.TableDataInfo;
 * 饲喂计划Controller
 *
 * @author HashMap
- * @date 2025-08-08
+ * @date 2025-08-14
 */
@RestController
@RequestMapping("/feed/FeedPlan")
-public class SgFeedPlanController extends BaseController
-{
+public class SgFeedPlanController extends BaseController {
    private final ISgFeedPlanService sgFeedPlanService;

    public SgFeedPlanController(ISgFeedPlanService sgFeedPlanService) {
@ -42,8 +42,7 @@ public class SgFeedPlanController extends BaseController
     */
    @PreAuthorize("@ss.hasPermi('feed:FeedPlan:list')")
    @GetMapping("/list")
-    public TableDataInfo list(SgFeedPlan sgFeedPlan)
-    {
+    public TableDataInfo list(SgFeedPlan sgFeedPlan) {
        startPage();
        List<SgFeedPlan> list = sgFeedPlanService.selectSgFeedPlanList(sgFeedPlan);
        return getDataTable(list);
@ -55,8 +54,7 @@ public class SgFeedPlanController extends BaseController
    @PreAuthorize("@ss.hasPermi('feed:FeedPlan:export')")
    @Log(title = "饲喂计划", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
-    public void export(HttpServletResponse response, SgFeedPlan sgFeedPlan)
-    {
+    public void export(HttpServletResponse response, SgFeedPlan sgFeedPlan) {
        List<SgFeedPlan> list = sgFeedPlanService.selectSgFeedPlanList(sgFeedPlan);
        ExcelUtil<SgFeedPlan> util = new ExcelUtil<>(SgFeedPlan.class);
        util.exportExcel(response, list, "饲喂计划数据");
@ -67,8 +65,7 @@ public class SgFeedPlanController extends BaseController
     */
    @PreAuthorize("@ss.hasPermi('feed:FeedPlan:query')")
    @GetMapping(value = "/{createDate}")
-    public AjaxResult getInfo(@PathVariable("createDate") Date createDate)
-    {
+    public AjaxResult getInfo(@PathVariable("createDate") Date createDate) {
        return success(sgFeedPlanService.selectSgFeedPlanByCreateDate(createDate));
    }

@ -78,8 +75,13 @@ public class SgFeedPlanController extends BaseController
    @PreAuthorize("@ss.hasPermi('feed:FeedPlan:add')")
    @Log(title = "饲喂计划", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult add(@RequestBody SgFeedPlan sgFeedPlan)
-    {
+    public AjaxResult add(@RequestBody SgFeedPlan sgFeedPlan) {
+        if (null == sgFeedPlan) {
+            throw new RuntimeException("数据为空");
+        }
+        sgFeedPlan.setCreateDate(new Date());
+        // 计算其他字段值
+        setPlan(sgFeedPlan);
        return toAjax(sgFeedPlanService.insertSgFeedPlan(sgFeedPlan));
    }

@ -89,8 +91,9 @@ public class SgFeedPlanController extends BaseController
    @PreAuthorize("@ss.hasPermi('feed:FeedPlan:edit')")
    @Log(title = "饲喂计划", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult edit(@RequestBody SgFeedPlan sgFeedPlan)
-    {
+    public AjaxResult edit(@RequestBody SgFeedPlan sgFeedPlan) {
+        // 根据修改后的值重新计算
+        setPlan(sgFeedPlan);
        return toAjax(sgFeedPlanService.updateSgFeedPlan(sgFeedPlan));
    }

@ -100,8 +103,24 @@ public class SgFeedPlanController extends BaseController
    @PreAuthorize("@ss.hasPermi('feed:FeedPlan:remove')")
    @Log(title = "饲喂计划", businessType = BusinessType.DELETE)
    @DeleteMapping("/{createDates}")
-    public AjaxResult remove(@PathVariable Date[] createDates)
-    {
+    public AjaxResult remove(@PathVariable Date[] createDates) {
        return toAjax(sgFeedPlanService.deleteSgFeedPlanByCreateDates(createDates));
    }
+
+    /**
+     * 设定计划值
+     * 用于添加和修改
+     */
+    private SgFeedPlan setPlan(SgFeedPlan sgFeedPlan) {
+        // 根据羊舍ID获取羊只数量
+        int countByFoldId = sgFeedPlanService.getSheepCountByFoldId(sgFeedPlan.getSheepHouseId());
+        sgFeedPlan.setSheepCount(countByFoldId);
+        // 计算总计划量
+        sgFeedPlan.setPlanFeedTotal(countByFoldId * sgFeedPlan.getPlanDailySize());
+        // 计算早中晚计划量
+        sgFeedPlan.setPlanMorningSize(sgFeedPlan.getPlanFeedTotal() * (sgFeedPlan.getRatioMorning() / 100));
+        sgFeedPlan.setPlanNoonSize(sgFeedPlan.getPlanFeedTotal() * (sgFeedPlan.getRatioNoon() / 100));
+        sgFeedPlan.setPlanAfternoonSize(sgFeedPlan.getPlanFeedTotal() * (sgFeedPlan.getRatioAfternoon() / 100));
+        return sgFeedPlan;
+    }
 }
--- a/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgMaterialController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/feed/controller/SgMaterialController.java
@ -3,7 +3,6 @@ package com.zhyc.module.feed.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
--- a/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedPlan.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/feed/domain/SgFeedPlan.java
@ -13,86 +13,88 @@ import com.zhyc.common.core.domain.BaseEntity;
 * 饲喂计划对象 sg_feed_plan
 * 
 * @author HashMap
- * @date 2025-08-08
+ * @date 2025-08-14
 */
-@Setter
@Getter
+@Setter
 public class SgFeedPlan extends BaseEntity
 {
    private static final long serialVersionUID = 1L;

    /** 创建日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date createDate;

    /** 配方编码 */
    @Excel(name = "配方编码")
    private String formulaId;

+    /** 批号 */
+    @Excel(name = "批号")
+    private String batchId;
+
    /** 羊舍 */
    @Excel(name = "羊舍")
-    private Long sheepHouseId;
+    private Integer sheepHouseId;

    /** 羊只数量 */
    @Excel(name = "羊只数量")
-    private Long sheepCount;
+    private Integer sheepCount;

    /** 日均计划量 */
    @Excel(name = "日均计划量")
-    private Long planDailySize;
-
-    /** 计划量(早) */
-    @Excel(name = "计划量(早)")
-    private Long planMorningSize;
-
-    /** 计划总量(早) */
-    @Excel(name = "计划总量(早)")
-    private Long planMorningTotal;
+    private Double planDailySize;

    /** 饲喂比例(早) */
    @Excel(name = "饲喂比例(早)")
-    private Long ratioMorning;
-
-    /** 实际量(早) */
-    @Excel(name = "实际量(早)")
-    private Long actualMorningSize;
-
-    /** 计划量(中) */
-    @Excel(name = "计划量(中)")
-    private Long planNoonSize;
-
-    /** 计划总量(中) */
-    @Excel(name = "计划总量(中)")
-    private Long planNoonTotal;
-
-    /** 实际量(中) */
-    @Excel(name = "实际量(中)")
-    private Long actualNoonSize;
+    private Double ratioMorning;

    /** 饲喂比例(中) */
    @Excel(name = "饲喂比例(中)")
-    private Long ratioNoon;
-
-    /** 计划量(下) */
-    @Excel(name = "计划量(下)")
-    private Long planAfternoonSize;
-
-    /** 计划总量(下) */
-    @Excel(name = "计划总量(下)")
-    private Long planAfternoonTotal;
-
-    /** 实际量(下) */
-    @Excel(name = "实际量(下)")
-    private Long actualAfternoonSize;
+    private Double ratioNoon;

    /** 饲喂比例(下) */
    @Excel(name = "饲喂比例(下)")
-    private Long ratioAfternoon;
+    private Double ratioAfternoon;
+
+    /** 计划量(早) */
+    @Excel(name = "计划量(早)")
+    private Double planMorningSize;
+
+    /** 计划总量(早) */
+    @Excel(name = "计划总量(早)")
+    private Double planMorningTotal;
+
+    /** 实际量(早) */
+    @Excel(name = "实际量(早)")
+    private Double actualMorningSize;
+
+    /** 计划量(中) */
+    @Excel(name = "计划量(中)")
+    private Double planNoonSize;
+
+    /** 计划总量(中) */
+    @Excel(name = "计划总量(中)")
+    private Double planNoonTotal;
+
+    /** 实际量(中) */
+    @Excel(name = "实际量(中)")
+    private Double actualNoonSize;
+
+    /** 计划量(下) */
+    @Excel(name = "计划量(下)")
+    private Double planAfternoonSize;
+
+    /** 计划总量(下) */
+    @Excel(name = "计划总量(下)")
+    private Double planAfternoonTotal;
+
+    /** 实际量(下) */
+    @Excel(name = "实际量(下)")
+    private Double actualAfternoonSize;

    /** 计划饲喂总量 */
    @Excel(name = "计划饲喂总量")
-    private Long planFeedTotal;
+    private Double planFeedTotal;

    /** 饲草班人员 */
    @Excel(name = "饲草班人员")
@ -108,21 +110,22 @@ public class SgFeedPlan extends BaseEntity
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("createDate", getCreateDate())
            .append("formulaId", getFormulaId())
+            .append("batchId", getBatchId())
            .append("sheepHouseId", getSheepHouseId())
            .append("sheepCount", getSheepCount())
            .append("planDailySize", getPlanDailySize())
+            .append("ratioMorning", getRatioMorning())
+            .append("ratioNoon", getRatioNoon())
+            .append("ratioAfternoon", getRatioAfternoon())
            .append("planMorningSize", getPlanMorningSize())
            .append("planMorningTotal", getPlanMorningTotal())
-            .append("ratioMorning", getRatioMorning())
            .append("actualMorningSize", getActualMorningSize())
            .append("planNoonSize", getPlanNoonSize())
            .append("planNoonTotal", getPlanNoonTotal())
            .append("actualNoonSize", getActualNoonSize())
-            .append("ratioNoon", getRatioNoon())
            .append("planAfternoonSize", getPlanAfternoonSize())
            .append("planAfternoonTotal", getPlanAfternoonTotal())
            .append("actualAfternoonSize", getActualAfternoonSize())
-            .append("ratioAfternoon", getRatioAfternoon())
            .append("planFeedTotal", getPlanFeedTotal())
            .append("zookeeper", getZookeeper())
            .append("planDate", getPlanDate())
--- a/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedPlanMapper.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/feed/mapper/SgFeedPlanMapper.java
@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
 * 饲喂计划Mapper接口
 * 
 * @author HashMap
- * @date 2025-08-08
+ * @date 2025-08-14
 */
@Mapper
 public interface SgFeedPlanMapper 
@ -20,7 +20,7 @@ public interface SgFeedPlanMapper
     * @param createDate 饲喂计划主键
     * @return 饲喂计划
     */
-    SgFeedPlan selectSgFeedPlanByCreateDate(Date createDate);
+    public SgFeedPlan selectSgFeedPlanByCreateDate(Date createDate);

    /**
     * 查询饲喂计划列表
@ -28,7 +28,7 @@ public interface SgFeedPlanMapper
     * @param sgFeedPlan 饲喂计划
     * @return 饲喂计划集合
     */
-    List<SgFeedPlan> selectSgFeedPlanList(SgFeedPlan sgFeedPlan);
+    public List<SgFeedPlan> selectSgFeedPlanList(SgFeedPlan sgFeedPlan);

    /**
     * 新增饲喂计划
@ -36,7 +36,7 @@ public interface SgFeedPlanMapper
     * @param sgFeedPlan 饲喂计划
     * @return 结果
     */
-    int insertSgFeedPlan(SgFeedPlan sgFeedPlan);
+    public int insertSgFeedPlan(SgFeedPlan sgFeedPlan);

    /**
     * 修改饲喂计划
@ -44,7 +44,7 @@ public interface SgFeedPlanMapper
     * @param sgFeedPlan 饲喂计划
     * @return 结果
     */
-    int updateSgFeedPlan(SgFeedPlan sgFeedPlan);
+    public int updateSgFeedPlan(SgFeedPlan sgFeedPlan);

    /**
     * 删除饲喂计划
@ -52,7 +52,7 @@ public interface SgFeedPlanMapper
     * @param createDate 饲喂计划主键
     * @return 结果
     */
-    int deleteSgFeedPlanByCreateDate(Date createDate);
+    public int deleteSgFeedPlanByCreateDate(Date createDate);

    /**
     * 批量删除饲喂计划
@ -60,5 +60,7 @@ public interface SgFeedPlanMapper
     * @param createDates 需要删除的数据主键集合
     * @return 结果
     */
-    int deleteSgFeedPlanByCreateDates(Date[] createDates);
+    public int deleteSgFeedPlanByCreateDates(Date[] createDates);
+
+    int selectSheepCountByFoldId(Integer foldId);
 }
--- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedPlanService.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/feed/service/ISgFeedPlanService.java
@ -8,7 +8,7 @@ import com.zhyc.module.feed.domain.SgFeedPlan;
 * 饲喂计划Service接口
 * 
 * @author HashMap
- * @date 2025-08-08
+ * @date 2025-08-14
 */
 public interface ISgFeedPlanService 
 {
@ -18,7 +18,7 @@ public interface ISgFeedPlanService
     * @param createDate 饲喂计划主键
     * @return 饲喂计划
     */
-    SgFeedPlan selectSgFeedPlanByCreateDate(Date createDate);
+    public SgFeedPlan selectSgFeedPlanByCreateDate(Date createDate);

    /**
     * 查询饲喂计划列表
@ -26,7 +26,7 @@ public interface ISgFeedPlanService
     * @param sgFeedPlan 饲喂计划
     * @return 饲喂计划集合
     */
-    List<SgFeedPlan> selectSgFeedPlanList(SgFeedPlan sgFeedPlan);
+    public List<SgFeedPlan> selectSgFeedPlanList(SgFeedPlan sgFeedPlan);

    /**
     * 新增饲喂计划
@ -34,7 +34,7 @@ public interface ISgFeedPlanService
     * @param sgFeedPlan 饲喂计划
     * @return 结果
     */
-    int insertSgFeedPlan(SgFeedPlan sgFeedPlan);
+    public int insertSgFeedPlan(SgFeedPlan sgFeedPlan);

    /**
     * 修改饲喂计划
@ -42,7 +42,7 @@ public interface ISgFeedPlanService
     * @param sgFeedPlan 饲喂计划
     * @return 结果
     */
-    int updateSgFeedPlan(SgFeedPlan sgFeedPlan);
+    public int updateSgFeedPlan(SgFeedPlan sgFeedPlan);

    /**
     * 批量删除饲喂计划
@ -50,7 +50,7 @@ public interface ISgFeedPlanService
     * @param createDates 需要删除的饲喂计划主键集合
     * @return 结果
     */
-    int deleteSgFeedPlanByCreateDates(Date[] createDates);
+    public int deleteSgFeedPlanByCreateDates(Date[] createDates);

    /**
     * 删除饲喂计划信息
@ -58,5 +58,7 @@ public interface ISgFeedPlanService
     * @param createDate 饲喂计划主键
     * @return 结果
     */
-    int deleteSgFeedPlanByCreateDate(Date createDate);
+    public int deleteSgFeedPlanByCreateDate(Date createDate);
+
+    int getSheepCountByFoldId(Integer foldId);
 }
--- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedPlanServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFeedPlanServiceImpl.java
@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 * 饲喂计划Service业务层处理
 * 
 * @author HashMap
- * @date 2025-08-08
+ * @date 2025-08-14
 */
@Service
@Transactional(rollbackFor=Exception.class)
@ -96,4 +96,9 @@ public class SgFeedPlanServiceImpl implements ISgFeedPlanService
    {
        return sgFeedPlanMapper.deleteSgFeedPlanByCreateDate(createDate);
    }
+
+    @Override
+    public int getSheepCountByFoldId(Integer foldId) {
+        return sgFeedPlanMapper.selectSheepCountByFoldId(foldId);
+    }
 }
--- a/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFormulaListServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/feed/service/impl/SgFormulaListServiceImpl.java
@ -1,7 +1,6 @@
 package com.zhyc.module.feed.service.impl;

 import java.util.List;
-import java.util.Objects;

 import org.springframework.stereotype.Service;
 import com.zhyc.module.feed.mapper.SgFormulaListMapper;
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyMeasureController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyMeasureController.java
@ -3,7 +3,6 @@ package com.zhyc.module.produce.bodyManage.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;

-import com.zhyc.common.utils.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java
@ -3,11 +3,8 @@ package com.zhyc.module.produce.bodyManage.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;
-import org.springframework.data.annotation.AccessType;

 /**
 * 体尺测量对象 sc_body_measure
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java
@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java
@ -3,8 +3,6 @@ package com.zhyc.module.produce.bodyManage.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java
@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java
@ -3,8 +3,6 @@ package com.zhyc.module.produce.breed.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java
@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java
@ -3,8 +3,6 @@ package com.zhyc.module.produce.breed.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java
@ -1,13 +1,8 @@
 package com.zhyc.module.produce.breed.domain;

-import java.math.BigDecimal;
-import java.util.Date;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java
@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java
@ -8,8 +8,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java
@ -1,13 +1,10 @@
 package com.zhyc.module.produce.breed.domain;

-import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java
@ -8,8 +8,6 @@ import com.zhyc.common.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;

 /**
 * 断奶记录对象 sc_wean_record
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScLambingRecordMapper.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScLambingRecordMapper.java
@ -2,7 +2,6 @@ package com.zhyc.module.produce.breed.mapper;

 import java.util.List;
 import com.zhyc.module.produce.breed.domain.ScLambingRecord;
-import com.zhyc.module.produce.breed.domain.ScLambDetail;
 import org.apache.ibatis.annotations.Mapper;

 /**
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScPregnancyRecordServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScPregnancyRecordServiceImpl.java
@ -3,7 +3,6 @@ package com.zhyc.module.produce.breed.service.impl;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Date;
 import java.util.Calendar;

 import com.zhyc.common.utils.DateUtils;
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java
@ -3,8 +3,6 @@ package com.zhyc.module.produce.manage_sheep.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java
@ -3,8 +3,6 @@ package com.zhyc.module.produce.manage_sheep.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java
@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java
@ -3,11 +3,8 @@ package com.zhyc.module.produce.manage_sheep.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;
-import org.springframework.beans.factory.annotation.Autowired;

 /**
 * 转群记录对象 sc_trans_group
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java
@ -3,8 +3,6 @@ package com.zhyc.module.produce.manage_sheep.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java
@ -2,7 +2,7 @@ package com.zhyc.module.produce.manage_sheep.service.impl;

 import java.util.Date;
 import java.util.List;
-import com.zhyc.common.utils.DateUtils;
+
 import com.zhyc.common.utils.SecurityUtils;
 import com.zhyc.module.base.domain.BasSheep;
 import com.zhyc.module.base.service.IBasSheepService;
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java
@ -8,7 +8,6 @@ import com.zhyc.common.utils.StringUtils;
 import com.zhyc.module.base.domain.BasSheep;
 import com.zhyc.module.base.domain.DaRanch;
 import com.zhyc.module.base.mapper.BasSheepMapper;
-import com.zhyc.module.base.mapper.DaRanchMapper;
 import com.zhyc.module.base.service.IBasSheepService;
 import com.zhyc.module.base.service.IDaRanchService;
 import com.zhyc.module.produce.manage_sheep.mapper.ScTransitionInfoMapper;
--- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java
@ -3,8 +3,6 @@ package com.zhyc.module.produce.other.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java
@ -3,8 +3,6 @@ package com.zhyc.module.produce.other.domain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

--- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java
@ -14,7 +14,6 @@ import com.zhyc.module.produce.other.mapper.ScFixHoofMapper;
 import com.zhyc.module.produce.other.service.IScFixHoofService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;

 /**
 * 修蹄Service业务层处理
--- a/zhyc-module/src/main/resources/mapper/feed/SgFeedPlanMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/feed/SgFeedPlanMapper.xml
@ -7,21 +7,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <resultMap type="SgFeedPlan" id="SgFeedPlanResult">
        <result property="createDate"    column="create_date"    />
        <result property="formulaId"    column="formula_id"    />
+        <result property="batchId"    column="batch_id"    />
        <result property="sheepHouseId"    column="sheep_house_id"    />
        <result property="sheepCount"    column="sheep_count"    />
        <result property="planDailySize"    column="plan_daily_size"    />
+        <result property="ratioMorning"    column="ratio_morning"    />
+        <result property="ratioNoon"    column="ratio_noon"    />
+        <result property="ratioAfternoon"    column="ratio_afternoon"    />
        <result property="planMorningSize"    column="plan_morning_size"    />
        <result property="planMorningTotal"    column="plan_morning_total"    />
-        <result property="ratioMorning"    column="ratio_morning"    />
        <result property="actualMorningSize"    column="actual_morning_size"    />
        <result property="planNoonSize"    column="plan_noon_size"    />
        <result property="planNoonTotal"    column="plan_noon_total"    />
        <result property="actualNoonSize"    column="actual_noon_size"    />
-        <result property="ratioNoon"    column="ratio_noon"    />
        <result property="planAfternoonSize"    column="plan_afternoon_size"    />
        <result property="planAfternoonTotal"    column="plan_afternoon_total"    />
        <result property="actualAfternoonSize"    column="actual_afternoon_size"    />
-        <result property="ratioAfternoon"    column="ratio_afternoon"    />
        <result property="planFeedTotal"    column="plan_feed_total"    />
        <result property="zookeeper"    column="zookeeper"    />
        <result property="planDate"    column="plan_date"    />
@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </resultMap>

    <sql id="selectSgFeedPlanVo">
-        select create_date, formula_id, sheep_house_id, sheep_count, plan_daily_size, plan_morning_size, plan_morning_total, ratio_morning, actual_morning_size, plan_noon_size, plan_noon_total, actual_noon_size, ratio_noon, plan_afternoon_size, plan_afternoon_total, actual_afternoon_size, ratio_afternoon, plan_feed_total, zookeeper, plan_date, remark from sg_feed_plan
+        select create_date, formula_id, batch_id, sheep_house_id, sheep_count, plan_daily_size, ratio_morning, ratio_noon, ratio_afternoon, plan_morning_size, plan_morning_total, actual_morning_size, plan_noon_size, plan_noon_total, actual_noon_size, plan_afternoon_size, plan_afternoon_total, actual_afternoon_size, plan_feed_total, zookeeper, plan_date, remark from sg_feed_plan
    </sql>

    <select id="selectSgFeedPlanList" parameterType="SgFeedPlan" resultMap="SgFeedPlanResult">
@ -37,9 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <where>  
            <if test="formulaId != null  and formulaId != ''"> and formula_id = #{formulaId}</if>
            <if test="sheepHouseId != null "> and sheep_house_id = #{sheepHouseId}</if>
-            <if test="zookeeper != null  and zookeeper != ''"> and zookeeper = #{zookeeper}</if>
-            <if test="planDate != null "> and plan_date = #{planDate}</if>
        </where>
+        ORDER BY formula_id ASC, plan_date ASC
    </select>
    
    <select id="selectSgFeedPlanByCreateDate" parameterType="Date" resultMap="SgFeedPlanResult">
@ -52,21 +52,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="createDate != null">create_date,</if>
            <if test="formulaId != null and formulaId != ''">formula_id,</if>
+            <if test="batchId != null and batchId != ''">batch_id,</if>
            <if test="sheepHouseId != null">sheep_house_id,</if>
            <if test="sheepCount != null">sheep_count,</if>
            <if test="planDailySize != null">plan_daily_size,</if>
+            <if test="ratioMorning != null">ratio_morning,</if>
+            <if test="ratioNoon != null">ratio_noon,</if>
+            <if test="ratioAfternoon != null">ratio_afternoon,</if>
            <if test="planMorningSize != null">plan_morning_size,</if>
            <if test="planMorningTotal != null">plan_morning_total,</if>
-            <if test="ratioMorning != null">ratio_morning,</if>
            <if test="actualMorningSize != null">actual_morning_size,</if>
            <if test="planNoonSize != null">plan_noon_size,</if>
            <if test="planNoonTotal != null">plan_noon_total,</if>
            <if test="actualNoonSize != null">actual_noon_size,</if>
-            <if test="ratioNoon != null">ratio_noon,</if>
            <if test="planAfternoonSize != null">plan_afternoon_size,</if>
            <if test="planAfternoonTotal != null">plan_afternoon_total,</if>
            <if test="actualAfternoonSize != null">actual_afternoon_size,</if>
-            <if test="ratioAfternoon != null">ratio_afternoon,</if>
            <if test="planFeedTotal != null">plan_feed_total,</if>
            <if test="zookeeper != null">zookeeper,</if>
            <if test="planDate != null">plan_date,</if>
@ -75,21 +76,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="createDate != null">#{createDate},</if>
            <if test="formulaId != null and formulaId != ''">#{formulaId},</if>
+            <if test="batchId != null and batchId != ''">#{batchId},</if>
            <if test="sheepHouseId != null">#{sheepHouseId},</if>
            <if test="sheepCount != null">#{sheepCount},</if>
            <if test="planDailySize != null">#{planDailySize},</if>
+            <if test="ratioMorning != null">#{ratioMorning},</if>
+            <if test="ratioNoon != null">#{ratioNoon},</if>
+            <if test="ratioAfternoon != null">#{ratioAfternoon},</if>
            <if test="planMorningSize != null">#{planMorningSize},</if>
            <if test="planMorningTotal != null">#{planMorningTotal},</if>
-            <if test="ratioMorning != null">#{ratioMorning},</if>
            <if test="actualMorningSize != null">#{actualMorningSize},</if>
            <if test="planNoonSize != null">#{planNoonSize},</if>
            <if test="planNoonTotal != null">#{planNoonTotal},</if>
            <if test="actualNoonSize != null">#{actualNoonSize},</if>
-            <if test="ratioNoon != null">#{ratioNoon},</if>
            <if test="planAfternoonSize != null">#{planAfternoonSize},</if>
            <if test="planAfternoonTotal != null">#{planAfternoonTotal},</if>
            <if test="actualAfternoonSize != null">#{actualAfternoonSize},</if>
-            <if test="ratioAfternoon != null">#{ratioAfternoon},</if>
            <if test="planFeedTotal != null">#{planFeedTotal},</if>
            <if test="zookeeper != null">#{zookeeper},</if>
            <if test="planDate != null">#{planDate},</if>
@ -101,21 +103,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        update sg_feed_plan
        <trim prefix="SET" suffixOverrides=",">
            <if test="formulaId != null and formulaId != ''">formula_id = #{formulaId},</if>
+            <if test="batchId != null and batchId != ''">batch_id = #{batchId},</if>
            <if test="sheepHouseId != null">sheep_house_id = #{sheepHouseId},</if>
            <if test="sheepCount != null">sheep_count = #{sheepCount},</if>
            <if test="planDailySize != null">plan_daily_size = #{planDailySize},</if>
+            <if test="ratioMorning != null">ratio_morning = #{ratioMorning},</if>
+            <if test="ratioNoon != null">ratio_noon = #{ratioNoon},</if>
+            <if test="ratioAfternoon != null">ratio_afternoon = #{ratioAfternoon},</if>
            <if test="planMorningSize != null">plan_morning_size = #{planMorningSize},</if>
            <if test="planMorningTotal != null">plan_morning_total = #{planMorningTotal},</if>
-            <if test="ratioMorning != null">ratio_morning = #{ratioMorning},</if>
            <if test="actualMorningSize != null">actual_morning_size = #{actualMorningSize},</if>
            <if test="planNoonSize != null">plan_noon_size = #{planNoonSize},</if>
            <if test="planNoonTotal != null">plan_noon_total = #{planNoonTotal},</if>
            <if test="actualNoonSize != null">actual_noon_size = #{actualNoonSize},</if>
-            <if test="ratioNoon != null">ratio_noon = #{ratioNoon},</if>
            <if test="planAfternoonSize != null">plan_afternoon_size = #{planAfternoonSize},</if>
            <if test="planAfternoonTotal != null">plan_afternoon_total = #{planAfternoonTotal},</if>
            <if test="actualAfternoonSize != null">actual_afternoon_size = #{actualAfternoonSize},</if>
-            <if test="ratioAfternoon != null">ratio_afternoon = #{ratioAfternoon},</if>
            <if test="planFeedTotal != null">plan_feed_total = #{planFeedTotal},</if>
            <if test="zookeeper != null">zookeeper = #{zookeeper},</if>
            <if test="planDate != null">plan_date = #{planDate},</if>
@ -134,4 +137,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            #{createDate}
        </foreach>
    </delete>
+
+    <select id="selectSheepCountByFoldId" parameterType="Integer">
+        SELECT COUNT(*)
+        FROM bas_sheep
+        WHERE sheepfold_id = #{foldId}
+    </select>
 </mapper>