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 |