 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 |
|
hongchao
|
308a82d004
|
工单接入web_url和rout
|
2025-06-19 10:49:20 +08:00 |
|
mashuai
|
755f001f02
|
优化
|
2025-06-19 10:28:50 +08:00 |
|
hayu
|
5326f9a137
|
问题修改
|
2025-06-19 10:18:47 +08:00 |
|
bonus
|
a3836fdb8d
|
标准箱新购入库接口开发
|
2025-06-18 21:10:55 +08:00 |
|
mashuai
|
49aca3a2bb
|
优化
|
2025-06-18 16:14:07 +08:00 |
|
hongchao
|
c6f87393a5
|
Merge remote-tracking branch 'origin/master'
|
2025-06-18 14:46:30 +08:00 |
|
hongchao
|
62c977d128
|
bug修复
|
2025-06-18 14:46:06 +08:00 |
|
hayu
|
d8c7b812d8
|
问题修改
|
2025-06-17 18:14:52 +08:00 |
|
mashuai
|
47da7e4756
|
bug修改及优化
|
2025-06-17 17:55:47 +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 |
|
mashuai
|
c212a6401e
|
配件库管绑定
|
2025-06-17 09:46:09 +08:00 |
|
bonus
|
97ce2b0e6f
|
出厂日期类型修改
|
2025-06-16 15:51:03 +08:00 |
|
bonus
|
fc272a7cfa
|
出厂日期类型修改
|
2025-06-16 15:49:39 +08:00 |
|
bonus
|
d584ee299d
|
减免接口开发
|
2025-06-16 15:47:54 +08:00 |
|
bonus
|
141248aebc
|
新购入库查询修改
|
2025-06-16 15:42:35 +08:00 |
|
syruan
|
4f133288a3
|
refactor(bonus-material): 重构数据加解密拦截器
- 优化了数据加密和解密的逻辑，提高了代码的可扩展性和维护性
- 增加了对空对象的判断，提高了代码的健壮性
- 优化了日志输出，增加了异常日志的空判断和错误处理
- 注释了未使用的拦截器方法，为未来可能的需求做准备
|
2025-06-16 15:39:19 +08:00 |
|
syruan
|
e78c6a2f0e
|
取消mybatis拦截器
|
2025-06-16 14:43:17 +08:00 |
|
bonus
|
b2deb4a778
|
修试后入库接口修改
|
2025-06-16 14:18:37 +08:00 |
|
bonus
|
17ddd03864
|
修试后人入库接口修改
|
2025-06-16 14:09:20 +08:00 |
|
bonus
|
85e34e4812
|
修试后入库接口判断修改
|
2025-06-16 13:37:19 +08:00 |
|
bonus
|
9f6f40e746
|
修试标准箱入库接口开发
|
2025-06-16 13:29:08 +08:00 |
|
bonus
|
c389361771
|
移交接口修改
|
2025-06-16 13:12:03 +08:00 |
|
hongchao
|
84a78feb16
|
Merge remote-tracking branch 'origin/master'
|
2025-06-16 10:51:01 +08:00 |
|
hongchao
|
8aeb1db885
|
bug修复
|
2025-06-16 10:50:39 +08:00 |
|
马三炮
|
d590219ca3
|
业务办理审核-减免审核，审核状态筛选状态与结果不一致；
|
2025-06-15 17:31:42 +08:00 |
|
马三炮
|
a74ac63a30
|
Merge remote-tracking branch 'origin/master'
|
2025-06-15 17:19:45 +08:00 |
|
马三炮
|
327cd5b727
|
业务办理记录查询-直转记录查询，审核状态筛选状态与结果不一致；
|
2025-06-15 17:19:31 +08:00 |
|
hayu
|
0a91d8a4aa
|
新购，配件
|
2025-06-15 17:05:06 +08:00 |
|
马三炮
|
260eb79d10
|
业务办理记录查询-直转记录查询，审核状态筛选状态与结果不一致；
|
2025-06-15 16:52:30 +08:00 |
|
马三炮
|
2f54446afc
|
会签管理-会签配置管理-费用见面审批流配置，节综合查询-设备使用追溯查询，时间选择器输入时间筛选，报错；
|
2025-06-15 16:38:01 +08:00 |
|
马三炮
|
52f38a5f68
|
会签管理-会签配置管理-费用见面审批流配置，节点名称文本框输入内容后点击搜索，报错系统未知错误；直转审批流配置、领用审批流配置类同；
|
2025-06-15 15:52:28 +08:00 |
|
马三炮
|
89e293575d
|
组织人员机具管理
|
2025-06-15 14:53:00 +08:00 |
|
bonus
|
2a17bb2201
|
标准箱修试入库接口开发
|
2025-06-15 14:00:10 +08:00 |
|
mashuai
|
e51cbaf4bc
|
新购优化
|
2025-06-15 13:52:25 +08:00 |
|
hayu
|
02ae3b6c9c
|
维修
|
2025-06-15 12:11:25 +08:00 |
|
bonus
|
03d2c2f1d1
|
修试后入库接口开发
|
2025-06-15 09:51:07 +08:00 |
|
hayu
|
6ad082593d
|
定损，维修，退料
|
2025-06-14 17:40:32 +08:00 |
|
mashuai
|
366db7dba7
|
新购优化
|
2025-06-14 14:58:13 +08:00 |
|
syruan
|
d6730c9bf8
|
功能优化：档案模块SQL条件优化 - 调整ArchivesMapper.xml中关键词搜索条件的格式，增强SQL语句可读性
|
2025-06-13 17:12:20 +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 |
|
hongchao
|
b95f57390e
|
bug修复
|
2025-06-13 15:30:48 +08:00 |
|
bonus
|
402f7e4cfb
|
Merge remote-tracking branch 'origin/master'
|
2025-06-12 14:53:33 +08:00 |
|
bonus
|
195277638c
|
修试后入库扫描二维码入库开发
|
2025-06-12 14:12:17 +08:00 |
|
hayu
|
955147c80f
|
退料、维修功能修改
|
2025-06-11 20:21:19 +08:00 |
|
hayu
|
b8d00c0fe0
|
退料任务，增加是否签字字段和筛选
|
2025-06-09 18:39:22 +08:00 |
|
mashuai
|
6039b472ae
|
优化
|
2025-06-04 16:52:04 +08:00 |
|
mashuai
|
0c253991fd
|
Merge remote-tracking branch 'origin/master'
|
2025-05-30 17:14:15 +08:00 |
|
mashuai
|
6f8a6b1b20
|
优化
|
2025-05-30 17:14:08 +08:00 |
|
hayu
|
9946989992
|
会签管理，库管员多选
|
2025-05-26 00:52:01 +08:00 |
|
mashuai
|
cc9662b2d9
|
优化
|
2025-05-22 10:57:41 +08:00 |
|
mashuai
|
50b8b37304
|
优化
|
2025-05-22 10:24:36 +08:00 |
|
mashuai
|
9f7e611850
|
优化
|
2025-05-21 18:14:55 +08:00 |
|
mashuai
|
dd4f7af324
|
Merge remote-tracking branch 'origin/master'
|
2025-05-20 17:59:06 +08:00 |
|
mashuai
|
42002e753a
|
优化
|
2025-05-20 17:59:01 +08:00 |
|
hongchao
|
f1becfbfa9
|
标准箱识别
|
2025-05-19 17:37:49 +08:00 |
|
hongchao
|
e11d095b6d
|
入库单审核（班长）
|
2025-05-12 18:11:36 +08:00 |
|
hongchao
|
11f5e507d3
|
试运行问题修复
|
2025-05-09 18:04:00 +08:00 |
|
hongchao
|
23882ec58d
|
试运行问题修复及工单接入
|
2025-05-08 16:23:10 +08:00 |
|
hongchao
|
8b55d8cc84
|
代码清除
|
2025-05-06 16:11:34 +08:00 |
|
hongchao
|
c640c0be1e
|
Merge remote-tracking branch 'origin/master'
|
2025-05-06 16:09:50 +08:00 |
|
hongchao
|
4fdd806585
|
结算管理bug修复
|
2025-05-06 16:09:34 +08:00 |
|
mashuai
|
611de717d7
|
测试
|
2025-05-06 14:39:26 +08:00 |
|
mashuai
|
29f225eddc
|
Revert "优化"
This reverts commit a8c1916f36.
|
2025-05-06 14:30:37 +08:00 |
|
mashuai
|
a8c1916f36
|
优化
|
2025-05-06 14:19:48 +08:00 |
|
mashuai
|
d29393b664
|
优化
|
2025-04-27 15:03:45 +08:00 |
|
mashuai
|
38c6886c25
|
优化
|
2025-04-25 16:36:02 +08:00 |
|
hongchao
|
26df45d72a
|
禅道bug修复
|
2025-04-24 16:57:51 +08:00 |
|
hongchao
|
c3b5949935
|
禅道bug修复
|
2025-04-17 17:54:04 +08:00 |
|
hongchao
|
422ff90370
|
检验报告同步
|
2025-04-16 18:14:53 +08:00 |
|
mashuai
|
3552543416
|
ocr
|
2025-04-16 14:48:01 +08:00 |
|
mashuai
|
d7dcbcddb6
|
ocr
|
2025-04-16 14:01:39 +08:00 |
|
mashuai
|
1c209385d0
|
接口优化
|
2025-04-08 08:49:41 +08:00 |
|
mashuai
|
75c57a4e86
|
接口调试
|
2025-04-03 14:49:04 +08:00 |
|
mashuai
|
ac845e3c5c
|
修试查询接口调试
|
2025-04-01 17:33:02 +08:00 |
|
mashuai
|
c6eaf1deab
|
Merge remote-tracking branch 'origin/master'
|
2025-03-31 19:14:10 +08:00 |
|
mashuai
|
02a24dfeb5
|
修试查询接口调试
|
2025-03-31 19:13:39 +08:00 |
|
bonus
|
e5409ef524
|
新购验收人接口开发
|
2025-03-31 14:40:18 +08:00 |
|
mashuai
|
66a5665ad3
|
机具一览表
|
2025-03-28 16:49:32 +08:00 |
|
mashuai
|
32822b3f6a
|
机具一览表
|
2025-03-28 11:16:07 +08:00 |
|
mashuai
|
93574630ed
|
修饰一览表
|
2025-03-26 16:21:51 +08:00 |
|
马三炮
|
5afdd83eed
|
首页查询接口
|
2025-03-25 18:51:21 +08:00 |
|
mashuai
|
c50f276928
|
Merge remote-tracking branch 'origin/master'
|
2025-03-25 18:19:19 +08:00 |
|
mashuai
|
4ae4266381
|
直转领退料
|
2025-03-25 18:19:14 +08:00 |
|
hongchao
|
aaf939d0c9
|
结算管理bug
|
2025-03-25 16:12:39 +08:00 |
|
mashuai
|
80eedb2bd6
|
修复
|
2025-03-25 09:36:27 +08:00 |
|
马三炮
|
81aadd4399
|
bug修复
|
2025-03-24 18:16:42 +08:00 |
|
马三炮
|
7b48217c09
|
bug修复
|
2025-03-24 10:22:00 +08:00 |
|
hongchao
|
ac01898219
|
结算管理批量结算
|
2025-03-21 13:35:32 +08:00 |
|
hongchao
|
bb3428c32f
|
bug修复
|
2025-03-21 09:19:53 +08:00 |
|
mashuai
|
d144384267
|
报废报表
|
2025-03-20 18:18:50 +08:00 |
|
马三炮
|
7ad75d209d
|
bug修复
|
2025-03-20 17:15:15 +08:00 |
|
hayu
|
920e3465d4
|
检修预警
|
2025-03-20 16:11:17 +08:00 |
|
mashuai
|
45aa0ad6e8
|
Merge remote-tracking branch 'origin/master'
|
2025-03-20 13:40:44 +08:00 |
|
mashuai
|
46157c7745
|
标准配置导出
|
2025-03-20 13:40:39 +08:00 |
 cwchen
|
d2fd65dc04
|
结算修改
|
2025-03-20 13:15:23 +08:00 |
|
mashuai
|
303621a8d5
|
维修
|
2025-03-19 18:24:49 +08:00 |
|
马三炮
|
076e233b9b
|
bug修复
|
2025-03-19 18:20:18 +08:00 |
|
hongchao
|
19963dcc82
|
bug修复
|
2025-03-19 18:09:28 +08:00 |
|
马三炮
|
6e27be0849
|
bug修复
|
2025-03-19 17:26:14 +08:00 |
|
mashuai
|
ee8255d465
|
bug修改
|
2025-03-19 15:46:47 +08:00 |
|
马三炮
|
3998874d75
|
bug修复
|
2025-03-19 15:37:04 +08:00 |
|
马三炮
|
4e58bc5fa5
|
bug修复
|
2025-03-19 13:48:06 +08:00 |
|
cwchen
|
fd4fa2b204
|
缺少物资名称搜索的模块添加查询
|
2025-03-19 11:28:52 +08:00 |
|
cwchen
|
02a0d10ddb
|
物资类型管理导出是不是表头和列表项对应不上问题修改
|
2025-03-19 10:31:36 +08:00 |
|
hongchao
|
0369107326
|
领用记录查询bug修复
|
2025-03-19 09:59:38 +08:00 |
|
hongchao
|
de2799ac40
|
Merge remote-tracking branch 'origin/master'
|
2025-03-19 09:49:49 +08:00 |
|
hongchao
|
3bfefdda5c
|
领用记录查询bug修复
|
2025-03-19 09:49:26 +08:00 |
|
马三炮
|
081e3129b5
|
bug修复
|
2025-03-19 09:28:26 +08:00 |
|
马三炮
|
5609c91108
|
bug修复
|
2025-03-19 09:19:43 +08:00 |
|
cwchen
|
0f55010fa3
|
页面上的出库量与领料单里的出库量不一致问题修改
|
2025-03-18 18:25:37 +08:00 |
|
hongchao
|
5f94050bba
|
Merge remote-tracking branch 'origin/master'
|
2025-03-18 18:20:59 +08:00 |
|
马三炮
|
59e81712a3
|
bug修复
|
2025-03-18 18:20:27 +08:00 |
|
hongchao
|
e8269cbc21
|
Merge remote-tracking branch 'origin/master'
|
2025-03-18 18:20:02 +08:00 |
|
hongchao
|
f20c5d54d0
|
app领用记录查询bug修复
|
2025-03-18 18:19:37 +08:00 |
|
cwchen
|
d89c35ade1
|
问题修改
|
2025-03-18 17:14:22 +08:00 |
|
hongchao
|
898ed313e6
|
bug修复
|
2025-03-18 17:01:20 +08:00 |
|
hongchao
|
b66eb4b9fe
|
bug修复
|
2025-03-17 16:28:08 +08:00 |
|
hongchao
|
de0957f63b
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-Material
|
2025-03-17 09:51:33 +08:00 |
|
mashuai
|
e470aea24c
|
优化
|
2025-03-12 17:52:59 +08:00 |
|
mashuai
|
72755dec3c
|
优化
|
2025-03-12 16:06:00 +08:00 |
|
mashuai
|
21cd3216c3
|
app领料退回
|
2025-03-10 16:39:12 +08:00 |
|
hongchao
|
28d494fcf1
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-Material
|
2025-03-10 08:57:30 +08:00 |
|
mashuai
|
8381e8eedd
|
联调
|
2025-03-08 15:59:33 +08:00 |
|
mashuai
|
1151e0f264
|
联调
|
2025-03-08 10:26:22 +08:00 |
|
hongchao
|
180bdd36a2
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-Material
|
2025-03-08 09:39:41 +08:00 |
|
mashuai
|
89ee5d117d
|
联调
|
2025-03-07 17:01:12 +08:00 |
|
马三炮
|
2e44ac9970
|
直转和减免审核逻辑编写
|
2025-03-07 15:47:31 +08:00 |
|
mashuai
|
db0079a181
|
领用记录查询页面联调
|
2025-03-07 15:25:02 +08:00 |
|
mashuai
|
30ea1e4aa6
|
领用申请详情导出
|
2025-03-07 14:08:23 +08:00 |
|
mashuai
|
4b52f8076c
|
综合查询
|
2025-03-07 11:00:08 +08:00 |
|
hongchao
|
38421b6367
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-Material
|
2025-03-07 08:40:02 +08:00 |
|
mashuai
|
5c2d2f6119
|
综合查询
|
2025-03-06 18:20:39 +08:00 |
|
马三炮
|
24e508ec17
|
直转和减免审核逻辑编写
|
2025-03-06 17:57:03 +08:00 |
|
马三炮
|
da6c7bc0fb
|
直转和减免审核逻辑编写
|
2025-03-06 17:52:12 +08:00 |
|
mashuai
|
c01b57d40a
|
标签导出
|
2025-03-06 17:21:53 +08:00 |
|
马三炮
|
886ae3c8d4
|
直转和减免审核逻辑编写
|
2025-03-06 16:45:40 +08:00 |
|
mashuai
|
4295427b2e
|
领料出库流程调试
|
2025-03-06 15:23:58 +08:00 |
|
mashuai
|
0d53867d46
|
领料出库流程调试
|
2025-03-06 14:37:32 +08:00 |
|
马三炮
|
825e65fe0d
|
领用审批优化，加上会签的逻辑
|
2025-03-06 11:01:00 +08:00 |
|
mashuai
|
ae9dcf37c2
|
Merge remote-tracking branch 'origin/master'
|
2025-03-06 10:26:21 +08:00 |
|
mashuai
|
c67af6e590
|
领料出库
|
2025-03-06 10:26:16 +08:00 |
|
zfh
|
49cf24d31a
|
领用审批优化，加上会签的逻辑
|
2025-03-06 08:59:23 +08:00 |
|
mashuai
|
cce535a7c1
|
标签查询
|
2025-03-05 17:10:17 +08:00 |
|
mashuai
|
43c2c01c7b
|
标签查询
|
2025-03-05 14:32: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 |
|
hongchao
|
4a1b680179
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-Material
|
2025-03-05 08:51:22 +08:00 |
|
zfh
|
c205a38005
|
领用审批优化，加上会签的逻辑
|
2025-03-04 18:53:36 +08:00 |
|
mashuai
|
97213e6e60
|
申请发布
|
2025-03-04 17:31:59 +08:00 |
|
hongchao
|
ece7af58cb
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-Material
|
2025-03-04 15:52:27 +08:00 |
|
hongchao
|
5f75f5de97
|
word导出leasePerson
|
2025-03-04 15:52:21 +08:00 |
|
mashuai
|
fc6916a2da
|
申请发布
|
2025-03-04 15:41:14 +08:00 |
|
hongchao
|
50b26aefe7
|
工器具数据导出
|
2025-03-04 15:07:41 +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
|
e564497ad4
|
配件
|
2025-02-28 15:58:32 +08:00 |
|
mashuai
|
aaf3000c70
|
维修拆分及修饰审核
|
2025-02-28 15:04:40 +08:00 |
|
mashuai
|
11d3ac48c4
|
优化
|
2025-02-27 15:37:11 +08:00 |
|
mashuai
|
5c481ee8b4
|
优化
|
2025-02-27 15:20:41 +08:00 |
|
mashuai
|
5a24c1baf0
|
Merge remote-tracking branch 'origin/master'
|
2025-02-21 03:48:09 +08:00 |
|
mashuai
|
20159734dd
|
优化
|
2025-02-21 03:47:55 +08:00 |
|
syruan
|
fb47cac1c4
|
增加日志处理
|
2025-02-21 03:45:28 +08:00 |
|
syruan
|
1bea1f7f8b
|
费用减免流程修改
|
2025-02-21 03:11:32 +08:00 |
|
mashuai
|
e5e01f5fd4
|
优化
|
2025-02-21 02:53:27 +08:00 |
|
bonus
|
0bd8c9f6eb
|
Merge remote-tracking branch 'origin/master'
|
2025-02-21 02:35:23 +08:00 |
|
bonus
|
d2e04ee62b
|
直转审核倒序开发
|
2025-02-21 02:35:01 +08:00 |
|
syruan
|
2ebb2d4202
|
Merge remote-tracking branch 'origin/master'
|
2025-02-21 02:26:52 +08:00 |
|
syruan
|
8e5f712756
|
费用减免工作流提交
|
2025-02-21 02:26:38 +08:00 |
|
zfh
|
4d4015b2e5
|
审核
|
2025-02-21 02:26:37 +08:00 |
|
bonus
|
4a90a4482b
|
减免接口开发
|
2025-02-21 01:57:45 +08:00 |
|
mashuai
|
978c15ed14
|
Merge remote-tracking branch 'origin/master'
|
2025-02-21 01:56:08 +08:00 |
|
mashuai
|
50567b761b
|
优化
|
2025-02-21 01:55:59 +08:00 |
|
bonus
|
c56038b1b3
|
Merge remote-tracking branch 'origin/master'
|
2025-02-21 01:53:12 +08:00 |
|
zfh
|
e808ba7e47
|
审核
|
2025-02-21 01:53:02 +08:00 |
|
bonus
|
3e6337b54c
|
直转审核接口开发
|
2025-02-21 01:47:38 +08:00 |
|
mashuai
|
bba09a7220
|
Merge remote-tracking branch 'origin/master'
|
2025-02-21 01:25:59 +08:00 |
|
mashuai
|
9b8f76a306
|
优化
|
2025-02-21 01:25:53 +08:00 |
|
zfh
|
287a019e4d
|
审核
|
2025-02-21 01:19:43 +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 |
|
mashuai
|
746b572d8e
|
优化
|
2025-02-20 23:33:31 +08:00 |
|
mashuai
|
213d250d34
|
报废
|
2025-02-20 22:56:17 +08:00 |
|
zfh
|
a15db088a1
|
审核
|
2025-02-20 22:42:40 +08:00 |
|
zfh
|
48d2534123
|
审核
|
2025-02-20 22:42:12 +08:00 |
|
zfh
|
09ccc004da
|
审核
|
2025-02-20 22:35:19 +08:00 |
|
hayu
|
dcc5132ff0
|
问题修改
|
2025-02-20 22:00:39 +08:00 |
|
mashuai
|
f277c297ea
|
新购绑定人
|
2025-02-20 21:33:52 +08:00 |
|
zfh
|
20a162bfc1
|
审核
|
2025-02-20 21:32:29 +08:00 |
|
zfh
|
de852b063d
|
审核
|
2025-02-20 20:55:07 +08:00 |
|
hayu
|
acf469307d
|
Merge remote-tracking branch 'origin/master'
|
2025-02-20 20:41:10 +08:00 |
|
hayu
|
4715df61b1
|
业务
|
2025-02-20 20:40:53 +08:00 |
|
mashuai
|
9f7a65e43b
|
Merge remote-tracking branch 'origin/master'
|
2025-02-20 20:40:14 +08:00 |
|
mashuai
|
ae48eff656
|
盘点报废
|
2025-02-20 20:40:09 +08:00 |
|
zfh
|
a1375eda07
|
审核
|
2025-02-20 20:37:52 +08:00 |
|
zfh
|
2db54ac3cb
|
审核
|
2025-02-20 20:37:27 +08:00 |
|
zfh
|
055037885d
|
审核
|
2025-02-20 20:36:57 +08:00 |
|
mashuai
|
a060b732c0
|
盘点报废
|
2025-02-20 20:29:35 +08:00 |
|
zfh
|
03667beb9d
|
审核
|
2025-02-20 20:16:55 +08:00 |
|
mashuai
|
49a158312a
|
盘点报废
|
2025-02-20 20:14:29 +08:00 |
|
mashuai
|
4fe80c4a93
|
Merge remote-tracking branch 'origin/master'
|
2025-02-20 20:10:01 +08:00 |
|
mashuai
|
745857a223
|
盘点报废
|
2025-02-20 20:09:52 +08:00 |
|
zfh
|
3542b435ed
|
Merge remote-tracking branch 'origin/master'
|
2025-02-20 20:05:54 +08:00 |
|
zfh
|
7be04ac787
|
审核
|
2025-02-20 20:05:44 +08:00 |
|
mashuai
|
6499410629
|
盘点报废
|
2025-02-20 19:20:55 +08:00 |
|
zfh
|
0b9cce98dc
|
审核
|
2025-02-20 19:03:02 +08:00 |
|
zfh
|
cfb08c8934
|
审核
|
2025-02-20 17:28:24 +08:00 |
|
zfh
|
014a4b3325
|
审核
|
2025-02-20 17:26:55 +08:00 |
|
mashuai
|
7b7b80f461
|
配件
|
2025-02-20 10:20:32 +08:00 |
|
bonus
|
fef30e9d8b
|
减免接口开发
|
2025-02-20 09:58:52 +08:00 |
|
bonus
|
f32b9dcfe9
|
Merge remote-tracking branch 'origin/master'
|
2025-02-20 09:58:03 +08:00 |
|
hayu
|
f4ca04f11b
|
后台业务办理记录查询，app业务办理记录查询
|
2025-02-19 20:29:20 +08:00 |
|
mashuai
|
85d9e0bacd
|
配件
|
2025-02-19 19:01:52 +08:00 |
|
mashuai
|
783274697f
|
Merge remote-tracking branch 'origin/master'
|
2025-02-19 17:31:28 +08:00 |
|
mashuai
|
983ec5db92
|
配件
|
2025-02-19 17:31:20 +08:00 |
|
hayu
|
584f2c40c7
|
直转申请,直转记录查询
|
2025-02-18 20:04:21 +08:00 |
|
hayu
|
dc5343ce48
|
直转申请,直转记录查询
|
2025-02-18 18:58:20 +08:00 |
|
syruan
|
f0ed1244d0
|
物资类型规格排序
|
2025-02-18 17:34:21 +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 |
|
bonus
|
03ee9b7926
|
减免接口-重复数据过滤1.0版修改
|
2025-02-17 14:49:44 +08:00 |
|
bonus
|
cbc6e0fb39
|
减免实体类型修改
|
2025-02-17 09:06:36 +08:00 |
|
bonus
|
32c403c8b5
|
减免接口开发
|
2025-02-17 09:01:30 +08:00 |
|
hayu
|
0816be447e
|
标准配置，领用申请
|
2025-02-15 17:02:41 +08:00 |
|
syruan
|
eacf57e3ef
|
i皖送费用推送定时任务
|
2025-02-15 16:38:24 +08:00 |
|
mashuai
|
03f6d6fa87
|
Merge remote-tracking branch 'origin/master'
|
2025-02-15 14:13:56 +08:00 |
|
mashuai
|
545cff40be
|
综合查询报废数量修改
|
2025-02-15 14:13:50 +08:00 |
|
hayu
|
0bf50f54cd
|
标准配置，领用申请
|
2025-02-14 18:12:43 +08:00 |
|
mashuai
|
d5ed07d4d0
|
优化
|
2025-02-14 17:54:28 +08:00 |
|
mashuai
|
10cc6c2cde
|
维修拆分
|
2025-02-14 17:29:40 +08:00 |
|
mashuai
|
cf65ca7a08
|
台账审核
|
2025-02-14 17:29:10 +08:00 |
|
hongchao
|
52b233f067
|
维修
|
2025-02-14 16:21:51 +08:00 |
|
syruan
|
a8af2538aa
|
新购验收单
|
2025-02-14 13:12:57 +08:00 |
|
hayu
|
be975c3162
|
功能修改
|
2025-02-14 09:15:18 +08:00 |
|
syruan
|
4ece73cc63
|
物资类型修改1
|
2025-02-13 18:24:11 +08:00 |
|
syruan
|
40fed1be0a
|
物资类型修改
|
2025-02-13 18:19:57 +08:00 |
|
syruan
|
8961e76bee
|
物资类型历史记录查询
|
2025-02-13 18:14:52 +08:00 |
|
syruan
|
40c7f30b02
|
物资类型价格变更记录接口
|
2025-02-13 17:59:05 +08:00 |
|
mashuai
|
0e10b67591
|
功能修改优化
|
2025-02-11 15:29:27 +08:00 |
|
hayu
|
06fda2ebf7
|
功能修改
|
2025-02-11 09:21:44 +08:00 |
|
hongchao
|
7cb7484618
|
Merge remote-tracking branch 'origin/master'
|
2025-02-10 17:21:46 +08:00 |
|
hongchao
|
1bffc4c4e3
|
领料申请管理
|
2025-02-10 17:21:16 +08:00 |
|
mashuai
|
02fe8438a0
|
功能修改
|
2025-02-10 15:12:58 +08:00 |
|
mashuai
|
542d02a8d9
|
分包商
|
2025-02-07 18:17:38 +08:00 |
|
mashuai
|
29e15504e9
|
bmfileinfo类共用移动
|
2025-02-07 17:15:01 +08:00 |
|
mashuai
|
7636dee74f
|
功能优化
|
2025-02-07 17:10:25 +08:00 |
|
mashuai
|
577b8fa34c
|
功能优化
|
2025-02-07 17:07:31 +08:00 |
|
syruan
|
80dc08d54e
|
i皖送推送修改
|
2025-02-06 17:43:02 +08:00 |
|
mashuai
|
2460c18a01
|
优化
|
2025-02-06 16:42:13 +08:00 |
|
mashuai
|
d35c87033d
|
优化
|
2025-02-06 15:21:43 +08:00 |
|
syruan
|
fb6c9bfc51
|
i皖送推送修改
|
2025-02-06 14:45:13 +08:00 |
|
syruan
|
69b7ac41ed
|
i皖送费用推送审核导出Api
|
2025-02-06 11:16:04 +08:00 |
|
mashuai
|
a5ebc4d727
|
Merge remote-tracking branch 'origin/master'
|
2025-01-24 18:03:31 +08:00 |
|
mashuai
|
c45378cde5
|
功能新增及优化
|
2025-01-24 18:03:26 +08:00 |
|
syruan
|
808b89b332
|
i皖送推送取消分页,完善删除标记逻辑
|
2025-01-24 17:58:58 +08:00 |
|
syruan
|
ae8560feb7
|
i皖送推送修改
|
2025-01-24 17:08:03 +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 |
|
syruan
|
e226744b47
|
Merge remote-tracking branch 'origin/master'
|
2025-01-23 17:51:39 +08:00 |
|
syruan
|
3cf1435a6e
|
i皖送推送修改
|
2025-01-23 17:51:20 +08:00 |
|
mashuai
|
3218fd90f6
|
功能新增优化
|
2025-01-23 17:43:58 +08:00 |
|
syruan
|
a9e22710b4
|
i皖送推送修改
|
2025-01-23 16:40:53 +08:00 |
|
syruan
|
471bc9af79
|
i皖送推送修改
|
2025-01-23 16:13:37 +08:00 |
|
syruan
|
ba45c87fb8
|
i皖送费用推送、Mybatis工程信息拦截器取消
|
2025-01-23 15:51:16 +08:00 |
|
syruan
|
758cd9f47d
|
新购验收会签、维修人员
|
2025-01-23 11:19:05 +08:00 |
|
mashuai
|
4c96c5ab9d
|
功能优化
|
2025-01-23 10:10:33 +08:00 |
|
mashuai
|
44a4c0d4a1
|
功能优化
|
2025-01-23 09:50:35 +08:00 |
|
mashuai
|
6a66e48eab
|
Merge remote-tracking branch 'origin/master'
|
2025-01-23 09:49:10 +08:00 |
|
mashuai
|
3ca213b4a1
|
功能优化
|
2025-01-23 09:49:01 +08:00 |
|
hongchao
|
445b8db21c
|
新购验收入库和新购验收管理对出厂日期的bug进行修复
|
2025-01-22 15:11:01 +08:00 |
|
mashuai
|
a3b562a77c
|
Merge remote-tracking branch 'origin/master'
|
2025-01-22 09:38:42 +08:00 |
|
mashuai
|
93690125a3
|
功能优化
|
2025-01-22 09:38:30 +08:00 |
|
hongchao
|
223f737ec3
|
配件管理，报废原因功能优化
|
2025-01-21 16:37:30 +08:00 |
|
syruan
|
422831bc0d
|
新购验收绑定会签人员去重
|
2025-01-21 13:43:26 +08:00 |
|
syruan
|
e10c3f6330
|
新购验收单修改
|
2025-01-21 11:06:14 +08:00 |
|
mashuai
|
1b60cf6927
|
配件
|
2025-01-20 18:21:03 +08:00 |
|
hongchao
|
2c7d7b1da1
|
结算审批
|
2025-01-20 17:14:23 +08:00 |
|
mashuai
|
ac92f47acb
|
配件移包part
|
2025-01-20 09:26:50 +08:00 |
|
mashuai
|
bfde5717d3
|
文件功能修改
|
2025-01-17 18:57:46 +08:00 |
|
syruan
|
8b4e9a9184
|
新购验收会签流程增加，验收单修改
|
2025-01-17 18:12:46 +08:00 |
|
mashuai
|
b14bed4d9a
|
Merge remote-tracking branch 'origin/master'
|
2025-01-17 15:53:19 +08:00 |
|
mashuai
|
f986162a4c
|
维修报废功能修改
|
2025-01-17 15:53:14 +08:00 |