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

更新

Browse Source
This commit is contained in:
loujf
2022-09-05 11:10:21 +08:00
parent 65924cf795
commit 03b0d4ab50
18 changed files with 73 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java
View File

@@ -460,7 +460,7 @@ public class MagicAgvServiceImpl implements MagicAgvService {
}
} else if ("NOP".equals(action)) {
//调用LMS接口
if(StrUtil.isNotEmpty(lnshStationDeviceDriver.getBarcode())){
if(lnshStationDeviceDriver.getBarcode() != 0){
JSONObject json = new JSONObject();
json.put("device_code",address);
json.put("type","5");
@@ -495,7 +495,7 @@ public class MagicAgvServiceImpl implements MagicAgvService {
}
} else if ("NOP".equals(action)) {
//调用LMS接口
if(StrUtil.isNotEmpty(lnshLaminatingMachineDeviceDriver.getBarcode())){
if(lnshLaminatingMachineDeviceDriver.getBarcode() != 0){
JSONObject json = new JSONObject();
json.put("device_code",address);
json.put("type","5");

12
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java
View File

@@ -54,8 +54,8 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_task);
}
public String getBarcode() {
return this.getOpcStringValue(item_barcode);
public int getBarcode() {
return this.getOpcIntegerValue(item_barcode);
}
public int getToCommand() {
@@ -70,8 +70,8 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_to_task);
}
public String getTo_barcode() {
return this.getOpcStringValue(item_to_barcode);
public int getTo_barcode() {
return this.getOpcIntegerValue(item_to_barcode);
}
//是否有货
@@ -112,7 +112,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_container_type, "托盘类型", "DB1.B3"));
list.add(new ItemDto(item_error, "报警信号", "DB1.B4"));
list.add(new ItemDto(item_task, "任务号", "DB1.D6"));
list.add(new ItemDto(item_barcode, "条码", "DB1.STRING10.50"));
list.add(new ItemDto(item_barcode, "条码", "DB1.W10"));
return list;
}
@@ -121,7 +121,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_to_command, "作业命令", "DB2.W0", Boolean.valueOf(true)));
list.add(new ItemDto(item_to_target, "目标站", "DB2.W2"));
list.add(new ItemDto(item_to_task, "任务号", "DB2.D4"));
list.add(new ItemDto(item_to_barcode, "条码", "DB2.STRING8.50"));
list.add(new ItemDto(item_to_barcode, "条码", "DB2.W8"));
return list;
}

2
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefination.java
View File

@@ -64,7 +64,7 @@ public class LnshLaminatingMachineDefination implements OpcDeviceDriverDefinatio
list.add(new ItemDto(ItemProtocol.item_container_type, "托盘类型", "DB1.B3"));
list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB1.B4"));
list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB1.D5"));
list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB1.STRING9.50"));
list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB1.W10"));
return list;
}

17
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java
View File

@@ -72,8 +72,8 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
int last_move = 0;
int last_task = 0;
int last_container_type = 0;
String barcode = "";
String last_barcode = "";
int barcode = 0;
int last_barcode = 0;
Boolean isonline = true;
int hasGoods = 0;
@@ -143,8 +143,8 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
logServer.deviceItemValue(this.device_code,"task",String.valueOf(task));
logServer.deviceExecuteLog(this.device_code,"","","信号task：" + last_task + "->" + task);
}
if (!StrUtil.equals(barcode,last_barcode)) {
logServer.deviceItemValue(this.device_code,"barcode",barcode);
if (barcode != last_barcode) {
logServer.deviceItemValue(this.device_code,"barcode",String.valueOf(barcode));
logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode);
}
if (container_type != last_container_type) {
@@ -185,25 +185,26 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
break;
case 4:
//申请入窑
if(move == 1 && !requireSucess && StrUtil.isNotEmpty(this.barcode)){
if(move == 1 && !requireSucess && barcode != 0){
applyIn();
}
break;
case 5:
//申请出窑
if (!requireSucess && this.move != 0 && StrUtil.isNotEmpty(this.barcode)) {
if (!requireSucess && this.move != 0 && barcode != 0) {
outKiln();
}
break;
case 6:
//入货架扫码
if (!requireSucess && this.move != 0 && StrUtil.isNotEmpty(this.barcode)) {
if (!requireSucess && this.move != 0 && barcode != 0) {
intoKiln();
}
break;
case 7:
//申请输送线RGV对接位入窑
if (!requireSucess && this.move == 0) {
// if (!requireSucess && this.move == 0) {
if (!requireSucess) {
putStorage();
}
break;

13
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java
View File

@@ -207,8 +207,8 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_putStation);
}
public String getBarcode() {
return this.getOpcStringValue(item_barcode);
public int getBarcode() {
return this.getOpcIntegerValue(item_barcode);
}
public String getMaterial() {
@@ -515,8 +515,8 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_to_material_type);
}
public int getTo_material_code() {
return this.getOpcIntegerValue(item_to_material_code);
public String getTo_material_code() {
return this.getOpcStringValue(item_to_material_code);
}
public String getTo_order_No() {
@@ -827,7 +827,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_error, "故障代码", "DB56.B3"));
list.add(new ItemDto(item_onoff_status, "开关机状态", "DB56.B4"));
list.add(new ItemDto(item_putStation, "当前码盘工位", "DB56.D6"));
list.add(new ItemDto(item_barcode, "当前码盘工位条码", "DB56.STRING10.50"));
list.add(new ItemDto(item_barcode, "当前码盘工位条码", "DB56.W10"));
list.add(new ItemDto(item_material, "码盘工位当前物料", "DB56.STRING266.50"));
list.add(new ItemDto(item_specifications, "规格", "DB56.STRING522.50"));
list.add(new ItemDto(item_batch, "批次", "DB56.D778"));
@@ -912,7 +912,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_to_material_qty, "托盘上数量", "DB57.W2"));
list.add(new ItemDto(item_to_allow_pallet_qty, "允许码垛数量", "DB57.W4"));
list.add(new ItemDto(item_to_material_type, "托盘类型", "DB57.D6"));
list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB57.D10"));
// list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB57.D10"));
list.add(new ItemDto(item_to_order_No, "工单号", "DB57.STRING14.50"));
list.add(new ItemDto(item_to_product_code, "产品编号", "DB57.W270"));
@@ -979,6 +979,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_to_container_getQty, "1#托盘抓取数", "DB57.W392"));
list.add(new ItemDto(item_to_getX_offset, "1#抓取X偏移", "DB57.W394"));
list.add(new ItemDto(item_to_getY_offset, "1#抓取Y偏移", "DB57.W396"));
list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB57.STRING652.50"));
return list;
}

2
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java
View File

@@ -63,7 +63,7 @@ public class LnshPackagePalletManipulatorDefination implements OpcDeviceDriverDe
list.add(new ItemDto(ItemProtocol.item_error, "故障代码", "DB56.B3"));
list.add(new ItemDto(ItemProtocol.item_onoff_status, "开关机状态", "DB56.B4"));
list.add(new ItemDto(ItemProtocol.item_putStation, "当前码盘工位", "DB56.D6"));
list.add(new ItemDto(ItemProtocol.item_barcode, "当前码盘工位条码", "DB56.STRING10.50"));
list.add(new ItemDto(ItemProtocol.item_barcode, "当前码盘工位条码", "DB56.W10"));
list.add(new ItemDto(ItemProtocol.item_material, "码盘工位当前物料", "DB56.STRING266.50"));
list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB56.STRING522.50"));
list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB56.D778"));

8
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java
View File

@@ -106,8 +106,8 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
int last_error_time = 0;
int put_station = 0;
int last_put_station = 0;
String barcode;
String last_barcode;
int barcode = 0;
int last_barcode = 0;
String material;
String last_material;
String order_No = "0";
@@ -372,8 +372,8 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time));
logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time);
}
if (!StrUtil.equals(barcode,last_barcode)) {
logServer.deviceItemValue(this.device_code,"barcode", barcode);
if (barcode != last_barcode) {
logServer.deviceItemValue(this.device_code,"barcode", String.valueOf(barcode));
logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode);
}
if (!StrUtil.equals(material,last_material)) {

15
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java
View File

@@ -91,8 +91,8 @@ public class ItemProtocol {
return this.getOpcStringValue(item_material);
}
public String getBarcode() {
return this.getOpcStringValue(item_barcode);
public int getBarcode() {
return this.getOpcIntegerValue(item_barcode);
}
public String getSpecifications() {
@@ -167,8 +167,8 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_to_material_type);
}
public int getTo_material_code() {
return this.getOpcIntegerValue(item_to_material_code);
public String getTo_material_code() {
return this.getOpcStringValue(item_to_material_code);
}
public String getTo_order_No() {
@@ -223,7 +223,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_batch, "批次", "DB112.D14"));
list.add(new ItemDto(item_specifications, "规格", "DB112.STRING18.50"));
list.add(new ItemDto(item_material, "物料", "DB112.STRING274.50"));
list.add(new ItemDto(item_barcode, "条码", "DB112.STRING530.50"));
list.add(new ItemDto(item_barcode, "条码", "DB112.W530"));
list.add(new ItemDto(item_AlongSide, "A长边", "DB112.W786"));
list.add(new ItemDto(item_BshortSide, "B短边", "DB112.W788"));
list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB112.W790"));
@@ -241,14 +241,15 @@ public class ItemProtocol {
list.add(new ItemDto(item_to_command, "作业命令", "DB113.W0", Boolean.valueOf(true)));
list.add(new ItemDto(item_to_target, "目标站", "DB113.W2"));
list.add(new ItemDto(item_to_task, "任务号", "DB113.D4"));
list.add(new ItemDto(item_to_barcode, "条码", "DB113.STRING8.50"));
list.add(new ItemDto(item_to_barcode, "条码", "DB113.W8"));
list.add(new ItemDto(item_to_error, "故障代码", "DB113.B264"));
list.add(new ItemDto(item_to_allow_pallet_qty, "允许码垛数量", "DB113.W266"));
list.add(new ItemDto(item_to_material_type, "托盘类型", "DB113.D268"));
list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB113.D272"));
// list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB113.D272"));
list.add(new ItemDto(item_to_order_qty, "下发工单数量", "DB113.D276"));
list.add(new ItemDto(item_to_product_code, "产品编号", "DB113.D280"));
list.add(new ItemDto(item_to_order_No, "工单号", "DB113.STRING284.50"));
list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB113.STRING540.50"));
return list;
}

2
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefination.java
View File

@@ -68,7 +68,7 @@ public class LnshPalletizingManipulatorSiteDefination implements OpcDeviceDriver
list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB112.D14"));
list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB112.STRING18.50"));
list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB112.STRING274.50"));
list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB112.STRING530.50"));
list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB112.W530"));
list.add(new ItemDto(ItemProtocol.item_AlongSide, "A长边", "DB112.W786"));
list.add(new ItemDto(ItemProtocol.item_BshortSide, "B短边", "DB112.W788"));
list.add(new ItemDto(ItemProtocol.item_Htrapezoidal, "H梯形高", "DB112.W790"));

8
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
View File

@@ -103,8 +103,8 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
int last_weight = 0;
String material;
String last_material;
String barcode;
String last_barcode;
int barcode = 0;
int last_barcode = 0;
String specifications = "";
String last_specifications = "";
int AlongSide = 0;
@@ -202,8 +202,8 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
logServer.deviceItemValue(this.device_code,"material", material);
logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material);
}
if (!StrUtil.equals(barcode,last_barcode)) {
logServer.deviceItemValue(this.device_code,"barcode", barcode);
if (barcode != last_barcode) {
logServer.deviceItemValue(this.device_code,"barcode", String.valueOf(barcode));
logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode);
}
if (!StrUtil.equals(specifications,last_specifications)) {

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

@@ -92,7 +92,7 @@ public class ItemProtocol {
public static String item_to_feedback = "to_feedback";
public static String item_to_error = "to_error";
public static String item_to_material = "to_material";
public static String item_to_material_code = "to_material_code";
public static String item_to_product_code = "to_product_code";
public static String item_to_AlongSide = "to_AlongSide";
@@ -470,7 +470,7 @@ public class ItemProtocol {
}
public String getTo_material() {
return this.getOpcStringValue(item_to_material);
return this.getOpcStringValue(item_to_material_code);
}
public int getToProduct_code() {
@@ -838,7 +838,7 @@ public class ItemProtocol {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB51.W0"));
list.add(new ItemDto(item_to_error, "故障代码", "DB51.W2"));
list.add(new ItemDto(item_to_material, "物料", "DB51.STRING4.50"));
list.add(new ItemDto(item_to_material_code, "物料", "DB51.STRING4.50"));
list.add(new ItemDto(item_to_product_code, "产品编号", "DB51.W260"));
list.add(new ItemDto(item_to_AlongSide, "A长边", "DB51.W262"));

8
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java
View File

@@ -76,8 +76,8 @@ public class ItemProtocol {
return this.getOpcStringValue(item_material);
}
public String getBarcode() {
return this.getOpcStringValue(item_barcode);
public int getBarcode() {
return this.getOpcIntegerValue(item_barcode);
}
public String getSpecifications() {
@@ -148,7 +148,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_batch, "批次", "DB4.D14"));
list.add(new ItemDto(item_specifications, "规格", "DB4.STRING18.50"));
list.add(new ItemDto(item_material, "物料", "DB4.STRING274.50"));
list.add(new ItemDto(item_barcode, "条码", "DB4.STRING530.50"));
list.add(new ItemDto(item_barcode, "条码", "DB4.W530"));
list.add(new ItemDto(item_container_type, "托盘类型", "DB4.B786"));
return list;
}
@@ -158,7 +158,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_to_command, "作业命令", "DB5.W0", Boolean.valueOf(true)));
list.add(new ItemDto(item_to_target, "目标站", "DB5.W2"));
list.add(new ItemDto(item_to_task, "任务号", "DB5.D4"));
list.add(new ItemDto(item_to_barcode, "条码", "DB5.STRING8.50"));
list.add(new ItemDto(item_to_barcode, "条码", "DB5.W8"));
return list;
}

2
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java
View File

@@ -68,7 +68,7 @@ public class LnshStationDefination implements OpcDeviceDriverDefination {
list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB4.D14"));
list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB4.STRING18.50"));
list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB4.STRING274.50"));
list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB4.STRING530.50"));
list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB4.W530"));
list.add(new ItemDto(ItemProtocol.item_container_type, "托盘类型", "DB4.B786"));
return list;
}

15
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
View File

@@ -104,8 +104,8 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
int last_weight = 0;
String material;
String last_material;
String barcode;
String last_barcode;
int barcode = 0;
int last_barcode = 0;
String specifications = "";
String last_specifications = "";
int container_type =0;
@@ -174,8 +174,8 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
logServer.deviceItemValue(this.device_code,"material", material);
logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material);
}
if (!StrUtil.equals(barcode,last_barcode)) {
logServer.deviceItemValue(this.device_code,"barcode", barcode);
if (barcode != last_barcode) {
logServer.deviceItemValue(this.device_code,"barcode", String.valueOf(barcode));
logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode);
}
if (!StrUtil.equals(specifications,last_specifications)) {
@@ -238,19 +238,19 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
break;
case 7:
//申请入窑输送任务
if (!requireSucess && this.move != 0 && StrUtil.isNotEmpty(this.barcode)) {
if (!requireSucess && this.move != 0 && barcode != 0) {
intoKiln();
}
break;
case 8:
//申请入窑
if(move == 1 && !requireSucess && StrUtil.isNotEmpty(this.barcode) && StrUtil.equals(this.getDevice().getExtraValue().get("apply_task").toString(),"true")){
if(move == 1 && !requireSucess && barcode != 0 && StrUtil.equals(this.getDevice().getExtraValue().get("apply_task").toString(),"true")){
applyIn();
}
break;
case 9:
//申请出窑
if (!requireSucess && this.move != 0 && StrUtil.isNotEmpty(this.barcode)) {
if (!requireSucess && this.move != 0 && barcode != 0) {
outKiln();
}
break;
@@ -731,6 +731,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
jo.put("barcode", this.getBarcode());
jo.put("specifications", this.getSpecifications());
jo.put("batch", this.getBatch());
jo.put("container_type", this.getContainer_type());
return jo;
}

13
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/ItemProtocol.java
View File

@@ -205,8 +205,8 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_getStation);
}
public String getBarcode() {
return this.getOpcStringValue(item_barcode);
public int getBarcode() {
return this.getOpcIntegerValue(item_barcode);
}
public String getMaterial() {
@@ -525,8 +525,8 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_to_material_type);
}
public int getTo_material_code() {
return this.getOpcIntegerValue(item_to_material_code);
public String getTo_material_code() {
return this.getOpcStringValue(item_to_material_code);
}
public String getTo_order_No() {
@@ -829,7 +829,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_onoff_status, "开关机状态", "DB62.B4"));
list.add(new ItemDto(item_putStation, "当前码盘工位", "DB62.D6"));
list.add(new ItemDto(item_getStation, "当前抓取工位", "DB62.D10"));
list.add(new ItemDto(item_barcode, "当前码盘工位条码", "DB62.S14"));
list.add(new ItemDto(item_barcode, "当前码盘工位条码", "DB62.W14"));
list.add(new ItemDto(item_material, "码盘工位当前物料", "DB62.S270"));
list.add(new ItemDto(item_specifications, "规格", "DB62.S526"));
list.add(new ItemDto(item_batch, "批次", "DB62.D782"));
@@ -915,7 +915,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_to_material_qty, "托盘上数量", "DB63.W4"));
list.add(new ItemDto(item_to_allow_pallet_qty, "允许码垛数量", "DB63.W6"));
list.add(new ItemDto(item_to_material_type, "托盘类型", "DB63.D8"));
list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB63.D12"));
// list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB63.D12"));
list.add(new ItemDto(item_to_order_No, "工单号", "DB63.S16"));
list.add(new ItemDto(item_to_product_code, "产品编号", "DB63.W272"));
@@ -982,6 +982,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_to_container_getQty, "1#托盘抓取数", "DB63.W394"));
list.add(new ItemDto(item_to_getX_offset, "1#抓取X偏移", "DB63.W396"));
list.add(new ItemDto(item_to_getY_offset, "1#抓取Y偏移", "DB63.W398"));
list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB63.STRING654.50"));
return list;
}

2
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDefination.java
View File

@@ -64,7 +64,7 @@ public class RljnPackagePalletSplitManipulatorDefination implements OpcDeviceDri
list.add(new ItemDto(ItemProtocol.item_onoff_status, "开关机状态", "DB62.B4"));
list.add(new ItemDto(ItemProtocol.item_putStation, "当前码盘工位", "DB62.D6"));
list.add(new ItemDto(ItemProtocol.item_getStation, "当前抓取工位", "DB62.D10"));
list.add(new ItemDto(ItemProtocol.item_barcode, "当前码盘工位条码", "DB62.S14"));
list.add(new ItemDto(ItemProtocol.item_barcode, "当前码盘工位条码", "DB62.W14"));
list.add(new ItemDto(ItemProtocol.item_material, "码盘工位当前物料", "DB62.S270"));
list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB62.S526"));
list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB62.D782"));

8
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java
View File

@@ -97,8 +97,8 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
int last_error_time = 0;
int put_station = 0;
int last_put_station = 0;
String barcode;
String last_barcode;
int barcode = 0;
int last_barcode = 0;
String material;
String last_material;
String order_No = "0";
@@ -389,8 +389,8 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time));
logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time);
}
if (!StrUtil.equals(barcode,last_barcode)) {
logServer.deviceItemValue(this.device_code,"barcode", barcode);
if (barcode != last_barcode) {
logServer.deviceItemValue(this.device_code,"barcode", String.valueOf(barcode));
logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode);
}
if (!StrUtil.equals(material,last_material)) {

4
acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue
View File

@@ -376,7 +376,7 @@ export default {
this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 5)
}
if (this.data1[val].code.indexOf('barcode') !== -1) {
this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 9) + '.50'
this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 9)
}
}
}
@@ -403,7 +403,7 @@ export default {
this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4)
}
if (this.data2[val].code.indexOf('to_barcode') !== -1) {
this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 8) + '.50'
this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 8)
}
}
}