itcast
|
000de8eafc
|
Merge remote-tracking branch 'origin/master'
|
2026-01-09 10:19:56 +08:00 |
 mashuai
|
ca91951233
|
优化
|
2026-01-09 10:14:11 +08:00 |
|
itcast
|
890934ada4
|
Merge remote-tracking branch 'origin/master'
|
2026-01-09 10:13:49 +08:00 |
|
itcast
|
fb3938a1a3
|
基础管理
|
2026-01-09 10:12:11 +08:00 |
 hayu
|
5b3b82a292
|
5号库改造
|
2026-01-09 10:06:19 +08:00 |
|
hayu
|
7790c6479d
|
5号库改造
|
2026-01-09 10:05:55 +08:00 |
 hongchao
|
ba18d88a9d
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2026-01-09 09:57:38 +08:00 |
|
hongchao
|
da537f966a
|
宏源权限
|
2026-01-09 09:57:24 +08:00 |
|
mashuai
|
142f011ab7
|
优化
|
2026-01-09 09:57:10 +08:00 |
 jiask
|
e9eeaffa11
|
jsk 机具库存查询 权限改造
|
2026-01-08 16:59:34 +08:00 |
|
jiask
|
b84d468e49
|
jsk ma_machine 检验预警权限改造
|
2026-01-08 16:58:00 +08:00 |
|
jiask
|
033019224b
|
jsk 新购到货管理 数据权限改造
|
2026-01-08 16:51:57 +08:00 |
|
hongchao
|
aaaa60c517
|
获取用户deptId
|
2026-01-07 15:28:37 +08:00 |
|
hongchao
|
d767bc22b6
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
# Conflicts:
# bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java
# bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeService.java
# bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
|
2026-01-07 14:47:37 +08:00 |
|
hongchao
|
121c207b74
|
获取用户deptId
|
2026-01-07 14:46:27 +08:00 |
|
mashuai
|
9632a36b63
|
优化
|
2026-01-07 14:30:01 +08:00 |
|
hongchao
|
3bf0bb85bf
|
减免审核
|
2026-01-06 16:40:01 +08:00 |
|
hongchao
|
e1760ce857
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2026-01-06 16:20:39 +08:00 |
|
hongchao
|
8fd7b25de3
|
减免审核
|
2026-01-06 16:20:16 +08:00 |
 bonus
|
39b4769a57
|
推送费用显示负数
|
2026-01-06 11:31:56 +08:00 |
|
hayu
|
7da8fe1173
|
优化：编码设备报废存储费用
|
2026-01-06 10:18:09 +08:00 |
|
hongchao
|
650afdb89f
|
问题修复
|
2026-01-04 09:13:12 +08:00 |
|
mashuai
|
3d18957cbf
|
新购及修试入库立体仓调试
|
2025-12-31 23:30:05 +08:00 |
|
bonus
|
5a8808b2c4
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-12-30 18:12:19 +08:00 |
|
bonus
|
4f9092ab13
|
修改定时器存储
|
2025-12-30 18:11:49 +08:00 |
|
mashuai
|
8585f4ade8
|
新购及修试入库立体仓调试
|
2025-12-30 17:03:22 +08:00 |
|
mashuai
|
8f9127f2be
|
字段优化
|
2025-12-30 17:01:15 +08:00 |
|
bonus
|
e5c4d96560
|
结算审核协议合并修改
|
2025-12-30 16:16:48 +08:00 |
|
bonus
|
c51647021e
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
# Conflicts:
# bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
|
2025-12-30 15:59:02 +08:00 |
|
hayu
|
ea45488670
|
维修记录重复及价格计算优化
|
2025-12-30 12:24:59 +08:00 |
|
mashuai
|
e620c2254c
|
立体仓出库
|
2025-12-29 17:43:07 +08:00 |
|
mashuai
|
a6e1d9e2b8
|
优化
|
2025-12-29 17:41:53 +08:00 |
|
mashuai
|
73c64cf1ab
|
立体仓标准箱
|
2025-12-29 17:38:54 +08:00 |
|
bonus
|
eae04e9353
|
未结算报表修改
|
2025-12-24 18:17:32 +08:00 |
|
mashuai
|
349f2493cf
|
优化
|
2025-12-18 16:45:17 +08:00 |
|
bonus
|
3cef269a7a
|
结算修改
|
2025-12-17 11:25:15 +08:00 |
|
hayu
|
a065b8ecde
|
报告一键下载功能优化
|
2025-12-15 10:37:06 +08:00 |
|
bonus
|
59d22c923a
|
直转提交默认source=1
|
2025-12-12 10:29:18 +08:00 |
|
mashuai
|
22a2bac03f
|
优化
|
2025-12-11 16:20:49 +08:00 |
|
mashuai
|
aa9fbe8759
|
结算页面优化
|
2025-12-11 13:17:21 +08:00 |
|
hayu
|
16f385fb5b
|
报告查询一键下载
|
2025-12-10 19:20:14 +08:00 |
|
mashuai
|
c3359b8e2e
|
优化
|
2025-12-10 17:16:19 +08:00 |
|
hongchao
|
88d1c12a64
|
未结算报表zip导出
|
2025-12-10 17:04:39 +08:00 |
|
mashuai
|
e298c589cf
|
推送优化及皖送接口及班组审批优化
|
2025-12-10 10:52:30 +08:00 |
|
hayu
|
d3753a9a34
|
报告查询一键下载
|
2025-12-10 09:18:23 +08:00 |
|
bonus
|
292fa1945c
|
安全工器具推送修改
|
2025-12-08 18:33:01 +08:00 |
|
bonus
|
53adca0c4c
|
结算维修单修改
|
2025-12-08 18:26:52 +08:00 |
|
hongchao
|
c7d5cc2303
|
结算
|
2025-12-08 18:04:18 +08:00 |
|
hongchao
|
fa2695bf04
|
结算
|
2025-12-08 17:07:38 +08:00 |
|
bonus
|
9e9a455756
|
结算协议书小数向上取整
|
2025-12-08 15:55:24 +08:00 |