Commit Graph

Select branches

Hide Pull Requests

master

1220

bei_febei_fen备份

bf_master

opt_250311

Mono Color

• 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
• 2d0c08748f rev:修改工单状态为枚举判断; baoge 2023-04-10 17:33:42 +08:00
• 2fa2ec70a3 Merge remote-tracking branch 'origin/master' baoge 2023-04-10 16:00:53 +08:00
• f7acb14776 add:增加一体机设备，工单，操作接口; baoge 2023-04-10 16:00:41 +08:00
• 9c9f25465e add:添加深坑清洗功能 zhangzhiqiang 2023-04-10 10:24:17 +08:00
• 3dcbb17f75 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one liyongde 2023-04-07 10:08:12 +08:00
• bf502d25cb fix: 修复异常 liyongde 2023-04-07 10:07:56 +08:00
• 7b4105fa2e Merge branch 'master' of http://121.40.234.130:8899/root/hl_one gengby 2023-04-06 20:19:25 +08:00
• 6f84106578 rev 更新同一点位有任务不能请求mes gengby 2023-04-06 20:19:07 +08:00
• 6202b514c2 fix: 修复任务类型信息，添加acs任务类型 liyongde 2023-04-06 20:16:41 +08:00
• 19656f89f0 rev 修改手动创建指令 gengby 2023-04-06 19:57:48 +08:00
• 04357d4129 Merge remote-tracking branch 'origin/master' baoge 2023-04-06 17:03:53 +08:00
• a5bb8fcd38 rev:修改acs更新缓存线实时任务id,改为更新编码及相关牵涉代码； rev:修改扫码异常查询逻辑，扫码异常确认功能增加对接位和准备位选择再下发acs; rev:修改指令查询中所有指令改为，增加显示字段及筛选条件。 rev:修改任务下发逻辑。 baoge 2023-04-06 17:03:44 +08:00
• 72491a513e fix 包装请求参数 USER-20220102CG\noblelift 2023-04-06 16:25:48 +08:00
• ae84fa94bc fix: 修复刻字和包装任务的bug liyongde 2023-04-06 16:22:26 +08:00
• 10f0b26339 rev 更新 gengby 2023-04-06 15:17:46 +08:00
• ef7553bc6f rev acs工单更新 USER-20220102CG\noblelift 2023-04-06 15:04:38 +08:00
• 049239cfa8 Merge remote-tracking branch 'origin/master' baoge 2023-04-06 11:19:46 +08:00
• 3db7640b8a add:增加升级版本信息和文件路径接口。 baoge 2023-04-06 11:19:36 +08:00
• a2a817ad24 rev 修改 gengby 2023-04-06 10:40:52 +08:00
• eda9ba4614 rev 修改 gengby 2023-04-06 10:40:37 +08:00
• 6b05845e3c opt: 优化任务代码 liyongde 2023-04-06 10:34:26 +08:00
• cf51e231a2 opt: 优化刻字、包装任务的代码 liyongde 2023-04-06 09:42:46 +08:00
• 13fffc8c97 add: 添加工单的校验 liyongde 2023-04-06 09:26:00 +08:00
• 92c7134da6 rev: 修改缓存线显示全部位置 liyongde 2023-04-04 17:26:47 +08:00
• a3a0f637a2 rev: 修改任务下发 liyongde 2023-04-04 17:01:37 +08:00
• 16fe28ce3b rev: 成品出库功能修改 liuxy 2023-04-04 14:39:12 +08:00
• 2b34529494 fix: 修复区域表把点位类型删除之后，点位管理查询报错 liyongde 2023-04-04 14:08:22 +08:00