95 Commits

Author SHA1 Message Date
HashMap
07468b9c00 Merge branch 'feature/material-management-20250805' 2025-08-06 21:10:38 +08:00
HashMap
64c2de5d21 feat(module): 出库记录
出库记录 & 批量导入
2025-08-06 21:10:06 +08:00
HashMap
a473018c48 feat(module): 物资管理
添加物资管理
实现Excel批量导入
2025-08-06 18:11:35 +08:00
HashMap
6fb4762af9 feat(module): 入库管理
添加入库管理模块,实现批量导入功能
2025-08-06 17:06:48 +08:00
zyk
9f9eef5f98 死亡管理 2025-08-06 15:37:17 +08:00
zyh
2083325e40 Merge remote-tracking branch 'origin/main' 2025-08-04 09:17:38 +08:00
zyh
4f48b75b43 判断羊只的删除/未删除状态 2025-08-04 09:17:14 +08:00
zyk
58a79671a0 Merge remote-tracking branch 'origin/main' 2025-08-02 09:55:20 +08:00
wyt
80d82c031f 修改分组管理后端实体 2025-08-01 18:07:48 +08:00
zyk
cc62981813 种公羊档案 2025-08-01 08:59:24 +08:00
ll
8eedf3b3ff 羊奶出入库 2025-07-31 23:34:58 +08:00
ll
feffe7f9ff 羊奶出入库 2025-07-31 23:26:38 +08:00
ll
f999f00a6e 班次奶量 2025-07-31 23:13:45 +08:00
ll
5c5a27bdea Merge remote-tracking branch 'origin/main' 2025-07-29 22:25:32 +08:00
ll
137b495af7 班次奶量 2025-07-29 22:25:19 +08:00
zyh
2f5bf785a7 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepMapper.java
#	zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java
2025-07-29 21:59:44 +08:00
zyh
9b0fd3799e 新增羊只,转场,转群,改耳号,改品种,改备注,体尺测量,体况评分,乳况评分,修蹄,去势初版 2025-07-29 21:58:46 +08:00
a6e014d0fa 新增创建人创建日期 2025-07-29 16:38:34 +08:00
cf11d9f711 消毒 2025-07-25 18:30:29 +08:00
af811ad8b5 免疫保健 2025-07-25 15:12:35 +08:00
693c73f30e 使用lombok @data,替换get,set,toString方法 2025-07-25 10:20:46 +08:00
wyt
77b0c4e0d1 新增羊群结构后端接口 2025-07-24 16:56:58 +08:00
896d12b9b1 驱虫 2025-07-23 18:33:08 +08:00
zyk
a934780e6f 修正孕检mapper文件 2025-07-23 14:44:38 +08:00
zyk
f53375249f Merge remote-tracking branch 'origin/main' 2025-07-23 14:40:13 +08:00
zyk
cab2fd0234 公羊管理-采精记录和配种记录 2025-07-23 14:40:06 +08:00
68c1ec1524 Merge remote-tracking branch 'main/main'
# Conflicts:
#	zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScPregnancyRecordMapper.java
#	zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScFixHoofMapper.java
2025-07-23 10:24:40 +08:00
e12e897f68 诊疗记录 2025-07-23 10:23:22 +08:00
zyk
1971225bc1 孕检记录 2025-07-22 15:38:48 +08:00
zyh
4f45e1fcbf Merge remote-tracking branch 'origin/main' 2025-07-22 14:59:47 +08:00
zyh
4fde560c83 修蹄,去势,转群的新增功能的完善 2025-07-22 14:55:18 +08:00
898add567d Merge remote-tracking branch 'main/main' 2025-07-21 19:28:52 +08:00
de40e1d393 治疗记录 2025-07-21 19:28:38 +08:00
wyt
e1dab09512 Merge remote-tracking branch 'origin/main' 2025-07-21 18:17:20 +08:00
wyt
e14341d804 修改羊只分组后端接口 2025-07-21 18:17:12 +08:00
ll
d853dbe5a3 Merge remote-tracking branch 'origin/main' 2025-07-21 15:54:17 +08:00
ll
61113ed805 鲜奶检验记录 2025-07-21 15:54:04 +08:00
6d6ea86942 检疫记录 2025-07-20 14:08:34 +08:00
862c86d130 业务结构调整 2025-07-18 15:34:18 +08:00
6db5787f8e Merge remote-tracking branch 'main/main' 2025-07-18 15:27:46 +08:00
696a36a0d2 业务结构调整 2025-07-18 15:27:22 +08:00
zyk
b88c7fc95a Merge remote-tracking branch 'origin/main' 2025-07-18 14:32:23 +08:00
zyk
959ad7e4c3 孕检记录 2025-07-18 14:32:05 +08:00
ll
e822fc5c54 Merge remote-tracking branch 'origin/main' 2025-07-18 13:09:52 +08:00
ll
62a84bc971 鲜奶检验记录 2025-07-18 13:09:35 +08:00
wyt
f33bf93714 修改羊只分组功能 2025-07-18 12:57:42 +08:00
wyt
a2d5c34995 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/domain/ScTransGroup.java
#	zhyc-module/src/main/resources/mapper/produce/other/fixHoof/ScFixHoofMapper.xml
2025-07-18 12:52:26 +08:00
wyt
0aeff5f82f 修改羊只分组功能 2025-07-18 12:51:57 +08:00
ll
2fe36ba97d Merge remote-tracking branch 'origin/main' 2025-07-18 11:48:30 +08:00
ll
a352c3d166 酸奶检验记录界面 2025-07-18 11:47:09 +08:00