Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 89fe7c4488 fix:退货口入库优化 zhouz 2024-07-04 15:31:01 +08:00
• 5083f4b85d Merge remote-tracking branch 'origin/master_merge' into master_merge gongbaoxiong 2024-07-04 14:33:22 +08:00
• 9ea855ce58 opt:修改线程影响的任务锁 gongbaoxiong 2024-07-04 14:33:12 +08:00
• 2df0a36d4e fix: 提前释放货位任务校验071 liyongde 2024-07-04 14:22:18 +08:00
• 2dcd2e1b22 opt: 操作/异常日志无法根据参数模糊查询 liyongde 2024-07-04 10:58:11 +08:00
• 7d6a2b0b88 opt: 穿拔轴调度添加任务，操作日志不在记录：获取未读的接收消息条数的相关记录 liyongde 2024-07-04 10:26:52 +08:00
• 54b9140e64 Merge remote-tracking branch 'origin/master' lishuai 2024-07-04 09:58:07 +08:00
• 260e796ac5 fix: 手动创建指令修改、日志添加 lishuai 2024-07-04 09:56:48 +08:00
• 0c32a3f635 opt:修改待检品立即下发搬运任务 gongbaoxiong 2024-07-04 09:01:47 +08:00
• d9f374983d fix:暂时取消MES子卷毛重推送 gongbaoxiong 2024-07-04 00:05:08 +08:00
• 3967634972 fix: 过滤分切计划 liyongde 2024-07-03 23:28:49 +08:00
• 63316e1f19 Merge remote-tracking branch 'origin/master_merge' into master_merge liyongde 2024-07-03 23:29:12 +08:00
• 7a6655360e fix: 过滤分切计划 liyongde 2024-07-03 23:28:49 +08:00
• 4ab8648dd2 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-03 23:02:45 +08:00
• b6548b25aa fix:分切计划上线临时修改方案 zhouz 2024-07-03 23:02:24 +08:00
• 0583524aa7 Merge remote-tracking branch 'origin/b_lms' into master_merge liyongde 2024-07-03 19:25:01 +08:00
• 6c606c5f80 fix: 过滤空直分切计划 liyongde 2024-07-03 19:24:13 +08:00
• c77a5f03e5 fix:增加任务校验 gongbaoxiong 2024-07-03 17:32:25 +08:00
• 053fac27f3 fix: agv系统显示修改 yanps 2024-07-03 17:11:02 +08:00
• 24678f2a47 合并 liuxy 2024-07-03 16:46:44 +08:00
• eaadc6b971 Merge commit '1f9ea990ecd9811e2002ef491e2fc57ae1848490' into master_merge liuxy 2024-07-03 16:43:57 +08:00
• 64dc664ad4 opt: 历史任务记录数据显示优化 yanps 2024-07-03 16:30:23 +08:00
• fb8bda8086 fix: 过滤B6分切计划 liyongde 2024-07-03 16:21:13 +08:00
• 9d8c85f192 opt：优化校验 liyongde 2024-07-03 16:07:05 +08:00
• 49e07e2b20 fix: 修改区域选择 liyongde 2024-07-03 14:28:47 +08:00
• b856cb00a8 opt：优化校验 liyongde 2024-07-03 16:07:05 +08:00
• 1f9ea990ec rev：sap推送改切计划根据仓库生成多个单据 liuxy 2024-07-03 16:01:24 +08:00
• 9b1280fa76 fix:去除校验 gongbaoxiong 2024-07-03 15:38:27 +08:00
• 14e00b4824 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-03 15:37:14 +08:00
• e8bccfced1 fix:发送数字孪生优化 zhouz 2024-07-03 15:36:33 +08:00
• b606e40f2c fix: 修改区域选择 liyongde 2024-07-03 14:28:47 +08:00
• 0ecbfb4678 Merge remote-tracking branch 'origin/b_lms' into master_merge liyongde 2024-07-03 13:26:32 +08:00
• 7a742a405d fix: 访问气胀轴库是否有轴 liyongde 2024-07-03 13:22:54 +08:00
• e8bab5acef Merge remote-tracking branch 'origin/b_lms' into master_merge liyongde 2024-07-03 13:15:11 +08:00
• 302d423d75 fix: return liyongde 2024-07-03 13:14:43 +08:00
• 13c454c758 Merge remote-tracking branch 'origin/b_lms' into master_merge liyongde 2024-07-03 13:09:51 +08:00
• 349d09d7c4 fix: 下发区域 liyongde 2024-07-03 13:09:08 +08:00
• acdca88bf5 Merge pull request 'b_lms_to_merge' (#6) from b_lms into master_merge 龚宝雄 2024-07-03 11:10:05 +08:00
• 465979349f fix:装箱区增加日志记录 gongbaoxiong 2024-07-03 11:05:26 +08:00
• 04d8f1e3d3 fix:装箱区增加日志记录 gongbaoxiong 2024-07-03 10:14:26 +08:00
• a70158b10d fix:修复装箱区子卷状态为合格品 gongbaoxiong 2024-07-03 09:45:17 +08:00
• dc5e96e117 fix:修复装箱位子卷状态为合格品，临时插入子卷信息重复校验 gongbaoxiong 2024-07-03 09:40:58 +08:00
• 2d53076a8f add:增加不对接MES包装关系逻辑 gongbaoxiong 2024-07-03 08:32:44 +08:00
• 0598067867 add:增加不对接MES包装关系逻辑 gongbaoxiong 2024-07-03 08:24:18 +08:00
• 416bbc4085 add:增加不对接MES包装关系逻辑 gongbaoxiong 2024-07-03 08:22:20 +08:00
• 85c6e2cf49 Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-07-03 07:47:38 +08:00
• 78703b146d fix:暂时去除锂电不允许表处的逻辑 zhouz 2024-07-03 07:47:12 +08:00
• 3ea9af5e29 Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-03 07:44:31 +08:00
• c9834e21f4 add:增加不对接MES包装关系逻辑 gongbaoxiong 2024-07-03 00:59:50 +08:00
• e442dbac71 Merge pull request 'b_lms_to_merge' (#5) from b_lms into master_merge 龚宝雄 2024-07-03 00:49:15 +08:00
• 9838e9da98 add:增加不对接MES包装关系逻辑 gongbaoxiong 2024-07-03 00:39:49 +08:00
• d02dea3fcc add:增加不对接MES包装关系逻辑 gongbaoxiong 2024-07-02 23:57:50 +08:00
• d4708ccc7a Merge remote-tracking branch 'origin/b_lms' into b_lms gongbaoxiong 2024-07-02 23:49:20 +08:00
• ecd477768a add:增加不对接MES包装关系逻辑 gongbaoxiong 2024-07-02 23:41:09 +08:00
• c1b47da9f0 add:增加不对接MES包装关系逻辑 gongbaoxiong 2024-07-02 23:41:09 +08:00
• f846c48f32 fix:新增临时包装关系和空木箱入库逻辑优化 zhouz 2024-07-02 23:37:41 +08:00
• 2da22af59a Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-02 23:36:57 +08:00
• 5870a48fe4 Merge remote-tracking branch 'origin/b_lms' into master_merge liyongde 2024-07-02 22:45:29 +08:00
• 71f320e158 Merge remote-tracking branch 'origin/b_lms' into b_lms liyongde 2024-07-02 22:44:23 +08:00
• 74decb66f7 fix: pc可修改分切计划信息-前端 liyongde 2024-07-02 22:44:13 +08:00
• f606c6a16a fix: pc可修改分切计划信息 liyongde 2024-07-02 22:43:33 +08:00
• 2bf7146c87 rev:优化agv下发方法 tuqiang 2024-07-02 20:38:23 +08:00
• 4fb3552444 Merge remote-tracking branch 'origin/master' lishuai 2024-07-02 19:38:30 +08:00
• 72b6c48a55 fix: 行架action变成5修改，扫码位终点为货位修改 lishuai 2024-07-02 19:38:09 +08:00
• f9fc6e8a50 opt: 仙工驱动监控页面实现国际化,NDC反馈行架还原 yanps 2024-07-02 17:24:26 +08:00
• c3a8cd70bd add:增加子卷规格校验 gongbaoxiong 2024-07-02 17:13:27 +08:00
• 3faf1b65c1 add:增加装箱区库存页面 gongbaoxiong 2024-07-02 16:30:19 +08:00
• 8add85dd71 Merge branch 'refs/heads/b_lms' into master_merge zhouz 2024-07-02 16:27:15 +08:00
• 7824298f1a fix:MES相关接口优化 zhouz 2024-07-02 16:26:30 +08:00
• 6a2a26e3c4 Merge remote-tracking branch 'origin/b_lms' into b_lms liyongde 2024-07-02 15:48:09 +08:00
• 03a94a7179 fix: 呼叫气胀轴查询acs，气胀轴库没货则生成任务 liyongde 2024-07-02 15:37:10 +08:00
• 2de875acd0 rev：增加捆扎相关校验 liuxy 2024-07-02 14:03:20 +08:00
• c8c1335329 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms liuxy 2024-07-02 14:02:32 +08:00
• 90572dc622 rev：增加捆扎相关校验 liuxy 2024-07-02 14:02:15 +08:00
• f10d468c21 opt:优化子卷按子卷规格排序 gongbaoxiong 2024-07-02 14:00:34 +08:00
• 2f6cbfd9c1 rev： 立库堆垛机相关任务下发时 给托盘号 liuxy 2024-07-02 13:29:00 +08:00
• 5826a97da2 Merge remote-tracking branch 'origin/b_lms' into b_lms gongbaoxiong 2024-07-02 13:12:51 +08:00
• 1a72a6cb78 opt:优化一楼装箱区任务类相关校验 gongbaoxiong 2024-07-02 13:12:34 +08:00
• d795315fe1 opt: 仙工机器人信息设备监控显示优化 yanps 2024-07-02 11:21:13 +08:00
• 216cd5540f rev:优化自动门写方法 tuqiang 2024-07-02 09:59:19 +08:00
• 818b88f70b fix: 日志修改 lishuai 2024-07-02 09:34:44 +08:00
• a84a6544f9 fix: 手持菜单区分与清除暂存修改 liyongde 2024-07-02 09:27:01 +08:00
• 1cf2e6305d fix: 删除子卷包装关系，异常包裹 liyongde 2024-07-01 22:00:58 +08:00
• 58f243053a Merge remote-tracking branch 'origin/b_lms' into master_merge liyongde 2024-07-01 17:35:47 +08:00
• 5871c91af5 fix: 套轴过滤一期分切计划 liyongde 2024-07-01 17:34:31 +08:00
• 04ecf56d51 Merge remote-tracking branch 'origin/b_lms' into master_merge liyongde 2024-07-01 16:48:17 +08:00
• b3227f1a8d Merge remote-tracking branch 'origin/master_merge' into master_merge zhouz 2024-07-01 16:45:18 +08:00
• 8ef3d51a8b feat: 分切拼接、区域注释 liyongde 2024-07-01 16:42:18 +08:00
• efafb265eb fix:MES相关接口优化 zhouz 2024-06-30 18:54:13 +08:00
• 7f201dba96 rev：代码合并 liuxy 2024-07-01 15:13:51 +08:00
• 69b58c9d06 Merge branch 'master' into master_merge liuxy 2024-07-01 15:13:07 +08:00
• e9f415d8cf rev：改切入库回传 liuxy 2024-07-01 15:10:58 +08:00
• a546856fda fix: 气胀轴代数校验位置改为分切计划表2 liyongde 2024-07-01 09:38:40 +08:00
• b00a5a23ef fix: 气胀轴代数校验位置改为分切计划表 liyongde 2024-07-01 09:28:02 +08:00
• 4c07bdbfca Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge liuxy 2024-07-01 13:58:54 +08:00
• ea5bfbf40e rev：捆扎相关修改 liuxy 2024-07-01 13:53:48 +08:00
• 3290cc8ff9 opt: 烘箱区域反馈行架调整,还原agv偏移功能 yanps 2024-07-01 09:51:23 +08:00
• a6536eb7ad fix: 气胀轴代数校验位置改为分切计划表2 liyongde 2024-07-01 09:38:40 +08:00
• c0d837711e fix: 气胀轴代数校验位置改为分切计划表 liyongde 2024-07-01 09:28:02 +08:00
• 729afce407 fix:WQL数据新增，入烘箱优化 zhouz 2024-06-30 18:54:13 +08:00