 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 |
 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 |
|
bonus
|
ed0cc6355d
|
审批人员接口修改
|
2025-06-25 10:31:00 +08:00 |
|
mashuai
|
b3d4d0c46f
|
优化及bug修复
|
2025-06-21 21:04:32 +08:00 |
|
mashuai
|
9335bc9041
|
优化
|
2025-06-21 11:00:18 +08:00 |
syruan
|
ea56bf273b
|
功能增强：新增材料员确认功能及分公司权限过滤相关改造
|
2025-06-19 16:17:08 +08:00 |
|
mashuai
|
755f001f02
|
优化
|
2025-06-19 10:28:50 +08:00 |
|
bonus
|
a3836fdb8d
|
标准箱新购入库接口开发
|
2025-06-18 21:10:55 +08:00 |
|
mashuai
|
e10ddd550f
|
bug
|
2025-06-18 09:20:34 +08:00 |
|
jiang
|
a9267824fd
|
Merge remote-tracking branch 'origin/master'
|
2025-06-17 13:37:11 +08:00 |
|
jiang
|
3d6558f07f
|
现场维修
|
2025-06-17 13:36:18 +08:00 |
|
bonus
|
97ce2b0e6f
|
出厂日期类型修改
|
2025-06-16 15:51:03 +08:00 |
|
bonus
|
2a17bb2201
|
标准箱修试入库接口开发
|
2025-06-15 14:00:10 +08:00 |
|
mashuai
|
e51cbaf4bc
|
新购优化
|
2025-06-15 13:52:25 +08:00 |
|
hayu
|
6ad082593d
|
定损，维修，退料
|
2025-06-14 17:40:32 +08:00 |
|
mashuai
|
366db7dba7
|
新购优化
|
2025-06-14 14:58:13 +08:00 |
|
syruan
|
e62d952468
|
功能优化：
1. 新增HTTP状态码枚举QUERY_DATA_NULL(404, "查询数据为空")
2. 档案模块优化：
- 添加Lombok注解@EqualsAndHashCode和@Accessors
- 新增档案字段archivesValue
- 扩展档案查询方法(selectInfoListByNameAndLevel)
- 新增根据文档名称和info值查询节点ID方法
3. 新增工程档案上传功能：
- 实现工程PDF文件上传接口
- 工程新增时自动创建档案分类节点
- 支持领料单/退料单/业务联系单PDF上传
4. 其他优化：
- 添加文件大小格式化方法
- 优化档案名称重复检查逻辑
- 完善异常处理和日志记录
|
2025-06-13 16:27:16 +08:00 |
|
mashuai
|
50b8b37304
|
优化
|
2025-05-22 10:24:36 +08:00 |
|
mashuai
|
9f7e611850
|
优化
|
2025-05-21 18:14:55 +08:00 |
 hongchao
|
23882ec58d
|
试运行问题修复及工单接入
|
2025-05-08 16:23:10 +08:00 |
|
hongchao
|
ac01898219
|
结算管理批量结算
|
2025-03-21 13:35:32 +08:00 |
|
mashuai
|
db0079a181
|
领用记录查询页面联调
|
2025-03-07 15:25:02 +08:00 |
|
mashuai
|
30ea1e4aa6
|
领用申请详情导出
|
2025-03-07 14:08:23 +08:00 |
|
mashuai
|
5c2d2f6119
|
综合查询
|
2025-03-06 18:20:39 +08:00 |
 马三炮
|
825e65fe0d
|
领用审批优化，加上会签的逻辑
|
2025-03-06 11:01:00 +08:00 |
|
zfh
|
49cf24d31a
|
领用审批优化，加上会签的逻辑
|
2025-03-06 08:59:23 +08:00 |
|
mashuai
|
cce535a7c1
|
标签查询
|
2025-03-05 17:10:17 +08:00 |
|
mashuai
|
5e2309f412
|
标签查询
|
2025-03-05 13:27:10 +08:00 |
|
mashuai
|
914f0c7a03
|
Merge remote-tracking branch 'origin/master'
|
2025-03-05 10:28:18 +08:00 |
|
mashuai
|
96985a751d
|
申请发布
|
2025-03-05 10:28:10 +08:00 |
|
zfh
|
3df87f5cef
|
领用审批优化，加上会签的逻辑
|
2025-03-05 09:23:17 +08:00 |
|
mashuai
|
97213e6e60
|
申请发布
|
2025-03-04 17:31:59 +08:00 |
|
mashuai
|
fc6916a2da
|
申请发布
|
2025-03-04 15:41:14 +08:00 |
|
mashuai
|
33992fef85
|
功能优化
|
2025-03-04 10:22:28 +08:00 |
|
hongchao
|
bbb6cc4a9a
|
领用申请下载文档
|
2025-03-04 08:55:10 +08:00 |
|
hongchao
|
21c0c50a92
|
领用申请
|
2025-02-28 18:20:55 +08:00 |
|
mashuai
|
aaf3000c70
|
维修拆分及修饰审核
|
2025-02-28 15:04:40 +08:00 |
|
syruan
|
8e5f712756
|
费用减免工作流提交
|
2025-02-21 02:26:38 +08:00 |
|
bonus
|
3e6337b54c
|
直转审核接口开发
|
2025-02-21 01:47:38 +08:00 |
|
hayu
|
232c8d8f3c
|
Merge remote-tracking branch 'origin/master'
|
2025-02-20 23:41:05 +08:00 |
|
hayu
|
982b0eb61c
|
问题修改
|
2025-02-20 23:40:48 +08:00 |
|
syruan
|
73b3c492ca
|
审批流通用方法优化
|
2025-02-20 23:40:31 +08:00 |
|
hayu
|
4715df61b1
|
业务
|
2025-02-20 20:40:53 +08:00 |
|
hayu
|
f4ca04f11b
|
后台业务办理记录查询，app业务办理记录查询
|
2025-02-19 20:29:20 +08:00 |
|
mashuai
|
2ca16fd1d5
|
常量
|
2025-02-18 17:51:17 +08:00 |
|
mashuai
|
a72cebcb00
|
Merge remote-tracking branch 'origin/master'
|
2025-02-18 09:21:08 +08:00 |
|
mashuai
|
445cd5b722
|
盘点报废
|
2025-02-18 09:20:55 +08:00 |
|
hayu
|
36ceb1b340
|
领用申请,领用记录查询
|
2025-02-17 17:43:58 +08:00 |
|
hayu
|
0816be447e
|
标准配置，领用申请
|
2025-02-15 17:02:41 +08:00 |
|
syruan
|
eacf57e3ef
|
i皖送费用推送定时任务
|
2025-02-15 16:38:24 +08:00 |
|
mashuai
|
0e10b67591
|
功能修改优化
|
2025-02-11 15:29:27 +08:00 |
|
hongchao
|
1bffc4c4e3
|
领料申请管理
|
2025-02-10 17:21:16 +08:00 |
|
mashuai
|
542d02a8d9
|
分包商
|
2025-02-07 18:17:38 +08:00 |
|
mashuai
|
29e15504e9
|
bmfileinfo类共用移动
|
2025-02-07 17:15:01 +08:00 |
|
mashuai
|
c124f9f4fb
|
Merge remote-tracking branch 'origin/master'
|
2025-01-24 15:53:13 +08:00 |
|
mashuai
|
8ac37a1628
|
功能新增及优化
|
2025-01-24 15:53:08 +08:00 |
|
hongchao
|
965b23e254
|
租赁结算导出对于无数据的增加行，i皖送ruan修改的代码
|
2025-01-24 15:08:08 +08:00 |
|
mashuai
|
1b60cf6927
|
配件
|
2025-01-20 18:21:03 +08:00 |
|
hongchao
|
79c0991698
|
全部导出时对于没有的数据进行进行单元格格式设置
|
2025-01-20 17:50:37 +08:00 |
|
hongchao
|
2c7d7b1da1
|
结算审批
|
2025-01-20 17:14:23 +08:00 |
|
mashuai
|
bfde5717d3
|
文件功能修改
|
2025-01-17 18:57:46 +08:00 |
|
mashuai
|
f986162a4c
|
维修报废功能修改
|
2025-01-17 15:53:14 +08:00 |
|
hongchao
|
f3f8dc0e85
|
退料审核人签名
|
2025-01-17 11:03:29 +08:00 |
|
mashuai
|
26c6415877
|
Merge remote-tracking branch 'origin/master'
|
2025-01-16 19:17:18 +08:00 |
|
mashuai
|
c4461f3b91
|
维修报废功能修改
|
2025-01-16 19:17:10 +08:00 |
|
hongchao
|
dcdf35762c
|
领料管理领料单审核签名
|
2025-01-16 18:06:58 +08:00 |
|
hongchao
|
4cf7c2e397
|
结算申请（单个）详情，四项导出以及融合导出，提交结算
|
2025-01-16 09:26:20 +08:00 |
|
mashuai
|
8109f4b9d2
|
维修功能修改
|
2025-01-15 17:34:00 +08:00 |
|
mashuai
|
c9ad9a1377
|
Merge remote-tracking branch 'origin/master'
|
2025-01-10 17:51:55 +08:00 |
|
mashuai
|
3d6a274eed
|
优化
|
2025-01-10 17:51:49 +08:00 |
|
syruan
|
4e3edf2cb2
|
新购实现拆分多次入库，状态流转优化
|
2025-01-10 17:47:41 +08:00 |
|
hongchao
|
9313ac3c2d
|
配件管理
|
2025-01-10 08:57:49 +08:00 |
|
syruan
|
4093544cb5
|
领料单电子签名
|
2025-01-09 11:13:03 +08:00 |
|
mashuai
|
0f8d6fed11
|
优化
|
2025-01-08 13:33:45 +08:00 |
|
mashuai
|
ba3fc88ce0
|
报废+ocr
|
2025-01-03 14:07:12 +08:00 |
|
mashuai
|
5fa102fc3d
|
报废审核
|
2025-01-02 10:55:57 +08:00 |
|
syruan
|
ca817bb3ab
|
新购验收绑定
|
2024-12-27 18:22:58 +08:00 |
|
mashuai
|
eb3cc94fbb
|
电子档案
|
2024-12-27 17:06:55 +08:00 |
|
mashuai
|
cddb0b9a8d
|
接口优化
|
2024-12-27 09:32:07 +08:00 |
|
mashuai
|
e09a530cff
|
接口修改
|
2024-12-26 18:21:15 +08:00 |
|
mashuai
|
f9cce25f3e
|
接口联调
|
2024-12-26 15:32:49 +08:00 |
|
mashuai
|
55ce855d68
|
接口联调
|
2024-12-26 14:38:33 +08:00 |
|
mashuai
|
44493ddc66
|
接口联调
|
2024-12-25 18:33:19 +08:00 |
|
mashuai
|
6ced630d20
|
接口联调
|
2024-12-25 14:32:34 +08:00 |
|
syruan
|
3fa849fa98
|
新购验收绑定修改
|
2024-12-24 19:30:58 +08:00 |
|
mashuai
|
3954484bb3
|
接口联调优化
|
2024-12-24 18:32:18 +08:00 |
|
syruan
|
41f5ed276b
|
新购入库完成状态判断逻辑优化
|
2024-12-23 18:46:25 +08:00 |
|
syruan
|
34d736ca85
|
新购枚举状态判断逻辑修改
|
2024-12-23 18:38:26 +08:00 |
|
syruan
|
0692590215
|
新购任务管理、验收、绑定、入库展示方式修改、新增阶段
|
2024-12-23 16:50:41 +08:00 |
|
mashuai
|
9cd60c3e1a
|
领料修改
|
2024-12-23 14:06:52 +08:00 |
|
mashuai
|
62443b4c8f
|
库存日志记录
|
2024-12-20 21:11:36 +08:00 |
|
mashuai
|
1bcd5b8993
|
库存日志记录
|
2024-12-20 19:46:20 +08:00 |
|
mashuai
|
15712e9610
|
优化
|
2024-12-20 17:38:02 +08:00 |
|
syruan
|
5dc324fa62
|
二维码标准箱--扫码入库机具
|
2024-12-20 16:44:12 +08:00 |
|
mashuai
|
fbf72c2f89
|
公用实体类移动
|
2024-12-20 16:39:22 +08:00 |
|
mashuai
|
224b71336d
|
新购及标准箱出库页面详情
|
2024-12-20 16:14:23 +08:00 |
|
mashuai
|
136fa84384
|
综合查询二级页面详情
|
2024-12-20 13:02:17 +08:00 |