jiang
|
456e88f4d4
|
接口对接
|
2025-08-27 16:05:42 +08:00 |
 liang.chao
|
3b3cec07bb
|
代码提交
|
2025-08-27 14:09:01 +08:00 |
|
liang.chao
|
50e48b3230
|
代码提交
|
2025-08-27 12:29:57 +08:00 |
|
liang.chao
|
c172a18ca9
|
Merge remote-tracking branch 'origin/master'
|
2025-08-27 11:42:25 +08:00 |
|
liang.chao
|
2d6f3939a9
|
代码提交
|
2025-08-27 11:42:18 +08:00 |
 bonus
|
6b1ebf97c5
|
结算表开发
|
2025-08-27 11:41:46 +08:00 |
 hayu
|
bc2a08303e
|
修改
|
2025-08-27 10:55:20 +08:00 |
 syruan
|
0c80b00186
|
领料费用计算小数点精度算法修改
|
2025-08-27 10:36:20 +08:00 |
 mashuai
|
dfaf94edd2
|
优化
|
2025-08-27 10:06:54 +08:00 |
|
hayu
|
8d9b7ccfa3
|
修改
|
2025-08-26 22:33:56 +08:00 |
|
mashuai
|
5e6c28baa4
|
优化
|
2025-08-26 20:58:26 +08:00 |
|
jiang
|
b35d42ff20
|
Merge remote-tracking branch 'origin/master'
|
2025-08-26 19:54:47 +08:00 |
|
jiang
|
d6e9a6ed59
|
接口对接
|
2025-08-26 19:54:22 +08:00 |
|
hayu
|
b7ed8f573a
|
修改
|
2025-08-26 18:44:00 +08:00 |
|
hayu
|
b5c7828252
|
修改
|
2025-08-26 16:20:19 +08:00 |
|
mashuai
|
b7d861f9b6
|
优化
|
2025-08-26 09:25:06 +08:00 |
|
syruan
|
876b06ab01
|
增加二维码查询外部使用接口
|
2025-08-25 18:38:22 +08:00 |
|
mashuai
|
8fef6cc97f
|
优化
|
2025-08-25 12:37:18 +08:00 |
|
hayu
|
b2971abc78
|
修改
|
2025-08-25 12:03:42 +08:00 |
|
mashuai
|
cc09b903fb
|
优化
|
2025-08-24 19:49:51 +08:00 |
|
syruan
|
937a619fd7
|
结算负数优化
|
2025-08-24 19:12:07 +08:00 |
|
hayu
|
ff05164b8b
|
修改
|
2025-08-24 18:59:16 +08:00 |
|
mashuai
|
6bc468201a
|
优化
|
2025-08-24 18:15:36 +08:00 |
|
liang.chao
|
877c06a088
|
代码提交
|
2025-08-24 18:02:56 +08:00 |
|
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 |