diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 524e35833..a5876d2cd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -883,6 +883,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme Device startDeviceError = deviceAppService.findDeviceByCode(startDeviceCode); if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.conveyor.name())) { pakagePLCData(list, startDeviceError.getExtraValue().get("x").toString(), startDeviceError.getExtraValue().get("z").toString(), startDeviceError.getExtraValue().get("y").toString(), "1", instructionErro.getInstruction_code()); + message = "one_message21"; requireSucess = true; return true; } @@ -895,6 +896,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme List list = new ArrayList(); if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.conveyor.name())) { pakagePLCData(list, instructionErro.getTo_x(), instructionErro.getTo_y(), instructionErro.getTo_z(), "2", instructionErro.getInstruction_code()); + message = "one_message22"; requireSucess = true; return true; } @@ -909,6 +911,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme List list = new ArrayList(); if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.storage.name())) { pakagePLCData(list, instructionErro.getFrom_x(), instructionErro.getFrom_y(), instructionErro.getFrom_z(), "1", instructionErro.getInstruction_code()); + message = "one_message23"; requireSucess = true; return true; } @@ -922,12 +925,14 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme List list = new ArrayList(); if (StrUtil.equals(nextDevice.getDevice_type(), DeviceType.conveyor.name())) { pakagePLCData(list, nextDevice.getExtraValue().get("x").toString(), nextDevice.getExtraValue().get("z").toString(), nextDevice.getExtraValue().get("y").toString(), "2", instructionErro.getInstruction_code()); + message = "one_message24"; requireSucess = true; return true; } //同排移库报警 if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.storage.name())) { pakagePLCData(list, nextDevice.getExtraValue().get("x").toString(), nextDevice.getExtraValue().get("z").toString(), nextDevice.getExtraValue().get("y").toString(), "2", instructionErro.getInstruction_code()); + message = "one_message23"; requireSucess = true; return true; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device.properties index 8eb4b8e22..139685dfb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device.properties @@ -17,6 +17,10 @@ one_message17=\u7533\u8BF7AGV\u642C\u8FD0\u4EFB\u52A1\u5931\u8D25 one_message18=\u672A\u627E\u5230\u66F4\u65B0\u7684\u70B9\u4F4D one_message19=\u4E0A\u4E00\u6761\u52A8\u4F5C\u4E0D\u662F\u53D6\u8D27\u4E2D\u6216\u8005\u53D6\u8D27\u5B8C\u6210\u62A5\u8B66 one_message20=\u4E0A\u4E00\u6761\u52A8\u4F5C\u4E0D\u662F\u653E\u8D27\u4E2D\u62A5\u8B66 +one_message21=\u5165\u5E93\u53D6\u8D27\u89E3\u8B66\u81EA\u52A8\u6267\u884C +one_message22=\u5165\u5E93\u653E\u8D27\u89E3\u8B66\u81EA\u52A8\u6267\u884C +one_message23=\u51FA\u5E93\u53D6\u8D27\u89E3\u8B66\u81EA\u52A8\u6267\u884C +one_message24=\u51FA\u5E93\u653E\u8D27\u89E3\u8B66\u81EA\u52A8\u6267\u884C one_mode1=\u7533\u8BF7\u5165\u5E93\u4EFB\u52A1 one_mode2=\u7533\u8BF7\u7A7A\u6258\u76D8\u5165\u5E93 one_mode3=\u7533\u8BF7AGV\u4EFB\u52A1 diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_en_US.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_en_US.properties index 73270fa50..a554e6d9a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_en_US.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_en_US.properties @@ -17,6 +17,10 @@ one_message17=Failed to apply for the AGV transfer task. Procedure one_message18=No updated point found one_message19=The previous action is not in the process of picking up or picking up the finished alarm one_message20=The last action was not an alarm during delivery +one_message21=Warehousing, picking up goods and alarm automatic execution +one_message22=Warehouse release alarm automatic execution +one_message23=Out of the warehouse to pick up goods and alarm automatic execution +one_message24=Warehouse release alarm automatic execution one_mode1=Request a warehouse entry task one_mode2=Request empty pallets for storage one_mode3=Request AGV diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_in_ID.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_in_ID.properties index 17ed9cb66..f332781e7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_in_ID.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_in_ID.properties @@ -17,6 +17,10 @@ one_message17=Aplikasi bantuan AGV pemindahan gagal one_message18=Titik pembaruan tidak ditemukan one_message19=Langkah terakhir bukan untuk mengambil barang atau menggunakannya untuk menyelesaikan alarm one_message20=Gerakan terakhir adalah tidak menempatkan alarm di kargo +one_message21=Lock-up pickup polisi berjalan otomatis +one_message22=Enhancer hancer akan melakukan otomatis +one_message23=Loading station b. P. D. Berjalan otomatis +one_message24=Penyimpanan barang dan pengiriman polis dilakukan secara otomatis one_mode1=Berlaku untuk tugas pustaka one_mode2=Pendaftaran nampan kosong one_mode3=Permintaan AGV diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_zh_CN.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_zh_CN.properties index 87d3b7bf1..f03787883 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_zh_CN.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_zh_CN.properties @@ -17,6 +17,10 @@ one_message17=\u7533\u8BF7\u8865\u7801AGV\u642C\u8FD0\u4EFB\u52A1\u5931\u8D25 one_message18=\u672A\u627E\u5230\u66F4\u65B0\u7684\u70B9\u4F4D one_message19=\u4E0A\u4E00\u6761\u52A8\u4F5C\u4E0D\u662F\u53D6\u8D27\u4E2D\u6216\u8005\u53D6\u8D27\u5B8C\u6210\u62A5\u8B66 one_message20=\u4E0A\u4E00\u6761\u52A8\u4F5C\u4E0D\u662F\u653E\u8D27\u4E2D\u62A5\u8B66 +one_message21=\u5165\u5E93\u53D6\u8D27\u89E3\u8B66\u81EA\u52A8\u6267\u884C +one_message22=\u5165\u5E93\u653E\u8D27\u89E3\u8B66\u81EA\u52A8\u6267\u884C +one_message23=\u51FA\u5E93\u53D6\u8D27\u89E3\u8B66\u81EA\u52A8\u6267\u884C +one_message24=\u51FA\u5E93\u653E\u8D27\u89E3\u8B66\u81EA\u52A8\u6267\u884C one_mode1=\u7533\u8BF7\u5165\u5E93\u4EFB\u52A1 one_mode2=\u7533\u8BF7\u7A7A\u6258\u76D8\u5165\u5E93 one_mode3=\u7533\u8BF7AGV\u4EFB\u52A1