 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 |
|
hayu
|
af9225d66f
|
修改
|
2025-09-03 20:22:07 +08:00 |
|
hongchao
|
a7207dc9bf
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-03 17:22:28 +08:00 |
|
hongchao
|
7d53a34a5e
|
问题修复
|
2025-09-03 17:22:15 +08:00 |
|
hayu
|
12f9f4a850
|
修改
|
2025-09-03 15:56:05 +08:00 |
|
hongchao
|
beefd3e461
|
直转审核流程修改领料数量
|
2025-09-03 12:14:58 +08:00 |
|
mashuai
|
714959eb41
|
功能优化
|
2025-09-03 02:29:08 +08:00 |
|
hayu
|
ed8924f9bc
|
修改
|
2025-09-02 23:57:30 +08:00 |
|
hongchao
|
f08ce31bd0
|
直转审核流程
|
2025-09-02 22:50:48 +08:00 |
|
hayu
|
082330c4a2
|
修改
|
2025-09-02 11:53:53 +08:00 |
|
hayu
|
e21189cf9b
|
Merge remote-tracking branch 'origin/master'
|
2025-09-02 11:32:56 +08:00 |
|
hayu
|
5f15a736fc
|
修改
|
2025-09-02 11:31:47 +08:00 |
|
hongchao
|
5598a935be
|
直转审核bug
|
2025-09-02 11:31:11 +08:00 |
|
hayu
|
5df71896fd
|
Merge remote-tracking branch 'origin/master'
|
2025-09-02 01:59:20 +08:00 |
|
hayu
|
caf103e9d1
|
修改
|
2025-09-02 01:58:57 +08:00 |
|
mashuai
|
6e32f84495
|
Merge remote-tracking branch 'origin/master'
|
2025-09-02 01:58:46 +08:00 |
|
mashuai
|
a921294a14
|
功能优化
|
2025-09-02 01:58:32 +08:00 |
|
syruan
|
09d69775da
|
优化未结算报表查询性能
- 添加 totalCount 查询接口，避免全表扫描
- 重构列表查询逻辑，提高查询效率
- 优化数据处理方式，减少冗余操作
-增加参数预处理，提升 SQL 执行效率
|
2025-09-02 01:57:50 +08:00 |
|
hayu
|
01d5b2bdb4
|
修改
|
2025-09-02 01:30:40 +08:00 |
|
syruan
|
6262a382c2
|
Merge remote-tracking branch 'frps/master' into frp-master
|
2025-09-01 22:17:31 +08:00 |
|
syruan
|
8d79e7c931
|
未结算协议查询修正
|
2025-09-01 22:17:27 +08:00 |
|
hayu
|
e37b4bfb7b
|
修改
|
2025-09-01 20:53:11 +08:00 |
|
hayu
|
015c852ede
|
修改
|
2025-09-01 16:28:30 +08:00 |
|
hayu
|
27f942d77d
|
修改
|
2025-09-01 14:15:19 +08:00 |
|
mashuai
|
7a2a10372f
|
Merge remote-tracking branch 'origin/master'
|
2025-09-01 13:32:04 +08:00 |
|
mashuai
|
dab38a5b9c
|
功能优化
|
2025-09-01 13:31:50 +08:00 |
|
hayu
|
4598a2d5ea
|
修改
|
2025-09-01 13:22:58 +08:00 |
|
syruan
|
40c7c19aa8
|
增加消耗性物资结算功能
- 新增消耗性物资的租赁费用计算逻辑
- 增加安全工器具的结算相关字段和功能
- 优化已结算和未结算协议的处理流程
-调整数据库查询以支持新的结算类型
|
2025-09-01 01:39:44 +08:00 |
|
mashuai
|
aea731d3b8
|
Merge remote-tracking branch 'origin/master'
|
2025-08-31 22:41:19 +08:00 |
|
hayu
|
c2343ece82
|
修改
|
2025-08-31 22:33:53 +08:00 |
jiang
|
17ceb7b0c5
|
接口对接
|
2025-08-31 22:12:38 +08:00 |
|
mashuai
|
14d3bc2040
|
功能优化
|
2025-08-31 22:05:06 +08:00 |
|
hongchao
|
046b71dec7
|
直转审核，数据迁移功能修复，
|
2025-08-31 20:57:51 +08:00 |
|
hongchao
|
fbd448a321
|
直转审核，数据迁移功能修复，
|
2025-08-31 20:57:01 +08:00 |
|
hongchao
|
451f542982
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-08-31 20:56:09 +08:00 |
|
hongchao
|
4ecc905556
|
直转审核，数据迁移功能修复，
|
2025-08-31 20:55:53 +08:00 |
|
hayu
|
fa5a630656
|
修改
|
2025-08-31 20:51:22 +08:00 |
|
mashuai
|
c7fc7a0cd2
|
功能优化
|
2025-08-31 18:24:23 +08:00 |
|
hayu
|
8257f1c3bd
|
修改
|
2025-08-31 18:19:11 +08:00 |
|
jiang
|
abcbeff813
|
接口对接
|
2025-08-31 13:25:08 +08:00 |
|
hayu
|
59842231f8
|
修改
|
2025-08-30 22:44:57 +08:00 |
|
mashuai
|
759f754fcf
|
功能优化
|
2025-08-30 22:42:04 +08:00 |
|
syruan
|
7fc22fde25
|
费用推送审核接口
|
2025-08-30 22:16:48 +08:00 |
|
syruan
|
5a6aaf5da7
|
（new）区间费用计算功能开发
|
2025-08-30 16:53:11 +08:00 |
|
mashuai
|
03b9e4ce8c
|
Merge remote-tracking branch 'origin/master'
|
2025-08-30 16:37:24 +08:00 |
|
mashuai
|
9454d969aa
|
优化
|
2025-08-30 16:37:08 +08:00 |
 bonus
|
26f59138aa
|
检验标签查询接口修改
|
2025-08-30 10:05:13 +08:00 |
|
hayu
|
50ed57eaa6
|
修改
|
2025-08-29 18:35:21 +08:00 |
|
mashuai
|
ef5e7262fa
|
Merge remote-tracking branch 'origin/master'
|
2025-08-29 18:34:04 +08:00 |
|
mashuai
|
1eb3a39b1f
|
优化
|
2025-08-29 18:33:50 +08:00 |
|
bonus
|
b0468de806
|
电子标签查询修改
|
2025-08-29 18:32:55 +08:00 |
|
hayu
|
9ebd493f87
|
修改
|
2025-08-29 18:18:41 +08:00 |
|
hongchao
|
813266dca2
|
退料和修试bug修复
|
2025-08-29 18:07:39 +08:00 |
|
hongchao
|
f840f0841c
|
退料和修试bug修复
|
2025-08-29 18:05:14 +08:00 |
|
syruan
|
c997c888be
|
丢失、报废、维修费用报表
|
2025-08-29 17:54:55 +08:00 |
|
hayu
|
de498f3e58
|
修改
|
2025-08-29 17:52:27 +08:00 |
|
hongchao
|
32eba8af22
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-08-29 14:52:54 +08:00 |
|
hongchao
|
02f99835fa
|
预警短信发送，修试入库数量显示
|
2025-08-29 14:52:35 +08:00 |
|
hongchao
|
e91ff17b80
|
预警短信发送，修试入库数量显示
|
2025-08-29 14:51:46 +08:00 |
|
mashuai
|
b2d8cb5d37
|
优化
|
2025-08-29 13:27:45 +08:00 |
|
mashuai
|
f547c8af75
|
Merge remote-tracking branch 'origin/master'
|
2025-08-29 11:25:25 +08:00 |
|
mashuai
|
094971b034
|
优化
|
2025-08-29 11:25:12 +08:00 |
|
bonus
|
6482651111
|
新购标准箱接口修改
|
2025-08-29 11:04:16 +08:00 |
|
hayu
|
d0d2904e15
|
修改
|
2025-08-28 21:25:23 +08:00 |
|
mashuai
|
f840b2820a
|
优化功能
|
2025-08-28 19:24:06 +08:00 |
|
jiang
|
6de69becb8
|
Merge remote-tracking branch 'origin/master'
|
2025-08-28 19:18:43 +08:00 |
|
jiang
|
4d7644cadb
|
接口对接
|
2025-08-28 19:18:31 +08:00 |
|
syruan
|
b8905ea4f4
|
已结算费用统计修改
|
2025-08-28 18:01:10 +08:00 |
|
hongchao
|
451d8dd923
|
盘点入库bug修复
|
2025-08-28 16:38:21 +08:00 |
|
hayu
|
b0159a8e18
|
修改
|
2025-08-28 15:25:52 +08:00 |
|
hayu
|
9e4bea6e87
|
修改
|
2025-08-27 21:57:11 +08:00 |
|
mashuai
|
a2a25fe20f
|
优化功能
|
2025-08-27 21:55:56 +08:00 |
|
jiang
|
bd8bef233a
|
接口对接
|
2025-08-27 18:12:27 +08:00 |
|
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 |
|
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 |