 liang.chao
|
e58a0cebd3
|
代码提交
|
2025-08-24 15:59:32 +08:00 |
 mashuai
|
e78a42de1f
|
优化
|
2025-08-24 15:03:03 +08:00 |
|
liang.chao
|
58245dd94c
|
代码提交
|
2025-08-24 12:25:38 +08:00 |
|
liang.chao
|
1e6400c0de
|
代码提交
|
2025-08-24 11:27:05 +08:00 |
 syruan
|
6183fc5163
|
修饰审核速度优化
|
2025-08-23 20:17:42 +08:00 |
 hayu
|
92c6a2f9e6
|
修改
|
2025-08-23 20:04:28 +08:00 |
|
liang.chao
|
ad5f3b5e94
|
代码提交
|
2025-08-23 19:37:38 +08:00 |
|
liang.chao
|
5cfcf6b3c3
|
Merge remote-tracking branch 'origin/master'
|
2025-08-23 19:26:16 +08:00 |
|
liang.chao
|
d4f687aa5a
|
代码提交
|
2025-08-23 19:26:12 +08:00 |
|
liang.chao
|
77f4998c98
|
代码提交
|
2025-08-23 19:24:46 +08:00 |
|
mashuai
|
7c0c13e8dd
|
优化
|
2025-08-23 19:22:18 +08:00 |
|
liang.chao
|
b5bf04e682
|
Merge remote-tracking branch 'origin/master'
|
2025-08-23 19:20:38 +08:00 |
|
liang.chao
|
883ee948e5
|
代码提交
|
2025-08-23 19:18:15 +08:00 |
 hongchao
|
cdeeab88bc
|
Merge remote-tracking branch 'origin/master'
|
2025-08-23 18:57:15 +08:00 |
|
hongchao
|
dc48d42b24
|
bug修复
|
2025-08-23 18:56:50 +08:00 |
|
syruan
|
4dc88291ee
|
修饰审核速度优化
|
2025-08-23 17:59:42 +08:00 |
|
hayu
|
5e5ae0d5a6
|
修改
|
2025-08-23 16:22:38 +08:00 |
|
syruan
|
add7904eb9
|
结算协议号直接查询
|
2025-08-23 16:11:16 +08:00 |
|
syruan
|
0c0bf6426c
|
费用未结算报表增加批量查询，优化执行速度
|
2025-08-22 18:03:59 +08:00 |
|
hayu
|
6a2d78c315
|
修改
|
2025-08-22 17:00:02 +08:00 |
|
syruan
|
1a1febf736
|
费用结算报表
|
2025-08-22 13:50:18 +08:00 |
|
syruan
|
7ad03dbdd0
|
feat(settlement): 新增已结算和未结算报表查询功能
- 在 SltAgreementInfoService接口中添加了 getSltReportedList 和 getSltReportList 方法
- 在 SltAgreementInfoServiceImpl 类中实现了这两个方法
- 在 SltAgreementInfoMapper 接口中添加了对应的 SQL 查询方法
- 在 XML 文件中编写了具体的 SQL 查询语句
- 优化了单位列表查询，增加了过滤班组的功能
|
2025-08-21 20:19:58 +08:00 |
|
mashuai
|
06fb0a60d1
|
优化
|
2025-08-21 20:04:14 +08:00 |
jiang
|
40bac3228a
|
日更新
|
2025-08-21 19:48:01 +08:00 |
 bonus
|
9575294561
|
安全工器具短信推送接口开发
|
2025-08-21 18:28:42 +08:00 |
|
hayu
|
90a7ec357f
|
修改
|
2025-08-21 17:33:44 +08:00 |
|
syruan
|
48fdebbb5b
|
判断以逗号分隔的字符串是否包含指定的值方法优化
|
2025-08-21 13:58:02 +08:00 |
|
hongchao
|
c955981105
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-08-21 12:15:16 +08:00 |
|
hongchao
|
513447b89e
|
bug修复
|
2025-08-21 12:14:47 +08:00 |
|
syruan
|
f9d856aad2
|
list权限取消
|
2025-08-21 12:10:04 +08:00 |
|
hayu
|
c01136e183
|
修改
|
2025-08-21 11:22:23 +08:00 |
|
mashuai
|
e42205a38f
|
优化
|
2025-08-21 09:31:10 +08:00 |
|
hongchao
|
d1e050469c
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-08-20 20:21:53 +08:00 |
|
hongchao
|
b5f101b9cb
|
bug修复
|
2025-08-20 20:21:23 +08:00 |
|
mashuai
|
f6e18f9455
|
优化
|
2025-08-20 20:06:37 +08:00 |
|
hongchao
|
daec444f42
|
bug修复
|
2025-08-20 19:18:14 +08:00 |
|
syruan
|
cc82eea09e
|
退料查询协议增加is_slt=0条件
|
2025-08-20 16:05:18 +08:00 |
|
mashuai
|
81bdd34307
|
优化
|
2025-08-20 12:44:53 +08:00 |
|
mashuai
|
2d0813824f
|
修饰代码优化
|
2025-08-20 11:21:28 +08:00 |
|
hongchao
|
1b31a24772
|
bug修复
|
2025-08-19 22:01:47 +08:00 |
|
mashuai
|
385dbab69f
|
修饰代码优化
|
2025-08-19 21:59:30 +08:00 |
|
mashuai
|
c1348ed43d
|
材料站领料删除优化
|
2025-08-19 18:20:36 +08:00 |
|
hayu
|
7bf95da044
|
Merge remote-tracking branch 'origin/master'
|
2025-08-19 17:44:05 +08:00 |
|
hayu
|
24aeb2d45f
|
修改
|
2025-08-19 17:43:02 +08:00 |
|
mashuai
|
3cf3896947
|
Merge remote-tracking branch 'origin/master'
|
2025-08-19 17:42:41 +08:00 |
|
mashuai
|
61aeb35cdb
|
新购优化
|
2025-08-19 17:42:18 +08:00 |
|
hayu
|
6e8f6d9f72
|
修改
|
2025-08-19 17:38:39 +08:00 |
|
syruan
|
d9f391e456
|
refactor(bonus-material): 移除测试代码并优化登录用户信息获取
- 删除了 SltAgreementInfoServiceImpl 类中的测试代码- 优化了获取登录用户信息的代码，提高代码可读性和性能
|
2025-08-19 17:37:54 +08:00 |
|
syruan
|
60761c8879
|
refactor(bonus-material): 优化退料流程和结算逻辑
- 修复班组退料时协议信息获取的问题
- 优化设备状态更新逻辑
- 改进材料站退料任务创建流程
- 完善结算协议表数据更新
- 优化登录用户结算权限检查
|
2025-08-19 17:37:02 +08:00 |
|
hayu
|
51ec281b35
|
修改
|
2025-08-19 17:03:15 +08:00 |
|
hayu
|
d4cb1788c2
|
修改
|
2025-08-19 16:04:51 +08:00 |
|
hayu
|
10c8b3b20b
|
修改
|
2025-08-19 15:47:02 +08:00 |
|
hayu
|
5abb54a53c
|
问题修改
|
2025-08-19 15:28:22 +08:00 |
|
mashuai
|
ff6de21cfb
|
优化
|
2025-08-19 14:10:26 +08:00 |
|
mashuai
|
62bfb600d4
|
优化
|
2025-08-19 13:21:06 +08:00 |
|
hayu
|
cf4ea24379
|
问题修改
|
2025-08-19 10:29:26 +08:00 |
|
mashuai
|
e656419492
|
优化
|
2025-08-19 09:27:28 +08:00 |
|
mashuai
|
89a9ebdb94
|
班组退料优化
|
2025-08-18 17:22:29 +08:00 |
|
mashuai
|
aba67051f6
|
班组退料
|
2025-08-18 16:09:02 +08:00 |
|
mashuai
|
e586306296
|
班组退料
|
2025-08-18 15:50:55 +08:00 |
|
hayu
|
e37ff62fd3
|
问题修改
|
2025-08-18 11:24:04 +08:00 |
|
hayu
|
9a820b42c3
|
问题修改
|
2025-08-18 10:19:18 +08:00 |
|
mashuai
|
a637da88e6
|
优化
|
2025-08-15 19:08:49 +08:00 |
|
mashuai
|
7d4c560eff
|
优化
|
2025-08-15 18:29:42 +08:00 |
|
mashuai
|
a0feb66853
|
优化
|
2025-08-15 18:23:00 +08:00 |
|
mashuai
|
8b72d2358b
|
优化
|
2025-08-15 17:41:58 +08:00 |
|
mashuai
|
0edf22a5a5
|
优化
|
2025-08-15 10:22:33 +08:00 |
|
mashuai
|
76c64903b8
|
优化
|
2025-08-14 19:11:46 +08:00 |
|
syruan
|
9f602eb078
|
refactor(bonus-material): 优化退料申请和租赁相关功能- 增加单位类型判断逻辑，针对班组类型添加特殊处理
- 改进协议 ID 查询逻辑，支持通过不同方式获取协议信息
- 优化 SQL 查询语句，提高数据查询效率
- 重构部分代码结构，提升可读性和可维护性
|
2025-08-14 18:36:09 +08:00 |
|
mashuai
|
e72f810b2a
|
优化
|
2025-08-14 18:09:11 +08:00 |
|
hongchao
|
db1af62b49
|
发起申请工单里面没有工程名称
|
2025-08-14 15:39:38 +08:00 |
|
hongchao
|
57d962f817
|
审批流修复
|
2025-08-14 13:53:32 +08:00 |
|
mashuai
|
d5e9f0664c
|
Merge remote-tracking branch 'origin/master'
|
2025-08-14 13:49:22 +08:00 |
|
mashuai
|
0de34998f7
|
优化
|
2025-08-14 13:48:59 +08:00 |
|
hayu
|
3f2b0fdea3
|
问题修改
|
2025-08-14 13:43:01 +08:00 |
|
bonus
|
b8aeeeff3b
|
工单审批判断当前审批人权限
|
2025-08-14 13:30:51 +08:00 |
|
hongchao
|
414fab945b
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-08-14 11:32:37 +08:00 |
|
hongchao
|
d195153152
|
审批流修复
|
2025-08-14 11:31:53 +08:00 |
|
syruan
|
bd2062e4b8
|
优化结算模块代码质量和可读性
- 使用 Objects.isNull 和 Objects.nonNull 替换直接 null 判断，提高代码可读性和安全性
|
2025-08-14 11:21:00 +08:00 |
|
syruan
|
193b71a798
|
用 GlobalConstants 替代硬编码的数字值
- 将硬编码的 1、2 等数字值替换为 GlobalConstants 中的常量
|
2025-08-14 11:14:43 +08:00 |
|
hayu
|
aeb6f957e0
|
问题修改
|
2025-08-13 19:02:01 +08:00 |
|
hongchao
|
1fef75868b
|
退料问题修复
|
2025-08-13 18:51:10 +08:00 |
|
hongchao
|
9a377f2b65
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-08-13 18:41:51 +08:00 |
|
hongchao
|
7712e6173d
|
退料问题修复
|
2025-08-13 18:41:31 +08:00 |
|
syruan
|
7338b210e9
|
refactor(material): 优化租赁模块代码结构和逻辑
- 新增 GlobalConstants 类，定义常用常量
- 优化 LeaseApplyInfoServiceImpl 和 LeaseOutDetailsServiceImpl 中的代码逻辑
|
2025-08-13 18:31:48 +08:00 |
|
hongchao
|
37023bbae4
|
退料问题修复
|
2025-08-13 17:56:08 +08:00 |
|
hongchao
|
c1c827008e
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-08-13 17:29:35 +08:00 |
|
hongchao
|
6f7c3c9947
|
退料问题修复
|
2025-08-13 17:27:50 +08:00 |
|
mashuai
|
335d48b5f3
|
优化
|
2025-08-13 11:09:23 +08:00 |
|
mashuai
|
11a5411d21
|
优化
|
2025-08-12 19:12:58 +08:00 |
|
hayu
|
4ba06551dc
|
问题修改
|
2025-08-12 18:20:35 +08:00 |
|
mashuai
|
2a91ea8e48
|
优化
|
2025-08-12 17:29:47 +08:00 |
|
mashuai
|
2089c4eb12
|
优化
|
2025-08-12 17:09:07 +08:00 |
|
syruan
|
a0f4d1e8d5
|
feat(material): 支持班组领料功能
- 新增字段和方法以支持班组领料
- 修改出库流程，增加对班组领料的处理逻辑
- 更新退料和结算相关功能，以适应班组领料
- 优化查询接口，支持按班组查询领料信息
|
2025-08-12 15:09:12 +08:00 |
|
hayu
|
185769e896
|
问题修改
|
2025-08-12 15:01:52 +08:00 |
|
mashuai
|
15895c528e
|
优化
|
2025-08-11 17:37:35 +08:00 |
|
mashuai
|
29940b3575
|
优化
|
2025-08-11 15:17:33 +08:00 |
|
hayu
|
924dc3f6d7
|
问题修改
|
2025-08-11 11:07:39 +08:00 |
|
mashuai
|
f29ae556fc
|
优化
|
2025-08-11 11:02:32 +08:00 |
|
mashuai
|
da3cc8fbaf
|
优化
|
2025-08-08 15:30:24 +08:00 |
|
mashuai
|
4f67ac7f80
|
优化
|
2025-08-07 09:56:04 +08:00 |
|
hayu
|
daa2861f0d
|
问题修改
|
2025-08-06 20:47:10 +08:00 |
|
mashuai
|
487bc5047a
|
优化
|
2025-08-06 17:50:48 +08:00 |
|
hayu
|
d8e5d565e0
|
问题修改
|
2025-08-06 16:55:34 +08:00 |
|
mashuai
|
342f27cfc8
|
优化
|
2025-08-06 09:12:38 +08:00 |
|
mashuai
|
e7e694735d
|
优化
|
2025-08-06 09:00:41 +08:00 |
|
mashuai
|
5d8f82bc27
|
Merge remote-tracking branch 'origin/master'
|
2025-08-05 21:18:57 +08:00 |
|
mashuai
|
a364f573a9
|
优化
|
2025-08-05 21:18:28 +08:00 |
|
hayu
|
2c0820d48f
|
问题修改
|
2025-08-05 21:06:11 +08:00 |
|
mashuai
|
c1710f52b8
|
材料站页面优化
|
2025-08-05 19:33:56 +08:00 |
|
hayu
|
97be09380e
|
问题修改
|
2025-08-05 15:37:02 +08:00 |
|
mashuai
|
9611f236b9
|
优化
|
2025-08-05 13:56:49 +08:00 |
|
mashuai
|
a866447d06
|
优化
|
2025-08-04 15:34:14 +08:00 |
|
hayu
|
19cceff7b8
|
问题修改
|
2025-08-04 09:58:23 +08:00 |
|
hayu
|
68764e648b
|
问题修改
|
2025-08-03 18:11:17 +08:00 |
|
mashuai
|
f165448650
|
分公司班组领料同步材料站
|
2025-08-03 16:25:20 +08:00 |
|
mashuai
|
16fe9fedbb
|
优化
|
2025-08-03 11:10:54 +08:00 |
|
syruan
|
3a0ef44b56
|
完善优化结算
|
2025-08-01 16:07:02 +08:00 |
|
hongchao
|
d51a0daf1c
|
退料
|
2025-08-01 14:37:18 +08:00 |
|
mashuai
|
8ec3710c2b
|
优化
|
2025-07-31 18:59:04 +08:00 |
|
mashuai
|
3888e72842
|
优化
|
2025-07-31 18:25:38 +08:00 |
|
mashuai
|
a0f3649173
|
优化
|
2025-07-31 17:11:00 +08:00 |
|
hayu
|
f281707f43
|
问题修改
|
2025-07-31 16:42:40 +08:00 |
|
mashuai
|
949f592b45
|
优化
|
2025-07-31 16:25:56 +08:00 |
|
mashuai
|
6fa6783969
|
优化
|
2025-07-31 15:50:41 +08:00 |
|
mashuai
|
d6279ec605
|
优化
|
2025-07-31 15:06:18 +08:00 |
|
hongchao
|
80cb178f52
|
退料负责机具权限
|
2025-07-31 10:25:47 +08:00 |
|
jiang
|
364a09f8ed
|
日更新
|
2025-07-30 18:31:30 +08:00 |
|
jiang
|
0f29e252bc
|
Merge remote-tracking branch 'origin/master'
|
2025-07-30 18:28:08 +08:00 |
|
jiang
|
962853c093
|
日更新
|
2025-07-30 18:28:01 +08:00 |
|
hayu
|
81c964be5a
|
问题修改
|
2025-07-30 18:12:00 +08:00 |
|
hongchao
|
3be946db4c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
|
2025-07-30 17:45:49 +08:00 |
|
hongchao
|
86ad36e74d
|
退料修改
|
2025-07-30 17:42:21 +08:00 |
|
syruan
|
c43ec2a116
|
Merge remote-tracking branch 'frps/master' into frp-master
|
2025-07-30 15:53:43 +08:00 |
|
syruan
|
58d40d964a
|
refactor(bonus-material): 重构协议信息获取和处理逻辑
- 将 mergerData 和 handleData 方法从控制器移动到服务层
- 优化了数据合并和处理的逻辑
- 使用 StringUtils 和 Objects 类改进了字符串和对象的处理- 调整了方法参数和返回类型，提高了代码的可读性和可维护性
|
2025-07-30 15:53:38 +08:00 |
|
jiang
|
847e0eaac8
|
日更新
|
2025-07-30 15:42:28 +08:00 |
|
mashuai
|
f377f210c5
|
Merge remote-tracking branch 'origin/master'
|
2025-07-30 14:23:36 +08:00 |
|
mashuai
|
a754499791
|
优化
|
2025-07-30 14:23:19 +08:00 |
|
syruan
|
91efabadc6
|
材料站协议查询修改
|
2025-07-30 14:12:21 +08:00 |
|
mashuai
|
5064809f9e
|
优化
|
2025-07-30 13:50:08 +08:00 |
|
syruan
|
33df1a7311
|
材料站班组下拉选、协议下拉选
|
2025-07-30 11:28:08 +08:00 |
|
mashuai
|
76f1a1f7f9
|
Merge remote-tracking branch 'origin/master'
|
2025-07-30 10:45:21 +08:00 |
|
mashuai
|
7db751ab74
|
优化
|
2025-07-30 10:45:04 +08:00 |
|
hayu
|
c6b7c6ab2d
|
问题修改
|
2025-07-30 01:35:19 +08:00 |
|
mashuai
|
c63a79304f
|
优化
|
2025-07-29 18:42:23 +08:00 |
|
hayu
|
2983184263
|
问题修改
|
2025-07-29 17:43:21 +08:00 |
|
jiang
|
cbd7538120
|
日更新
|
2025-07-29 15:53:18 +08:00 |
|
jiang
|
274a72d126
|
日更新
|
2025-07-29 15:53:01 +08:00 |
|
jiang
|
a114f6cb13
|
Merge remote-tracking branch 'origin/master'
|
2025-07-28 18:41:42 +08:00 |
|
jiang
|
bc8ce5ad71
|
现场维修
|
2025-07-28 18:41:33 +08:00 |
|
bonus
|
d5f6711d1c
|
Merge remote-tracking branch 'origin/master'
|
2025-07-28 15:57:27 +08:00 |
|
bonus
|
a816d9448d
|
维修拆分提交修改
|
2025-07-28 15:57:07 +08:00 |
|
mashuai
|
e592719669
|
优化
|
2025-07-28 15:56:11 +08:00 |
|
syruan
|
2338d1c89e
|
新购的整体查询速度优化
|
2025-07-28 15:53:50 +08:00 |
|
syruan
|
e1aef51b22
|
退料查询优化，3秒->0.3秒
|
2025-07-28 11:11:01 +08:00 |
|
syruan
|
dc39193624
|
修正领料库存逻辑
|
2025-07-28 09:51:48 +08:00 |
|
syruan
|
21bee91a10
|
领料查询、出库的速度优化
材料站出库优化
select下拉框优化
|
2025-07-27 19:09:42 +08:00 |
|
mashuai
|
0ec7b9ca73
|
优化
|
2025-07-27 14:50:47 +08:00 |
|
bonus
|
f7b00ae4c0
|
退料编码查询，退料任务结束修改
|
2025-07-26 19:10:34 +08:00 |
|
bonus
|
02f28b9cbb
|
修试后入库驳回至维修定损，修改默认值
|
2025-07-26 16:00:31 +08:00 |
|
mashuai
|
5cef41384f
|
优化
|
2025-07-26 14:03:59 +08:00 |
|
syruan
|
db111f72b8
|
fix(bonus-material): 领料出库驳回修改任务状态
|
2025-07-26 13:39:18 +08:00 |
|
bonus
|
eecad8ae44
|
mapper映射修改
|
2025-07-26 13:27:16 +08:00 |
|
bonus
|
a86638a9a6
|
领料电子签名通知材料员接口修改
|
2025-07-26 13:22:31 +08:00 |
|
mashuai
|
264061c917
|
优化
|
2025-07-26 12:51:23 +08:00 |
|
syruan
|
bb90f2eda0
|
fix(bonus-material): 新增字段 newTypeId 和 typeId，以区分新旧类型 ID
|
2025-07-26 12:33:21 +08:00 |
|
syruan
|
547968052c
|
refactor(bonus-material): 修改领料任务完成时更新发布数量的 SQL 语句
|
2025-07-26 10:02:19 +08:00 |
|
hayu
|
303bc50798
|
装卸单
|
2025-07-26 09:56:51 +08:00 |
|
hayu
|
d1cde518da
|
装卸单增加类型选择
|
2025-07-26 09:16:17 +08:00 |
|
mashuai
|
41747895a6
|
优化
|
2025-07-25 22:44:52 +08:00 |
|
mashuai
|
5fb2a46e6a
|
优化
|
2025-07-25 19:38:57 +08:00 |
|
mashuai
|
e0a7248b04
|
Merge remote-tracking branch 'origin/master'
|
2025-07-25 18:37:44 +08:00 |
|
mashuai
|
d0f87feffa
|
优化
|
2025-07-25 18:37:34 +08:00 |
|
bonus
|
604aadd425
|
减免接口开发
|
2025-07-25 18:34:36 +08:00 |
|
hongchao
|
fc34e7371c
|
task_type修改
|
2025-07-25 15:46:05 +08:00 |
|
mashuai
|
50108d818a
|
优化
|
2025-07-25 14:14:19 +08:00 |
|
syruan
|
25d102c90a
|
feat(lease): 新增领用发布驳回功能并优化相关逻辑
- 新增领用发布驳回接口和相关服务方法
- 实现驳回时减少已发布数量和删除发布详情的功能
- 优化工程机具领用导出中的SQL逻辑，避免重复计算
|
2025-07-24 16:27:38 +08:00 |
|
hongchao
|
344bbfaad0
|
维修及配件管理修改修复
|
2025-07-24 15:21:22 +08:00 |
|
hayu
|
8f9fb12a25
|
问题修复
|
2025-07-24 00:49:13 +08:00 |
|
mashuai
|
6e0e6a656b
|
优化
|
2025-07-23 18:56:14 +08:00 |
|
bonus
|
ffca789f74
|
维修接口bug修改
|
2025-07-23 18:44:54 +08:00 |
|
hongchao
|
b8add13440
|
Merge remote-tracking branch 'origin/master'
|
2025-07-23 18:31:21 +08:00 |
|
hongchao
|
7443b7e664
|
bug修复
|
2025-07-23 18:30:41 +08:00 |
|
mashuai
|
cceb802448
|
优化
|
2025-07-23 09:04:57 +08:00 |
|
hayu
|
48f78938fb
|
定损
|
2025-07-22 18:25:22 +08:00 |
|
bonus
|
8a49ecee7c
|
退料接收bug修改
|
2025-07-22 16:09:58 +08:00 |
|
mashuai
|
44ad0681c3
|
优化
|
2025-07-22 08:57:01 +08:00 |
|
bonus
|
953c7dcd8f
|
结算接口修改
|
2025-07-21 17:44:46 +08:00 |
|
bonus
|
204924c35d
|
皖送工单审批人状态修改
|
2025-07-21 11:31:07 +08:00 |
|
mashuai
|
16e8fe193a
|
优化
|
2025-07-19 17:48:40 +08:00 |
|
mashuai
|
1da5ba205f
|
优化
|
2025-07-19 16:13:55 +08:00 |
|
mashuai
|
e2fd903141
|
优化
|
2025-07-18 17:07:04 +08:00 |
|
mashuai
|
b1fb3f1773
|
bug
|
2025-07-17 22:22:25 +08:00 |
|
mashuai
|
be9c2db097
|
权限
|
2025-07-17 21:41:01 +08:00 |
|
mashuai
|
7794c7de56
|
结算权限
|
2025-07-17 20:54:12 +08:00 |
|
mashuai
|
76fe998670
|
报表权限
|
2025-07-17 20:15:23 +08:00 |
|
mashuai
|
41ea12a1ed
|
退料，维修权限
|
2025-07-17 18:35:51 +08:00 |
|
liang.chao
|
f6bdfe2af9
|
Merge remote-tracking branch 'origin/master'
|
2025-07-17 14:20:01 +08:00 |
|
liang.chao
|
3564e3eae6
|
工程状态去除必填校验
|
2025-07-17 14:19:25 +08:00 |
|
bonus
|
3ed544f28a
|
人员权限划分接口开发
|
2025-07-17 13:06:45 +08:00 |
|
mashuai
|
812387edcc
|
权限
|
2025-07-16 18:49:44 +08:00 |
|
mashuai
|
4353aeda95
|
材料站
|
2025-07-16 11:35:04 +08:00 |
|
liang.chao
|
831d8057c7
|
接口提交
|
2025-07-15 19:27:28 +08:00 |
|
liang.chao
|
9e8e4335b7
|
接口提交
|
2025-07-15 17:33:39 +08:00 |
|
mashuai
|
91426aaa7d
|
材料站
|
2025-07-15 16:46:58 +08:00 |
|
mashuai
|
fa6d7d58b8
|
材料站
|
2025-07-15 10:06:22 +08:00 |
|
mashuai
|
ec9578a99f
|
材料站
|
2025-07-14 19:22:44 +08:00 |
|
liang.chao
|
6f21827607
|
接口提交
|
2025-07-14 17:42:02 +08:00 |
|
mashuai
|
572f487f58
|
Merge remote-tracking branch 'origin/master'
|
2025-07-14 17:27:25 +08:00 |
|
mashuai
|
d70a67e46f
|
材料站
|
2025-07-14 17:27:12 +08:00 |
|
hongchao
|
36c95e4930
|
bug修复
|
2025-07-14 17:26:40 +08:00 |
|
liang.chao
|
802001f039
|
接口提交
|
2025-07-14 14:58:29 +08:00 |
|
liang.chao
|
459cf50095
|
Merge remote-tracking branch 'origin/master'
|
2025-07-14 13:45:16 +08:00 |
|
liang.chao
|
cd8d35212f
|
接口提交
|
2025-07-14 13:44:56 +08:00 |
|
hongchao
|
1aa8313f64
|
查询优化
|
2025-07-14 13:43:57 +08:00 |
|
mashuai
|
1747408292
|
材料站
|
2025-07-13 10:09:45 +08:00 |
|
mashuai
|
57ae6a898b
|
材料站
|
2025-07-12 14:05:59 +08:00 |
|
mashuai
|
870da9e03f
|
材料站
|
2025-07-12 10:21:07 +08:00 |
|
mashuai
|
218fff6e46
|
材料站
|
2025-07-11 16:33:19 +08:00 |
|
mashuai
|
4fbaa07ccf
|
材料站
|
2025-07-10 09:22:11 +08:00 |
|
mashuai
|
93378c0796
|
材料站
|
2025-07-09 17:46:55 +08:00 |
|
hongchao
|
96e515d6af
|
bug修复
|
2025-07-09 14:14:31 +08:00 |
|
mashuai
|
cea9cb8390
|
材料站
|
2025-07-08 19:58:24 +08:00 |
|
hongchao
|
7901d6fc1e
|
材料员确认
|
2025-07-08 19:34:56 +08:00 |
|
hongchao
|
0c352f19d4
|
Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
# Conflicts:
# bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java
# bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java
|
2025-07-08 19:05:07 +08:00 |
|
hongchao
|
a04795ee22
|
材料员确认
|
2025-07-08 19:03:15 +08:00 |
|
mashuai
|
16774174ff
|
领料出库签字
|
2025-07-08 18:30:57 +08:00 |
|
mashuai
|
6de4ee15c1
|
领料出库签字
|
2025-07-08 18:03:05 +08:00 |
|
mashuai
|
f16a59ce04
|
材料站权限
|
2025-07-08 15:06:27 +08:00 |
|
mashuai
|
492b4c4b92
|
材料站权限
|
2025-07-08 14:35:00 +08:00 |
|
hongchao
|
d1d7d0f479
|
Merge remote-tracking branch 'origin/master'
|
2025-07-08 09:52:46 +08:00 |
|
hongchao
|
605e2f452b
|
项目部授权--项目委托书，电子签名
|
2025-07-08 09:51:09 +08:00 |
|
mashuai
|
d4873a96c1
|
优化
|
2025-07-07 19:07:11 +08:00 |
|
mashuai
|
f0c4987889
|
优化
|
2025-07-07 15:25:25 +08:00 |
|
mashuai
|
478d5beac7
|
优化
|
2025-07-07 15:04:21 +08:00 |
|
hongchao
|
5e9f28a5d5
|
iws短信批量通知
|
2025-07-07 10:55:44 +08:00 |
|
hongchao
|
7e8fbb8f9a
|
iws中i8工程项目定时器的中文状态转换成字典
|
2025-07-07 09:24:00 +08:00 |
|
hongchao
|
0da067b680
|
iws中i8工程项目定时器的中文状态转换成字典
|
2025-07-07 09:20:56 +08:00 |
|
mashuai
|
ad33168e9c
|
优化
|
2025-07-05 22:39:43 +08:00 |
|
mashuai
|
a431d047c4
|
优化
|
2025-07-05 21:27:36 +08:00 |
|
mashuai
|
0ccb1f92fe
|
材料站退料
|
2025-07-05 17:57:19 +08:00 |
|
liang.chao
|
4375cbe920
|
Merge remote-tracking branch 'origin/master'
|
2025-07-05 17:27:43 +08:00 |
|
mashuai
|
ea78ac290a
|
材料站权限及优化
|
2025-07-05 17:27:05 +08:00 |
|
liang.chao
|
ff2cf08087
|
接口提交
|
2025-07-05 17:24:36 +08:00 |
|
hongchao
|
27f44676f4
|
iws中i8工程项目每日定时器编写
|
2025-07-05 13:48:29 +08:00 |
|
mashuai
|
6e438a67e8
|
优化及bug修复
|
2025-07-05 13:22:39 +08:00 |
|
mashuai
|
6e43c00a91
|
优化及bug修复
|
2025-07-04 18:07:30 +08:00 |
skjia
|
0901a311a0
|
jsk 根据机具类型查询机具列表接口 根据工程/往来单位/协议号查询机具信息 根据工程查询领用信息
|
2025-07-04 15:30:07 +08:00 |
 马三炮
|
a4c53207ea
|
业务联单取值有误，项目部材料站站长暂时要，项目部技术员是业务联系单创建人
|
2025-07-04 13:37:36 +08:00 |
|
马三炮
|
7b98284a3d
|
务办理-领用记录查询查看时没有值
|
2025-07-04 11:28:22 +08:00 |
|
马三炮
|
150389f72a
|
机械化标准配置，新增配置时，无法输入，只能点选；添加完要么弹窗不关闭，要么增加数量录入
|
2025-07-04 09:59:20 +08:00 |
|
hongchao
|
f580e018ad
|
工单接入bug修复
|
2025-07-04 08:58:02 +08:00 |
|
hongchao
|
e7f077ba69
|
Merge remote-tracking branch 'origin/master'
|
2025-07-03 15:30:28 +08:00 |
|
hongchao
|
67b8251b3f
|
bug修复
|
2025-07-03 15:30:04 +08:00 |
|
hayu
|
7d3d64a1b7
|
项目部授权班组下拉选
|
2025-07-03 09:36:37 +08:00 |
|
hongchao
|
274b5879ec
|
费用结算定时器修正
|
2025-07-03 09:00:09 +08:00 |
|
mashuai
|
0b4a17e009
|
优化
|
2025-07-02 17:08:51 +08:00 |
|
mashuai
|
5754e50bd2
|
优化
|
2025-07-02 16:39:27 +08:00 |
|
mashuai
|
ce9c84fb93
|
优化
|
2025-07-02 13:49:08 +08:00 |
|
mashuai
|
000d3502fb
|
优化
|
2025-07-01 14:14:28 +08:00 |
|
mashuai
|
50493d7bf3
|
优化
|
2025-07-01 13:43:33 +08:00 |
|
hongchao
|
ddcde38fb0
|
盘带绑定接口开发
|
2025-07-01 11:15:08 +08:00 |
|
mashuai
|
8b14acfa29
|
铭牌信息查询
|
2025-06-30 18:08:26 +08:00 |
|
mashuai
|
f58a96fd7a
|
铭牌信息查询
|
2025-06-30 14:19:47 +08:00 |
|
mashuai
|
93e1838c34
|
标准箱信息查询
|
2025-06-30 13:44:27 +08:00 |
|
mashuai
|
8b614fd7dd
|
新购优化
|
2025-06-30 10:09:40 +08:00 |
syruan
|
a6639b8210
|
新增费用推送审核功能及AES加密工具类
|
2025-06-29 17:45:32 +08:00 |
|
bonus
|
f0b250ae0d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java
|
2025-06-29 14:44:55 +08:00 |
|
bonus
|
67f56ecba2
|
结算费用开发
|
2025-06-29 14:43:51 +08:00 |
|
jiang
|
2399b23a84
|
Merge remote-tracking branch 'origin/master'
|
2025-06-27 17:55:39 +08:00 |
|
jiang
|
787d2c2bb0
|
现场维修
|
2025-06-27 17:55:32 +08:00 |
|
mashuai
|
3de7f33bad
|
结算优化
|
2025-06-27 17:23:30 +08:00 |
|
syruan
|
2c16a68deb
|
refactor(workflow): 优化直转审批流功能
- 新增 ApplyEventListener 监听器处理审批流事件
- 重构 DirectAuditImpl 和 DirectRotationImpl 中的审批流逻辑
- 新增 InsertWorkflowEvent 事件类用于审批流事件
- 优化 SysWorkflowConfigMapper 和 SysWorkflowNodeMapper 的 SQL 查询
- 改进 SysWorkflowNodeServiceImpl 中的节点配置处理方法
|
2025-06-27 16:30:48 +08:00 |
|
mashuai
|
93e5753c85
|
材料站迁移
|
2025-06-27 14:43:33 +08:00 |
|
hayu
|
249330f6bb
|
项目部授权
|
2025-06-26 13:06:20 +08:00 |
|
jiang
|
108d3c7d95
|
现场维修
|
2025-06-25 18:14:50 +08:00 |
|
jiang
|
002f325cb1
|
Merge remote-tracking branch 'origin/master'
|
2025-06-25 16:48:55 +08:00 |
|
jiang
|
52b925e233
|
现场维修
|
2025-06-25 16:48:48 +08:00 |
 lizhenhua
|
6460a87a85
|
Merge remote-tracking branch 'origin/master'
|
2025-06-25 16:35:50 +08:00 |
|
lizhenhua
|
b97217a556
|
振华电子标签
|
2025-06-25 16:35:29 +08:00 |
|
jiang
|
6b33e8955b
|
现场维修
|
2025-06-25 16:25:30 +08:00 |
|
jiang
|
a85dc4fefd
|
Merge remote-tracking branch 'origin/master'
|
2025-06-25 16:24:45 +08:00 |
|
jiang
|
c9d75ee967
|
现场维修
|
2025-06-25 16:24:33 +08:00 |
|
lizhenhua
|
1bf01705f5
|
振华电子标签
|
2025-06-25 16:16:42 +08:00 |
|
lizhenhua
|
3f5d122065
|
振华电子标签
|
2025-06-25 15:57:26 +08:00 |
|
lizhenhua
|
1968012905
|
振华电子标签
|
2025-06-25 15:56:07 +08:00 |
|
lizhenhua
|
287d6c9ad0
|
振华电子标签
|
2025-06-25 15:53:52 +08:00 |
|
bonus
|
40543b9091
|
二维码查询开发
|
2025-06-25 15:40:06 +08:00 |
|
bonus
|
ed0cc6355d
|
审批人员接口修改
|
2025-06-25 10:31:00 +08:00 |
|
mashuai
|
03d7f690ba
|
修饰审核驳回优化
|
2025-06-24 14:11:07 +08:00 |
|
hayu
|
57f7bf5d16
|
定损驳回
|
2025-06-24 10:03:10 +08:00 |
|
mashuai
|
af7f799433
|
维修驳回优化
|
2025-06-24 09:58:21 +08:00 |
|
mashuai
|
0467712248
|
维修驳回优化
|
2025-06-24 09:10:13 +08:00 |
|
mashuai
|
522ef25d63
|
维修驳回优化
|
2025-06-23 16:20:22 +08:00 |
|
mashuai
|
523ad7ecb9
|
维修驳回优化
|
2025-06-23 16:03:58 +08:00 |
|
mashuai
|
b3d4d0c46f
|
优化及bug修复
|
2025-06-21 21:04:32 +08:00 |
|
hayu
|
e1c9e6a30c
|
定损问题修改
|
2025-06-21 17:48:19 +08:00 |
|
hongchao
|
9c4fb81dfa
|
Merge remote-tracking branch 'origin/master'
|
2025-06-21 16:27:57 +08:00 |
|
hongchao
|
771059c9b0
|
工单接入人修改
|
2025-06-21 16:27:33 +08:00 |
|
bonus
|
15e9eb85df
|
业务联系单模版修改
|
2025-06-21 13:37:15 +08:00 |
|
mashuai
|
9335bc9041
|
优化
|
2025-06-21 11:00:18 +08:00 |
|
bonus
|
0772811caa
|
修改新购入库接口
|
2025-06-20 09:59:10 +08:00 |
|
hongchao
|
60df5ef07a
|
标准箱移交人更改
|
2025-06-20 09:09:59 +08:00 |
|
syruan
|
ea56bf273b
|
功能增强：新增材料员确认功能及分公司权限过滤相关改造
|
2025-06-19 16:17:08 +08:00 |
|
hayu
|
488cab504c
|
问题修改
|
2025-06-19 11:49:03 +08:00 |
|
hayu
|
da3cc55b4a
|
问题修改
|
2025-06-19 11:17:00 +08:00 |
|
hongchao
|
50bf4dc698
|
Merge remote-tracking branch 'origin/master'
|
2025-06-19 10:49:50 +08:00 |
|
hongchao
|
308a82d004
|
工单接入web_url和rout
|
2025-06-19 10:49:20 +08:00 |
|
mashuai
|
755f001f02
|
优化
|
2025-06-19 10:28:50 +08:00 |
|
hayu
|
5326f9a137
|
问题修改
|
2025-06-19 10:18:47 +08:00 |
|
bonus
|
a3836fdb8d
|
标准箱新购入库接口开发
|
2025-06-18 21:10:55 +08:00 |
|
mashuai
|
49aca3a2bb
|
优化
|
2025-06-18 16:14:07 +08:00 |
|
hongchao
|
c6f87393a5
|
Merge remote-tracking branch 'origin/master'
|
2025-06-18 14:46:30 +08:00 |
|
hongchao
|
62c977d128
|
bug修复
|
2025-06-18 14:46:06 +08:00 |
|
hayu
|
d8c7b812d8
|
问题修改
|
2025-06-17 18:14:52 +08:00 |
|
mashuai
|
47da7e4756
|
bug修改及优化
|
2025-06-17 17:55:47 +08:00 |
|
jiang
|
a9267824fd
|
Merge remote-tracking branch 'origin/master'
|
2025-06-17 13:37:11 +08:00 |
|
jiang
|
3d6558f07f
|
现场维修
|
2025-06-17 13:36:18 +08:00 |
|
mashuai
|
c212a6401e
|
配件库管绑定
|
2025-06-17 09:46:09 +08:00 |
|
bonus
|
97ce2b0e6f
|
出厂日期类型修改
|
2025-06-16 15:51:03 +08:00 |
|
bonus
|
fc272a7cfa
|
出厂日期类型修改
|
2025-06-16 15:49:39 +08:00 |
|
bonus
|
d584ee299d
|
减免接口开发
|
2025-06-16 15:47:54 +08:00 |
|
bonus
|
141248aebc
|
新购入库查询修改
|
2025-06-16 15:42:35 +08:00 |
|
syruan
|
4f133288a3
|
refactor(bonus-material): 重构数据加解密拦截器
- 优化了数据加密和解密的逻辑，提高了代码的可扩展性和维护性
- 增加了对空对象的判断，提高了代码的健壮性
- 优化了日志输出，增加了异常日志的空判断和错误处理
- 注释了未使用的拦截器方法，为未来可能的需求做准备
|
2025-06-16 15:39:19 +08:00 |
|
syruan
|
e78c6a2f0e
|
取消mybatis拦截器
|
2025-06-16 14:43:17 +08:00 |
|
bonus
|
b2deb4a778
|
修试后入库接口修改
|
2025-06-16 14:18:37 +08:00 |
|
bonus
|
17ddd03864
|
修试后人入库接口修改
|
2025-06-16 14:09:20 +08:00 |
|
bonus
|
85e34e4812
|
修试后入库接口判断修改
|
2025-06-16 13:37:19 +08:00 |
|
bonus
|
9f6f40e746
|
修试标准箱入库接口开发
|
2025-06-16 13:29:08 +08:00 |
|
bonus
|
c389361771
|
移交接口修改
|
2025-06-16 13:12:03 +08:00 |
|
hongchao
|
84a78feb16
|
Merge remote-tracking branch 'origin/master'
|
2025-06-16 10:51:01 +08:00 |
|
hongchao
|
8aeb1db885
|
bug修复
|
2025-06-16 10:50:39 +08:00 |
|
马三炮
|
d590219ca3
|
业务办理审核-减免审核，审核状态筛选状态与结果不一致；
|
2025-06-15 17:31:42 +08:00 |
|
马三炮
|
a74ac63a30
|
Merge remote-tracking branch 'origin/master'
|
2025-06-15 17:19:45 +08:00 |
|
马三炮
|
327cd5b727
|
业务办理记录查询-直转记录查询，审核状态筛选状态与结果不一致；
|
2025-06-15 17:19:31 +08:00 |
|
hayu
|
0a91d8a4aa
|
新购，配件
|
2025-06-15 17:05:06 +08:00 |
|
马三炮
|
260eb79d10
|
业务办理记录查询-直转记录查询，审核状态筛选状态与结果不一致；
|
2025-06-15 16:52:30 +08:00 |
|
马三炮
|
2f54446afc
|
会签管理-会签配置管理-费用见面审批流配置，节综合查询-设备使用追溯查询，时间选择器输入时间筛选，报错；
|
2025-06-15 16:38:01 +08:00 |
|
马三炮
|
52f38a5f68
|
会签管理-会签配置管理-费用见面审批流配置，节点名称文本框输入内容后点击搜索，报错系统未知错误；直转审批流配置、领用审批流配置类同；
|
2025-06-15 15:52:28 +08:00 |
|
马三炮
|
89e293575d
|
组织人员机具管理
|
2025-06-15 14:53:00 +08:00 |
|
bonus
|
2a17bb2201
|
标准箱修试入库接口开发
|
2025-06-15 14:00:10 +08:00 |
|
mashuai
|
e51cbaf4bc
|
新购优化
|
2025-06-15 13:52:25 +08:00 |
|
hayu
|
02ae3b6c9c
|
维修
|
2025-06-15 12:11:25 +08:00 |
|
bonus
|
03d2c2f1d1
|
修试后入库接口开发
|
2025-06-15 09:51:07 +08:00 |
|
hayu
|
6ad082593d
|
定损，维修，退料
|
2025-06-14 17:40:32 +08:00 |
|
mashuai
|
366db7dba7
|
新购优化
|
2025-06-14 14:58:13 +08:00 |
|
syruan
|
d6730c9bf8
|
功能优化：档案模块SQL条件优化 - 调整ArchivesMapper.xml中关键词搜索条件的格式，增强SQL语句可读性
|
2025-06-13 17:12:20 +08:00 |
|
syruan
|
e62d952468
|
功能优化：
1. 新增HTTP状态码枚举QUERY_DATA_NULL(404, "查询数据为空")
2. 档案模块优化：
- 添加Lombok注解@EqualsAndHashCode和@Accessors
- 新增档案字段archivesValue
- 扩展档案查询方法(selectInfoListByNameAndLevel)
- 新增根据文档名称和info值查询节点ID方法
3. 新增工程档案上传功能：
- 实现工程PDF文件上传接口
- 工程新增时自动创建档案分类节点
- 支持领料单/退料单/业务联系单PDF上传
4. 其他优化：
- 添加文件大小格式化方法
- 优化档案名称重复检查逻辑
- 完善异常处理和日志记录
|
2025-06-13 16:27:16 +08:00 |
|
hongchao
|
b95f57390e
|
bug修复
|
2025-06-13 15:30:48 +08:00 |
|
bonus
|
402f7e4cfb
|
Merge remote-tracking branch 'origin/master'
|
2025-06-12 14:53:33 +08:00 |