 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 |