 yejian
|
5839016fb7
Merge remote-tracking branch 'origin/master' into master
|
3 anni fa |
|
yejian
|
cd1dceae1f
刀具同步问题修改
|
3 anni fa |
 oyq28
|
5351875c06
异常处理后端代码处理
|
3 anni fa |
 姚云青
|
c0b1784566
Merge remote-tracking branch 'origin/master' into master
|
3 anni fa |
|
姚云青
|
fcec5ee7f3
三坐标检测不合格后，跳转到上下料站
|
3 anni fa |
|
yejian
|
a603ff7a67
刀具管理模拟接口加入联调，历史逻辑重构
|
3 anni fa |
|
oyq28
|
1267e98c63
更新抽检结果展示 、 节点扩展异常日志、 指令重发增加功能判断
|
3 anni fa |
|
yejian
|
45c994ec5d
重调度时如果有正在加工中的工序对应设备时间累加当作多设备调度选择的依据
|
3 anni fa |
|
姚云青
|
89acc1a697
临时注释掉
|
3 anni fa |
|
oyq28
|
3bf61081b5
同步修改抽检工序的工序ID问题
|
3 anni fa |
|
yejian
|
7b08e09563
重调度时如果有正在加工中的工序对应设备时间累加当作多设备调度选择的依据
|
3 anni fa |
|
oyq28
|
f6d89ea41e
修复抽检操作设备对象的bug
|
3 anni fa |
|
yejian
|
54b86fedd9
重调度时如果有正在加工中的工序对应设备时间累加当作多设备调度选择的依据
|
3 anni fa |
|
oyq28
|
7645f13675
修复抽检节点操作设备Bug
|
3 anni fa |
|
yejian
|
a64ba64abc
抽检时一个工序存在多次agv调度，agv动态位子判断逻辑修改，节点回调前先判断是否在排产，排产时等待排产完成继续执行
|
3 anni fa |
|
姚云青
|
c828344b3f
Merge remote-tracking branch 'origin/master' into master
|
3 anni fa |
|
姚云青
|
505596d0de
临时注释掉
|
3 anni fa |
|
yejian
|
a9521790be
删除重复代码
|
3 anni fa |
|
姚云青
|
5fa638fbc0
Merge remote-tracking branch 'origin/master' into master
|
3 anni fa |
|
姚云青
|
8b24c8628a
tasknode 添加procedureId 字段
|
3 anni fa |
|
yejian
|
30afe3b6f4
模式切换重调度时判断当前是否有正常进行的订单，没有的话不进行排产
|
3 anni fa |
|
姚云青
|
0de4494b92
一键排产的时候，如果是手动模式的话，则不推送
|
3 anni fa |
|
姚云青
|
7c06970f48
修改bug
|
3 anni fa |
|
姚云青
|
3acc20c344
临时注释掉
|
3 anni fa |
|
姚云青
|
f0a92b2da7
临时注释掉
|
3 anni fa |
|
姚云青
|
12c215a7bf
修改bug
|
3 anni fa |
|
姚云青
|
706d2bac5a
修改bug
|
3 anni fa |
|
姚云青
|
10173d7343
Merge remote-tracking branch 'origin/master' into master
|
3 anni fa |
|
姚云青
|
f1ae96a6a1
修改bug
|
3 anni fa |
|
yejian
|
71933a585f
反正重调度后更新了task表的resourceid后需要同步更新tasknode表
|
3 anni fa |
