 hongchao
|
c6c6e37496
|
供应功能
|
2025-11-20 14:35:40 +08:00 |
 mashuai
|
d9ccc42c98
|
工程页面增加分公司字段
|
2025-11-20 14:33:20 +08:00 |
|
hongchao
|
90853274b2
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-11-20 09:10:01 +08:00 |
|
hongchao
|
ce15fd7cce
|
未结算报表添加筛选状态
|
2025-11-20 09:09:42 +08:00 |
 bonus
|
bf375678ce
|
归还日期修改
|
2025-11-20 08:57:50 +08:00 |
|
mashuai
|
1fe52be0fe
|
Merge remote-tracking branch 'origin/master'
|
2025-11-19 15:37:55 +08:00 |
|
mashuai
|
c721b26c33
|
资产占用月度报表
|
2025-11-19 15:37:49 +08:00 |
|
bonus
|
680921426d
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-11-19 15:29:25 +08:00 |
|
bonus
|
018e3547fd
|
归还日期修改
|
2025-11-19 15:28:26 +08:00 |
|
hongchao
|
28590dd4d0
|
Merge remote-tracking branch 'origin/master'
|
2025-11-19 15:22:20 +08:00 |
|
hongchao
|
2097a45f7f
|
大屏竣工未退预警限制添加
|
2025-11-19 15:21:16 +08:00 |
|
mashuai
|
37f581eeeb
|
数据推送及优化
|
2025-11-18 18:18:08 +08:00 |
|
bonus
|
b7aae9dd66
|
推送预警接口修改
|
2025-11-18 09:08:50 +08:00 |
|
mashuai
|
7ea92579a6
|
优化
|
2025-11-17 18:14:24 +08:00 |
|
bonus
|
c8791ea360
|
结算查询逻辑修改
|
2025-11-17 12:24:34 +08:00 |
|
bonus
|
4a4d4faf37
|
增加导出本次下次检验时间
|
2025-11-17 10:53:37 +08:00 |
|
bonus
|
59b187558e
|
绝缘手套（鞋）查询预警修改
|
2025-11-17 10:47:52 +08:00 |
|
bonus
|
f9dd410e7e
|
绝缘手套（鞋）查询预警修改
|
2025-11-17 10:47:47 +08:00 |
|
bonus
|
81a356779f
|
出库数字查询修改
|
2025-11-17 10:43:28 +08:00 |
|
bonus
|
992897b829
|
结算模块修改
|
2025-11-15 15:47:05 +08:00 |
|
bonus
|
d8ee1d4c68
|
修改设备编辑接口，防止购置批次修改
|
2025-11-14 14:29:49 +08:00 |
 syruan
|
d3571c72bd
|
清空缓存以确保每次任务和请求使用最新数据，避免缓存污染
|
2025-11-14 14:00:06 +08:00 |
|
mashuai
|
3b51d2c52a
|
优化
|
2025-11-14 13:18:44 +08:00 |
|
mashuai
|
7ffe66df7d
|
优化
|
2025-11-14 13:06:32 +08:00 |
|
mashuai
|
d9cbc0b1d5
|
导出优化
|
2025-11-13 18:12:02 +08:00 |
|
mashuai
|
2a9eea531c
|
导出优化
|
2025-11-13 17:06:24 +08:00 |
|
mashuai
|
32e338bad2
|
优化
|
2025-11-13 13:32:56 +08:00 |
|
hongchao
|
8b3ffc8957
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-11-12 17:42:00 +08:00 |
|
hongchao
|
726b2d3eab
|
问题修复
|
2025-11-12 17:41:39 +08:00 |
|
mashuai
|
2851805852
|
优化
|
2025-11-12 17:33:07 +08:00 |
 hayu
|
d867cc27df
|
维修详情、维修审核详情导出
|
2025-11-12 12:23:31 +08:00 |
|
hongchao
|
bd8741fb92
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-11-12 09:16:14 +08:00 |
|
hongchao
|
6c48d117d4
|
导出明细，保有量
|
2025-11-12 09:16:08 +08:00 |
|
mashuai
|
90194d5f7d
|
优化
|
2025-11-11 17:39:06 +08:00 |
|
mashuai
|
2a76c27522
|
优化
|
2025-11-11 16:29:09 +08:00 |
|
hongchao
|
d2267cd583
|
综合查询保有量
|
2025-11-11 11:59:13 +08:00 |
|
mashuai
|
aa913f67dc
|
优化
|
2025-11-11 11:21:00 +08:00 |
|
mashuai
|
5484ed45d6
|
优化
|
2025-11-11 09:42:51 +08:00 |
|
hayu
|
56407c53d0
|
新购到货验收页面状态显示及状态筛选
|
2025-11-10 22:47:09 +08:00 |
|
mashuai
|
d5bec70961
|
领料
|
2025-11-10 18:07:32 +08:00 |
|
mashuai
|
a3637a710b
|
退料
|
2025-11-10 18:01:33 +08:00 |
|
mashuai
|
a848e238e8
|
优化
|
2025-11-10 17:24:31 +08:00 |
|
mashuai
|
024b9a77ac
|
优化
|
2025-11-10 11:13:58 +08:00 |
|
mashuai
|
21f4efb400
|
优化
|
2025-11-10 10:15:16 +08:00 |
|
hayu
|
6460f63eec
|
修改
|
2025-11-10 09:03:28 +08:00 |
|
hayu
|
9b4e0ce504
|
协议新增、修改、删除权限
|
2025-11-07 17:10:59 +08:00 |
|
mashuai
|
794569f225
|
优化
|
2025-11-07 17:07:11 +08:00 |
|
syruan
|
510d85723c
|
Enhance filtering logic in LeaseApplyInfoServiceImpl for improved query accuracy
|
2025-11-07 16:56:42 +08:00 |
|
mashuai
|
85f91ac8d7
|
优化
|
2025-11-07 16:52:40 +08:00 |
|
hayu
|
6635f25c6f
|
报告查询，出库检验报告样式优化以及改为PDF
|
2025-11-07 16:40:54 +08:00 |
|
mashuai
|
a1ab7cda31
|
优化
|
2025-11-07 16:34:10 +08:00 |
|
hongchao
|
7914432f44
|
Merge remote-tracking branch 'origin/master'
|
2025-11-07 16:24:23 +08:00 |
|
hongchao
|
8cf7b8ac23
|
协议删除限制
|
2025-11-07 16:24:07 +08:00 |
|
mashuai
|
b5af5fc71b
|
短信存储
|
2025-11-07 15:46:51 +08:00 |
|
hayu
|
c90560fbaa
|
退料、维修、维修审核查询页面
|
2025-11-07 09:16:04 +08:00 |
|
hongchao
|
69b5f3853d
|
未结算报表zip导出设置
|
2025-11-06 17:19:59 +08:00 |
|
mashuai
|
78322f8e31
|
Merge remote-tracking branch 'origin/master'
|
2025-11-06 12:17:02 +08:00 |
|
mashuai
|
dea5b4faa2
|
短信
|
2025-11-06 12:16:54 +08:00 |
|
hongchao
|
b6ec265fed
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-11-05 18:03:26 +08:00 |
|
hongchao
|
1efb444bb2
|
结算审核页面接口，导出，直转审核导出
|
2025-11-05 18:03:16 +08:00 |
|
hayu
|
14c2318b26
|
保有量查询增加筛选
|
2025-11-05 10:58:05 +08:00 |
|
syruan
|
27c3f54c9f
|
Refactor lease price calculations and enforce source filtering in SQL queries
|
2025-11-04 20:25:14 +08:00 |
|
mashuai
|
c5761ebb0d
|
新购优化
|
2025-11-04 19:01:31 +08:00 |
|
hongchao
|
c6028b6166
|
结算全部导出，结算权限页面接口
|
2025-11-04 17:05:03 +08:00 |
|
mashuai
|
dfdc2e8340
|
领用驳回优化
|
2025-11-04 16:52:59 +08:00 |
|
hongchao
|
83bde9d6b1
|
Merge remote-tracking branch 'origin/master'
|
2025-11-03 17:15:05 +08:00 |
|
hongchao
|
443cd22e4d
|
直转审核页面查询优化
|
2025-11-03 17:14:48 +08:00 |
|
mashuai
|
b16ed60636
|
修试入库导出，班组进出场优化
|
2025-11-03 17:13:50 +08:00 |
|
hongchao
|
ce2e0fb2b5
|
Merge remote-tracking branch 'origin/master'
|
2025-11-03 16:02:47 +08:00 |
|
hongchao
|
4f29c8860b
|
盘点绑定修复
|
2025-11-03 16:02:23 +08:00 |
|
mashuai
|
3fdb25babe
|
优化
|
2025-11-03 14:18:36 +08:00 |
|
hayu
|
b3e90a6463
|
修改
|
2025-11-01 15:25:33 +08:00 |
|
hayu
|
4a89d1bbf0
|
材料站出库--二维码下载与生成
|
2025-11-01 14:34:21 +08:00 |
|
hayu
|
e18052d756
|
修改
|
2025-10-31 20:50:07 +08:00 |
|
mashuai
|
f4922d8331
|
优化
|
2025-10-31 17:23:31 +08:00 |
|
syruan
|
b9c8b4aa67
|
未结算报表历史存储
|
2025-10-31 14:43:25 +08:00 |
|
syruan
|
ed79555cd7
|
代马帅提交
|
2025-10-31 13:31:26 +08:00 |
|
syruan
|
6aa9887316
|
Merge remote-tracking branch 'frps/master' into frp-master
|
2025-10-31 13:29:21 +08:00 |
|
mashuai
|
f98f630eba
|
平衡表
|
2025-10-31 10:25:58 +08:00 |
|
mashuai
|
4ef78a3a49
|
退料
|
2025-10-30 20:23:31 +08:00 |
|
hayu
|
bebe9ee876
|
修改
|
2025-10-30 20:00:59 +08:00 |
|
mashuai
|
824c23e86f
|
现场维修
|
2025-10-30 18:36:33 +08:00 |
|
mashuai
|
28ea7cc40e
|
直转优化
|
2025-10-30 18:33:15 +08:00 |
|
bonus
|
db56b45f4a
|
定损查询增加任务状态
|
2025-10-30 17:54:59 +08:00 |
|
bonus
|
e06533339c
|
推送费用过滤工程
|
2025-10-30 13:44:36 +08:00 |
|
hayu
|
a4234eabbb
|
报告查询、直转单号区分
|
2025-10-30 10:10:11 +08:00 |
|
syruan
|
c0664919d0
|
增加历史报表查询功能及相关服务实现
|
2025-10-30 09:48:54 +08:00 |
|
mashuai
|
955c20af02
|
领料优化
|
2025-10-29 13:46:39 +08:00 |
|
mashuai
|
7902b21197
|
出门证优化
|
2025-10-28 16:48:54 +08:00 |
|
hayu
|
99d867ea4e
|
日期更新查询限制修改
|
2025-10-27 17:25:05 +08:00 |
|
mashuai
|
34e155d2cc
|
优化
|
2025-10-27 14:27:13 +08:00 |
|
mashuai
|
712142380a
|
优化
|
2025-10-24 17:15:15 +08:00 |
|
hongchao
|
9689475e41
|
where去除
|
2025-10-23 19:09:51 +08:00 |
|
mashuai
|
8904b1efc5
|
优化
|
2025-10-23 18:51:55 +08:00 |
|
hayu
|
a1a2bc44ad
|
配件库存、维修单签名
|
2025-10-23 18:45:13 +08:00 |
|
hongchao
|
9654565123
|
维修记录表修改
|
2025-10-23 17:50:34 +08:00 |
|
bonus
|
f78ce835a3
|
新购查询修改
|
2025-10-23 17:06:03 +08:00 |
|
bonus
|
bb9afdb09a
|
保存工单接口修改
|
2025-10-22 19:31:35 +08:00 |
|
mashuai
|
89c6bc6d6a
|
优化
|
2025-10-22 19:22:10 +08:00 |
|
hongchao
|
a765c3fb65
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-10-22 19:03:53 +08:00 |
|
hongchao
|
0cf07ee2c5
|
问题修复
|
2025-10-22 19:03:37 +08:00 |
|
hayu
|
55435560c3
|
维修数量增加限制
|
2025-10-22 18:54:45 +08:00 |
|
bonus
|
a26d40d9ea
|
材料站结算查看接口修改
|
2025-10-22 16:32:39 +08:00 |
|
mashuai
|
9e4dada563
|
新购及修试未入库定时器
|
2025-10-21 19:08:04 +08:00 |
|
hayu
|
609c0c3421
|
修改
|
2025-10-21 19:05:55 +08:00 |
|
hongchao
|
76390545c8
|
结算排列问题修复
|
2025-10-21 18:31:26 +08:00 |
|
syruan
|
40c26fce29
|
结算导出修改
|
2025-10-21 18:00:57 +08:00 |
|
hongchao
|
594c725e02
|
材料站过滤不展示协议单位,结算管理
|
2025-10-21 17:38:42 +08:00 |
|
bonus
|
e6c43863d3
|
材料站提交结算接口修改
|
2025-10-21 16:46:51 +08:00 |
|
hongchao
|
11301dbf40
|
直转，领料审核
|
2025-10-20 19:45:40 +08:00 |
|
hongchao
|
d898abed05
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-10-20 18:32:33 +08:00 |
|
bonus
|
6d9c8d53b4
|
直转详细接口修改
|
2025-10-20 18:32:21 +08:00 |
|
hongchao
|
6c4d399cc5
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-10-20 18:30:30 +08:00 |
|
bonus
|
ba553fd064
|
直转详细接口修改
|
2025-10-20 18:30:08 +08:00 |
|
hongchao
|
590045903c
|
大屏接口分页
|
2025-10-20 18:29:52 +08:00 |
|
mashuai
|
5b8a37a191
|
优化
|
2025-10-20 18:12:51 +08:00 |
|
bonus
|
a40f77a9d7
|
推送接口修改
|
2025-10-20 17:21:16 +08:00 |
|
hongchao
|
d8e024e5b8
|
大屏接口分页
|
2025-10-20 17:04:12 +08:00 |
|
hongchao
|
f5d5a06719
|
Merge remote-tracking branch 'origin/master'
|
2025-10-20 16:19:01 +08:00 |
|
hongchao
|
31e18ad590
|
大屏接口分页
|
2025-10-20 16:18:50 +08:00 |
|
syruan
|
339dc16de6
|
修正结算申请查询逻辑
|
2025-10-20 15:46:46 +08:00 |
|
hongchao
|
a818ce9d87
|
机具费用推送修改
|
2025-10-20 15:30:32 +08:00 |
|
hongchao
|
3eefc8bbc5
|
机具费用推送修改
|
2025-10-20 15:29:51 +08:00 |
|
hayu
|
0864b70fb1
|
修改
|
2025-10-20 14:59:57 +08:00 |
|
bonus
|
0c4949f672
|
推送接口修改
|
2025-10-20 13:55:24 +08:00 |
|
mashuai
|
7456d374ea
|
领用优化
|
2025-10-20 13:51:05 +08:00 |
|
hongchao
|
f1a2a69919
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-10-20 11:30:42 +08:00 |
|
hongchao
|
c6d84fa4f5
|
机具费用推送修改
|
2025-10-20 11:29:41 +08:00 |
|
bonus
|
55441b378c
|
推送接口修改
|
2025-10-20 10:18:27 +08:00 |
|
mashuai
|
2aa6920c88
|
优化
|
2025-10-18 22:02:43 +08:00 |
|
hongchao
|
4f1d529512
|
Merge remote-tracking branch 'origin/master'
|
2025-10-17 16:30:45 +08:00 |
|
hongchao
|
8bc69b7139
|
大屏二级接口修改
|
2025-10-17 16:30:19 +08:00 |
|
mashuai
|
06a6f2787c
|
优化
|
2025-10-17 14:51:32 +08:00 |
|
hongchao
|
f99abf6cf4
|
问题修复
|
2025-10-17 14:44:28 +08:00 |
|
hongchao
|
09a9ac8cef
|
Merge remote-tracking branch 'origin/master'
|
2025-10-17 12:11:43 +08:00 |
|
hongchao
|
f5cf9fced2
|
问题修复
|
2025-10-17 12:11:16 +08:00 |
|
mashuai
|
86a4b29c60
|
优化
|
2025-10-17 12:03:09 +08:00 |
|
hongchao
|
055dc44132
|
Merge remote-tracking branch 'origin/master'
|
2025-10-17 11:00:39 +08:00 |
|
hongchao
|
a1128af03b
|
大屏物资二级详情页面接口
|
2025-10-17 11:00:16 +08:00 |
|
mashuai
|
2294540e06
|
优化
|
2025-10-17 10:07:47 +08:00 |
|
mashuai
|
2b71b89aa0
|
优化
|
2025-10-16 18:47:21 +08:00 |
|
hongchao
|
271fcfc103
|
Merge remote-tracking branch 'origin/master'
|
2025-10-16 18:09:46 +08:00 |
|
hongchao
|
75d7e59e14
|
标准箱出库，新购验收单
|
2025-10-16 18:09:11 +08:00 |
|
mashuai
|
852b710033
|
优化
|
2025-10-16 12:20:11 +08:00 |
|
mashuai
|
3450cad3b4
|
优化
|
2025-10-16 09:14:02 +08:00 |
|
hongchao
|
b1fe3d440b
|
租赁费用下拉问题修正
|
2025-10-15 17:48:15 +08:00 |
|
hongchao
|
e4b2439bb7
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-10-15 17:12:07 +08:00 |
|
hongchao
|
e4b9634357
|
退料，领料，结算问题修复
|
2025-10-15 17:11:45 +08:00 |
|
bonus
|
ca47adb504
|
修改超期日期
|
2025-10-15 01:32:56 +08:00 |
|
hongchao
|
fffbf0dcb5
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-10-15 01:24:54 +08:00 |
|
bonus
|
808208472e
|
增加超期日期
|
2025-10-15 01:24:39 +08:00 |
|
hongchao
|
77fa7563d6
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-10-15 00:52:48 +08:00 |
|
hongchao
|
f63a56ee22
|
结算工程加字段
|
2025-10-15 00:52:40 +08:00 |
|
bonus
|
d2c103ca1a
|
增加超期日期
|
2025-10-15 00:52:06 +08:00 |
|
mashuai
|
2a8dca2a2b
|
优化
|
2025-10-15 00:50:19 +08:00 |
|
bonus
|
4ca6bc49d2
|
增加超期日期
|
2025-10-15 00:48:48 +08:00 |
|
bonus
|
cfc9e975e3
|
增加超期日期
|
2025-10-15 00:42:30 +08:00 |
|
hayu
|
86f12a5413
|
修改
|
2025-10-15 00:13:52 +08:00 |
|
bonus
|
ec6f1a5ea4
|
班组库存分包查询修改
|
2025-10-14 23:31:57 +08:00 |
|
hongchao
|
25df39b6e0
|
结算工程限制
|
2025-10-14 22:52:50 +08:00 |
|
hongchao
|
4a3d1617ea
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-10-14 22:41:50 +08:00 |
|
hongchao
|
532666b0b2
|
问题修复
|
2025-10-14 22:41:37 +08:00 |
|
bonus
|
bab5c3ef1d
|
材料站丢失费用逻辑修改
|
2025-10-14 22:34:11 +08:00 |
|
bonus
|
49241d48e3
|
材料站结算班组项目部修改
|
2025-10-14 22:00:41 +08:00 |
|
mashuai
|
e1c5771475
|
优化
|
2025-10-14 21:58:10 +08:00 |
|
hongchao
|
c1306c49e3
|
问题修复
|
2025-10-14 21:55:30 +08:00 |
|
hongchao
|
b3c97bce82
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-10-14 21:42:22 +08:00 |
|
bonus
|
54b954122f
|
Merge remote-tracking branch 'origin/master'
|
2025-10-14 21:42:15 +08:00 |
|
hongchao
|
bab678f32d
|
问题修复
|
2025-10-14 21:42:07 +08:00 |
|
hayu
|
f77c901cb0
|
修改
|
2025-10-14 21:41:55 +08:00 |
|
bonus
|
3bd67c598b
|
材料站结算超期费用修改
|
2025-10-14 21:41:16 +08:00 |
|
mashuai
|
20f399eb35
|
导出优化
|
2025-10-14 20:06:23 +08:00 |
|
bonus
|
434a330191
|
材料站结算修改
|
2025-10-14 17:38:23 +08:00 |
|
hayu
|
739df5ea33
|
修改
|
2025-10-14 17:35:38 +08:00 |
|
mashuai
|
1824735546
|
优化
|
2025-10-14 17:34:13 +08:00 |
|
syruan
|
0597901404
|
Merge remote-tracking branch 'frps/master' into frp-master
# Conflicts:
# bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
|
2025-10-14 17:29:02 +08:00 |
|
hongchao
|
288d52e280
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
|
2025-10-14 17:26:57 +08:00 |
|
hongchao
|
2ea92e78a6
|
结算修改
|
2025-10-14 17:26:29 +08:00 |
|
bonus
|
a431f69a95
|
材料站结算修改
|
2025-10-14 17:26:11 +08:00 |
|
mashuai
|
4f5f2eb0f2
|
优化
|
2025-10-13 23:01:30 +08:00 |
|
hongchao
|
de2fb68076
|
Merge remote-tracking branch 'origin/master'
|
2025-10-13 21:39:13 +08:00 |
|
hongchao
|
37a4600263
|
结算修改
|
2025-10-13 21:37:02 +08:00 |
|
mashuai
|
84da3532fc
|
优化
|
2025-10-13 21:33:50 +08:00 |
|
hayu
|
39f0b41bbb
|
直转签名
|
2025-10-13 21:31:42 +08:00 |
|
hayu
|
deb5f9ce89
|
维修员、材料员、库管员强制维护签名
|
2025-10-13 18:44:17 +08:00 |
|
mashuai
|
150b01d3cc
|
优化
|
2025-10-13 18:31:45 +08:00 |
|
mashuai
|
2dc94f20b8
|
领用无法发布已结算协议
|
2025-10-11 17:44:39 +08:00 |
 jjLv
|
9003c84147
|
导出功能（维修审核管理）
|
2025-10-11 17:38:50 +08:00 |
 liux
|
8a80a7059e
|
修饰任务审核模块功能修改优化
|
2025-10-11 17:37:52 +08:00 |
|
syruan
|
02f89296f1
|
修正
|
2025-10-11 15:46:07 +08:00 |
|
mashuai
|
a763b6d646
|
材料站优化
|
2025-10-11 11:25:06 +08:00 |
 liang.chao
|
00506cc7ca
|
代码提交
|
2025-10-11 11:20:49 +08:00 |
|
hayu
|
fb20d8517f
|
退料单查询审核人
|
2025-10-10 21:50:14 +08:00 |
|
liang.chao
|
d1235dcc06
|
代码提交
|
2025-10-10 21:39:19 +08:00 |
|
syruan
|
5b686df136
|
增加结算日志
|
2025-10-10 21:13:54 +08:00 |
|
bonus
|
ea1a3411f1
|
Merge remote-tracking branch 'origin/master'
|
2025-10-10 21:07:03 +08:00 |
|
bonus
|
6ca23d9fc9
|
协议合并修改
|
2025-10-10 21:06:07 +08:00 |
|
syruan
|
43499b4a45
|
增加根据协议ID和结算类型修改设备状态为丢失的功能，优化相关数据处理逻辑
|
2025-10-10 21:05:36 +08:00 |
|
hongchao
|
2e50eb1ad0
|
Merge remote-tracking branch 'origin/master'
|
2025-10-10 20:59:43 +08:00 |
|
hongchao
|
aa2eccd23c
|
台账关联班组
|
2025-10-10 20:59:30 +08:00 |
|
jjLv
|
1f8e477105
|
导出功能（发料记录汇总、维修任务管理、维修审核管理）
|
2025-10-10 20:58:21 +08:00 |
|
liux
|
9efa25e31a
|
材料站点导出及查询优化
|
2025-10-10 20:57:44 +08:00 |
|
liux
|
b75ab65778
|
材料站点导出及查询优化
|
2025-10-10 20:56:27 +08:00 |
|
mashuai
|
b252062602
|
Merge remote-tracking branch 'origin/master'
|
2025-10-10 17:35:17 +08:00 |
|
mashuai
|
ebc342a9c1
|
材料站优化
|
2025-10-10 17:35:08 +08:00 |
|
hayu
|
ccbed741c7
|
Merge remote-tracking branch 'origin/master'
|
2025-10-10 17:34:54 +08:00 |
|
hayu
|
b0a4f046fd
|
退料单查询审核人、授权功能修改
|
2025-10-10 17:34:06 +08:00 |
|
hongchao
|
ffeea860d9
|
Merge remote-tracking branch 'origin/master'
|
2025-10-10 17:33:54 +08:00 |
|
hongchao
|
0a41ecc202
|
定时器增量工程添加至工程表
|
2025-10-10 17:33:10 +08:00 |
|
syruan
|
22bf965675
|
优化结算申请相关功能，增加费用明细字段，调整数据处理逻辑
|
2025-10-10 17:32:37 +08:00 |
|
hongchao
|
bc8822fc1f
|
Merge remote-tracking branch 'origin/master'
|
2025-10-10 12:14:35 +08:00 |
|
hongchao
|
5a5b8c609f
|
配件查询，在修工程
|
2025-10-10 12:12:49 +08:00 |
|
hongchao
|
a94f01e29b
|
Merge branch 'master' of http://36.33.26.201:3000/bonus/Bonus-Cloud-Material
|
2025-10-10 12:11:25 +08:00 |
|
hongchao
|
a0f3df9801
|
Merge branch 'master' of http://36.33.26.201:3000/bonus/Bonus-Cloud-Material
# Conflicts:
# bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
|
2025-10-10 12:11:18 +08:00 |
|
mashuai
|
260bf92be1
|
材料站优化
|
2025-10-10 12:10:36 +08:00 |
|
hongchao
|
8a362ef695
|
修改
|
2025-10-10 12:08:14 +08:00 |
|
syruan
|
86136d45ea
|
优化结算申请相关功能，更新费用明细处理逻辑，调整SQL查询及Mapper方法
|
2025-10-10 12:07:09 +08:00 |
|
hayu
|
47e5755fc5
|
增加直转数据标识
|
2025-10-09 16:57:20 +08:00 |
|
mashuai
|
d93c4a38f9
|
材料站结算
|
2025-10-09 15:36:22 +08:00 |
|
mashuai
|
b123d9c2b7
|
优化
|
2025-09-30 19:46:35 +08:00 |
|
mashuai
|
e844e4a0a3
|
材料站优化
|
2025-09-30 19:15:28 +08:00 |
|
hongchao
|
73f3c4bcbf
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-30 18:54:32 +08:00 |
|
hongchao
|
8916b4d19f
|
退料，新购
|
2025-09-30 18:54:18 +08:00 |
|
hayu
|
7829982bb3
|
修改
|
2025-09-30 18:27:11 +08:00 |
|
syruan
|
e4f207eeef
|
增加根据协议ID查询消耗品明细费用功能，优化相关数据处理逻辑
|
2025-09-30 18:11:11 +08:00 |
|
hongchao
|
f93a0d5845
|
费用推送字段变更
|
2025-09-30 11:57:48 +08:00 |
|
hongchao
|
f0c21d3191
|
费用推送字段变更
|
2025-09-30 11:56:56 +08:00 |
|
hongchao
|
f795f9fcd9
|
费用推送字段变更
|
2025-09-30 11:55:38 +08:00 |
|
mashuai
|
66730c0a78
|
材料站优化
|
2025-09-30 10:55:20 +08:00 |
|
syruan
|
9f6e4af5e3
|
优化结算信息处理逻辑，设置不收费项目金额为0，调整日期查询范围
|
2025-09-29 21:14:00 +08:00 |
|
syruan
|
a74a8a099e
|
增加结算申请相关功能，优化查询逻辑及数据处理
|
2025-09-29 16:56:44 +08:00 |
|
mashuai
|
a35ceb8ce1
|
导出数字类型格式转换
|
2025-09-29 16:16:08 +08:00 |
|
mashuai
|
77de75c9a0
|
材料站
|
2025-09-29 09:17:55 +08:00 |
|
mashuai
|
aed825e462
|
材料站供应平衡
|
2025-09-28 23:33:28 +08:00 |
|
mashuai
|
91515b24e8
|
Merge remote-tracking branch 'origin/master'
|
2025-09-28 21:36:29 +08:00 |
|
mashuai
|
ac5ca6258d
|
材料站供应平衡
|
2025-09-28 21:36:20 +08:00 |
|
hayu
|
a89936cb70
|
过滤已结算的工程
|
2025-09-28 20:00:05 +08:00 |
|
bonus
|
2204220937
|
站内直转工单路径修改
|
2025-09-28 19:43:18 +08:00 |
|
bonus
|
f6c57b17c6
|
参数修改
|
2025-09-28 17:23:48 +08:00 |
|
bonus
|
3e1b591873
|
重要机具接口推送信息开发
|
2025-09-28 17:03:12 +08:00 |
|
mashuai
|
58dc019e3b
|
优化
|
2025-09-28 13:50:01 +08:00 |
|
mashuai
|
e194a430fe
|
材料员功能优化
|
2025-09-28 09:53:45 +08:00 |
|
mashuai
|
5e7dcea2d2
|
材料员功能新增优化
|
2025-09-27 23:15:45 +08:00 |
|
bonus
|
bc7317d324
|
退料编码重复创建接口修改
|
2025-09-27 21:40:44 +08:00 |
|
mashuai
|
d19d313683
|
材料员功能新增优化
|
2025-09-27 21:00:07 +08:00 |
|
mashuai
|
ee5b1d8e28
|
材料员功能新增优化
|
2025-09-27 20:54:58 +08:00 |
|
hongchao
|
d053295eee
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-27 20:40:58 +08:00 |
|
hongchao
|
4990a820ca
|
问题修复
|
2025-09-27 20:40:44 +08:00 |
|
bonus
|
00961979d1
|
材料站出库限制范围为项目部
|
2025-09-27 17:38:01 +08:00 |
|
hongchao
|
dc70da60ee
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-27 16:04:26 +08:00 |