Merge remote-tracking branch 'main/main'

zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java

@@ -1,14 +1,11 @@
-package com.zhyc.module.produce.sheep.controller;
+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.produce.sheep.domain.BasSheep;
+import com.zhyc.module.base.domain.BasSheep;
-import com.zhyc.module.produce.sheep.mapper.BasSheepMapper;
+import com.zhyc.module.base.mapper.BasSheepMapper;
-import com.zhyc.module.produce.sheep.service.IBasSheepService;
+import com.zhyc.module.base.service.IBasSheepService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupController.java

@@ -1,12 +1,12 @@
-package com.zhyc.module.fileManagement.controller;
+package com.zhyc.module.base.controller;
 
 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.common.utils.poi.ExcelUtil;
-import com.zhyc.module.fileManagement.domain.BasSheepGroup;
+import com.zhyc.module.base.domain.BasSheepGroup;
-import com.zhyc.module.fileManagement.service.IBasSheepGroupService;
+import com.zhyc.module.base.service.IBasSheepGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupMappingController.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.fileManagement.controller;
+package com.zhyc.module.base.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -6,6 +6,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.zhyc.common.utils.StringUtils;
+import com.zhyc.module.base.domain.BasSheepGroupMapping;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -13,8 +14,7 @@ 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.fileManagement.domain.BasSheepGroupMapping;
+import com.zhyc.module.base.service.IBasSheepGroupMappingService;
-import com.zhyc.module.fileManagement.service.IBasSheepGroupMappingService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 

zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepVarietyController.java

@@ -1,7 +1,10 @@
-package com.zhyc.module.base.variety.controller;
+package com.zhyc.module.base.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhyc.module.base.domain.BasSheepVariety;
+import com.zhyc.module.base.service.IBasSheepVarietyService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,8 +19,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.base.variety.domain.BasSheepVariety;
-import com.zhyc.module.base.variety.service.IBasSheepVarietyService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 

zhyc-module/src/main/java/com/zhyc/module/base/controller/DaSheepfoldController.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.fileManagement.controller;
+package com.zhyc.module.base.controller;
 
 import com.zhyc.common.annotation.Log;
 import com.zhyc.common.core.controller.BaseController;
@@ -6,8 +6,8 @@ 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.fileManagement.domain.DaSheepfold;
+import com.zhyc.module.base.domain.DaSheepfold;
-import com.zhyc.module.fileManagement.service.IDaSheepfoldService;
+import com.zhyc.module.base.service.IDaSheepfoldService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.fileManagement.controller;
+package com.zhyc.module.base.controller;
 
 import com.zhyc.common.annotation.Log;
 import com.zhyc.common.core.controller.BaseController;
@@ -6,8 +6,8 @@ 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.fileManagement.domain.SheepFile;
+import com.zhyc.module.base.domain.SheepFile;
-import com.zhyc.module.fileManagement.service.ISheepFileService;
+import com.zhyc.module.base.service.ISheepFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.sheep.domain;
+package com.zhyc.module.base.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.fileManagement.domain;
+package com.zhyc.module.base.domain;
 
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.TreeEntity;

zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.fileManagement.domain;
+package com.zhyc.module.base.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.base.variety.domain;
+package com.zhyc.module.base.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.fileManagement.domain;
+package com.zhyc.module.base.domain;
 
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.fileManagement.domain;
+package com.zhyc.module.base.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zhyc.common.annotation.Excel;

zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMapper.java

@@ -1,6 +1,6 @@
-package com.zhyc.module.fileManagement.mapper;
+package com.zhyc.module.base.mapper;
 
-import com.zhyc.module.fileManagement.domain.BasSheepGroup;
+import com.zhyc.module.base.domain.BasSheepGroup;
 
 import java.util.List;
 

zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMappingMapper.java

@@ -1,9 +1,9 @@
-package com.zhyc.module.fileManagement.mapper;
+package com.zhyc.module.base.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import com.zhyc.module.fileManagement.domain.BasSheepGroupMapping;
+import com.zhyc.module.base.domain.BasSheepGroupMapping;
 import org.apache.ibatis.annotations.Param;
 /**
  * 羊只分组关联Mapper接口

zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepMapper.java

@@ -1,8 +1,8 @@
-package com.zhyc.module.produce.sheep.mapper;
+package com.zhyc.module.base.mapper;
 
 import java.util.List;
-import com.zhyc.module.produce.sheep.domain.BasSheep;
+
-import org.apache.ibatis.annotations.Param;
+import com.zhyc.module.base.domain.BasSheep;
 
 /**
  * 羊只基本信息Mapper接口

zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepVarietyMapper.java

@@ -1,7 +1,8 @@
-package com.zhyc.module.base.variety.mapper;
+package com.zhyc.module.base.mapper;
 
 import java.util.List;
-import com.zhyc.module.base.variety.domain.BasSheepVariety;
+
+import com.zhyc.module.base.domain.BasSheepVariety;
 
 /**
  * 羊只品种Mapper接口

zhyc-module/src/main/java/com/zhyc/module/base/mapper/DaSheepfoldMapper.java

@@ -1,6 +1,6 @@
-package com.zhyc.module.fileManagement.mapper;
+package com.zhyc.module.base.mapper;
 
-import com.zhyc.module.fileManagement.domain.DaSheepfold;
+import com.zhyc.module.base.domain.DaSheepfold;
 
 import java.util.List;
 

zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java

@@ -1,6 +1,6 @@
-package com.zhyc.module.fileManagement.mapper;
+package com.zhyc.module.base.mapper;
 
-import com.zhyc.module.fileManagement.domain.SheepFile;
+import com.zhyc.module.base.domain.SheepFile;
 
 import java.util.List;
 

zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepGroupMappingService.java

@@ -1,9 +1,9 @@
-package com.zhyc.module.fileManagement.service;
+package com.zhyc.module.base.service;
 
 import java.util.List;
 import java.util.Map;
 
-import com.zhyc.module.fileManagement.domain.BasSheepGroupMapping;
+import com.zhyc.module.base.domain.BasSheepGroupMapping;
 
 /**
  * 羊只分组关联Service接口

zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepGroupService.java

@@ -1,6 +1,6 @@
-package com.zhyc.module.fileManagement.service;
+package com.zhyc.module.base.service;
 
-import com.zhyc.module.fileManagement.domain.BasSheepGroup;
+import com.zhyc.module.base.domain.BasSheepGroup;
 
 import java.util.List;
 

zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepService.java

@@ -1,7 +1,8 @@
-package com.zhyc.module.produce.sheep.service;
+package com.zhyc.module.base.service;
 
 import java.util.List;
-import com.zhyc.module.produce.sheep.domain.BasSheep;
+
+import com.zhyc.module.base.domain.BasSheep;
 
 /**
  * 羊只基本信息Service接口

zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepVarietyService.java

@@ -1,7 +1,8 @@
-package com.zhyc.module.base.variety.service;
+package com.zhyc.module.base.service;
 
 import java.util.List;
-import com.zhyc.module.base.variety.domain.BasSheepVariety;
+
+import com.zhyc.module.base.domain.BasSheepVariety;
 
 /**
  * 羊只品种Service接口

zhyc-module/src/main/java/com/zhyc/module/base/service/IDaSheepfoldService.java

@@ -1,6 +1,6 @@
-package com.zhyc.module.fileManagement.service;
+package com.zhyc.module.base.service;
 
-import com.zhyc.module.fileManagement.domain.DaSheepfold;
+import com.zhyc.module.base.domain.DaSheepfold;
 
 import java.util.List;
 

zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java

@@ -1,6 +1,6 @@
-package com.zhyc.module.fileManagement.service;
+package com.zhyc.module.base.service;
 
-import com.zhyc.module.fileManagement.domain.SheepFile;
+import com.zhyc.module.base.domain.SheepFile;
 
 import java.util.List;
 

zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupMappingServiceImpl.java

@@ -1,13 +1,13 @@
-package com.zhyc.module.fileManagement.service.impl;
+package com.zhyc.module.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
 
+import com.zhyc.module.base.domain.BasSheepGroupMapping;
+import com.zhyc.module.base.mapper.BasSheepGroupMappingMapper;
+import com.zhyc.module.base.service.IBasSheepGroupMappingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zhyc.module.fileManagement.mapper.BasSheepGroupMappingMapper;
-import com.zhyc.module.fileManagement.domain.BasSheepGroupMapping;
-import com.zhyc.module.fileManagement.service.IBasSheepGroupMappingService;
 
 /**
  * 羊只分组关联Service业务层处理
@@ -16,7 +16,7 @@ import com.zhyc.module.fileManagement.service.IBasSheepGroupMappingService;
  * @date 2025-07-16
  */
 @Service
-public class BasSheepGroupMappingServiceImpl implements IBasSheepGroupMappingService 
+public class BasSheepGroupMappingServiceImpl implements IBasSheepGroupMappingService
 {
     @Autowired
     private BasSheepGroupMappingMapper basSheepGroupMappingMapper;

zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupServiceImpl.java

@@ -1,9 +1,9 @@
-package com.zhyc.module.fileManagement.service.impl;
+package com.zhyc.module.base.service.impl;
 
 import com.zhyc.common.utils.DateUtils;
-import com.zhyc.module.fileManagement.domain.BasSheepGroup;
+import com.zhyc.module.base.domain.BasSheepGroup;
-import com.zhyc.module.fileManagement.mapper.BasSheepGroupMapper;
+import com.zhyc.module.base.mapper.BasSheepGroupMapper;
-import com.zhyc.module.fileManagement.service.IBasSheepGroupService;
+import com.zhyc.module.base.service.IBasSheepGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,7 +16,7 @@ import java.util.List;
  * @date 2025-07-14
  */
 @Service
-public class BasSheepGroupServiceImpl implements IBasSheepGroupService 
+public class BasSheepGroupServiceImpl implements IBasSheepGroupService
 {
     @Autowired
     private BasSheepGroupMapper basSheepGroupMapper;

zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepServiceImpl.java

@@ -1,12 +1,12 @@
-package com.zhyc.module.produce.sheep.service.impl;
+package com.zhyc.module.base.service.impl;
 
 import java.util.List;
 import com.zhyc.common.utils.DateUtils;
+import com.zhyc.module.base.domain.BasSheep;
+import com.zhyc.module.base.mapper.BasSheepMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zhyc.module.produce.sheep.mapper.BasSheepMapper;
+import com.zhyc.module.base.service.IBasSheepService;
-import com.zhyc.module.produce.sheep.domain.BasSheep;
-import com.zhyc.module.produce.sheep.service.IBasSheepService;
 
 /**
  * 羊只基本信息Service业务层处理

zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepVarietyServiceImpl.java

@@ -1,11 +1,12 @@
-package com.zhyc.module.base.variety.service.impl;
+package com.zhyc.module.base.service.impl;
 
 import java.util.List;
+
+import com.zhyc.module.base.domain.BasSheepVariety;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zhyc.module.base.variety.mapper.BasSheepVarietyMapper;
+import com.zhyc.module.base.mapper.BasSheepVarietyMapper;
-import com.zhyc.module.base.variety.domain.BasSheepVariety;
+import com.zhyc.module.base.service.IBasSheepVarietyService;
-import com.zhyc.module.base.variety.service.IBasSheepVarietyService;
 
 /**
  * 羊只品种Service业务层处理

zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaSheepfoldServiceImpl.java

@@ -1,8 +1,8 @@
-package com.zhyc.module.fileManagement.service.impl;
+package com.zhyc.module.base.service.impl;
 
-import com.zhyc.module.fileManagement.domain.DaSheepfold;
+import com.zhyc.module.base.domain.DaSheepfold;
-import com.zhyc.module.fileManagement.mapper.DaSheepfoldMapper;
+import com.zhyc.module.base.mapper.DaSheepfoldMapper;
-import com.zhyc.module.fileManagement.service.IDaSheepfoldService;
+import com.zhyc.module.base.service.IDaSheepfoldService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java

@@ -1,9 +1,9 @@
-package com.zhyc.module.fileManagement.service.impl;
+package com.zhyc.module.base.service.impl;
 
 import com.zhyc.common.utils.DateUtils;
-import com.zhyc.module.fileManagement.domain.SheepFile;
+import com.zhyc.module.base.domain.SheepFile;
-import com.zhyc.module.fileManagement.mapper.SheepFileMapper;
+import com.zhyc.module.base.mapper.SheepFileMapper;
-import com.zhyc.module.fileManagement.service.ISheepFileService;
+import com.zhyc.module.base.service.ISheepFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,7 +16,7 @@ import java.util.List;
  * @date 2025-07-13
  */
 @Service
-public class SheepFileServiceImpl implements ISheepFileService 
+public class SheepFileServiceImpl implements ISheepFileService
 {
     @Autowired
     private SheepFileMapper sheepFileMapper;

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpFreshMilkInspController.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.dairyProducts.freshMilkTest.controller;
+package com.zhyc.module.dairyProducts.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -16,8 +16,8 @@ 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.freshMilkTest.domain.NpFreshMilkInsp;
+import com.zhyc.module.dairyProducts.domain.NpFreshMilkInsp;
-import com.zhyc.module.dairyProducts.freshMilkTest.service.INpFreshMilkInspService;
+import com.zhyc.module.dairyProducts.service.INpFreshMilkInspService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpRawMilkInspeController.java

@@ -1,7 +1,9 @@
-package com.zhyc.module.dairyProducts.rawMilkTest.controller;
+package com.zhyc.module.dairyProducts.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhyc.module.dairyProducts.service.INpRawMilkInspeService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,8 +18,7 @@ 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.rawMilkTest.domain.NpRawMilkInspe;
+import com.zhyc.module.dairyProducts.domain.NpRawMilkInspe;
-import com.zhyc.module.dairyProducts.rawMilkTest.service.INpRawMilkInspeService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/NpYogurtInspController.java

@@ -1,7 +1,9 @@
-package com.zhyc.module.dairyProducts.yogurtTest.controller;
+package com.zhyc.module.dairyProducts.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhyc.module.dairyProducts.domain.NpYogurtInsp;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,8 +18,7 @@ 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.yogurtTest.domain.NpYogurtInsp;
+import com.zhyc.module.dairyProducts.service.INpYogurtInspService;
-import com.zhyc.module.dairyProducts.yogurtTest.service.INpYogurtInspService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzDryMatterCorrectionController.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.dairyProducts.dryMatterCorrection.controller;
+package com.zhyc.module.dairyProducts.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -16,8 +16,8 @@ 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.dryMatterCorrection.domain.XzDryMatterCorrection;
+import com.zhyc.module.dairyProducts.domain.XzDryMatterCorrection;
-import com.zhyc.module.dairyProducts.dryMatterCorrection.service.IXzDryMatterCorrectionService;
+import com.zhyc.module.dairyProducts.service.IXzDryMatterCorrectionService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzParityCorrectionController.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.dairyProducts.parityCorrection.controller;
+package com.zhyc.module.dairyProducts.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -16,8 +16,8 @@ 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.parityCorrection.domain.XzParityCorrection;
+import com.zhyc.module.dairyProducts.domain.XzParityCorrection;
-import com.zhyc.module.dairyProducts.parityCorrection.service.IXzParityCorrectionService;
+import com.zhyc.module.dairyProducts.service.IXzParityCorrectionService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/controller/XzWegihCorrectionController.java

@@ -1,7 +1,10 @@
-package com.zhyc.module.dairyProducts.weightCorrection.controller;
+package com.zhyc.module.dairyProducts.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhyc.module.dairyProducts.domain.XzWegihCorrection;
+import com.zhyc.module.dairyProducts.service.IXzWegihCorrectionService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,8 +19,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.weightCorrection.domain.XzWegihCorrection;
-import com.zhyc.module.dairyProducts.weightCorrection.service.IXzWegihCorrectionService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.dairyProducts.freshMilkTest.domain;
+package com.zhyc.module.dairyProducts.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java

@@ -340,7 +340,7 @@
 //            .toString();
 //    }
 //}
-package com.zhyc.module.dairyProducts.rawMilkTest.domain;
+package com.zhyc.module.dairyProducts.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.dairyProducts.yogurtTest.domain;
+package com.zhyc.module.dairyProducts.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.dairyProducts.dryMatterCorrection.domain;
+package com.zhyc.module.dairyProducts.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.dairyProducts.parityCorrection.domain;
+package com.zhyc.module.dairyProducts.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.dairyProducts.weightCorrection.domain;
+package com.zhyc.module.dairyProducts.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpFreshMilkInspMapper.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.dairyProducts.freshMilkTest.mapper;
+package com.zhyc.module.dairyProducts.mapper;
 
 import java.util.List;
-import com.zhyc.module.dairyProducts.freshMilkTest.domain.NpFreshMilkInsp;
+import com.zhyc.module.dairyProducts.domain.NpFreshMilkInsp;
 
 /**
  * 鲜奶生产，成品检验记录Mapper接口

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpRawMilkInspeMapper.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.dairyProducts.rawMilkTest.mapper;
+package com.zhyc.module.dairyProducts.mapper;
 
 import java.util.List;
-import com.zhyc.module.dairyProducts.rawMilkTest.domain.NpRawMilkInspe;
+import com.zhyc.module.dairyProducts.domain.NpRawMilkInspe;
 
 /**
  * 生乳检验记录Mapper接口

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpYogurtInspMapper.java

@@ -1,7 +1,8 @@
-package com.zhyc.module.dairyProducts.yogurtTest.mapper;
+package com.zhyc.module.dairyProducts.mapper;
 
 import java.util.List;
-import com.zhyc.module.dairyProducts.yogurtTest.domain.NpYogurtInsp;
+
+import com.zhyc.module.dairyProducts.domain.NpYogurtInsp;
 
 /**
  * 酸奶生产，成品检疫记录Mapper接口

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzDryMatterCorrectionMapper.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.dairyProducts.dryMatterCorrection.mapper;
+package com.zhyc.module.dairyProducts.mapper;
 
 import java.util.List;
-import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection;
+import com.zhyc.module.dairyProducts.domain.XzDryMatterCorrection;
 
 /**
  * 干物质校正Mapper接口

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzParityCorrectionMapper.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.dairyProducts.parityCorrection.mapper;
+package com.zhyc.module.dairyProducts.mapper;
 
 import java.util.List;
-import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection;
+import com.zhyc.module.dairyProducts.domain.XzParityCorrection;
 
 /**
  * 胎次校正Mapper接口

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzWegihCorrectionMapper.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.dairyProducts.weightCorrection.mapper;
+package com.zhyc.module.dairyProducts.mapper;
 
 import java.util.List;
-import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection;
+import com.zhyc.module.dairyProducts.domain.XzWegihCorrection;
 
 /**
  * 称重校正Mapper接口

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpFreshMilkInspService.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.dairyProducts.freshMilkTest.service;
+package com.zhyc.module.dairyProducts.service;
 
 import java.util.List;
-import com.zhyc.module.dairyProducts.freshMilkTest.domain.NpFreshMilkInsp;
+import com.zhyc.module.dairyProducts.domain.NpFreshMilkInsp;
 
 /**
  * 鲜奶生产，成品检验记录Service接口

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpRawMilkInspeService.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.dairyProducts.rawMilkTest.service;
+package com.zhyc.module.dairyProducts.service;
 
 import java.util.List;
-import com.zhyc.module.dairyProducts.rawMilkTest.domain.NpRawMilkInspe;
+import com.zhyc.module.dairyProducts.domain.NpRawMilkInspe;
 
 /**
  * 生乳检验记录Service接口

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/INpYogurtInspService.java

@@ -1,7 +1,8 @@
-package com.zhyc.module.dairyProducts.yogurtTest.service;
+package com.zhyc.module.dairyProducts.service;
 
 import java.util.List;
-import com.zhyc.module.dairyProducts.yogurtTest.domain.NpYogurtInsp;
+
+import com.zhyc.module.dairyProducts.domain.NpYogurtInsp;
 
 /**
  * 酸奶生产，成品检疫记录Service接口

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/IXzDryMatterCorrectionService.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.dairyProducts.dryMatterCorrection.service;
+package com.zhyc.module.dairyProducts.service;
 
 import java.util.List;
-import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection;
+import com.zhyc.module.dairyProducts.domain.XzDryMatterCorrection;
 
 /**
  * 干物质校正Service接口

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/IXzParityCorrectionService.java

@@ -1,7 +1,8 @@
-package com.zhyc.module.dairyProducts.parityCorrection.service;
+package com.zhyc.module.dairyProducts.service;
 
 import java.util.List;
-import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection;
+
+import com.zhyc.module.dairyProducts.domain.XzParityCorrection;
 
 /**
  * 胎次校正Service接口

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/IXzWegihCorrectionService.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.dairyProducts.weightCorrection.service;
+package com.zhyc.module.dairyProducts.service;
 
 import java.util.List;
-import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection;
+import com.zhyc.module.dairyProducts.domain.XzWegihCorrection;
 
 /**
  * 称重校正Service接口

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpFreshMilkInspServiceImpl.java

@@ -1,12 +1,12 @@
-package com.zhyc.module.dairyProducts.freshMilkTest.service.impl;
+package com.zhyc.module.dairyProducts.service.impl;
 
 import java.util.List;
 import com.zhyc.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zhyc.module.dairyProducts.freshMilkTest.mapper.NpFreshMilkInspMapper;
+import com.zhyc.module.dairyProducts.mapper.NpFreshMilkInspMapper;
-import com.zhyc.module.dairyProducts.freshMilkTest.domain.NpFreshMilkInsp;
+import com.zhyc.module.dairyProducts.domain.NpFreshMilkInsp;
-import com.zhyc.module.dairyProducts.freshMilkTest.service.INpFreshMilkInspService;
+import com.zhyc.module.dairyProducts.service.INpFreshMilkInspService;
 
 /**
  * 鲜奶生产，成品检验记录Service业务层处理

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpRawMilkInspeServiceImpl.java

@@ -1,12 +1,12 @@
-package com.zhyc.module.dairyProducts.rawMilkTest.service.impl;
+package com.zhyc.module.dairyProducts.service.impl;
 
 import java.util.List;
 import com.zhyc.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zhyc.module.dairyProducts.rawMilkTest.mapper.NpRawMilkInspeMapper;
+import com.zhyc.module.dairyProducts.mapper.NpRawMilkInspeMapper;
-import com.zhyc.module.dairyProducts.rawMilkTest.domain.NpRawMilkInspe;
+import com.zhyc.module.dairyProducts.domain.NpRawMilkInspe;
-import com.zhyc.module.dairyProducts.rawMilkTest.service.INpRawMilkInspeService;
+import com.zhyc.module.dairyProducts.service.INpRawMilkInspeService;
 
 /**
  * 生乳检验记录Service业务层处理

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/NpYogurtInspServiceImpl.java

@@ -1,12 +1,12 @@
-package com.zhyc.module.dairyProducts.yogurtTest.service.impl;
+package com.zhyc.module.dairyProducts.service.impl;
 
 import java.util.List;
 import com.zhyc.common.utils.DateUtils;
+import com.zhyc.module.dairyProducts.domain.NpYogurtInsp;
+import com.zhyc.module.dairyProducts.mapper.NpYogurtInspMapper;
+import com.zhyc.module.dairyProducts.service.INpYogurtInspService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zhyc.module.dairyProducts.yogurtTest.mapper.NpYogurtInspMapper;
-import com.zhyc.module.dairyProducts.yogurtTest.domain.NpYogurtInsp;
-import com.zhyc.module.dairyProducts.yogurtTest.service.INpYogurtInspService;
 
 /**
  * 酸奶生产，成品检疫记录Service业务层处理
@@ -15,7 +15,7 @@ import com.zhyc.module.dairyProducts.yogurtTest.service.INpYogurtInspService;
  * @date 2025-07-17
  */
 @Service
-public class NpYogurtInspServiceImpl implements INpYogurtInspService 
+public class NpYogurtInspServiceImpl implements INpYogurtInspService
 {
     @Autowired
     private NpYogurtInspMapper npYogurtInspMapper;

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/XzDryMatterCorrectionServiceImpl.java

@@ -1,11 +1,11 @@
-package com.zhyc.module.dairyProducts.dryMatterCorrection.service.impl;
+package com.zhyc.module.dairyProducts.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zhyc.module.dairyProducts.dryMatterCorrection.mapper.XzDryMatterCorrectionMapper;
+import com.zhyc.module.dairyProducts.mapper.XzDryMatterCorrectionMapper;
-import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection;
+import com.zhyc.module.dairyProducts.domain.XzDryMatterCorrection;
-import com.zhyc.module.dairyProducts.dryMatterCorrection.service.IXzDryMatterCorrectionService;
+import com.zhyc.module.dairyProducts.service.IXzDryMatterCorrectionService;
 
 /**
  * 干物质校正Service业务层处理

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/XzParityCorrectionServiceImpl.java

@@ -1,11 +1,12 @@
-package com.zhyc.module.dairyProducts.parityCorrection.service.impl;
+package com.zhyc.module.dairyProducts.service.impl;
 
 import java.util.List;
+
+import com.zhyc.module.dairyProducts.mapper.XzParityCorrectionMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zhyc.module.dairyProducts.parityCorrection.mapper.XzParityCorrectionMapper;
+import com.zhyc.module.dairyProducts.domain.XzParityCorrection;
-import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection;
+import com.zhyc.module.dairyProducts.service.IXzParityCorrectionService;
-import com.zhyc.module.dairyProducts.parityCorrection.service.IXzParityCorrectionService;
 
 /**
  * 胎次校正Service业务层处理

zhyc-module/src/main/java/com/zhyc/module/dairyProducts/service/impl/XzWegihCorrectionServiceImpl.java

@@ -1,11 +1,12 @@
-package com.zhyc.module.dairyProducts.weightCorrection.service.impl;
+package com.zhyc.module.dairyProducts.service.impl;
 
 import java.util.List;
+
+import com.zhyc.module.dairyProducts.domain.XzWegihCorrection;
+import com.zhyc.module.dairyProducts.mapper.XzWegihCorrectionMapper;
+import com.zhyc.module.dairyProducts.service.IXzWegihCorrectionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zhyc.module.dairyProducts.weightCorrection.mapper.XzWegihCorrectionMapper;
-import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection;
-import com.zhyc.module.dairyProducts.weightCorrection.service.IXzWegihCorrectionService;
 
 /**
  * 称重校正Service业务层处理
@@ -14,7 +15,7 @@ import com.zhyc.module.dairyProducts.weightCorrection.service.IXzWegihCorrection
  * @date 2025-07-12
  */
 @Service
-public class XzWegihCorrectionServiceImpl implements IXzWegihCorrectionService 
+public class XzWegihCorrectionServiceImpl implements IXzWegihCorrectionService
 {
     @Autowired
     private XzWegihCorrectionMapper xzWegihCorrectionMapper;

zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScBreedPlanController.java

@@ -1,7 +1,9 @@
-package com.zhyc.module.produce.mating_plan.controller;
+package com.zhyc.module.produce.breed.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhyc.module.produce.breed.domain.ScBreedPlan;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,8 +18,7 @@ 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.produce.mating_plan.domain.ScBreedPlan;
+import com.zhyc.module.produce.breed.service.IScBreedPlanService;
-import com.zhyc.module.produce.mating_plan.service.IScBreedPlanService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 

zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScBreedPlanGenerateController.java

@@ -1,9 +1,11 @@
-package com.zhyc.module.produce.mating_plan.controller;
+package com.zhyc.module.produce.breed.controller;
 
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
+
+import com.zhyc.module.produce.breed.domain.ScBreedPlanGenerate;
+import com.zhyc.module.produce.breed.service.IScBreedPlanGenerateService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,11 +20,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.produce.mating_plan.domain.ScBreedPlan;
-import com.zhyc.module.produce.mating_plan.domain.ScBreedPlanGenerate;
-import com.zhyc.module.produce.mating_plan.service.IScBreedPlanService;
-import com.zhyc.module.produce.mating_plan.service.IScBreedPlanGenerateService;
-import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 
 /**

zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScDryMilkController.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.drymilk.controller;
+package com.zhyc.module.produce.breed.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -16,8 +16,8 @@ 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.produce.drymilk.domain.ScDryMilk;
+import com.zhyc.module.produce.breed.domain.ScDryMilk;
-import com.zhyc.module.produce.drymilk.service.IScDryMilkService;
+import com.zhyc.module.produce.breed.service.IScDryMilkService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 

zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScWeanRecordController.java

@@ -1,7 +1,9 @@
-package com.zhyc.module.produce.wean.controller;
+package com.zhyc.module.produce.breed.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhyc.module.produce.breed.domain.ScWeanRecord;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,8 +18,7 @@ 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.produce.wean.domain.ScWeanRecord;
+import com.zhyc.module.produce.breed.service.IScWeanRecordService;
-import com.zhyc.module.produce.wean.service.IScWeanRecordService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 

zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.mating_plan.domain;
+package com.zhyc.module.produce.breed.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.mating_plan.domain;
+package com.zhyc.module.produce.breed.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.mating_plan.domain;
+package com.zhyc.module.produce.breed.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.drymilk.domain;
+package com.zhyc.module.produce.breed.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.wean.domain;
+package com.zhyc.module.produce.breed.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;

zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanGenerateMapper.java

@@ -1,10 +1,10 @@
-package com.zhyc.module.produce.mating_plan.mapper;
+package com.zhyc.module.produce.breed.mapper;
 
 import java.util.List;
 import java.util.Map;
 import org.apache.ibatis.annotations.Param;
-import com.zhyc.module.produce.mating_plan.domain.ScBreedPlanGenerate;
+import com.zhyc.module.produce.breed.domain.ScBreedPlanGenerate;
-import com.zhyc.module.produce.mating_plan.domain.ScBreedPlan;
+import com.zhyc.module.produce.breed.domain.ScBreedPlan;
 
 /**
  * 配种计划生成Mapper接口

zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanMapper.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.produce.mating_plan.mapper;
+package com.zhyc.module.produce.breed.mapper;
 
 import java.util.List;
-import com.zhyc.module.produce.mating_plan.domain.ScBreedPlan;
+import com.zhyc.module.produce.breed.domain.ScBreedPlan;
 
 /**
  * 配种计划Mapper接口

zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScDryMilkMapper.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.produce.drymilk.mapper;
+package com.zhyc.module.produce.breed.mapper;
 
 import java.util.List;
-import com.zhyc.module.produce.drymilk.domain.ScDryMilk;
+import com.zhyc.module.produce.breed.domain.ScDryMilk;
 
 /**
  * 干奶记录Mapper接口

zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScWeanRecordMapper.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.produce.wean.mapper;
+package com.zhyc.module.produce.breed.mapper;
 
 import java.util.List;
-import com.zhyc.module.produce.wean.domain.ScWeanRecord;
+import com.zhyc.module.produce.breed.domain.ScWeanRecord;
 
 /**
  * 断奶记录Mapper接口

zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScBreedPlanGenerateService.java

@@ -1,8 +1,8 @@
-package com.zhyc.module.produce.mating_plan.service;
+package com.zhyc.module.produce.breed.service;
 
 import java.util.List;
 import java.util.Map;
-import com.zhyc.module.produce.mating_plan.domain.ScBreedPlanGenerate;
+import com.zhyc.module.produce.breed.domain.ScBreedPlanGenerate;
 
 /**
  * 配种计划生成Service接口

zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScBreedPlanService.java

@@ -1,7 +1,8 @@
-package com.zhyc.module.produce.mating_plan.service;
+package com.zhyc.module.produce.breed.service;
 
 import java.util.List;
-import com.zhyc.module.produce.mating_plan.domain.ScBreedPlan;
+
+import com.zhyc.module.produce.breed.domain.ScBreedPlan;
 
 /**
  * 配种计划Service接口

zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScDryMilkService.java

@@ -1,7 +1,7 @@
-package com.zhyc.module.produce.drymilk.service;
+package com.zhyc.module.produce.breed.service;
 
 import java.util.List;
-import com.zhyc.module.produce.drymilk.domain.ScDryMilk;
+import com.zhyc.module.produce.breed.domain.ScDryMilk;
 
 /**
  * 干奶记录Service接口

zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScWeanRecordService.java

@@ -1,7 +1,8 @@
-package com.zhyc.module.produce.wean.service;
+package com.zhyc.module.produce.breed.service;
 
 import java.util.List;
-import com.zhyc.module.produce.wean.domain.ScWeanRecord;
+
+import com.zhyc.module.produce.breed.domain.ScWeanRecord;
 
 /**
  * 断奶记录Service接口

zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScBreedPlanGenerateServiceImpl.java

@@ -1,20 +1,20 @@
-package com.zhyc.module.produce.mating_plan.service.impl;
+package com.zhyc.module.produce.breed.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
-import java.util.ArrayList;
 import java.util.Date;
 import java.text.SimpleDateFormat;
+
+import com.zhyc.module.produce.breed.domain.ScBreedPlan;
+import com.zhyc.module.produce.breed.domain.ScBreedPlanGenerate;
+import com.zhyc.module.produce.breed.mapper.ScBreedPlanGenerateMapper;
+import com.zhyc.module.produce.breed.mapper.ScBreedPlanMapper;
+import com.zhyc.module.produce.breed.service.IScBreedPlanGenerateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.zhyc.common.utils.SecurityUtils;
-import com.zhyc.module.produce.mating_plan.mapper.ScBreedPlanGenerateMapper;
-import com.zhyc.module.produce.mating_plan.mapper.ScBreedPlanMapper;
-import com.zhyc.module.produce.mating_plan.domain.ScBreedPlanGenerate;
-import com.zhyc.module.produce.mating_plan.domain.ScBreedPlan;
-import com.zhyc.module.produce.mating_plan.service.IScBreedPlanGenerateService;
 
 /**
  * 配种计划生成Service业务层处理

zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScBreedPlanServiceImpl.java

@@ -1,11 +1,12 @@
-package com.zhyc.module.produce.mating_plan.service.impl;
+package com.zhyc.module.produce.breed.service.impl;
 
 import java.util.List;
+
+import com.zhyc.module.produce.breed.domain.ScBreedPlan;
+import com.zhyc.module.produce.breed.mapper.ScBreedPlanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zhyc.module.produce.mating_plan.mapper.ScBreedPlanMapper;
+import com.zhyc.module.produce.breed.service.IScBreedPlanService;
-import com.zhyc.module.produce.mating_plan.domain.ScBreedPlan;
-import com.zhyc.module.produce.mating_plan.service.IScBreedPlanService;
 
 /**
  * 配种计划Service业务层处理

zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScDryMilkServiceImpl.java

@@ -1,11 +1,11 @@
-package com.zhyc.module.produce.drymilk.service.impl;
+package com.zhyc.module.produce.breed.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zhyc.module.produce.drymilk.mapper.ScDryMilkMapper;
+import com.zhyc.module.produce.breed.mapper.ScDryMilkMapper;
-import com.zhyc.module.produce.drymilk.domain.ScDryMilk;
+import com.zhyc.module.produce.breed.domain.ScDryMilk;
-import com.zhyc.module.produce.drymilk.service.IScDryMilkService;
+import com.zhyc.module.produce.breed.service.IScDryMilkService;
 import com.zhyc.common.utils.StringUtils;
 import com.zhyc.common.exception.ServiceException;
 

zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScWeanRecordServiceImpl.java

@@ -1,13 +1,13 @@
-package com.zhyc.module.produce.wean.service.impl;
+package com.zhyc.module.produce.breed.service.impl;
 
 import java.util.List;
 import com.zhyc.common.utils.DateUtils;
+import com.zhyc.module.produce.breed.domain.ScWeanRecord;
+import com.zhyc.module.produce.breed.mapper.ScWeanRecordMapper;
+import com.zhyc.module.produce.breed.service.IScWeanRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.zhyc.module.produce.wean.mapper.ScWeanRecordMapper;
-import com.zhyc.module.produce.wean.domain.ScWeanRecord;
-import com.zhyc.module.produce.wean.service.IScWeanRecordService;
 
 /**
  * 断奶记录Service业务层处理

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScAddSheepController.java

@@ -1,14 +1,14 @@
-package com.zhyc.module.produce.manage_sheep.add_sheep.controller;
+package com.zhyc.module.produce.manage_sheep.controller;
 
 import com.zhyc.common.annotation.Log;
 import com.zhyc.common.core.domain.AjaxResult;
 import com.zhyc.common.enums.BusinessType;
 import com.zhyc.common.exception.ServiceException;
 import com.zhyc.common.utils.poi.ExcelUtil;
-import com.zhyc.module.produce.manage_sheep.add_sheep.domain.ScAddSheep;
+import com.zhyc.module.produce.manage_sheep.domain.ScAddSheep;
-import com.zhyc.module.produce.manage_sheep.add_sheep.service.IScAddSheepService;
+import com.zhyc.module.produce.manage_sheep.service.IScAddSheepService;
-import com.zhyc.module.fileManagement.domain.DaSheepfold;
+import com.zhyc.module.base.domain.DaSheepfold;
-import com.zhyc.module.fileManagement.service.IDaSheepfoldService;
+import com.zhyc.module.base.service.IDaSheepfoldService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java

@@ -1,11 +1,11 @@
-package com.zhyc.module.produce.manage_sheep.trans_group.controller;
+package com.zhyc.module.produce.manage_sheep.controller;
 
 import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.zhyc.module.produce.manage_sheep.trans_group.domain.ScTransGroup;
+import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup;
-import com.zhyc.module.produce.manage_sheep.trans_group.service.IScTransGroupService;
+import com.zhyc.module.produce.manage_sheep.service.IScTransGroupService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.manage_sheep.transition_info.controller;
+package com.zhyc.module.produce.manage_sheep.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -16,8 +16,8 @@ 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.produce.manage_sheep.transition_info.domain.ScTransitionInfo;
+import com.zhyc.module.produce.manage_sheep.domain.ScTransitionInfo;
-import com.zhyc.module.produce.manage_sheep.transition_info.service.IScTransitionInfoService;
+import com.zhyc.module.produce.manage_sheep.service.IScTransitionInfoService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScAddSheep.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.manage_sheep.add_sheep.domain;
+package com.zhyc.module.produce.manage_sheep.domain;
 
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.manage_sheep.trans_group.domain;
+package com.zhyc.module.produce.manage_sheep.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -66,12 +66,6 @@ public class ScTransGroup extends BaseEntity {
     @Excel(name = "品种")
     private String varietyName;
 
-    /** 品种id */
-    private Long varietyId;
-
-    /** 品种名称（联表查询返回，非数据库字段） */
-    @Excel(name = "品种")
-    private String varietyName;
 
     private Integer reason;
     /**

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.manage_sheep.transition_info.domain;
+package com.zhyc.module.produce.manage_sheep.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScAddSheepMapper.java

@@ -1,6 +1,6 @@
-package com.zhyc.module.produce.manage_sheep.add_sheep.mapper;
+package com.zhyc.module.produce.manage_sheep.mapper;
 
-import com.zhyc.module.produce.manage_sheep.add_sheep.domain.ScAddSheep;
+import com.zhyc.module.produce.manage_sheep.domain.ScAddSheep;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java

@@ -1,8 +1,8 @@
-package com.zhyc.module.produce.manage_sheep.trans_group.mapper;
+package com.zhyc.module.produce.manage_sheep.mapper;
 
 import java.util.List;
 
-import com.zhyc.module.produce.manage_sheep.trans_group.domain.ScTransGroup;
+import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup;
 
 /**
  * 转群记录Mapper接口

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java

@@ -1,8 +1,8 @@
-package com.zhyc.module.produce.manage_sheep.transition_info.mapper;
+package com.zhyc.module.produce.manage_sheep.mapper;
 
 import java.util.List;
 
-import com.zhyc.module.produce.manage_sheep.transition_info.domain.ScTransitionInfo;
+import com.zhyc.module.produce.manage_sheep.domain.ScTransitionInfo;
 
 /**
  * 转场Mapper接口

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScAddSheepService.java

@@ -1,7 +1,6 @@
-package com.zhyc.module.produce.manage_sheep.add_sheep.service;
+package com.zhyc.module.produce.manage_sheep.service;
 
-import com.zhyc.common.core.domain.AjaxResult;
+import com.zhyc.module.produce.manage_sheep.domain.ScAddSheep;
-import com.zhyc.module.produce.manage_sheep.add_sheep.domain.ScAddSheep;
 
 import java.util.List;
 

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransGroupService.java

@@ -1,8 +1,8 @@
-package com.zhyc.module.produce.manage_sheep.trans_group.service;
+package com.zhyc.module.produce.manage_sheep.service;
 
 import java.util.List;
 
-import com.zhyc.module.produce.manage_sheep.trans_group.domain.ScTransGroup;
+import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup;
 
 /**
  * 转群记录Service接口

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java

@@ -1,8 +1,8 @@
-package com.zhyc.module.produce.manage_sheep.transition_info.service;
+package com.zhyc.module.produce.manage_sheep.service;
 
 import java.util.List;
 
-import com.zhyc.module.produce.manage_sheep.transition_info.domain.ScTransitionInfo;
+import com.zhyc.module.produce.manage_sheep.domain.ScTransitionInfo;
 
 /**
  * 转场Service接口

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java

@@ -1,16 +1,14 @@
-package com.zhyc.module.produce.manage_sheep.add_sheep.service.impl;
+package com.zhyc.module.produce.manage_sheep.service.impl;
 
 import com.zhyc.common.exception.ServiceException;
 import com.zhyc.common.utils.StringUtils;
-import com.zhyc.module.produce.manage_sheep.add_sheep.domain.ScAddSheep;
+import com.zhyc.module.produce.manage_sheep.domain.ScAddSheep;
-import com.zhyc.module.produce.manage_sheep.add_sheep.mapper.ScAddSheepMapper;
+import com.zhyc.module.produce.manage_sheep.mapper.ScAddSheepMapper;
-import com.zhyc.module.produce.manage_sheep.add_sheep.service.IScAddSheepService;
+import com.zhyc.module.produce.manage_sheep.service.IScAddSheepService;
-import com.zhyc.module.produce.sheep.domain.BasSheep;
+import com.zhyc.module.base.domain.BasSheep;
-import com.zhyc.module.produce.sheep.mapper.BasSheepMapper;
+import com.zhyc.module.base.service.IBasSheepService;
-import com.zhyc.module.produce.sheep.service.IBasSheepService;
+import com.zhyc.module.base.domain.DaSheepfold;
-import com.zhyc.module.produce.sheep.service.impl.BasSheepServiceImpl;
+import com.zhyc.module.base.mapper.DaSheepfoldMapper;
-import com.zhyc.module.fileManagement.domain.DaSheepfold;
-import com.zhyc.module.fileManagement.mapper.DaSheepfoldMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java

@@ -1,13 +1,13 @@
-package com.zhyc.module.produce.manage_sheep.trans_group.service.impl;
+package com.zhyc.module.produce.manage_sheep.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import com.zhyc.common.utils.DateUtils;
-import com.zhyc.module.produce.manage_sheep.trans_group.domain.ScTransGroup;
+import com.zhyc.module.produce.manage_sheep.mapper.ScTransGroupMapper;
-import com.zhyc.module.produce.manage_sheep.trans_group.mapper.ScTransGroupMapper;
+import com.zhyc.module.produce.manage_sheep.service.IScTransGroupService;
-import com.zhyc.module.produce.manage_sheep.trans_group.service.IScTransGroupService;
+import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java

@@ -1,12 +1,12 @@
-package com.zhyc.module.produce.manage_sheep.transition_info.service.impl;
+package com.zhyc.module.produce.manage_sheep.service.impl;
 
 import java.util.List;
 import com.zhyc.common.utils.DateUtils;
-import com.zhyc.module.produce.manage_sheep.transition_info.domain.ScTransitionInfo;
+import com.zhyc.module.produce.manage_sheep.mapper.ScTransitionInfoMapper;
-import com.zhyc.module.produce.manage_sheep.transition_info.mapper.ScTransitionInfoMapper;
+import com.zhyc.module.produce.manage_sheep.domain.ScTransitionInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zhyc.module.produce.manage_sheep.transition_info.service.IScTransitionInfoService;
+import com.zhyc.module.produce.manage_sheep.service.IScTransitionInfoService;
 
 /**
  * 转场Service业务层处理

zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScCastrateController.java

@@ -1,10 +1,10 @@
-package com.zhyc.module.produce.other.castrate.controller;
+package com.zhyc.module.produce.other.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.zhyc.module.produce.other.castrate.domain.ScCastrate;
+import com.zhyc.module.produce.other.domain.ScCastrate;
-import com.zhyc.module.produce.other.castrate.service.IScCastrateService;
+import com.zhyc.module.produce.other.service.IScCastrateService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScFixHoofController.java

@@ -1,10 +1,10 @@
-package com.zhyc.module.produce.other.fixHoof.controller;
+package com.zhyc.module.produce.other.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.zhyc.module.produce.other.fixHoof.domain.ScFixHoof;
+import com.zhyc.module.produce.other.domain.ScFixHoof;
-import com.zhyc.module.produce.other.fixHoof.service.IScFixHoofService;
+import com.zhyc.module.produce.other.service.IScFixHoofService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.other.castrate.domain;
+package com.zhyc.module.produce.other.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java

@@ -1,4 +1,4 @@
-package com.zhyc.module.produce.other.fixHoof.domain;
+package com.zhyc.module.produce.other.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;