 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 |
|
hongchao
|
e526346a24
|
直转审核状态字符判断
|
2025-09-27 15:59:53 +08:00 |
|
bonus
|
e61f7590df
|
项目部出库接口开发
|
2025-09-27 14:54:37 +08:00 |
|
syruan
|
ba3470bc26
|
增加查询未完成维修单列表功能，优化相关SQL逻辑
|
2025-09-27 10:21:08 +08:00 |
|
hongchao
|
535e9ccc2f
|
Merge remote-tracking branch 'origin/master'
|
2025-09-27 10:00:31 +08:00 |
|
hongchao
|
39c69c2ff3
|
费用推送统一调登录
|
2025-09-27 09:58:12 +08:00 |
|
hongchao
|
dc26bfbc5e
|
费用推送产线服务地址更换
|
2025-09-27 09:53:23 +08:00 |
|
hayu
|
85887779fd
|
材料站领料单号一键出库
|
2025-09-26 18:01:23 +08:00 |
|
hongchao
|
fc22661725
|
材料站出库领料单接口分包单位修正
|
2025-09-26 17:09:45 +08:00 |
|
hongchao
|
5f6087d0a9
|
费用推送
|
2025-09-26 16:32:33 +08:00 |
|
syruan
|
5cec3ddecf
|
增加已结算费用查询功能，优化领料明细获取逻辑
|
2025-09-25 17:54:00 +08:00 |
|
bonus
|
fc24c9d576
|
修改台账报表机具分包领用在用展示
|
2025-09-25 17:44:57 +08:00 |
|
hayu
|
e8d6125f70
|
工地直转退料领料信息中增加直转id
|
2025-09-25 16:56:20 +08:00 |
|
syruan
|
e835da5e30
|
优化导出结算信息逻辑，简化数据处理方式
|
2025-09-25 14:00:30 +08:00 |
|
hongchao
|
91b66aa7b3
|
部署报错解决
|
2025-09-25 13:23:07 +08:00 |
|
hongchao
|
78c1aaf908
|
直转问题修复
|
2025-09-25 12:07:43 +08:00 |
|
bonus
|
cf935f714f
|
结算维修单号去掉定损单号
|
2025-09-25 11:40:25 +08:00 |
|
syruan
|
5388327dbb
|
优化费用信息查询逻辑，合并数据处理
|
2025-09-24 21:33:55 +08:00 |
|
hongchao
|
e8d5685ac9
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-24 21:32:55 +08:00 |
|
hongchao
|
b06a0be9a3
|
短信批量发送修改
|
2025-09-24 21:32:41 +08:00 |
|
bonus
|
d3678516a1
|
预警内容接口修改
|
2025-09-24 21:32:13 +08:00 |
|
bonus
|
552e3ff7d0
|
预警接口开发
|
2025-09-24 21:06:37 +08:00 |
|
bonus
|
7266486e5e
|
预警内容修改接口
|
2025-09-24 21:02:09 +08:00 |
|
syruan
|
f232db9e56
|
调整费用明细标题和数据填充逻辑，修正丢失与报废费用的显示
|
2025-09-24 20:43:55 +08:00 |
|
hayu
|
e3e9dfed2f
|
修改
|
2025-09-24 20:43:09 +08:00 |
|
syruan
|
f2408b6f6e
|
增加已结算过滤功能，优化项目查询逻辑
|
2025-09-24 19:17:08 +08:00 |
|
mashuai
|
b7179fae41
|
材料员优化
|
2025-09-24 18:36:06 +08:00 |
|
hongchao
|
44fc28a2e3
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-24 17:54:48 +08:00 |
|
hongchao
|
9c1cc5a3cf
|
直转代码提交
|
2025-09-24 17:54:39 +08:00 |
|
hayu
|
44c4d568be
|
修改
|
2025-09-24 16:49:39 +08:00 |
|
mashuai
|
9236606439
|
机具优化
|
2025-09-24 16:15:16 +08:00 |
|
hayu
|
9dab95e001
|
修改
|
2025-09-23 20:32:54 +08:00 |
|
mashuai
|
fd650d2f3c
|
Merge remote-tracking branch 'origin/master'
|
2025-09-23 20:12:43 +08:00 |
|
mashuai
|
e83e88e68f
|
材料站优化
|
2025-09-23 20:12:32 +08:00 |
|
syruan
|
68d9424b0b
|
优化审核状态过滤逻辑，移除未审核或审核不通过的记录
|
2025-09-23 20:12:30 +08:00 |
|
bonus
|
5f4d9a9226
|
工程合并及结算维修单号修改
|
2025-09-23 19:16:54 +08:00 |
|
mashuai
|
b2d7d082f0
|
优化
|
2025-09-23 16:35:13 +08:00 |
|
mashuai
|
2c4aa45c82
|
优化
|
2025-09-23 16:34:12 +08:00 |
|
mashuai
|
eb127b3daf
|
Merge remote-tracking branch 'origin/master'
|
2025-09-23 16:13:25 +08:00 |
|
mashuai
|
92b21519bc
|
优化
|
2025-09-23 16:13:11 +08:00 |
|
hongchao
|
0644ace525
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-23 16:00:26 +08:00 |
|
hongchao
|
1e958de63d
|
材料站直转修复
|
2025-09-23 16:00:01 +08:00 |
|
bonus
|
a878f88d51
|
工程合并接口开发
|
2025-09-23 14:32:12 +08:00 |
|
hayu
|
1c1f973957
|
修改
|
2025-09-23 12:45:44 +08:00 |
|
hayu
|
c0bb92fd75
|
修改
|
2025-09-23 12:21:35 +08:00 |
|
mashuai
|
7597ea905f
|
优化
|
2025-09-22 20:52:01 +08:00 |
|
hongchao
|
69f46d8a1a
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-22 19:28:29 +08:00 |
|
hongchao
|
b40219b870
|
材料站领料修改
|
2025-09-22 19:28:20 +08:00 |
|
bonus
|
664d09dbeb
|
材料站多协议类型树修改
|
2025-09-22 19:01:55 +08:00 |
|
mashuai
|
a73ca331cb
|
优化
|
2025-09-22 16:37:06 +08:00 |
|
bonus
|
471c867c13
|
过滤费用为0的数据不展示
|
2025-09-22 13:56:16 +08:00 |
|
hongchao
|
06b73d765f
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-19 15:44:15 +08:00 |
|
hongchao
|
012d6be506
|
代码去除
|
2025-09-19 15:44:05 +08:00 |
|
mashuai
|
a4d1ebd228
|
Merge remote-tracking branch 'origin/master'
|
2025-09-19 15:43:53 +08:00 |
|
mashuai
|
6b623f2eab
|
优化
|
2025-09-19 15:43:47 +08:00 |
|
hongchao
|
8000e6e4f8
|
sql修复
|
2025-09-19 15:41:34 +08:00 |
|
hongchao
|
130440d3d8
|
sql修复
|
2025-09-19 14:54:54 +08:00 |
|
hayu
|
0ae0d50578
|
修改
|
2025-09-19 14:50:17 +08:00 |
|
hongchao
|
cadfdc6cdc
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-19 14:32:14 +08:00 |
|
mashuai
|
0485bcb690
|
优化
|
2025-09-19 14:32:03 +08:00 |
|
hongchao
|
1466d8686e
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-19 14:29:06 +08:00 |
|
hongchao
|
9260cd9822
|
材料站下拉框
|
2025-09-19 14:29:00 +08:00 |
|
mashuai
|
62f98b1445
|
优化
|
2025-09-19 14:21:31 +08:00 |
|
mashuai
|
0a6f204afc
|
出库优化
|
2025-09-18 19:51:47 +08:00 |
|
mashuai
|
040b69d594
|
材料站优化
|
2025-09-18 19:36:12 +08:00 |
|
hayu
|
bd953a8796
|
增加编码状态更改记录
|
2025-09-18 18:46:59 +08:00 |
|
hongchao
|
5ecbf25188
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-18 17:34:50 +08:00 |
|
hongchao
|
140305f73f
|
大屏预警过滤去除
|
2025-09-18 17:34:38 +08:00 |
|
bonus
|
9f70189db7
|
材料站增加检查报告
|
2025-09-18 17:14:50 +08:00 |
|
hongchao
|
1ffe0cb288
|
退料问题修复
|
2025-09-18 14:55:39 +08:00 |
|
hayu
|
c2b63488af
|
修改
|
2025-09-18 12:25:30 +08:00 |
|
hongchao
|
0c1228234b
|
材料站领料记录添加备注
|
2025-09-18 10:49:31 +08:00 |
|
mashuai
|
7c31ac223b
|
材料站优化
|
2025-09-17 22:02:24 +08:00 |
|
mashuai
|
9b7527b087
|
材料站优化
|
2025-09-17 21:56:10 +08:00 |
|
hayu
|
e962757e41
|
修改
|
2025-09-17 21:44:17 +08:00 |
|
mashuai
|
99b47f9fed
|
材料站优化
|
2025-09-17 20:32:54 +08:00 |
|
hongchao
|
e7cecc89f3
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-17 18:27:01 +08:00 |
|
hongchao
|
70eea4c3f8
|
大屏接口
|
2025-09-17 18:26:44 +08:00 |
|
mashuai
|
6851a6b6c5
|
材料站优化
|
2025-09-17 18:23:02 +08:00 |
|
hongchao
|
336847c054
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-17 12:22:55 +08:00 |
|
hongchao
|
d860758ac0
|
导出领料出库明细
|
2025-09-17 12:22:33 +08:00 |
|
mashuai
|
a9c6fb295d
|
单位新增优化
|
2025-09-17 12:22:27 +08:00 |
|
hayu
|
8b938c25bb
|
修改
|
2025-09-16 21:13:11 +08:00 |
|
mashuai
|
78f82c37c4
|
Merge remote-tracking branch 'origin/master'
|
2025-09-16 21:08:01 +08:00 |
|
mashuai
|
ee5d6414d7
|
功能优化
|
2025-09-16 21:07:49 +08:00 |
|
hongchao
|
0b65c3639f
|
导出领料出库明细
|
2025-09-16 20:42:58 +08:00 |
|
hongchao
|
76490ac8c7
|
工器具检验字段处理
|
2025-09-16 14:04:04 +08:00 |
|
hongchao
|
f5bfd5c199
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-16 12:18:51 +08:00 |
|
mashuai
|
9d801cf860
|
功能优化
|
2025-09-16 12:18:34 +08:00 |
|
hongchao
|
88c9266ce3
|
直转最后完成处理
|
2025-09-16 11:32:20 +08:00 |
|
mashuai
|
b1fe3526c4
|
功能优化
|
2025-09-15 19:55:53 +08:00 |
|
hayu
|
3b5c725f1c
|
修改
|
2025-09-15 19:42:39 +08:00 |
|
hayu
|
bb41e8db9d
|
Merge remote-tracking branch 'origin/master'
|
2025-09-15 19:34:19 +08:00 |
|
hayu
|
e6ad7bd2f3
|
修改
|
2025-09-15 19:34:08 +08:00 |
|
mashuai
|
995268a664
|
功能优化
|
2025-09-15 19:22:41 +08:00 |
|
mashuai
|
3393b7ba6d
|
Merge remote-tracking branch 'origin/master'
|
2025-09-15 19:22:21 +08:00 |
|
mashuai
|
9245aa992d
|
功能优化
|
2025-09-15 19:22:14 +08:00 |
|
hayu
|
d2e2fe1b1a
|
修改
|
2025-09-15 19:21:02 +08:00 |
|
hayu
|
f32ff8cb6b
|
修改
|
2025-09-15 19:19:37 +08:00 |
|
mashuai
|
0279307413
|
功能优化
|
2025-09-15 18:43:18 +08:00 |
|
mashuai
|
f76d14c6c5
|
Merge remote-tracking branch 'origin/master'
|
2025-09-15 18:36:57 +08:00 |
|
mashuai
|
3e0b2ace75
|
功能优化
|
2025-09-15 18:36:46 +08:00 |
|
hongchao
|
fc72658b96
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-15 18:02:51 +08:00 |
|
hongchao
|
7141100081
|
网页版领料工单接入，材料站退料单
|
2025-09-15 18:02:33 +08:00 |
|
bonus
|
855cffa5df
|
结算丢失、审核接口列表展示修改
|
2025-09-15 15:48:15 +08:00 |
|
hongchao
|
c9f1e51d3f
|
领料审核驳回
|
2025-09-15 14:37:22 +08:00 |
|
mashuai
|
3315b69a88
|
功能优化
|
2025-09-15 12:25:17 +08:00 |
|
hongchao
|
51250a0b3a
|
撤回功能
|
2025-09-15 00:10:55 +08:00 |
|
hongchao
|
a403ec5405
|
撤回功能
|
2025-09-14 23:44:32 +08:00 |
|
hayu
|
89f4f166c1
|
修改
|
2025-09-14 23:39:53 +08:00 |
|
mashuai
|
989f1efc3d
|
功能优化
|
2025-09-14 23:24:15 +08:00 |
|
bonus
|
9c1a1379f2
|
领料确认接口优化
|
2025-09-14 23:20:19 +08:00 |
|
syruan
|
5362cfd2ee
|
优化维修费用记录逻辑，根据任务是否定损
- 注释掉部分冗余代码，包括设置维修数量和新增维修费用记录的操作
- 修改 getCostCount 查询条件，使用 task_id 替代 repair_id，并添加 is_ds = 1 的条件
- 优化判断逻辑，将 count <= 0 改为 count == 0
|
2025-09-14 23:04:27 +08:00 |
|
hongchao
|
76e36697f4
|
Merge remote-tracking branch 'origin/master'
|
2025-09-14 21:04:38 +08:00 |
|
hongchao
|
bf77815eb7
|
扫描二维码
|
2025-09-14 21:04:26 +08:00 |
|
syruan
|
9cdfee2f1c
|
添加报废费用记录功能
- 在 RepairTaskDetails 中添加 buyPrice 字段，用于获取采购原值
- 在 RepairServiceImpl 中实现报废费用记录的新增逻辑
- 修改 Mapper XML，增加获取采购原值的 SQL 查询
|
2025-09-14 21:04:04 +08:00 |
|
hayu
|
547af18752
|
材料站退料预约
|
2025-09-14 20:36:51 +08:00 |
|
hongchao
|
cdb1ef32ce
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-14 19:15:45 +08:00 |
|
hongchao
|
c2970de1b8
|
盘点入库修正
|
2025-09-14 19:15:38 +08:00 |
|
mashuai
|
e3c670c46d
|
功能优化
|
2025-09-14 17:10:37 +08:00 |
|
hongchao
|
591b7fcbde
|
盘点入库修正
|
2025-09-14 16:35:15 +08:00 |
|
hayu
|
ce86089d29
|
修改
|
2025-09-14 12:34:31 +08:00 |
|
hongchao
|
8a86d64282
|
材料站领料单详情接口
|
2025-09-14 11:24:02 +08:00 |
|
hongchao
|
dae408efad
|
合并代码恢复自身代码
|
2025-09-13 20:09:29 +08:00 |
|
hongchao
|
1dd6d9be47
|
材料站，直转
|
2025-09-13 19:11:11 +08:00 |
|
hongchao
|
167e214bc8
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
# Conflicts:
# bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
# bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
|
2025-09-13 17:57:09 +08:00 |
|
hongchao
|
95bb8ca367
|
材料站，直转
|
2025-09-13 17:53:54 +08:00 |
|
bonus
|
2457422046
|
领料出库、材料站类型树查询优化
|
2025-09-13 17:26:46 +08:00 |
|
hayu
|
513d96dca7
|
修改
|
2025-09-13 15:29:31 +08:00 |
|
mashuai
|
4bc97b87ac
|
材料站功能优化
|
2025-09-13 01:28:58 +08:00 |
|
mashuai
|
16573aedc9
|
材料站功能优化
|
2025-09-13 01:02:36 +08:00 |
|
mashuai
|
4e1becb6a5
|
功能优化
|
2025-09-12 12:10:24 +08:00 |
|
hayu
|
7aa2b00248
|
修改
|
2025-09-12 11:12:53 +08:00 |
|
hayu
|
38afac0898
|
修改
|
2025-09-12 10:49:54 +08:00 |
|
mashuai
|
fac0a798c2
|
功能优化
|
2025-09-12 09:30:37 +08:00 |
|
mashuai
|
0127ff089c
|
Merge remote-tracking branch 'origin/master'
|
2025-09-12 09:08:49 +08:00 |
|
mashuai
|
b27830f800
|
功能优化
|
2025-09-12 09:08:42 +08:00 |
|
hongchao
|
6b92e8821b
|
大屏详情接口补充
|
2025-09-12 09:00:58 +08:00 |
|
mashuai
|
023ad15fe4
|
功能优化
|
2025-09-11 20:02:26 +08:00 |
|
hongchao
|
419605f4c2
|
退料问题修复
|
2025-09-11 18:25:26 +08:00 |
|
hongchao
|
2b6a959a20
|
大屏总数详情接口修正
|
2025-09-11 18:16:28 +08:00 |
|
hongchao
|
3f78b98261
|
结算问题修复
|
2025-09-11 15:08:08 +08:00 |
|
hongchao
|
0284f8fc0f
|
结算问题修复
|
2025-09-11 11:37:12 +08:00 |
|
mashuai
|
53f5e35bbf
|
功能优化
|
2025-09-10 18:53:49 +08:00 |
|
hongchao
|
88f3da9eb7
|
问题修复
|
2025-09-10 18:03:35 +08:00 |
|
mashuai
|
af3b8b420a
|
功能优化
|
2025-09-10 17:33:45 +08:00 |
|
hongchao
|
6510eda512
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-10 15:55:39 +08:00 |
|
hongchao
|
550589f839
|
维修同步更改检修信息
|
2025-09-10 15:55:17 +08:00 |
|
syruan
|
243056af2f
|
优化已结算协议的租赁费用计算逻辑
- 新增查询已结算协议明细的 SQL 查询方法
- 修改区间费用计算逻辑，区分已结算和未结算协议
- 优化租赁天数计算逻辑，针对已结算协议进行特殊处理
-修复跨区间租赁的费用计算问题
|
2025-09-10 15:12:11 +08:00 |
|
hongchao
|
1743a4e54e
|
问题修复
|
2025-09-10 11:33:52 +08:00 |
|
hongchao
|
1a354c7b97
|
结算限制
|
2025-09-10 09:28:20 +08:00 |
|
mashuai
|
4118bc1358
|
功能优化
|
2025-09-09 20:42:02 +08:00 |
|
mashuai
|
ac76c04f80
|
Merge remote-tracking branch 'origin/master'
|
2025-09-09 20:30:09 +08:00 |
|
mashuai
|
d29122b150
|
功能优化
|
2025-09-09 20:29:52 +08:00 |
|
hongchao
|
cf8b5f8204
|
退料问题，竣工问题，盘点问题修复
|
2025-09-09 20:10:01 +08:00 |
|
mashuai
|
5c540d2cf1
|
功能优化
|
2025-09-09 12:10:21 +08:00 |
|
hongchao
|
0e7e6dc5b0
|
竣工机具数量
|
2025-09-09 09:01:51 +08:00 |
|
bonus
|
64a50e1b1c
|
竣工机具预警
|
2025-09-08 21:52:24 +08:00 |
|
hongchao
|
42ab1d8997
|
Merge remote-tracking branch 'origin/master'
|
2025-09-08 21:32:27 +08:00 |
|
hongchao
|
9c7de4734a
|
bug修复
|
2025-09-08 21:31:48 +08:00 |
|
hongchao
|
6cac0068a8
|
bug修复
|
2025-09-08 21:31:24 +08:00 |
|
mashuai
|
b376d46041
|
功能优化
|
2025-09-08 21:27:03 +08:00 |
|
bonus
|
ca98ff1eb2
|
检修预警皖送工程限制放开
|
2025-09-08 20:26:59 +08:00 |
|
bonus
|
dd2d6898b3
|
预警安全工器具
|
2025-09-08 19:36:47 +08:00 |
|
bonus
|
edc7b4061b
|
手机号加密
|
2025-09-08 19:32:40 +08:00 |
|
bonus
|
ff70e83b4b
|
大屏库管员接口修改
|
2025-09-08 19:21:32 +08:00 |
|
syruan
|
dd18b0daf5
|
增加结算类型筛选并优化查询- 在 IwsCostPushMapper.xml 中添加 settlementType 筛选条件
- 优化 IwsCostPushServiceImpl 中的代码格式
- 简化 SltAgreementInfoMapper.xml 中的查询语句
|
2025-09-08 18:57:58 +08:00 |
|
bonus
|
b645ab383a
|
预警数据过滤
|
2025-09-08 18:47:39 +08:00 |
|
hayu
|
9dd653ba4c
|
修改
|
2025-09-08 18:21:54 +08:00 |
|
hongchao
|
77623fb534
|
Merge remote-tracking branch 'origin/master'
|
2025-09-08 18:02:32 +08:00 |
|
hongchao
|
9fc787b1c1
|
bug修复
|
2025-09-08 18:01:51 +08:00 |
|
bonus
|
92c7c0c9ae
|
费用推送接口修改
|
2025-09-08 17:05:07 +08:00 |
|
hongchao
|
fa79b4467e
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-08 10:08:16 +08:00 |
|
hongchao
|
e15a9fe8e5
|
bug修复
|
2025-09-08 10:08:09 +08:00 |
|
mashuai
|
c9eae46186
|
功能优化
|
2025-09-06 19:37:17 +08:00 |
|
syruan
|
1ac2534ff9
|
移除缓存配置并调整相关代码
- 删除了 CacheConfig 类和 RedisCacheConfig 类
- 移除了 ComplexQueryController 中的缓存相关注解
- 调整了 MaterialLeaseInfoServiceImpl 中的缓存相关方法，改为私有方法
- 重命名了 ProjUsingRecordExports 类，修正了包结构
- 优化了 PreventRepeatSubmitAspect 中的日志记录和错误处理
|
2025-09-06 18:34:32 +08:00 |
|
mashuai
|
40b9706aae
|
功能优化
|
2025-09-06 18:30:29 +08:00 |
|
hongchao
|
3d7a6c03cb
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-06 18:10:49 +08:00 |
|
hongchao
|
0c42706c8c
|
检验报告同步
|
2025-09-06 18:10:33 +08:00 |
|
hongchao
|
fa1105ccf2
|
检验报告同步
|
2025-09-06 18:10:24 +08:00 |
|
hayu
|
831497d4a8
|
修改
|
2025-09-06 17:57:14 +08:00 |
|
hayu
|
3e07175e67
|
修改
|
2025-09-06 17:55:53 +08:00 |
|
syruan
|
9361352ee1
|
添加缓存注解以优化性能
- 在 MaterialLeaseInfoServiceImpl 类中的 getUseTypeTree、getTeamByNameCached 和 getAgreementInfoCached 方法上添加 Cacheable 注解
-通过缓存结果减少数据库查询次数，提高系统响应速度
-优化了与项目 ID、班组名称和协议 ID 相关的数据查询
|
2025-09-06 17:40:21 +08:00 |
|
syruan
|
0f3582ab4c
|
优化物资数量批量查询性能
- 修改 getNumListBatch 接口返回类型，从 Map<Long, BigDecimal>改为 List<Type>
- 在服务实现中对批量查询结果进行转换，提高数据处理效率
- 更新 XML 配置，调整查询结果映射类型
|
2025-09-06 16:53:50 +08:00 |
|
syruan
|
82d6ab70d9
|
优化 getUseTypeTree 方法性能
- 新增 CacheConfig 类，为 getUseTypeTree 方法提供缓存支持
-重构 getUseTypeTree 方法，优化数据查询和处理逻辑
- 新增批量查询接口和 SQL，提高查询效率
- 优化数据库查询条件，提高查询性能
|
2025-09-06 16:27:02 +08:00 |
|
mashuai
|
9662ab772d
|
功能优化及小工具导入
|
2025-09-06 15:34:14 +08:00 |
|
mashuai
|
cf61a7adc2
|
功能优化及小工具导入
|
2025-09-06 15:33:41 +08:00 |
|
mashuai
|
d7cdc490b7
|
功能优化
|
2025-09-06 13:29:19 +08:00 |
|
hayu
|
ac92abc828
|
修改
|
2025-09-05 16:49:01 +08:00 |
|
mashuai
|
b5ca9c5f81
|
功能优化
|
2025-09-05 16:17:34 +08:00 |
|
syruan
|
d8dc3a5ad5
|
修复跨区间租赁数据统计问题
-优化了 SltAgreementInfoMapper.xml 中的时间范围过滤逻辑，增加了对跨区间租赁的处理
- 更新了 SltAgreementInfoServiceImpl 中的数据过滤方法，与 SQL逻辑保持一致
- 通过多种情况判断，准确筛选出与查询区间有交集的租赁记录
|
2025-09-05 15:52:18 +08:00 |
|
mashuai
|
fdd2df4576
|
功能优化
|
2025-09-05 13:09:22 +08:00 |
|
hongchao
|
b91a5304b4
|
检修预警柱状图数量统计修改
|
2025-09-05 12:08:02 +08:00 |
|
liang.chao
|
9e2fa8109e
|
代码提交
|
2025-09-05 09:55:19 +08:00 |
|
liang.chao
|
e5792c3e27
|
Merge remote-tracking branch 'origin/master'
|
2025-09-05 09:33:58 +08:00 |
|
liang.chao
|
8e1aa0be95
|
代码提交
|
2025-09-05 09:33:45 +08:00 |
|
mashuai
|
ce1c35d31c
|
功能优化
|
2025-09-04 23:28:15 +08:00 |
|
mashuai
|
3014474c88
|
功能优化
|
2025-09-04 22:54:30 +08:00 |
|
liang.chao
|
98ba908bf8
|
代码提交
|
2025-09-04 21:26:17 +08:00 |
|
liang.chao
|
7025f28b46
|
代码提交
|
2025-09-04 21:18:44 +08:00 |
|
liang.chao
|
64a0130fe5
|
代码提交
|
2025-09-04 21:01:32 +08:00 |
|
liang.chao
|
f8fc86dc2c
|
代码提交
|
2025-09-04 21:00:15 +08:00 |
|
liang.chao
|
6ba1e886f3
|
Merge remote-tracking branch 'origin/master'
|
2025-09-04 20:57:12 +08:00 |
|
liang.chao
|
13aa60f1c5
|
代码提交
|
2025-09-04 20:57:07 +08:00 |
|
liang.chao
|
81f82e3007
|
代码提交
|
2025-09-04 19:54:59 +08:00 |
|
hongchao
|
cd8f82eb1b
|
检修预警柱状图总公司接口修改
|
2025-09-04 18:52:02 +08:00 |
|
hongchao
|
0aa12bd997
|
大屏检修预警修复
|
2025-09-04 18:26:28 +08:00 |
|
syruan
|
c3253543ce
|
添加冲账功能并优化区间费用计算
- 在 PeriodCostResultVo 中添加 markTime 字段，用于冲账日期- 在 SltAgreementInfoMapper 中添加 selectPeriodCostListForCharge 方法，用于查询冲账记录- 更新 SltAgreementInfoMapper.xml，添加新的 SQL 查询语句
- 修改 SltAgreementInfoServiceImpl 中的查询逻辑，加入冲账数据处理
- 优化区间费用汇总功能，增加对未填写协议编号的校验
|
2025-09-04 16:00:06 +08:00 |
|
liang.chao
|
4ca2b3e091
|
Merge remote-tracking branch 'origin/master'
|
2025-09-04 15:46:39 +08:00 |
|
liang.chao
|
c66fc79469
|
代码提交
|
2025-09-04 15:46:32 +08:00 |
|
hayu
|
b8cf2f3c2a
|
修改
|
2025-09-04 14:43:55 +08:00 |
|
liang.chao
|
78e2a37c9c
|
代码提交
|
2025-09-04 12:51:07 +08:00 |
|
liang.chao
|
11b34a6424
|
Merge remote-tracking branch 'origin/master'
|
2025-09-04 12:51:02 +08:00 |
|
liang.chao
|
bfb47f02dd
|
代码提交
|
2025-09-04 12:50:44 +08:00 |
|
mashuai
|
19791eb436
|
功能优化
|
2025-09-04 12:24:37 +08:00 |
|
liang.chao
|
2e66fae328
|
代码提交
|
2025-09-04 12:22:41 +08:00 |
|
liang.chao
|
1b5b72fe0c
|
Merge remote-tracking branch 'origin/master'
|
2025-09-04 11:31:23 +08:00 |
|
liang.chao
|
17178c4dfb
|
代码提交
|
2025-09-04 11:28:32 +08:00 |
|
hayu
|
23d74da2d1
|
修改
|
2025-09-04 11:27:12 +08:00 |
|
mashuai
|
a5274db2e3
|
功能优化
|
2025-09-04 11:07:53 +08:00 |
|
hayu
|
9d41f58598
|
修改
|
2025-09-04 10:59:40 +08:00 |
|
syruan
|
635cabdc90
|
修复结算协议查询和费用计算相关问题- 移除了 SltAgreementInfoMapper.xml 中的协议编码模糊查询条件
- 修改了未结算协议的查询逻辑，增加了对 is_slt 字段为空的处理- 修正了租赁费用计算条件，将 > 0 改为 >= 1，确保当天领当天退也能正常计算费用
- 更新了日期计算方法，确保领料日期和退料日期相同时算作 1 天
|
2025-09-04 07:50:31 +08:00 |
|
mashuai
|
8d4fc5ce0b
|
Merge remote-tracking branch 'origin/master'
|
2025-09-04 00:57:16 +08:00 |
|
mashuai
|
1f98abc54a
|
功能优化
|
2025-09-04 00:56:59 +08:00 |
|
hayu
|
d0057cee18
|
修改
|
2025-09-03 23:25:15 +08:00 |
|
hongchao
|
72cb20d447
|
问题修复
|
2025-09-03 21:37:00 +08:00 |
|
hongchao
|
38276744f6
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-03 21:21:27 +08:00 |
|
hongchao
|
dc0dd59f06
|
问题修复
|
2025-09-03 21:21:12 +08:00 |
|
hayu
|
52b43766aa
|
修改
|
2025-09-03 20:57:05 +08:00 |
|
hayu
|
e2e9527f4d
|
修改
|
2025-09-03 20:51:54 +08:00 |