Commit Graph

500 Commits

Author SHA1 Message Date
hongchao 4a7ffb0145 新购模板导入和下载 2025-03-31 17:26:40 +08:00
hongchao 78ea1a4b72 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java
2025-03-28 18:25:31 +08:00
hongchao a23effb2ca 功能新增 2025-03-28 18:24:38 +08:00
mashuai 6ba42d5d9e Merge remote-tracking branch 'origin/master' 2025-03-28 15:57:16 +08:00
mashuai a19a79ecdd bug修复 2025-03-28 15:57:12 +08:00
hongchao 184de4ced1 出库时间修改 2025-03-27 19:05:11 +08:00
hongchao 0e69f27259 结算导出 2025-03-26 17:38:26 +08:00
hongchao b9c5fe133c 结算管理分开结算 2025-03-25 18:35:01 +08:00
hongchao e013adb90e 结算管理bug 2025-03-25 16:41:30 +08:00
hongchao 107c820e41 Merge branch 'master' of http://192.168.0.75:3000/bonus/cqdevicemgt 2025-03-25 13:39:30 +08:00
hongchao 2513430e71 结算管理 2025-03-25 13:39:23 +08:00
mashuai c0efe840d5 退料 2025-03-25 09:48:03 +08:00
hongchao 93594c38bc Merge branch 'master' of http://192.168.0.75:3000/bonus/cqdevicemgt 2025-03-25 08:48:25 +08:00
hongchao 8d273bad74 结算管理 2025-03-24 17:24:10 +08:00
mashuai 810a72b47f 退料 2025-03-24 14:27:50 +08:00
mashuai 0964332247 Revert "文件上传"
This reverts commit 75332ddd
2025-03-24 11:15:59 +08:00
mashuai 60e13662a7 退料 2025-03-24 10:44:26 +08:00
bonus e48cfda3f0 月度费用审核开发 2025-03-21 17:01:10 +08:00
bonus 0abb17dbde 月度费用审核开发 2025-03-21 14:55:07 +08:00
mashuai 00d19721a4 Merge remote-tracking branch 'origin/master' 2025-03-20 15:53:24 +08:00
mashuai dc384cbdda 功能优化 2025-03-20 15:53:18 +08:00
马三炮 160e5a427b 维修记录明细问题修复,新购流程调整编写 2025-03-13 17:03:32 +08:00
liang.chao 9f93af7b13 代码提交 2025-03-12 17:19:09 +08:00
bonus cf63ffa3a5 数据查看权限修改 2025-03-12 09:50:43 +08:00
liang.chao 9c2a5ab361 代码提交 2025-03-11 18:05:29 +08:00
liang.chao 4c9133c563 代码提交 2025-03-11 17:50:09 +08:00
mashuai 8b50866190 维修拆分 2025-03-11 09:31:57 +08:00
mashuai 13cddfef9a 维修拆分 2025-03-11 09:15:35 +08:00
liang.chao 8243be6781 代码提交 2025-03-10 18:12:05 +08:00
mashuai 9fd3d09005 库管员联调 2025-03-10 13:55:20 +08:00
马三炮 c0602ec45f bug修复 2025-03-10 10:51:37 +08:00
liang.chao 6e1dc7c0b7 代码提交 2025-03-08 18:33:19 +08:00
liang.chao 39e569160e 代码提交 2025-03-08 18:22:12 +08:00
bonus b00153f18c 以大代小下审核修改规格名称 2025-03-08 17:50:38 +08:00
liang.chao 153d739c69 代码提交 2025-03-08 17:19:30 +08:00
bonus 802c34d487 以大代小下插入租赁结算记录表slt 2025-03-08 16:28:58 +08:00
liang.chao f95a5f39ae Merge remote-tracking branch 'origin/master' 2025-03-08 16:26:32 +08:00
liang.chao ea00df8e21 退料接收和维修需求开发 2025-03-08 16:26:19 +08:00
hayu ea99d0b6bd 设备类型下拉选查询增加替换字段 2025-03-08 15:54:20 +08:00
bonus 1052d7edb0 以大代小下拉增加租赁单价 2025-03-08 11:43:18 +08:00
hayu 279fc309b3 设备类型下拉选增加单位字段 2025-03-08 10:41:19 +08:00
mashuai 22e961a6b1 Merge remote-tracking branch 'origin/master' 2025-03-08 10:32:26 +08:00
mashuai 75332ddd6a 文件上传 2025-03-08 10:32:21 +08:00
马三炮 50874b9974 成套代码优化 2025-03-07 18:13:54 +08:00
bonus 6c5a14c811 以大代小出库插入记录 2025-03-07 11:05:40 +08:00
hayu 40b6fa35b9 设备类型下拉选 2025-03-05 14:48:59 +08:00
bonus f0bf68a8cd 1机具类型以大代小、是否库存管理2领料预出库数查询修改 2025-03-04 17:25:57 +08:00
liang.chao bed98574c4 代码提交 2025-02-27 19:00:23 +08:00
mashuai 34a13018d8 盘点报废 2025-02-27 15:39:01 +08:00
hayu 3475e6418c 二级库编码设备归还问题修复 2025-02-27 14:43:44 +08:00