Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• e23b64122a add: 手持查询暂存位置的数据 liyongde 2024-07-20 16:48:55 +08:00
• a9db3d0804 fix: 手持分切下卷提示信息 liyongde 2024-07-20 15:52:13 +08:00
• f967f0a08a fix: 暂时过滤1700，1800的frp套轴，新增ACS请求气胀轴库出气胀轴，手持查询优化 liyongde 2024-07-20 13:50:30 +08:00
• 2b3f0f251b rev：回传 liuxy 2024-07-20 13:28:02 +08:00
• d21648c6e9 rev：子卷装箱 liuxy 2024-07-20 11:25:26 +08:00
• 8ed0f989b0 opt:增加子卷质检相关校验。 gongbaoxiong 2024-07-20 01:16:20 +08:00
• 4f304aed13 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-19 19:01:35 +08:00
• ee6c444b49 fix: 手持下料查询 liyongde 2024-07-19 19:01:13 +08:00
• 470eeeb89a rev: 二期入库回传 liuxy 2024-07-19 17:55:35 +08:00
• 79fa7584fd rev: 二期手工分配 liuxy 2024-07-19 16:15:45 +08:00
• 6ee2dcc5a9 rev：二期入库创建人修改，入库完成自动回传mes liuxy 2024-07-19 13:56:30 +08:00
• d59e5d22a1 add:新增表 liuxy 2024-07-19 10:33:13 +08:00
• c87492af54 fix:去除测试参数，测试代码，修改补空任务触发时间。 gongbaoxiong 2024-07-18 23:41:22 +08:00
• 0154f6ccf9 fix:去除测试参数，测试代码，修改补空任务触发时间。 gongbaoxiong 2024-07-18 22:25:49 +08:00
• de9e24bf05 fix: 初始化恢复子卷套轴可手动选择，新增气胀轴库出轴API liyongde 2024-07-18 18:48:31 +08:00
• 0f748b1aea rev:木箱出库任务卡控 liuxy 2024-07-18 11:03:37 +08:00
• 6daf96858d fix:修复分切多个分切计划过滤 gongbaoxiong 2024-07-17 23:25:42 +08:00
• a07a8a7172 fix:修复分切多个分切计划过滤 gongbaoxiong 2024-07-17 23:20:18 +08:00
• 327cb82f45 opt:优化装箱数延迟触发补空任务 gongbaoxiong 2024-07-17 20:07:04 +08:00
• 590c50d3ca fix: 注释 liyongde 2024-07-17 19:06:39 +08:00
• 65de4ff0a1 add: 新增根据参数配置来管理是否只做拔轴业务 liyongde 2024-07-17 18:38:11 +08:00
• ac4cdc79b2 rev：成品入库木箱高度类型 liuxy 2024-07-17 17:20:51 +08:00
• 88468a2f7d Merge remote-tracking branch 'origin/master_merge' into master_merge gongbaoxiong 2024-07-17 16:28:29 +08:00
• ed0563058b opt:优化装箱数为1的触发补空任务 gongbaoxiong 2024-07-17 16:28:17 +08:00
• ef0ccea9d6 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-17 16:08:41 +08:00
• 2a129305e5 fix: 下卷校验任务 liyongde 2024-07-17 16:08:33 +08:00
• 6df9321c30 Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge liuxy 2024-07-17 16:03:50 +08:00
• 18184c37df rev：木箱信息新增搜索框 liuxy 2024-07-17 16:03:34 +08:00
• 866ff0e5a2 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-17 16:02:55 +08:00
• eae9ea5e30 fix: 穿拔轴过滤同母卷套轴 liyongde 2024-07-17 16:02:36 +08:00
• 97fedaf121 opt:优化装箱数为1的触发补空任务 gongbaoxiong 2024-07-17 15:51:12 +08:00
• e58368070b opt:优化装箱数为1的触发补空任务 gongbaoxiong 2024-07-17 15:50:12 +08:00
• 660ef38039 add:增加载具下线桁架任务顺序校验 gongbaoxiong 2024-07-17 13:55:24 +08:00
• 2a159bd238 rev：二期移库 liuxy 2024-07-17 11:22:09 +08:00
• c69fcd40f5 add:增加取放货信息异常日志记录 gongbaoxiong 2024-07-17 10:30:22 +08:00
• 9e0e105785 opt:优化装箱区装箱空载具按空载具数量进行下发agv任务 gongbaoxiong 2024-07-17 09:35:47 +08:00
• 2ae67fc99e opt:优化装箱区装箱任务完成再送空载具 gongbaoxiong 2024-07-16 22:28:12 +08:00
• 419e821ffc opt:优化ACS频繁反馈任务状态校验 gongbaoxiong 2024-07-16 17:19:42 +08:00
• a0fd76de10 opt:优化管制区搬回合格品放置顺序 gongbaoxiong 2024-07-16 16:48:16 +08:00
• 9c798602ef opt:复称的子卷搬运待检区 gongbaoxiong 2024-07-16 16:24:43 +08:00
• b849ba5d32 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-16 15:53:24 +08:00
• d9ad4a476a add: 套轴区域选择、套轴计划为当天计划 liyongde 2024-07-16 15:53:03 +08:00
• 9a89e6e6a3 opt:补空载具优先到管制区 gongbaoxiong 2024-07-16 15:51:20 +08:00
• 3427f3210c opt:补空载具优先到管制区 gongbaoxiong 2024-07-16 15:49:53 +08:00
• 2ed32a6ab2 Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge liuxy 2024-07-16 15:26:19 +08:00
• 8081da6c11 rev：异常任务处理 liuxy 2024-07-16 15:26:03 +08:00
• 7a4899da4b add:增加任务完成起点库存校验 gongbaoxiong 2024-07-16 14:39:08 +08:00
• f9e4de4b6d Merge remote-tracking branch 'origin/master_merge' into master_merge gongbaoxiong 2024-07-16 14:16:36 +08:00
• 782defaee7 fix:修复临时管制点查询问题 gongbaoxiong 2024-07-16 14:16:28 +08:00
• 5773ed3b17 Merge branch 'b_lms' into master_merge liuxy 2024-07-16 13:16:00 +08:00
• eb3d6c428e rev：下发时给移库路由 liuxy 2024-07-16 13:14:38 +08:00
• 9938bf4237 opt:修改update方式只修改条件 gongbaoxiong 2024-07-16 13:09:15 +08:00
• 70a68acebc add: 分切子卷维护分切机手持 liyongde 2024-07-15 18:50:20 +08:00
• fbc75a982e add:增加复称和NG搬出与搬入卷临时管制点相关逻辑 gongbaoxiong 2024-07-15 18:40:41 +08:00
• f085095da5 opt: 线程池线程复用导致链路id相同 liyongde 2024-07-15 15:40:27 +08:00
• 3e3a129372 opt: 添加套拔轴业务的日志 liyongde 2024-07-15 14:25:45 +08:00
• 3ff0cfe226 opt:优化补空任务优先去待检区均衡分配 gongbaoxiong 2024-07-15 12:32:01 +08:00
• d3ec5053e7 fix:分切优化 zhouz 2024-07-15 12:30:19 +08:00
• c55b1afab9 opt:优化补空任务优先去待检区均衡分配 gongbaoxiong 2024-07-15 11:26:47 +08:00
• eeb4a8fdd8 Merge branch 'b_lms' into master_merge liuxy 2024-07-15 10:28:05 +08:00
• 12c36420fa rev：查询最小巷道倒序 liuxy 2024-07-15 10:26:19 +08:00
• 258428b276 Merge branch 'master' into master_merge liuxy 2024-07-15 09:52:19 +08:00
• 6f316d1960 fix:出库报表 liuxy 2024-07-15 09:51:41 +08:00
• 4f63db49e0 Merge branch 'master' into master_merge liuxy 2024-07-15 09:11:28 +08:00
• 46bd8c83ee fix:新-出库报表导出 liuxy 2024-07-15 09:09:27 +08:00
• e60a4a9794 fix:干燥剂模板 zhouz 2024-07-15 09:02:49 +08:00
• 31cff3e496 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-15 00:06:27 +08:00
• ec0278c4d9 opt: sql改进，考虑改切的分切计划 liyongde 2024-07-15 00:06:08 +08:00
• 487489e934 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-14 18:37:59 +08:00
• c916dad331 fix:干燥剂模板 zhouz 2024-07-14 18:37:39 +08:00
• 89dea12564 opt:增加已删除的子卷分切计划数据筛选 gongbaoxiong 2024-07-14 17:37:37 +08:00
• 484cfacee6 fix: 扫描码位生成指令优化、内包间优化、写信号优化、lucence注解 lishuai 2024-07-14 17:15:45 +08:00
• bd0177895e rev:烘箱工序优化 tuqiang 2024-07-14 16:52:33 +08:00
• 3b7e4e5b3b opt:增加桁架的取放货完成多次请求信号校验 gongbaoxiong 2024-07-14 15:54:43 +08:00
• 7788ee87a0 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-14 14:46:58 +08:00
• 6109cbc948 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-14 14:46:41 +08:00
• 22c7fac30e fix: 套轴校验执行中任务过滤空值 liyongde 2024-07-14 14:46:15 +08:00
• 98e0d4e69c opt:优化装箱最后一个子卷临时计数方式 gongbaoxiong 2024-07-14 14:45:55 +08:00
• 3ebe629301 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-14 13:00:15 +08:00
• 586f51f093 fix:一期生箔优化 zhouz 2024-07-14 13:00:01 +08:00
• 76ec78d5b9 Merge remote-tracking branch 'origin/master_merge' into master_merge gongbaoxiong 2024-07-14 10:48:01 +08:00
• ec353aa614 fix: 套轴完成查找相同点位错误，添加点位类型校验 liyongde 2024-07-14 10:48:06 +08:00
• b533348e65 opt:优化装箱最后一个子卷临时计数方式 gongbaoxiong 2024-07-14 10:47:49 +08:00
• 04981d794d Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-14 10:14:36 +08:00
• 1195317905 fix: 套轴完成查找相同点位错误，添加点位类型校验 liyongde 2024-07-14 10:14:13 +08:00
• 89dbc2218e opt:优化日志记录 gongbaoxiong 2024-07-14 09:03:01 +08:00
• de653e68a4 opt:优化装箱区——>待检区送空载具逻辑 gongbaoxiong 2024-07-14 08:34:57 +08:00
• dd39ac725a opt:优化装箱区——>待检区送空载具逻辑 gongbaoxiong 2024-07-13 23:57:07 +08:00
• 0ef454fa79 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-13 23:48:52 +08:00
• 67d1f7a5e4 fix:B1母卷上料优化 zhouz 2024-07-13 23:48:21 +08:00
• ab5f7a82eb rev:优化日志 tuqiang 2024-07-13 18:13:34 +08:00
• 1a1acb9cff fix: 手持绑定气胀轴点位维护错位 liyongde 2024-07-13 17:13:55 +08:00
• 0ec06b2937 fix:修改更新满轴库存 gongbaoxiong 2024-07-13 14:44:59 +08:00
• 2e67662a87 fix:B1母卷上料优化 zhouz 2024-07-13 13:23:12 +08:00
• 2759ce1560 fix: 自动呼叫套轴,改切计划找不到计划 liyongde 2024-07-13 13:09:55 +08:00
• 2c9b074efd fix:MES相关接口优化 zhouz 2024-07-13 11:40:16 +08:00
• 2e3bbf7bbb rev 更新设备同步默认最大线程数，按照PLC ip数配置线程数 USER-20220102CG\noblelift 2024-07-13 11:19:48 +08:00
• b43a390a6f rev 优化线程相关 USER-20220102CG\noblelift 2024-07-13 08:35:29 +08:00
• 3ea3481c33 fix:MES相关接口优化 zhouz 2024-07-13 08:30:55 +08:00
• c75148580a feat: 套轴优化，新增手持气胀轴维护 liyongde 2024-07-12 23:46:02 +08:00