 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 |