Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• dccfbe32ff init master zhangzq 2024-08-29 14:43:50 +08:00
• 81d95623e3 init zhangzq 2024-08-29 13:24:10 +08:00
• 8352deaf22 add 缺口体积 周俊杰 2024-06-03 14:21:49 +08:00
• a7038bd9ab feat: 新增接收缺口体积，人工包装上报批次对应关系，木托盘批次修改 liyongde 2024-06-03 13:41:19 +08:00
• fe86a1ade2 fix: 样式 liyongde 2024-05-30 18:12:58 +08:00
• fae1c79e95 fix: 通知标题 liyongde 2024-04-22 09:33:42 +08:00
• c5dee1c8c4 fix: 日志管理时间差问题 liyongde 2024-04-18 15:25:53 +08:00
• 46cf2c8da0 fix: 自动下发任务修改时间长导致覆盖了排产确认的状态 liyongde 2024-04-11 09:26:49 +08:00
• 3f7853bd95 fix: 添加注释 liyongde 2024-03-26 18:06:15 +08:00
• e451d53cd4 fix: 窑口 liyongde 2024-03-07 18:18:14 +08:00
• ba20c7d4d5 fix: 入窑口修改 liyongde 2024-02-29 09:58:07 +08:00
• 5aecb9d7eb fix: 光电判断点位解锁行不通，通过校验任务解决 liyongde 2024-02-03 14:28:21 +08:00
• d6a0636082 fix: 加急工单入窑、分拣批次关系对应 liyongde 2024-02-01 15:14:28 +08:00
• 14472eca34 fix 指令多次生成和用户管理功能 周俊杰 2024-01-21 16:55:42 +08:00
• 2f7e618200 feat: 报表 liyongde 2024-01-16 09:39:42 +08:00
• 598de70e0d rev: 压机加急工单搬运、滚筒线送料到入窑口、回滚失效 liyongde 2024-01-11 17:47:25 +08:00
• eb7c692d55 fix: 日志ip地址 liyongde 2024-01-10 10:32:58 +08:00
• 743184329a opt: 任务管理界面查询失败 liyongde 2024-01-08 15:31:26 +08:00
• 71103b2c60 feat: 添加事务注解 liyongde 2024-01-08 10:55:35 +08:00
• 71ee3c2461 fix: 重复组盘信息修改 liyongde 2024-01-07 21:05:20 +08:00
• c6de04c178 feat: 添加静置时间判断日志 liyongde 2024-01-06 11:55:02 +08:00
• a0ad123c26 opt: 滚筒线数据 liyongde 2024-01-06 09:45:17 +08:00
• 7141d36c1a fix: 修复马钢问题 liyongde 2024-01-02 18:21:39 +08:00
• 91f02bf0a1 Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg 周俊杰 2024-01-02 10:24:04 +08:00
• eb24c55505 add 自动门对接 rev luncener日志更新 周俊杰 2024-01-02 10:23:31 +08:00
• b4ab0d4da1 fix: 自动叫下一个工单的料 liyongde 2024-01-01 20:30:54 +08:00
• 91dd284a27 opt: 代码写法 liyongde 2023-12-29 12:48:42 +08:00
• cd99e32c97 add: 压机叫料重量修改 liyongde 2023-12-29 10:16:00 +08:00
• 7810ffdf04 fix: 循环依赖 liyongde 2023-12-29 08:54:11 +08:00
• bf5696c15f opt: 任务。任务配置 liyongde 2023-12-28 18:59:46 +08:00
• c10bee03c9 fix: lucene、参数 liyongde 2023-12-28 16:13:41 +08:00
• dec4c18ecb opt:日志优化 zhangzq 2023-12-28 15:21:34 +08:00
• 61ff4a6e6b rev:配置文件更新 ludj 2023-12-28 11:28:57 +08:00
• c45480064a rev: pom文件更新 ludj 2023-12-27 20:21:14 +08:00
• f0de929d33 opt: lucene,链路追踪，MDC liyongde 2023-12-27 18:49:54 +08:00
• 570f81e3f0 add 1 liyongde 2023-12-26 12:15:14 +08:00
• 6c91925517 feat: 去除swagger liyongde 2023-12-25 15:31:11 +08:00
• 34879a8187 fix: 看板数据优化 liyongde 2023-12-25 11:03:38 +08:00
• c07f8d17be opt: 代码修复 liyongde 2023-12-13 18:29:03 +08:00
• 68d72ada2b opt: 任务与工单 liyongde 2023-12-12 13:46:54 +08:00
• 7464f849cd fix： 修复马钢lucene日志打印 liyongde 2023-12-05 20:16:00 +08:00
• ab789178cc fix: 线程池bug liyongde 2023-12-05 16:26:45 +08:00
• 69789e9b30 opt: 代码格式化 liyongde 2023-12-04 16:00:09 +08:00
• b9f18e997f fix: MES对接 liyongde 2023-12-01 17:22:35 +08:00
• 80205987e9 add 强制完成当天也可以，查询泥料编码 周俊杰 2023-11-29 13:31:49 +08:00
• 425f35ab55 Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg liyongde 2023-11-29 09:28:33 +08:00
• 3227306116 fix: MES对接 liyongde 2023-11-29 09:28:17 +08:00
• 7e1fef8b0b add 布料机反馈重量和泥料 rev写入方法修改 周俊杰 2023-11-28 10:48:13 +08:00
• 25bc769deb fix: MES数据对接 liyongde 2023-11-24 11:12:07 +08:00
• e053387741 opt: 代码整理 liyongde 2023-11-23 15:12:15 +08:00
• 9b251ed604 fix: 任务工厂3.0改造与工单for update的使用 liyongde 2023-11-21 18:11:00 +08:00
• 0a31f770ca opt: 代码整理，出窑口校验，入窑口校验，布料信息，对接记录筛选功能 liyongde 2023-11-20 10:05:12 +08:00
• 019d5cf4aa feat: 自动下发工单 liyongde 2023-11-16 14:24:59 +08:00
• a365a3bfb6 fix: 手持、自动工单、点位编码 liyongde 2023-11-15 19:02:54 +08:00
• 4471be290e rev 驱动更新 周俊杰 2023-11-14 09:04:10 +08:00
• 6b4d359fa5 1 周俊杰 2023-11-10 13:34:13 +08:00
• 8b27a98268 rev 写入方法 周俊杰 2023-11-10 12:28:00 +08:00
• b93405f1a3 Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg liyongde 2023-11-09 20:24:27 +08:00
• 7e84c43700 feat: 1.马钢分拣钢托物料多次出库问题优化开发 2.马钢混碾自动化初步开发与测试 liyongde 2023-11-09 20:23:05 +08:00
• 6845411297 1.马钢分拣钢托物料多次出库问题优化开发 2.马钢混碾自动化初步开发与测试 liyongde 2023-11-09 20:23:05 +08:00
• 29b407fb17 rev 写入更新 周俊杰 2023-11-09 10:34:33 +08:00
• cb2d38b3d5 fix: 物料缺少字段 liyongde 2023-11-07 19:03:42 +08:00
• 28befb0110 add 分拣工单给电气物料规格，写入方法更新 周俊杰 2023-11-07 17:08:58 +08:00
• 2507655221 fix: 分拣送空托错误、看板数据、工单号重复并发问题 liyongde 2023-11-07 15:14:12 +08:00
• 47a1c3a014 Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg liyongde 2023-11-06 13:15:45 +08:00
• 8f2a9efad1 fix: 唛头修改 liyongde 2023-11-06 13:15:34 +08:00
• 5bdc8f610b fix: 分拣包装不锁 liyongde 2023-11-06 12:02:10 +08:00
• 43e9f732fc feat: 工单强制报工 liyongde 2023-11-03 18:12:13 +08:00
• 41666a22ca fix: 自动下发工单 liyongde 2023-11-02 17:18:50 +08:00
• 0c0421f5ce fix: 窑后送料禁止去货架三层、分拣优化、任务请求并发问题、点位解锁功能 liyongde 2023-11-02 08:53:19 +08:00
• ffb6dac06d fix: 分拣叫料校验、看板更新 liyongde 2023-10-31 10:36:07 +08:00
• 0654d2378f fix: 分拣满料没有存储木托盘载具号问题 liyongde 2023-10-30 18:22:46 +08:00
• 760edf13f3 opt: 工单 liyongde 2023-10-30 13:32:44 +08:00
• 30e62c7737 feat: 定时获取工单与自动下发工单，工单选择物料优化 liyongde 2023-10-30 11:17:38 +08:00
• 84abe5b172 fix: 出库规则(数量最少、先进先出、货位号) liyongde 2023-10-27 16:21:44 +08:00
• 8249664844 opt: 人工分拣与自动分拣一样的功能 liyongde 2023-10-27 15:38:10 +08:00
• 4fd372c46c fix: 手持货架清空问题，组盘位置改为分情况不同位置 liyongde 2023-10-27 09:20:31 +08:00
• a5cbd9f071 Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg 周俊杰 2023-10-26 14:53:51 +08:00
• 3d137e3c2a add rgv驱动，拆垛位刚托盘数量下发，强制入库20 周俊杰 2023-10-26 14:53:20 +08:00
• 0cf10e6118 feat: 定时清除lucene日志 liyongde 2023-10-26 11:13:29 +08:00
• d22a79cc9c opt: 工单下发提示 liyongde 2023-10-25 18:41:51 +08:00
• 96ff1a585e rev RGV日志,拆垛入库携带条码 周俊杰 2023-10-25 17:25:48 +08:00
• fd2c368833 add RGV任务复位 周俊杰 2023-10-25 16:54:57 +08:00
• d072f165f0 fix: 获取组盘信息校验、acs请求获取组盘信息、优化物料查询、人工维护 liyongde 2023-10-25 15:44:58 +08:00
• b9c342d48a fix: 分拣工单物料信息问题、组盘信息冗余问题、 liyongde 2023-10-25 10:39:05 +08:00
• 0b37e66ac8 fix: 与调用mes数据库的问题 liyongde 2023-10-24 15:05:37 +08:00
• 0a779f2b00 fix: oracle分页查询sql liyongde 2023-10-24 12:21:04 +08:00
• 6a5a9c68d4 fix: 唛头问题 liyongde 2023-10-24 09:42:36 +08:00
• 22deece58f rev: 分拣工单、分拣木托盘搬运校验根据计算好的数量 liyongde 2023-10-23 18:30:38 +08:00
• ff1c809fd8 fix: 分拣缺空任务 liyongde 2023-10-22 14:55:30 +08:00
• 957176fd68 fix：json转换错误 liyongde 2023-10-22 14:42:40 +08:00
• dd235191a9 fix: 双层输送线搬运规则、点位复位问题、分拣包装下发覆膜机位置 liyongde 2023-10-21 16:45:31 +08:00
• 5d3bb72266 feat: 修改对接记录存储、打印唛头、码垛剩余反馈 liyongde 2023-10-20 18:25:46 +08:00
• 16155f87ca feat: 定时同步物料 liyongde 2023-10-20 11:21:54 +08:00
• f961f6114e AGV与RGV驱动更新 周俊杰 2023-10-19 22:08:47 +08:00
• aca6a33ec3 opt: 分拣叫料规则、手持货架盘点、压机搬运 liyongde 2023-10-19 10:51:52 +08:00
• 0e9840310f fix: 手持：压机搬运、货架盘点、出窑取双层输送线逻辑 liyongde 2023-10-18 10:19:45 +08:00
• 6a3ed777fa add: 分拣工单根据库存选择物料功能 liyongde 2023-10-16 15:03:29 +08:00
• 043962f14b fix: mes压机检测新增物料等信息 private String MATERIAL_ID; private String MATERIAL_NAME; private String MATERIAL_SPEC; private String MATERIAL_MODEL; private String MACHINE_WET; liyongde 2023-10-13 14:44:28 +08:00
• 9fa97946ae opt: 日志打印 liyongde 2023-10-12 16:51:29 +08:00