Commit Graph

46 Commits

Author SHA1 Message Date
jiask dfcd61fa31 jsk 数据概览 修改 2026-02-05 18:35:18 +08:00
liang.chao b64a0948e1 代码提交 2026-02-05 18:14:58 +08:00
liang.chao 3f42f95b41 代码提交 2026-02-05 14:27:46 +08:00
hayu b65007b909 结算修改去掉数量 2026-02-03 13:29:14 +08:00
liang.chao 89eaccf189 代码提交 2026-02-02 16:20:59 +08:00
liang.chao 199ced5e85 机具领料逻辑修改 2026-02-02 16:11:54 +08:00
haozq 06b3398dd7 对机具出入库 领料 首页展示 问题进行修改 2026-02-02 15:36:13 +08:00
liang.chao 06b37f0185 首页预警计划到期代码提交 2026-02-02 10:34:24 +08:00
liang.chao 7f4d00ca00 首页预警代码提交 2026-01-30 17:42:57 +08:00
马三炮 417cb7e497 新增系统问题下载 2026-01-30 10:47:06 +08:00
hayu 4ccd339437 结算修改 2026-01-28 20:52:18 +08:00
hayu 48cf463236 结算修改 2026-01-28 18:09:27 +08:00
hayu 181a93d340 Merge remote-tracking branch 'origin/main' 2026-01-27 10:26:47 +08:00
马三炮 bb2d49e944 修改sql语句 2026-01-23 10:17:18 +08:00
马三炮 d21636425e 恢复被覆盖的代码 2026-01-22 18:25:33 +08:00
hayu 075a7f53f6 机具领用导入模板优化 2026-01-06 15:28:29 +08:00
syruan 5d90547613 Merge remote-tracking branch 'origin/main' 2026-01-04 16:35:34 +08:00
syruan fb1cbfcc37 分页组件重构、新类型管理模块上线、BootStarp表格斑马线去除 2026-01-04 16:01:38 +08:00
hayu f80d4148b9 机具领料导入 2026-01-04 15:30:01 +08:00
hayu 8fa6e994f0 机具领料模版下载与导入 2025-12-30 13:48:42 +08:00
hayu 5a513f49d1 修改 2025-12-16 11:27:15 +08:00
hayu 9934b4b340 新购流程查看 2025-12-04 08:55:46 +08:00
jiang eecbff5ae2 机具库存收藏修改 2025-12-03 20:33:27 +08:00
jiang 79c3b3124d 机具库存收藏修改 2025-12-03 20:26:41 +08:00
jiang 5d6389bf3f Merge remote-tracking branch 'origin/main'
# Conflicts:
#	resources/mybatis/bm/ProjectManageMapper.xml
#	resources/mybatis/scrap/ScrapTaskRecordMapper.xml
#	src/com/bonus/bm/controller/ProjectManageController.java
#	src/com/bonus/bm/dao/ProjectManageDao.java
#	src/com/bonus/bm/service/ProjectManageService.java
2025-12-03 20:12:21 +08:00
jiang e767b6182c 机具库存收藏修改 2025-12-03 20:11:16 +08:00
hayu 448f0e9e96 修改 2025-12-03 20:05:26 +08:00
syruan c8f7e94c8e 优化Excel导出功能,增加费用汇总区域及金额转换为中文大写 2025-12-03 19:53:45 +08:00
jiang 037c8e3e69 机具库存收藏修改 2025-12-03 19:52:59 +08:00
hayu c97b87be10 修改 2025-12-02 16:14:14 +08:00
jiang 7621de57f3 机具库存收藏修改 2025-09-15 10:22:01 +08:00
syruan 1e3b66e9e6 增加APP维修关键字搜索 2025-07-18 09:43:57 +08:00
syruan fe7722020d 增加待办移动端适配-优化sql判断 2025-07-16 21:20:59 +08:00
hayu 7ccc77c2f7 修改 2025-07-16 14:45:35 +08:00
jiang c9f34ad08f 机具库存收藏修改 2025-07-16 14:31:33 +08:00
syruan 41086c1353 修复登陆弹窗多次触发问题 2025-07-15 18:16:08 +08:00
hayu 8d6a68ee8e 功能修改 2025-07-14 18:42:16 +08:00
hayu f4bd00b4fb 问题优化 2025-07-10 18:54:12 +08:00
jiang 2153fab6b4 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	WebContent/WEB-INF/views/rm/UnFinishContentList.jsp
2025-07-10 17:59:30 +08:00
jiang 773248c9a3 机具库存收藏修改 2025-07-10 17:58:32 +08:00
syruan ef7c37b79f refactor(ma): 优化机具类型树查询并添加直接报废功能
- 修改登录页面和系统标题为"贵送机具管理系统"
- 优化机具类型树查询逻辑,提高查询效率
- 添加在库机具直接报废功能
- 更新机具类型树查询 SQL,支持多级分类和模糊查询
2025-07-10 15:29:18 +08:00
jiang de6e56f059 机具库存收藏修改 2025-07-09 19:01:52 +08:00
syruan 43be14b4f6 refactor(app): 优化 AppMachineBindingController 和相关控制器的代码结构
- 调整了多个页面格式
2025-07-09 15:08:10 +08:00
jiang 87762cbb01 机具库存收藏修改 2025-07-09 15:00:20 +08:00
syruan 4c8bf65bf3 初始化 2025-07-04 16:32:00 +08:00
syruan debdc0c00a Initial commit 2025-06-20 17:47:53 +08:00