fix
This commit is contained in:
@@ -21,7 +21,6 @@ public class ItemProtocol {
|
|||||||
public static String item_to_target = "to_target";
|
public static String item_to_target = "to_target";
|
||||||
public static String item_to_task = "to_task";
|
public static String item_to_task = "to_task";
|
||||||
public static String item_weight = "weight";
|
public static String item_weight = "weight";
|
||||||
public static String item_number = "number";
|
|
||||||
|
|
||||||
private StandardInspectSiteDeviceDriver driver;
|
private StandardInspectSiteDeviceDriver driver;
|
||||||
|
|
||||||
@@ -53,10 +52,6 @@ public class ItemProtocol {
|
|||||||
return this.getOpcIntegerValue(item_task);
|
return this.getOpcIntegerValue(item_task);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getNumber() {
|
|
||||||
return this.getOpcIntegerValue(item_number);
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getToCommand() {
|
public int getToCommand() {
|
||||||
return this.getOpcIntegerValue(item_to_command);
|
return this.getOpcIntegerValue(item_to_command);
|
||||||
}
|
}
|
||||||
@@ -96,7 +91,6 @@ public class ItemProtocol {
|
|||||||
list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2"));
|
list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2"));
|
||||||
list.add(new ItemDto(item_error, "报警信号", "DB600.B6"));
|
list.add(new ItemDto(item_error, "报警信号", "DB600.B6"));
|
||||||
list.add(new ItemDto(item_task, "任务号", "DB600.D8"));
|
list.add(new ItemDto(item_task, "任务号", "DB600.D8"));
|
||||||
list.add(new ItemDto(item_number, "数量","DB600.D10"));
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -79,10 +79,6 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
|
|||||||
String message = null;
|
String message = null;
|
||||||
Boolean iserror = false;
|
Boolean iserror = false;
|
||||||
|
|
||||||
int number = 0;
|
|
||||||
int last_number = 0;
|
|
||||||
|
|
||||||
|
|
||||||
boolean hasVehicle = false;
|
boolean hasVehicle = false;
|
||||||
boolean isReady = false;
|
boolean isReady = false;
|
||||||
protected int instruction_num = 0;
|
protected int instruction_num = 0;
|
||||||
@@ -143,7 +139,6 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
|
|||||||
move = this.itemProtocol.getMove();
|
move = this.itemProtocol.getMove();
|
||||||
task = this.itemProtocol.getTask();
|
task = this.itemProtocol.getTask();
|
||||||
hasGoods = this.itemProtocol.getMove();
|
hasGoods = this.itemProtocol.getMove();
|
||||||
number = this.itemProtocol.getNumber();
|
|
||||||
|
|
||||||
if (move != last_move) {
|
if (move != last_move) {
|
||||||
this.requireSucess = false;
|
this.requireSucess = false;
|
||||||
@@ -192,7 +187,6 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
|
|||||||
last_error = error;
|
last_error = error;
|
||||||
last_move = move;
|
last_move = move;
|
||||||
last_task = task;
|
last_task = task;
|
||||||
last_number = number;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -95,6 +95,8 @@ import hongxiang_conveyor from '@/views/acs/device/driver/hongxiang_conveyor'
|
|||||||
import plug_pull_device_site from '@/views/acs/device/driver/plug_pull_device_site'
|
import plug_pull_device_site from '@/views/acs/device/driver/plug_pull_device_site'
|
||||||
import siemens_conveyor_labeling from '@/views/acs/device/driver/siemens_conveyor_labeling'
|
import siemens_conveyor_labeling from '@/views/acs/device/driver/siemens_conveyor_labeling'
|
||||||
import siemens_conveyor_ckk from '@/views/acs/device/driver/siemens_conveyor_ckk'
|
import siemens_conveyor_ckk from '@/views/acs/device/driver/siemens_conveyor_ckk'
|
||||||
|
import fold_disc_site from '@/views/acs/device/driver/fold_disc_site'
|
||||||
|
import standard_autodoor from '@/views/acs/device/driver/standard_autodoor'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'DeviceConfig',
|
name: 'DeviceConfig',
|
||||||
@@ -120,7 +122,9 @@ export default {
|
|||||||
slit_two_manipulator,
|
slit_two_manipulator,
|
||||||
plug_pull_device_site,
|
plug_pull_device_site,
|
||||||
siemens_conveyor_labeling,
|
siemens_conveyor_labeling,
|
||||||
siemens_conveyor_ckk
|
siemens_conveyor_ckk,
|
||||||
|
fold_disc_site,
|
||||||
|
standard_autodoor
|
||||||
},
|
},
|
||||||
dicts: ['device_type'],
|
dicts: ['device_type'],
|
||||||
mixins: [crud],
|
mixins: [crud],
|
||||||
|
|||||||
Reference in New Issue
Block a user