 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
|
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
|
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
|
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
|
dc26bfbc5e
|
费用推送产线服务地址更换
|
2025-09-27 09:53:23 +08:00 |
|
hayu
|
85887779fd
|
材料站领料单号一键出库
|
2025-09-26 18:01:23 +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 |
|
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 |
|
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
|
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 |
|
mashuai
|
9236606439
|
机具优化
|
2025-09-24 16:15:16 +08:00 |
|
hayu
|
9dab95e001
|
修改
|
2025-09-23 20:32:54 +08:00 |
|
mashuai
|
e83e88e68f
|
材料站优化
|
2025-09-23 20:12:32 +08:00 |
|
bonus
|
5f4d9a9226
|
工程合并及结算维修单号修改
|
2025-09-23 19:16:54 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |