Commit Graph

220 Commits

Author SHA1 Message Date
bonus a86638a9a6 领料电子签名通知材料员接口修改 2025-07-26 13:22:31 +08:00
mashuai 264061c917 优化 2025-07-26 12:51:23 +08:00
mashuai 50108d818a 优化 2025-07-25 14:14:19 +08:00
hayu 8f9fb12a25 问题修复 2025-07-24 00:49:13 +08:00
mashuai 16e8fe193a 优化 2025-07-19 17:48:40 +08:00
mashuai 41ea12a1ed 退料,维修权限 2025-07-17 18:35:51 +08:00
mashuai 812387edcc 权限 2025-07-16 18:49:44 +08:00
mashuai 218fff6e46 材料站 2025-07-11 16:33:19 +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 6e43c00a91 优化及bug修复 2025-07-04 18:07:30 +08:00
hongchao d1f2ed4200 bug修复 2025-07-03 15:31:35 +08:00
hongchao 67b8251b3f bug修复 2025-07-03 15:30:04 +08:00
mashuai 5754e50bd2 优化 2025-07-02 16:39:27 +08:00
mashuai ce9c84fb93 优化 2025-07-02 13:49:08 +08:00
mashuai 8b14acfa29 铭牌信息查询 2025-06-30 18:08:26 +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
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