diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java index 6de1912..e3eb1fc 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java @@ -103,7 +103,7 @@ public enum DriverTypeEnum { LNSH_SPLIT_MANIPULATOR(47, "lnsh_split_manipulator", "晟华-拆垛机械手", "station"), - LNSH_RGV(48, "lnsh_rgv", "晟华-RGV", "station"), + LNSH_RGV(48, "lnsh_rgv", "晟华-RGV", "rgv"), LNSH_PACKAGE_LINE(49, "lnsh_package_line", "晟华-包装机", "station"), diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index dfaaeb7..4008e9b 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -1190,7 +1190,19 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial extraObj.put(json.getString("extra_code"), json.get("extra_value")); } } - + extraObj.put("address", dto.getAddress()); + JSONArray get_device_code = extraObj.getJSONArray("get_device_code"); + JSONArray load_device_code = extraObj.getJSONArray("load_device_code"); + JSONArray put_device_code = extraObj.getJSONArray("put_device_code"); + if (ObjectUtil.isNotEmpty(get_device_code)) { + extraObj.put("get_device_code",get_device_code); + } + if (ObjectUtil.isNotEmpty(load_device_code)) { + extraObj.put("load_device_code",load_device_code); + } + if (ObjectUtil.isNotEmpty(put_device_code)) { + extraObj.put("put_device_code",put_device_code); + } extraObj.put("address", dto.getAddress()); result.put("form", extraObj); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java index 01cd90e..3dbef25 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java @@ -2,8 +2,10 @@ package org.nl.acs.device_driver.lnsh.lnsh_mixing_mill; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; @@ -275,17 +277,20 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen } else { this.instruction_require_time = date; HttpResponse result = acsToWmsService.enterOrder(json); - if (result.getStatus() == 200) { - this.writing(this.mode); - ProduceshiftorderDto dto = produceshiftorderService.findByCode(String.valueOf(order_No)); - if (this.mode == 4) { - dto.setOrder_status("2"); - } else if (this.mode == 3){ - dto.setOrder_status("0"); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSON.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + ProduceshiftorderDto dto = produceshiftorderService.findByCode(String.valueOf(order_No)); + if (this.mode == 4) { + dto.setOrder_status("2"); + } else if (this.mode == 3) { + dto.setOrder_status("0"); + } + produceshiftorderService.update(dto); } - produceshiftorderService.update(dto); } - requireSucess = true; + this.setRequireSucess(true); return true; } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java index 01cd82f..1b9544c 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java @@ -2,6 +2,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_package_pallet_manipulator; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; @@ -775,13 +776,17 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD } else { this.instruction_require_time = date; HttpResponse result = acsToWmsService.enterOrder(json); - if (result.getStatus() == 200) { - this.writing(this.mode); - ProduceshiftorderDto dto = produceshiftorderService.findByCode(String.valueOf(order_No)); - dto.setOrder_status("0"); - produceshiftorderService.update(dto); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + ProduceshiftorderDto dto = produceshiftorderService.findByCode(String.valueOf(order_No)); + dto.setOrder_status("0"); + produceshiftorderService.update(dto); + } } - requireSucess = true; + + this.setRequireSucess(true); return true; } } @@ -1011,10 +1016,13 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD json.put("tool_coordinate",tool_coordinate); HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); - if (result.getStatus() == 200) { - this.writing(this.mode); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + } } - requireSucess = true; + this.setRequireSucess(true); return true; } } @@ -1096,10 +1104,13 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD json.put("tool_coordinate",tool_coordinate); HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); - if (result.getStatus() == 200) { - this.writing(this.mode); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + } } - requireSucess = true; + this.setRequireSucess(true); return true; } } @@ -1122,11 +1133,13 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD json.put("qty",qty); json.put("vehicle_code",barcode); HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); - if (result.getStatus() == 200) { - this.writing(this.mode); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + } } - - requireSucess = true; + this.setRequireSucess(true); return true; } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java index ed200ac..9e23962 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java @@ -2,6 +2,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; @@ -292,10 +293,13 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri json.put("qty",encoder_qty); json.put("is_full","1"); HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); - if (result.getStatus() == 200) { - this.writing(this.mode); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + } } - requireSucess = true; + this.setRequireSucess(true); return true; } } @@ -343,11 +347,13 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri json.put("type","4"); json.put("qty",encoder_qty); HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); - if (result.getStatus() == 200) { - this.writing(this.mode); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + } } - - requireSucess = true; + this.setRequireSucess(true); return true; } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java index 7cd6286..cae5d96 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java @@ -2,6 +2,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_split_manipulator; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; @@ -336,10 +337,13 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im json.put("is_full","1"); HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); - if (result.getStatus() == 200) { - this.writing(this.mode); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + } } - requireSucess = true; + this.setRequireSucess(true); return true; } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java index 38a0a93..617b0e6 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java @@ -26,6 +26,7 @@ public class ItemProtocol { public static String item_barcode = "barcode"; public static String item_specifications = "specifications"; public static String item_batch = "batch"; + public static String item_container_type = "container_type"; public static String item_to_command = "to_command"; public static String item_to_target = "to_target"; @@ -89,6 +90,10 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_batch); } + public int getContainer_type() { + return this.getOpcIntegerValue(item_container_type); + } + public int getToCommand() { return this.getOpcIntegerValue(item_to_command); } @@ -143,9 +148,10 @@ public class ItemProtocol { list.add(new ItemDto(item_task, "任务号", "DB4.D6")); list.add(new ItemDto(item_weight, "重量", "DB4.D10")); list.add(new ItemDto(item_batch, "批次", "DB4.D14")); - list.add(new ItemDto(item_material, "物料", "DB4.S18")); - list.add(new ItemDto(item_barcode, "条码", "DB4.S274")); - list.add(new ItemDto(item_specifications, "规格", "DB4.S530")); + list.add(new ItemDto(item_specifications, "规格", "DB4.S18")); + list.add(new ItemDto(item_material, "物料", "DB4.S274")); + list.add(new ItemDto(item_barcode, "条码", "DB4.S530")); + list.add(new ItemDto(item_container_type, "托盘类型", "DB4.B786")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java index 8d1aa4f..0283f06 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java @@ -66,9 +66,10 @@ public class LnshStationDefination implements OpcDeviceDriverDefination { list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB4.D6")); list.add(new ItemDto(ItemProtocol.item_weight, "重量", "DB4.D10")); list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB4.D14")); - list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB4.S18")); - list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB4.S274")); - list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB4.S530")); + list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB4.S18")); + list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB4.S274")); + list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB4.S530")); + list.add(new ItemDto(ItemProtocol.item_container_type, "托盘类型", "DB4.S786")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java index 878979a..5c63b84 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java @@ -2,6 +2,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_station; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONArray; @@ -276,11 +277,13 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements json.put("vehicle_code",barcode); json.put("is_full","0"); HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); - if (result.getStatus() == 200) { - this.writing(this.mode); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + } } - - requireSucess = true; + this.setRequireSucess(true); return true; } } @@ -304,11 +307,13 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements json.put("vehicle_code",barcode); json.put("is_full","0"); HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); - if (result.getStatus() == 200) { - this.writing(this.mode); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + } } - - requireSucess = true; + this.setRequireSucess(true); return true; } } @@ -328,15 +333,17 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements JSONObject json = new JSONObject(); json.put("device_code",this.device_code); json.put("type","1"); - json.put("qty",weight); + json.put("material",material); json.put("vehicle_code",barcode); json.put("is_full","1"); HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); - if (result.getStatus() == 200) { - this.writing(this.mode); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + } } - - requireSucess = true; + this.setRequireSucess(true); return true; } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java index 07443de..b41d0e3 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java @@ -1,5 +1,6 @@ package org.nl.acs.device_driver.lnsh.rljn_package_palletSplit_manipulator; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; @@ -813,13 +814,17 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe } else { this.instruction_require_time = date; HttpResponse result = acsToWmsService.enterOrder(json); - if (result.getStatus() == 200) { - this.writing(this.mode); - ProduceshiftorderDto dto = produceshiftorderService.findByCode(String.valueOf(order_No)); - dto.setOrder_status("0"); - produceshiftorderService.update(dto); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + ProduceshiftorderDto dto = produceshiftorderService.findByCode(String.valueOf(order_No)); + dto.setOrder_status("0"); + produceshiftorderService.update(dto); + } } - requireSucess = true; + + this.setRequireSucess(true); return true; } } @@ -967,7 +972,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe this.writing("to_tool_coordinate",tool_coordinate); } - requireSucess = true; + this.setRequireSucess(true); return true; } } @@ -1049,10 +1054,13 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe json.put("tool_coordinate",tool_coordinate); HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); - if (result.getStatus() == 200) { - this.writing(this.mode); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + } } - requireSucess = true; + this.setRequireSucess(true); return true; } } @@ -1134,10 +1142,13 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe json.put("tool_coordinate",tool_coordinate); HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); - if (result.getStatus() == 200) { - this.writing(this.mode); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + } } - requireSucess = true; + this.setRequireSucess(true); return true; } } @@ -1160,11 +1171,13 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe json.put("qty",qty); json.put("vehicle_code",barcode); HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); - if (result.getStatus() == 200) { - this.writing(this.mode); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + this.writing(this.mode); + } } - - requireSucess = true; + this.setRequireSucess(true); return true; } } diff --git a/acs/qd/src/views/acs/device/config.vue b/acs/qd/src/views/acs/device/config.vue index 20334a9..3875883 100644 --- a/acs/qd/src/views/acs/device/config.vue +++ b/acs/qd/src/views/acs/device/config.vue @@ -119,6 +119,7 @@ import lnsh_station from '@/views/acs/device/driver/lnsh/lnsh_station' import lnsh_Laminating_machine from '@/views/acs/device/driver/lnsh/lnsh_Laminating_machine' import lnsh_package_site from '@/views/acs/device/driver/lnsh/lnsh_package_site' import rljn_package_palletSplit_manipulator from '@/views/acs/device/driver/lnsh/rljn_package_palletSplit_manipulator' +import standard_rgv from '@/views/acs/device/driver/standard_rgv' export default { name: 'DeviceConfig', @@ -130,7 +131,7 @@ export default { standard_photoelectric_inspect_site, ndxy_special, hailiang_labeling, ndxy_special_two, whxr_storage_conveyor, whxr_ball_mill, whxr_spary_tower, whxr_weight, electric_fence, lnsh_mixing_mill, lnsh_press, lnsh_palletizing_manipulator, lnsh_fold_disc_site, lnsh_kiln_lane, lnsh_kiln_truss, lnsh_package_line, lnsh_out_kiln_truss, lnsh_package_pallet_manipulator, lnsh_pallet_storage, lnsh_labeling_machine, lnsh_split_manipulator, lnsh_rgv, - lnsh_station, lnsh_Laminating_machine, lnsh_package_site, rljn_package_palletSplit_manipulator }, + lnsh_station, lnsh_Laminating_machine, lnsh_package_site, rljn_package_palletSplit_manipulator, standard_rgv }, dicts: ['device_type'], mixins: [crud], data() { diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue index e343a8e..9027028 100644 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue +++ b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue @@ -372,7 +372,7 @@ export default { this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4) } if (this.data1[val].code.indexOf('barcode') !== -1) { - this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 8) + this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 5) } } } @@ -399,7 +399,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 + '.' + 'D' + (parseInt(endNumber) + 8) + this.data2[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 8) } } } diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue index 824ee97..a2684b4 100644 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue +++ b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue @@ -55,6 +55,51 @@ + + + + + + + + + + + + + + + + + @@ -281,6 +326,9 @@ export default { plc_code: '', opc_id: '', opc_code: '', + get_device_code: '', + load_device_code: '', + put_device_code: '', configLoading: false, dataOpcservers: [], dataOpcPlcs: [], diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue index 3625ff2..1898eb2 100644 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue +++ b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue @@ -342,11 +342,20 @@ export default { if (this.data1[val].code.indexOf('weight') !== -1) { this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 9) } + if (this.data1[val].code.indexOf('batch') !== -1) { + this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 13) + } + if (this.data1[val].code.indexOf('specifications') !== -1) { + this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 17) + } if (this.data1[val].code.indexOf('material') !== -1) { - this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 13) + this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 273) } if (this.data1[val].code.indexOf('barcode') !== -1) { - this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 269) + this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 529) + } + if (this.data1[val].code.indexOf('container_type') !== -1) { + this.data1[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 785) } } } @@ -372,6 +381,9 @@ export default { if (this.data2[val].code.indexOf('to_task') !== -1) { this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4) } + if (this.data2[val].code.indexOf('to_barcode') !== -1) { + this.data2[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 8) + } } } }, diff --git a/acs/qd/src/views/acs/device/driver/standard_rgv.vue b/acs/qd/src/views/acs/device/driver/standard_rgv.vue new file mode 100644 index 0000000..10839ab --- /dev/null +++ b/acs/qd/src/views/acs/device/driver/standard_rgv.vue @@ -0,0 +1,538 @@ + + + + +