Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• f6abc2cd3e rev 请求标记复位 gengby 2023-05-17 17:27:57 +08:00
• a72caf0a31 rev 修复删除设备报错 分页显示问题 gengby 2023-05-17 17:26:50 +08:00
• 30db992ada add:工单及工单记录 zhangzhiqiang 2023-05-17 15:15:35 +08:00
• a97b32d3a9 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-17 09:54:30 +08:00
• 8026de6ec2 fix:原材料入库 ZHOUZ\Noble'lift 2023-05-17 09:54:26 +08:00
• b5e24c4fa8 add:物料基础 zhangzhiqiang 2023-05-15 20:39:47 +08:00
• cc9f55ace0 add:基础管理/物料分类 zhangzhiqiang 2023-05-15 19:47:30 +08:00
• 9aeff869a6 rev: 成品入库分配修改 liuxy 2023-05-15 11:53:40 +08:00
• 535b1a6b8c rev：仓储基础管理维护 zhangzhiqiang 2023-05-15 11:23:04 +08:00
• 382f8e5503 rev:冲突处理 zhangzhiqiang 2023-05-15 09:53:32 +08:00
• 0bb532221b rev:冲突解决 liuxy 2023-05-15 09:39:46 +08:00
• 0f6b643ed3 rev:冲突处理 liuxy 2023-05-15 09:37:42 +08:00
• bad9c80a5f Merge branch 'master' of http://121.40.234.130:8899/root/hl_one liuxy 2023-05-15 09:34:39 +08:00
• eb1d33da9d rev: 代码提交 liuxy 2023-05-15 09:29:48 +08:00
• a097053f14 解决冲突 ZHOUZ\Noble'lift 2023-05-15 09:23:47 +08:00
• 577c8ee65d Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-15 09:23:08 +08:00
• 27454e664e add:新增原材料入库功能 ZHOUZ\Noble'lift 2023-05-15 09:11:58 +08:00
• 4b3cba9ff2 add:入库分配 liuxy 2023-05-15 08:58:59 +08:00
• 474df3f5d8 add:添加仓库记录表服务/修改仓库基础数据服务 zhangzhiqiang 2023-05-15 00:27:04 +08:00
• 4895d08d02 Merge remote-tracking branch 'origin/master' baoge 2023-05-12 11:12:15 +08:00
• 36fa3dfd95 fix:出入库枚举修改 ZHOUZ\Noble'lift 2023-05-11 16:48:25 +08:00
• 0e6913243c Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-11 16:19:22 +08:00
• db6ca6d0ac fix:删除引用分配页面 ZHOUZ\Noble'lift 2023-05-11 16:19:17 +08:00
• 4f2f6196c1 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-05-11 15:08:20 +08:00
• 68b19747b6 add:任务相关服务 zhangzhiqiang 2023-05-11 15:08:09 +08:00
• 0115eab818 rev: 入库组盘 liuxy 2023-05-11 14:04:44 +08:00
• eb7d4a2b40 add：半成品入库功能 zhangzhiqiang 2023-05-11 11:17:34 +08:00
• c91a5f86e7 fix:原料入库主页面 ZHOUZ\Noble'lift 2023-05-10 16:57:32 +08:00
• a17c0eff45 add:半成品代码/仓库flow zhangzhiqiang 2023-05-10 14:36:02 +08:00
• 38dfe6e96d rev: xml路径修改 liuxy 2023-05-10 11:10:29 +08:00
• fbde7268ef add:载具 zhangzhiqiang 2023-05-10 11:03:23 +08:00
• 055ecfc400 add:主数据载具 zhangzhiqiang 2023-05-10 10:54:36 +08:00
• 2e3072a5d5 add:半成品/原料基础数据 zhangzhiqiang 2023-05-10 10:29:10 +08:00
• 8916b80dc0 rev:半成品维护 zhangzhiqiang 2023-05-10 09:47:12 +08:00
• 420eec9ace add:半成品入库 zhangzhiqiang 2023-05-09 22:44:20 +08:00
• ef710b9b5e rev: 成品入库前后端修改 liuxy 2023-05-09 21:00:53 +08:00
• f6c8f65177 add lucene gengby 2023-05-09 15:37:26 +08:00
• 9b8d295fe7 rev 在线状态 gengby 2023-05-09 14:35:18 +08:00
• b974006173 rev:基础数据维护 zhangzhiqiang 2023-05-09 13:54:35 +08:00
• e3031c5267 add 封箱拆箱线, rev 测试读写 gengby 2023-05-08 11:04:52 +08:00
• 1e2692e426 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-08 08:50:18 +08:00
• 53d4e9dd04 角色权限修改 ZHOUZ\Noble'lift 2023-05-08 08:50:13 +08:00
• a7f9ea77ac init project zhangzhiqiang 2023-05-06 17:18:46 +08:00
• 46990a545c add:新增半成品前端页面 liuxy 2023-05-06 16:54:13 +08:00
• 8df349f377 rev:菜单系统type不一致问题 zhangzhiqiang 2023-05-06 14:37:02 +08:00
• f3f0573970 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-05-06 14:13:13 +08:00
• a768d4f615 rev:menu不显示 zhangzhiqiang 2023-05-06 14:12:55 +08:00
• 072645e8bf oshi 监控版本更新 ludj 2023-05-05 20:00:22 +08:00
• 57730a631e add:修改成品出入库未mybatis zhangzhiqiang 2023-05-05 18:46:17 +08:00
• adc8063ba5 POM文件修改 ludj 2023-05-05 18:37:26 +08:00
• 4ed462645b Merge branch 'master' of http://121.40.234.130:8899/root/hl_one ZHOUZ\Noble'lift 2023-05-05 18:23:40 +08:00
• 1c327b5e58 新增原材料出入库、在库管理 ZHOUZ\Noble'lift 2023-05-05 18:23:35 +08:00
• eb2653f67d pom文件修改 ludj 2023-05-05 17:45:13 +08:00
• 047199776d menuId改为menu_id ZHOUZ\Noble'lift 2023-05-05 16:35:38 +08:00
• afd8dc8026 add:新增成品盘点管理前端页面 liuxy 2023-05-05 16:26:11 +08:00
• 5b8a2cb441 init project zhangzhiqiang 2023-05-05 16:17:19 +08:00
• 5da0c0eb0c rev:修改前端引用路由 liuxy 2023-05-05 15:43:37 +08:00
• 5a898e9f21 init structure zhangzhiqiang 2023-05-05 15:06:20 +08:00
• 9b17f46d72 Merge remote-tracking branch 'origin/master' baoge 2023-05-05 11:07:56 +08:00
• 234d2337d8 Revert "rev:修改结构" zhangzhiqiang 2023-05-04 20:40:53 +08:00
• 2f8b55fe06 Revert "rev:修改结构" zhangzhiqiang 2023-05-04 20:39:31 +08:00
• f6df55e031 init project zhangzhiqiang 2023-05-04 20:35:14 +08:00
• c36e97732b init project zhangzhiqiang 2023-05-04 20:26:55 +08:00
• e23b246afd init project zhangzhiqiang 2023-05-04 18:59:14 +08:00
• abc2af1ceb init project zhangzhiqiang 2023-05-04 13:56:29 +08:00
• 16906b4039 init zhangzhiqiang 2023-05-03 11:23:01 +08:00
• fd26e8fd31 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-04-28 14:56:59 +08:00
• f87dd1690c init：project structure zhangzhiqiang 2023-04-28 14:56:51 +08:00
• f8747d1210 Merge remote-tracking branch 'origin/master' baoge 2023-04-27 15:39:44 +08:00
• a23eae3cf2 rev 工作模式 gengby 2023-04-27 14:21:16 +08:00
• 778d8fb7df rev 封箱拆箱 gengby 2023-04-27 13:33:04 +08:00
• a351d652a0 Merge remote-tracking branch 'origin/master' baoge 2023-04-27 10:16:16 +08:00
• 34bca47651 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-04-25 19:38:51 +08:00
• f0c1387064 rev:接口联调 zhangzhiqiang 2023-04-25 19:38:44 +08:00
• d1ac61df70 rev 联调问题修改 gengby 2023-04-25 17:30:25 +08:00
• 2313d80660 rev 信号类型 gengby 2023-04-25 11:10:19 +08:00
• 8c3e1d0a3a add:物料项点 zhangzhiqiang 2023-04-24 19:08:57 +08:00
• 4460aeb7b2 add:质检基础数据 zhangzhiqiang 2023-04-23 16:08:32 +08:00
• 1ee9d7362b rev:修改结构 zhangzhiqiang 2023-04-23 14:04:45 +08:00
• d4a63d1619 rev 缓存线有任务时不下发调度 gengby 2023-04-18 12:00:00 +08:00
• edcf960254 rev:成品出入库功能 zhangzhiqiang 2023-04-17 20:10:09 +08:00
• b762ec097a rev:修改半成品出库页面接口。 baoge 2023-04-17 11:22:36 +08:00
• 640503c693 rev:修改半成品出库分配，设置，强制确认逻辑。 baoge 2023-04-17 11:19:16 +08:00
• 9deeb8b14c rev 更新细节 gengby 2023-04-17 08:50:26 +08:00
• 6f9eb90c58 rev:修改excel中update_id，create_id为数字类型； baoge 2023-04-14 15:19:14 +08:00
• 1333a16763 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one baoge 2023-04-14 14:36:11 +08:00
• 82334dccf0 rev:修改区域选择 baoge 2023-04-14 14:35:22 +08:00
• f540d88857 rev:成品入库分配 zhangzhiqiang 2023-04-14 14:29:56 +08:00
• d841b8e6c3 opt:优化半成品入库点位锁定与生成任务代码； baoge 2023-04-14 14:26:25 +08:00
• 797c2e84c9 opt:优化半成品入库点位锁定与生成任务代码； baoge 2023-04-14 14:25:58 +08:00
• e1d40f7884 add:区域查询 zhangzhiqiang 2023-04-14 11:35:27 +08:00
• 729f61216a rev:成品入库 zhangzhiqiang 2023-04-14 11:13:56 +08:00
• aa9be88be3 add:增加半成品入库前端页面 baoge 2023-04-14 10:26:13 +08:00
• 16f34a5e3a add:增加半成品入库功能 baoge 2023-04-14 10:09:32 +08:00
• 3214d73799 rev:修改缓存线点位表task_id为task_code baoge 2023-04-11 19:11:18 +08:00
• af698f6663 rev:修改一体机设备列表工单数获取。 baoge 2023-04-11 16:33:03 +08:00
• a41a254545 rev:修改缓存线扫码异常和缓存线异常下发acs接口。 baoge 2023-04-11 11:30:20 +08:00
• e0f89df220 rev:修改缓存线扫码异常和缓存线异常下发acs接口。 baoge 2023-04-11 11:27:06 +08:00
• 204d771420 rev: 字段修改 liyongde 2023-04-10 20:02:17 +08:00
• e16a1fd440 rev：一体机工单强制完成 zhangzhiqiang 2023-04-10 17:53:39 +08:00