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

驱动修改

Browse Source
This commit is contained in:
周俊杰
2023-08-29 19:18:52 +08:00
parent 2ba1ee4540
commit 7c7aa7d9de
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -44,6 +44,7 @@ import org.nl.modules.system.service.impl.ParamServiceImpl;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.start.auto.run.NDCSocketConnectionAutoRun;
import javax.validation.constraints.NotBlank;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

6
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/ItemProtocol.java
View File

@@ -25,7 +25,7 @@ public class ItemProtocol {
public static String item_to_vehicle_code = "to_vehicle_code";
public static String item_to_vehicle_type = "to_vehicle_type";
public static String item_to_is_package = "to_is_package";
public static String item_to_is_weight = "to_is_weight";
public static String item_is_weight = "is_weight";
public static String item_material = "material";
public static String item_barcode = "barcode";
public static String item_to_target = "to_target";
@@ -59,7 +59,7 @@ public class ItemProtocol {
public int getTask() { return this.getOpcIntegerValue(item_task); }
public int getWeight() { return this.getOpcIntegerValue(item_to_is_weight);}
public int getWeight() { return this.getOpcIntegerValue(item_is_weight);}
public int getMove() {
return this.getOpcIntegerValue(item_move);
@@ -134,7 +134,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_ioaction, "进出信号", "DB51.B4"));
list.add(new ItemDto(item_error, "报警信号", "DB51.B5"));
list.add(new ItemDto(item_task, "任务号", "DB51.D6"));
list.add(new ItemDto(item_to_is_weight, "重量", "DB51.D10"));
list.add(new ItemDto(item_is_weight, "重量", "DB51.D10"));
list.add(new ItemDto(item_material, "物料", "DB51.STRING14.50"));
list.add(new ItemDto(item_barcode, "条码", "DB51.W66"));
return list;

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefination.java
View File

@@ -64,7 +64,7 @@ public class LnshPackageSiteDefination implements OpcDeviceDriverDefination {
list.add(new ItemDto(ItemProtocol.item_ioaction, "进出信号", "DB51.B4"));
list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB51.B5"));
list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB51.B6"));
list.add(new ItemDto(ItemProtocol.item_to_is_weight, "重量", "DB51.B10"));
list.add(new ItemDto(ItemProtocol.item_is_weight, "重量", "DB51.B10"));
list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB51.STRING14.50"));
list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB51.B66"));
return list;