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

rev:优化手持接口

Browse Source
This commit is contained in:
tuqiang
2024-04-03 15:47:12 +08:00
parent 4592e16ddf
commit bd633bbba2
3 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/ItemProtocol.java
View File

@@ -40,22 +40,28 @@ public class ItemProtocol {
//下发命令
public static String item_to_command = "to_command";
//纸管1规格
public static String item_to_material1 = "to_material1";
//纸管2规格
public static String item_to_material2 = "to_material2";
//纸管数量
public static String item_to_qty = "to_qty";
//气涨轴类型 标箔/锂电 1/2
//气涨轴类型
public static String item_to_qzz_type = "to_qzz_type";
//是否下发纸管号1
public static String item_to_volumn1 = "to_volumn1";
//纸管1尺寸
//套管纸管1规格
public static String item_to_material1 = "to_material1";
//套管纸管2规格
public static String item_to_material2 = "to_material2";
//套管纸管数量
public static String item_to_qty1 = "to_qty1";
//套管纸管1尺寸
public static String item_to_size1 = "to_size1";
//纸管2尺寸
//套管纸管2尺寸
public static String item_to_size2 = "to_size2";
//是否下发纸管号2
public static String item_to_volumn2 = "to_volumn2";
//拔轴纸管1规格
public static String item_to_material3 = "to_material1";
//拔轴纸管2规格
public static String item_to_material4 = "to_material2";
//套拔轴纸管数量
public static String item_to_qty2 = "to_qty2";
//拔轴纸管1尺寸
public static String item_to_size3 = "to_size1";
//拔轴纸管2尺寸
public static String item_to_size4 = "to_size2";
private PlugPullDeviceSiteDeviceDriver driver;
@@ -103,6 +109,10 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_to_command);
}
public int getTo_qzz_type() {
return this.getOpcIntegerValue(item_to_qzz_type);
}
public String getTo_material1() {
return this.getOpcStringValue(item_to_material1);
}
@@ -111,16 +121,8 @@ public class ItemProtocol {
return this.getOpcStringValue(item_to_material2);
}
public int getTo_qty() {
return this.getOpcIntegerValue(item_to_qty);
}
public int getTo_qzz_type() {
return this.getOpcIntegerValue(item_to_qzz_type);
}
public String getTo_volumn1() {
return this.getOpcStringValue(item_to_volumn1);
public int getTo_qty1() {
return this.getOpcIntegerValue(item_to_qty1);
}
public int getTo_size1() {
@@ -131,10 +133,27 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_to_size2);
}
public String getTo_volumn2() {
return this.getOpcStringValue(item_to_volumn1);
public String getTo_material3() {
return this.getOpcStringValue(item_to_material3);
}
public String getTo_material4() {
return this.getOpcStringValue(item_to_material4);
}
public int getTo_qty2() {
return this.getOpcIntegerValue(item_to_qty2);
}
public int getTo_size3() {
return this.getOpcIntegerValue(item_to_size3);
}
public int getTo_size4() {
return this.getOpcIntegerValue(item_to_size4);
}
Boolean isonline;
Boolean isError;
@@ -198,13 +217,16 @@ public class ItemProtocol {
public static List<ItemDto> getWriteableItemDtos() {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_to_command, "下发命令", "DB10.W0"));
list.add(new ItemDto(item_to_material1, "纸管1规格", "DB10.String602.60"));
list.add(new ItemDto(item_to_material2, "纸管2规格", "DB10.String656.60"));
list.add(new ItemDto(item_to_qty, "纸管数量", "DB10.W6"));
list.add(new ItemDto(item_to_material1, "套管纸管1规格", "DB10.String602.60"));
list.add(new ItemDto(item_to_material2, "套管纸管2规格", "DB10.String656.60"));
list.add(new ItemDto(item_to_qty1, "套管纸管数量", "DB10.W6"));
list.add(new ItemDto(item_to_qzz_type, "气胀轴类型", "DB10.W8"));
list.add(new ItemDto(item_to_volumn1, "下发纸管号1", "DB10.String610.60"));
list.add(new ItemDto(item_to_volumn2, "下发纸管号2", "DB10.String612.60"));
list.add(new ItemDto(item_to_size1, "下发纸管1尺寸", "DB10.W10"));
list.add(new ItemDto(item_to_size1, "套管纸管1尺寸", "DB10.W10"));
list.add(new ItemDto(item_to_size2, "套管纸管2尺寸", "DB10.W12"));
list.add(new ItemDto(item_to_material1, "拔轴纸管1规格", "DB10.String602.60"));
list.add(new ItemDto(item_to_material2, "拔轴纸管2规格", "DB10.String656.60"));
list.add(new ItemDto(item_to_qty2, "拔轴纸管数量", "DB10.W6"));
list.add(new ItemDto(item_to_size1, "拔轴纸管1尺寸", "DB10.W10"));
list.add(new ItemDto(item_to_size2, "下发纸管2尺寸", "DB10.W12"));
return list;
}

16
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java
View File

@@ -124,8 +124,12 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl
String toMaterial2 = null;
String lastToMaterial2 = null;
int toQty = 0;
int lastToQty = 0;
int toQty1 = 0;
int lastToQty1 = 0;
int toQty2 = 0;
int lastToQty2 = 0;
int toQzzType = 0;
int lastToQzzType = 0;
@@ -183,10 +187,9 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl
toCommand = this.itemProtocol.getTo_command();
toMaterial1 = this.itemProtocol.getTo_material1();
toMaterial2 = this.itemProtocol.getTo_material2();
toQty = this.itemProtocol.getTo_qty();
toQty1 = this.itemProtocol.getTo_qty1();
toQty2 = this.itemProtocol.getTo_qty2();
toQzzType = this.itemProtocol.getTo_qzz_type();
toVolumn1 = this.itemProtocol.getTo_volumn1();
toVolumn2 = this.itemProtocol.getTo_volumn2();
toSize1 = this.itemProtocol.getTo_size1();
toSize2 = this.itemProtocol.getTo_size2();
@@ -268,7 +271,8 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl
lastToCommand = toCommand;
lastToMaterial1 = toMaterial1;
lastToMaterial2 = toMaterial2;
lastToQty = toQty;
lastToQty1 = toQty1;
lastToQty2 = toQty2;
lastToQzzType = toQzzType;
lastToVolumn2 = toVolumn2;
lastToVolumn1 = toVolumn1;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java
View File

@@ -167,7 +167,7 @@ public class HandServiceImpl implements HandService {
JSONObject jo = new JSONObject();
Dict dict = list.get(i);
String region_id = dict.getDict_id();
String region_code = dict.getCode();
String region_code = dict.getValue();
String region_name = dict.getName();
jo.put("region_id", region_id);
jo.put("region_code", region_code);