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

fix: 舞台编辑不显示问题修复

Browse Source
This commit is contained in:
LENOVO
2024-04-01 15:09:34 +08:00
parent 60d26e40bc
commit 5ce79d36fd
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
View File

@@ -140,6 +140,10 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
String material_barcode = null; String material_barcode = null;
String last_material_barcode = null; String last_material_barcode = null;
String hand_barcode = null;
String hand_material_barcode = null;
//数量 //数量
int qty = 0; int qty = 0;
int last_qty = 0; int last_qty = 0;
@@ -685,6 +689,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
jo.put("device_name", this.getDevice().getDevice_name()); jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode); jo.put("mode", mode);
jo.put("hand_barcode", hand_barcode);
jo.put("move", move); jo.put("move", move);
jo.put("action", action); jo.put("action", action);
jo.put("task", task); jo.put("task", task);
@@ -695,7 +700,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", LangProcess.msg(feedMessage)); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "conveyor_with_scanner_weight");
jo.put("is_click", true); jo.put("is_click", true);
return jo; return jo;
} }
@@ -708,6 +713,10 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
} else if (StrUtil.equals(requestSucess, "1")) { } else if (StrUtil.equals(requestSucess, "1")) {
this.requireSucess = true; this.requireSucess = true;
} }
String hand_barcode = data.getString("hand_barcode");
this.setHand_barcode(hand_barcode);
String hand_material_barcode = data.getString("hand_material_barcode");
this.setHand_material_barcode(hand_material_barcode);
} }
@Override @Override

3
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java
View File

@@ -149,6 +149,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
List<String> putDeviceCodeList = null; List<String> putDeviceCodeList = null;
@Override @Override
public Device getDevice() { public Device getDevice() {
return this.device; return this.device;
@@ -605,7 +606,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", LangProcess.msg(feedMessage)); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "box_package_manipulator");
jo.put("is_click", true); jo.put("is_click", true);
jo.put("x", x); jo.put("x", x);
jo.put("y", y); jo.put("y", y);

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java
View File

@@ -561,7 +561,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", LangProcess.msg(feedMessage)); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "box_storage_manipulator");
jo.put("is_click", true); jo.put("is_click", true);
return jo; return jo;
} }