root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 2525cd6861 fix:老车间工单打印报错 master2 zhangzq 2024-11-07 10:24:54 +08:00
  • 5d09730b64 add:修改老车间工单打印 zhangzq 2024-11-05 19:17:38 +08:00
  • d604552b9a add：添加激光下料导入工单功能,单工任务类型改成12(由右先取) zhangzq 2024-07-11 10:12:37 +08:00
  • cb3c92b841 rev:修改工单开工逻辑：一个设备允许多个工单创建下发 zhangzq 2024-06-13 14:05:22 +08:00
  • f3e969047d rev:工单电气数量校验 zhangzq 2024-05-22 14:54:40 +08:00
  • 5eb8e99422 rev:备份 feature/sanxianacs1213 gengby 2024-05-20 17:41:22 +08:00
  • 447ce3f874 add:三线地址 zhangzq 2024-05-14 16:03:38 +08:00
  • 15efc27f89 Merge remote-tracking branch 'origin/master2' into master2 zhangzq 2024-05-14 14:05:17 +08:00
  • 73de07eb64 add:环保清洗线 zhangzq 2024-05-14 14:05:10 +08:00
  • d28c7a0390 rev:mqttServer gengby 2024-03-28 15:00:11 +08:00
  • f5b9f7290c rev:替换下发kep数据为MQTT gengby 2024-03-28 13:43:39 +08:00
  • 2187ae9a6e rev:替换驱动里面的lucene日志 master gengby 2024-03-20 12:33:46 +08:00
  • 482d5ce483 rev:日志打印 gengby 2024-03-19 17:05:19 +08:00
  • b8cb53d8b8 rev:驱动 gengby 2024-03-19 15:46:18 +08:00
  • 6489ad259c rev：mqtt gengby 2024-03-19 15:46:02 +08:00
  • d7917a9d38 rev:ndc netty gengby 2024-03-19 15:45:14 +08:00
  • 1bfc70d6c7 rev:lucene gengby 2024-03-15 08:53:31 +08:00
  • 900d54279e opt:日志打印 zhangzq 2024-03-11 15:27:59 +08:00
  • c7b66b7c95 opt:日志打印 zhangzq 2024-03-07 09:11:04 +08:00
  • cd33fb8f07 Merge remote-tracking branch 'origin/master2' into master2 zhangzq 2024-03-07 09:06:27 +08:00
  • 5dc29176a5 opt:优化线程池，工单同步接口 zhangzq 2024-03-07 09:06:19 +08:00
  • 708a31b9e6 undo:缓存线箱码物料更新 feature/sanxian_lms_0219 zhangzq 2024-02-28 16:50:23 +08:00
  • 06e9ccc0fe add:振动清洗机上下料任务 zhangzq 2024-02-28 16:35:19 +08:00
  • 1581392e26 rev:维护工单看板数据信息 zhangzq 2024-02-27 14:03:10 +08:00
  • b3ba7056e1 add:工单看板 zhangzq 2024-02-26 15:12:52 +08:00
  • a77500f2d8 add:三线清洗功能前端 zhangzq 2024-02-26 09:14:14 +08:00
  • 45377df88e add:三线清洗功能 zhangzq 2024-02-26 09:11:47 +08:00
  • cde116d4f0 add:三线专机任务 zhangzq 2024-02-20 15:42:58 +08:00
  • ddc10ecc10 rev:netty ndc gengby 2024-02-20 14:55:04 +08:00
  • 4a8acc9027 Merge remote-tracking branch 'origin/master2' into feature/sanxian_lms_0219 zhangzq 2024-02-20 09:30:51 +08:00
  • f1a5c41128 rev:日志修改（未完成） zhangzq 2024-02-19 17:06:26 +08:00
  • 4afc8d43b2 Merge branch 'feature/sanxian_acs_1213' into feature/sanxianacs1213 zhangzq 2024-02-19 17:00:49 +08:00
  • dfc127e6f9 add:三线专机任务 zhangzq 2024-02-19 16:41:37 +08:00
  • 93185c9bfa add:测试 gengby 2024-02-19 14:41:01 +08:00
  • 990fcb563a add:接入mqtt2 feature/sanxian_acs_1213 zhangzq 2024-02-19 14:36:33 +08:00
  • de54a09c5b add:接入mqtt2 zhangzq 2024-02-19 14:36:09 +08:00
  • 7c0a5cfa5a init:三线初始化数据 zhangzq 2024-02-19 14:28:54 +08:00
  • ccbcccfef3 add:接入mqtt(td:项目启停时设备信号读写2) zhangzq 2024-02-19 13:45:48 +08:00
  • 0d78f68bac add:接入mqtt(td:项目启停时设备信号读写) zhangzq 2024-02-04 14:14:55 +08:00
  • b0b9dedaee add:接入mqtt(td:项目启停时设备信号读写) zhangzq 2024-02-01 17:54:08 +08:00
  • 86935740fc add:接入mqtt(td:项目启停时设备信号读写) zhangzq 2024-02-01 17:27:03 +08:00
  • 087d719036 rev:海柔功能修改 zhangzq 2024-01-27 17:14:17 +08:00
  • 8b70386156 rev:集群日志修改 feature/msyql集群 zhangzq 2024-01-27 16:55:17 +08:00
  • 300278e1c8 rev:更新 gengby 2024-01-26 15:42:39 +08:00
  • c9ea2f112b rev:集群日志修改 zhangzq 2024-01-24 15:09:40 +08:00
  • 48a45ba56d add:手持海柔出入库顺序表2 zhangzq 2024-01-24 09:49:39 +08:00
  • 2f933a6709 add:手持海柔出入库顺序表 zhangzq 2024-01-24 09:28:23 +08:00
  • ef3baa529c add:手持海柔出入库顺序表 zhangzq 2024-01-24 08:43:50 +08:00
  • 7dea257509 Merge remote-tracking branch 'origin/master' zhangzq 2024-01-23 17:25:36 +08:00
  • 115719abea add:手持海柔出入库顺序表 zhangzq 2024-01-23 17:25:25 +08:00
  • 14225144e7 Merge remote-tracking branch 'origin/master' zhangzq 2024-01-23 13:49:10 +08:00
  • 2698f6c897 Revert "rev:海柔半成品库接口调整" zhangzq 2024-01-23 13:48:54 +08:00
  • 0b0b5d849f Merge remote-tracking branch 'origin/master' zhangzq 2024-01-23 13:45:54 +08:00
  • 1563af97dd add:海柔顺序表 zhangzq 2024-01-23 13:45:49 +08:00
  • 65df3187e5 add:分布式日志 zhangzq 2024-01-22 17:30:02 +08:00
  • ce5dcdf1f4 rev:更新 gengby 2024-01-22 08:55:25 +08:00
  • 32afb67abb rev:海柔半成品库接口调整 zhangzq 2024-01-19 16:33:49 +08:00
  • 720699bdd5 rev:更新 gengby 2024-01-15 08:54:50 +08:00
  • 69dc5a92a1 opt:工单数量更新 feature/opt_24_0103 zhangzq 2024-01-11 18:31:48 +08:00
  • 41ca5fae61 opt:日志优化 zhangzq 2024-01-11 17:26:46 +08:00
  • 26fd3d1919 rev:海柔业务 gengby 2024-01-11 10:40:27 +08:00
  • 9b97d45a5f rev:lucene gengby 2024-01-08 09:56:55 +08:00
  • 3ee52d3fbc rev:删除驱动里面电气信号变化记录日志 gengby 2024-01-03 09:00:59 +08:00
  • 16b4e1bef3 add:忽略lucene生成的文件 gengby 2024-01-02 17:34:10 +08:00
  • 16878950bc rev:替换lucene gengby 2024-01-02 17:22:47 +08:00
  • d967103c17 rev:替换lucene gengby 2024-01-02 17:21:53 +08:00
  • 93bf10bd79 add:海柔输送线申请空框任务 gengby 2023-12-29 13:49:21 +08:00
  • 530275d651 opt:日志优化 zhangzq 2023-12-28 19:40:49 +08:00
  • 83fc33ebae opt:日志优化2 zhangzq 2023-12-28 13:47:53 +08:00
  • ae48f6ce1c opt:日志优化 zhangzq 2023-12-27 16:47:27 +08:00
  • 68b87a2953 opt:日志优化 zhangzq 2023-12-27 14:22:03 +08:00
  • 8db97aa7f3 fix:取消任务时更新库存;opt:日志优化 zhangzq 2023-12-27 11:16:54 +08:00
  • 523c3837e2 fix:取消任务时更新库存 zhangzq 2023-12-27 09:19:24 +08:00
  • 01bafbf404 fix:入库订单查询sql报错 zhangzq 2023-12-26 18:24:02 +08:00
  • a596caddfe opt:优化日志；add：包装机一体机页面新增空筐送回 zhangzq 2023-12-26 16:25:20 +08:00
  • fbd5e1ca7e rev: 增加日志配置-CMD控制台高亮，链路追踪 ludj 2023-12-25 19:07:50 +08:00
  • 05878afa90 add:刻字机不合格数量 gengby 2023-12-21 19:26:31 +08:00
  • 2bdea65231 rev:日志文件打印慢 zhangzq 2023-12-21 19:21:08 +08:00
  • 41040484b5 rev:增加规格统计分页，修改排产顺序，设备最后规格记录; baoge 2023-12-19 16:38:02 +08:00
  • a3c6f9bb3b rev:删除loki gengby 2023-12-19 08:51:01 +08:00
  • 1735f6e48c rev:工单强制完成 zhangzq 2023-12-16 17:55:02 +08:00
  • e620dff9b2 add:手工排产功能上线；出库单设置 zhangzq 2023-12-14 18:31:36 +08:00
  • 9f2b73a49f rev:分支合并修复 zhangzq 2023-12-13 17:31:22 +08:00
  • 6713250a56 add 海荣成品空载具入库 周俊杰 2023-12-13 16:34:23 +08:00
  • 3610044642 rev:工单创建校验 zhangzq 2023-12-13 16:31:00 +08:00
  • 680159531d 111 周俊杰 2023-12-13 15:30:33 +08:00
  • 1dbc4e0098 Merge remote-tracking branch 'origin/master' zhangzq 2023-12-13 14:44:59 +08:00
  • 007bd043f3 rev:工单编号 zhangzq 2023-12-13 14:44:51 +08:00
  • ec8c3bee78 rev：三线半成品修改 device_fix liuxy 2023-12-08 18:14:26 +08:00
  • dc0b25d076 add:排产调整sql。 baoge 2023-12-08 16:00:32 +08:00
  • 462728956e add:增加工单排产调整相关功能。 baoge 2023-12-08 15:56:59 +08:00
  • 34e9bd0dd8 rev：三线半成品acs申请任务 liuxy 2023-12-06 08:59:00 +08:00
  • 45a102eed0 rev:pom zhangzq 2023-12-04 16:42:12 +08:00
  • 1d28c7cf9e rev:工单下发接口兼容暂停工单;opt:删除useragent zhangzq 2023-12-04 16:02:16 +08:00
  • c4c7fc9c27 rev：工单查询sql zhangzq 2023-12-04 09:50:04 +08:00
  • 925b2a998e add:飞书接口 zhangzq 2023-11-29 17:17:37 +08:00
  • 1f82889211 Merge remote-tracking branch 'origin/master' zhangzq 2023-11-29 10:15:39 +08:00
  • 2927e7e25f rev:新增报工时间字段，下料机优先级，缓存线写0（三层缓存线跑）下一道工序设备来料仓排序 zhangzq 2023-11-29 10:15:33 +08:00
  • 11a007ea36 rev 修改逻辑 USER-20220102CG\noblelift 2023-11-22 13:46:16 +08:00
  • ecb875e229 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one USER-20220102CG\noblelift 2023-11-22 13:32:04 +08:00