 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 |