Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 68b6ddb793 opt:子卷装箱测试 baoge 2024-05-14 22:49:10 +08:00
• 1a0e0fe86c fix: 堆垛机异常报警重新下发 LENOVO 2024-05-14 20:20:19 +08:00
• 00d823ccd3 opt: 监控大屏显示设备信息优化 yanps 2024-05-14 19:56:50 +08:00
• 4741f9952d rev 更新线程 USER-20220102CG\noblelift 2024-05-14 18:30:15 +08:00
• 324d05fd5e fix;新增载具类型 zhouz 2024-05-14 16:03:07 +08:00
• 4c5642c001 opt: 信号线程还原 yanps 2024-05-14 15:39:05 +08:00
• c7490d35f8 fix: lms联调修改 LENOVO 2024-05-14 15:10:32 +08:00
• 48ba755ad9 fix:出入库任务类型给托盘类型，空木箱出库返回木箱号 zhouz 2024-05-14 15:04:44 +08:00
• 4df8527bb4 opt: 历史任务记录显示起点2终点2,监控大屏2秒刷新 yanps 2024-05-14 09:00:00 +08:00
• ad7c2ddd03 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-13 20:05:00 +08:00
• ec6a0553d4 fix:任务下发ACS增加托盘类型，新增空木箱入库的业务逻辑 zhouz 2024-05-13 20:04:55 +08:00
• 9bbe7c8b68 rev:更新设备监控刷新时间 tuqiang 2024-05-13 19:10:34 +08:00
• afc6f0de94 合并代码 USER-20220102CG\noblelift 2024-05-13 15:14:20 +08:00
• a05fa03de5 更新信号同步线程 USER-20220102CG\noblelift 2024-05-13 14:37:43 +08:00
• 7de225053e rev:设备驱动国际化以及设备监控国际化 tuqiang 2024-05-13 14:22:29 +08:00
• 756f7b47e0 fix: 日志bug修改 LENOVO 2024-05-13 13:42:53 +08:00
• b51073e512 fix: 日志bug修改 LENOVO 2024-05-13 13:40:20 +08:00
• be03e7a61e Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-05-13 13:25:57 +08:00
• 4414177cac rev:返检、改切回传MES新增回传时间 ZHOUZ\Noble'lift 2024-05-13 13:25:34 +08:00
• 7b771a0a9c Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms liyongde 2024-05-13 11:11:37 +08:00
• 3282f15af7 add: 输送机申请贴标demo liyongde 2024-05-13 11:10:46 +08:00
• 4e3dc384af fix: 托盘类型不对，直接去扫码位托盘入库代码开发 LENOVO 2024-05-13 10:07:27 +08:00
• 30ad6db6ac Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-13 09:35:08 +08:00
• 6c4170cd59 rev;木箱入库修改 zhouz 2024-05-13 09:35:01 +08:00
• 6831a82a5a opt:空木箱入库增加层数 baoge 2024-05-12 16:43:16 +08:00
• a6b9e54572 opt:空木箱入库增加层数 baoge 2024-05-12 15:26:32 +08:00
• a296a4845d rev:空木箱入库修改 zhouz 2024-05-12 15:12:49 +08:00
• 095809680d Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-12 15:12:04 +08:00
• 28059f4269 rev:空木箱入库修改 zhouz 2024-05-12 15:12:00 +08:00
• fde40a795a fix: 任务暂停修复 LENOVO 2024-05-12 11:25:09 +08:00
• 3e0eb7fd54 fix: 申请成功后下发命令、堆垛机报警重试 LENOVO 2024-05-12 09:48:37 +08:00
• 2939259652 Merge remote-tracking branch 'origin/master' LENOVO 2024-05-12 09:42:37 +08:00
• 7f1b8b8e29 fix: 申请成功后下发命令、堆垛机报警重试 LENOVO 2024-05-12 09:41:58 +08:00
• 9eea3bb5ea opt:空木箱入库增加层数 baoge 2024-05-11 22:23:02 +08:00
• 4667761c9c Merge remote-tracking branch 'origin/b_lms' into b_lms baoge 2024-05-11 22:12:54 +08:00
• 34def7f32a opt:空木箱入库增加层数 baoge 2024-05-11 22:09:26 +08:00
• b6dd29b4b7 add: 添加任务类型显示查询 yanps 2024-05-11 20:27:02 +08:00
• fd86281afe rev：修改空托盘出库任务类 liuxy 2024-05-11 17:27:00 +08:00
• fb8cf98363 opt: 日志文件大小调整 yanps 2024-05-11 17:23:20 +08:00
• 9d752f91ea rev：图标优化 liuxy 2024-05-11 17:16:54 +08:00
• 94f09d2397 rev： 空托盘入库托盘类型，仓位顺序，前端页面优化 liuxy 2024-05-11 17:13:43 +08:00
• 37ad133cfe add: 增加日志级别 yanps 2024-05-11 15:56:55 +08:00
• 0c0eda5d8e fix: 二期内包间送子卷请求 liyongde 2024-05-11 14:20:42 +08:00
• 1203688b92 add：手持空托盘入库 liuxy 2024-05-11 13:13:47 +08:00
• 52b4c905f7 rev:二期任务类型 liuxy 2024-05-11 12:32:45 +08:00
• 5b41adbf67 add: 增加打印日志级别校验,添加测距站点 yanps 2024-05-11 11:16:48 +08:00
• 034907e722 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-11 09:25:17 +08:00
• e79f50f09b rev:空木箱入库给ACS木箱信息字段 zhouz 2024-05-11 09:25:11 +08:00
• 45d609fb33 fix: 字段修改 LENOVO 2024-05-11 09:02:16 +08:00
• 10dcb6f9a5 Merge remote-tracking branch 'origin/master' LENOVO 2024-05-10 19:20:07 +08:00
• d83f7c450b fix: 禁止出入库任务、暂停任务 LENOVO 2024-05-10 19:19:15 +08:00
• f9667ee9a1 fix:优化前端页面以及修复点位管理功能bug tuqiang 2024-05-10 17:51:15 +08:00
• a07df96854 opt:处理代码冲突 baoge 2024-05-10 14:19:13 +08:00
• 9e45690cd0 opt: 添加堆垛机下发信号日志 yanps 2024-05-10 10:56:16 +08:00
• ce168c147b Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-05-09 20:02:00 +08:00
• d03c915e92 dev:新增备货区代码 zhouz 2024-05-09 20:01:54 +08:00
• 04fb44f67d opt: 设备xy坐标不记录日志 yanps 2024-05-09 19:12:35 +08:00
• b0f9b1c038 opt: 拔轴机优化 yanps 2024-05-09 19:07:36 +08:00
• dee0cf57ae fix: 纸管信息设置到点位上 liyongde 2024-05-09 17:00:10 +08:00
• de4ef00659 rev：手持入库仓位数限制 liuxy 2024-05-09 11:17:15 +08:00
• 9f5baffd40 rev:设备监控页面优化 tuqiang 2024-05-09 10:54:19 +08:00
• bd2bc9ba99 Merge remote-tracking branch 'origin/master' LENOVO 2024-05-08 17:22:28 +08:00
• b36299dd56 fix: 堆垛机异常情况取消 LENOVO 2024-05-08 17:16:58 +08:00
• f35d96317c Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-05-08 17:05:51 +08:00
• a60a4229ff rev:新增登录次数限制，密码正则表达式校验，发货区AGV任务生成添加开关 ZHOUZ\Noble'lift 2024-05-08 17:05:39 +08:00
• 9c3d8f3322 opt: 贴标增加字段 yanps 2024-05-08 15:13:22 +08:00
• 1877e6a1f2 add：仓位初始化 liuxy 2024-05-08 10:10:32 +08:00
• 40ae72314a opt: 设备报警字典表 yanps 2024-05-08 08:54:42 +08:00
• 5d88fe734d fix: 堆垛机异常情况开发 LENOVO 2024-05-07 14:55:37 +08:00
• 9ff24e0095 fix: 堆垛机异常情况开发 LENOVO 2024-05-07 14:20:30 +08:00
• c74e5fe313 fix: 堆垛机异常情况开发 LENOVO 2024-05-07 14:06:56 +08:00
• 963e729f73 rev：仓位自动预警根据百分比进行预警 liuxy 2024-05-07 13:56:45 +08:00
• 1b9d943c1e fix: 堆垛机异常情况开发 LENOVO 2024-05-07 13:32:29 +08:00
• d4c9e471ce fix: 自动创建ddj路由 LENOVO 2024-05-06 19:49:06 +08:00
• fe191c9ad5 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one ZHOUZ\Noble'lift 2024-05-06 14:27:03 +08:00
• 27f5ba8036 rev:兰州二期仓库入虚拟区 ZHOUZ\Noble'lift 2024-05-06 14:26:56 +08:00
• 572f60077f opt: 堆垛机创建指令优化 yanps 2024-05-06 09:56:47 +08:00
• daaa7c94d2 fix: 开盖位 LENOVO 2024-05-06 09:46:16 +08:00
• d2d7f4228e fix: 路由路线修改、开盖位 LENOVO 2024-05-06 09:32:57 +08:00
• 8207f52961 fix: 扫码位托盘类型下发问题修复 LENOVO 2024-05-05 14:12:42 +08:00
• 6dcf9c843b opt: 输送线联调优化 yanps 2024-04-30 13:35:59 +08:00
• b6736b9a9d add：拣选出库开发 liuxy 2024-04-30 10:57:40 +08:00
• 18008d04a1 Merge remote-tracking branch 'origin/master' LENOVO 2024-04-29 18:27:17 +08:00
• a6a6f4d7e2 fix: 现场联调 LENOVO 2024-04-29 18:26:29 +08:00
• 66571afda4 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-04-29 09:34:17 +08:00
• f3a03ae6ea rev:修改表处问题 zhouz 2024-04-29 09:34:10 +08:00
• 819e8948a0 rev: 分切呼叫套轴不区分锂电标箔，只区分气胀轴尺寸 liyongde 2024-04-29 08:43:43 +08:00
• 537295a272 fix: 只做拔轴任务的纸管信息 liyongde 2024-04-28 08:53:01 +08:00
• 8e3434449e rev：1.生产入库：650的箱子优先入1层 2.1层空托盘扩容 3.立库主存区仓位预警提示 4.仓位查询页面优化：增加立库层数、是否空位条件查询。 liuxy 2024-04-28 08:49:33 +08:00
• 610d03a771 Merge remote-tracking branch 'origin/master' LENOVO 2024-04-27 19:45:35 +08:00
• b205b442df fix: 现场入库联调出库联调修改 LENOVO 2024-04-27 19:44:38 +08:00
• d36aeaced6 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms liyongde 2024-04-26 18:11:32 +08:00
• 9282e10873 refactor: 代码生成器 liyongde 2024-04-26 18:11:13 +08:00
• 073caafb3f add：新增堆垛机，输送线待机后清除写入的信号 tuqiang 2024-04-26 15:03:39 +08:00
• c76498597a Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms zhouz 2024-04-26 13:28:48 +08:00
• 4b1b5c0552 rev:编码生成BUG，载具新增功能修改 zhouz 2024-04-26 13:28:42 +08:00
• d2275d700f fix: 分切缓存状态修改 liyongde 2024-04-26 10:33:18 +08:00
• 6ea2a98c1d opt: 内包间联调优化 yanps 2024-04-26 09:18:59 +08:00
• c021bcdfa8 add: 反馈子卷重量 liyongde 2024-04-24 18:52:39 +08:00
• f61baa473b fix: 二期内包间拔轴请求、套轴请求的纸管信息、套管工位请求判断去成品还是废箔的接口API定义 liyongde 2024-04-24 15:34:39 +08:00