 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 |