Commit Graph

1009 Commits

Author SHA1 Message Date
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