fix :lms联调

2024-02-26 16:31:33 +08:00
parent 2498dea59f
commit 2f85b23948
25 changed files with 396 additions and 117 deletions
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
@@ -25,3 +25,4 @@ error_sysFile=\u4E0A\u4F20\u5931\u8D25
 error_sysLimit=\u8BBF\u95EE\u6B21\u6570\u9650\u5236\!
 zh_device_name_isNotNull = \u4E2D\u6587\u8BBE\u5907\u540D\u79F0\u4E0D\u80FD\u4F4D\u7A7A
 error_not_configured=\u5B57\u5178\u8868\u672A\u914D\u7F6E\u5BF9\u5E94\u7684\u62A5\u8B66\u4FE1\u606F
+error_creat_route=\u5DF2\u5B58\u5728\u8BE5\u8DEF\u7531\u8DEF\u7EBF\uFF01
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
@@ -25,4 +25,5 @@ error_sysFile=Upload failed
 error_sysLimit=Access limit\!
 zh_device_name_isNotNull = Chinese device name cannot be empty\!
 error_not_configured=The dictionary table is not configured with alarm information
+error_creat_route=The route already exists!

--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
@@ -25,3 +25,4 @@ error_sysFile=Upload gagal
 error_sysLimit=Batas akses\!
 zh_device_name_isNotNull= Nama perangkat dalam bahasa Cina tidak boleh kosong!
 error_not_configured=Informasi alarm tak dikonfigurasi dari tabel kamus
+error_creat_route=Itu sudah ada!
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
@@ -25,4 +25,5 @@ error_sysFile=\u4E0A\u4F20\u5931\u8D25
 error_sysLimit=\u8BBF\u95EE\u6B21\u6570\u9650\u5236\!
 zh_device_name_isNotNull = \u4E2D\u6587\u8BBE\u5907\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
 error_not_configured=\u5B57\u5178\u8868\u672A\u914D\u7F6E\u5BF9\u5E94\u7684\u62A5\u8B66\u4FE1\u606F
+error_creat_route=\u5DF2\u5B58\u5728\u8BE5\u8DEF\u7531\u8DEF\u7EBF\uFF01

--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice.properties
@@ -5,6 +5,12 @@ one_message4=\u6025\u505C
 one_message5=\u4E0D\u660E
 one_message6=\u6CA1\u6709\u8F93\u9001\u7EBF\u5230\u5806\u579B\u673A\u7684\u8DEF\u7531
 one_message7=\u672A\u8054\u673A\u6216\u5DF2\u4FEE\u6539
+one_message8=\u7533\u8BF7\u6346\u624E\u7535\u6C14\u8BBE\u5907\u4EFB\u52A1\u53F7
+one_message9=\u672A\u627E\u5230\u5BF9\u5E94\u6307\u4EE4
+one_message10=\u4EFB\u52A1\u53F7\u4E3A\u7A7A
+one_message11=\u672A\u627E\u5230\u8F7D\u5177\u53F7
+one_message13=\u7533\u8BF7\u4EFB\u52A1\u6210\u529F
+one_message14=\u7533\u8BF7\u4EFB\u52A1\u5931\u8D25
 one_mode1=\u7533\u8BF7\u5165\u5E93\u4EFB\u52A1
 one_mode2=\u7533\u8BF7\u7A7A\u6258\u76D8\u5165\u5E93
 one_mode3=\u7533\u8BF7AGV\u4EFB\u52A1
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_en_US.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_en_US.properties
@@ -5,6 +5,12 @@ one_message4=scram
 one_message5=unknown
 one_message6=There is no routing of the conveyor line to the stacker
 one_message7=Not online or modified
+one_message8=Request the task number of bundling electrical devices
+one_message9=No corresponding instruction found
+one_message10=The task number is empty
+one_message11=Vehicle number not found
+one_message13=Request task successfully
+one_message14=Task request failed
 one_mode1=Request a warehouse entry task
 one_mode2=Request empty pallets for storage
 one_mode3=Request AGV
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_in_ID.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_in_ID.properties
@@ -5,6 +5,12 @@ one_message4=tiba-tiba
 one_message5=Tak diketahui
 one_message6=Tidak ada rute pengiriman ke stacker
 one_message7=Unfreed atau diubah
+one_message8=Aplikasikan nomor misi perangkat listrik terikat
+one_message9=Perintah yang sesuai tidak ditemukan
+one_message10=Nomor misi kosong
+one_message11=Tidak ada nomor muatan yang ditemukan
+one_message13=Sukses menerapkan misi
+one_message14=Misi aplikasi gagal
 one_mode1=Berlaku untuk tugas pustaka
 one_mode2=Pendaftaran nampan kosong
 one_mode3=Permintaan  AGV
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_zh_CN.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_zh_CN.properties
@@ -5,6 +5,12 @@ one_message4=\u6025\u505C
 one_message5=\u4E0D\u660E
 one_message6=\u6CA1\u6709\u8F93\u9001\u7EBF\u5230\u5806\u579B\u673A\u7684\u8DEF\u7531
 one_message7=\u672A\u8054\u673A\u6216\u5DF2\u4FEE\u6539
+one_message8=\u7533\u8BF7\u6346\u624E\u7535\u6C14\u8BBE\u5907\u4EFB\u52A1\u53F7
+one_message9=\u672A\u627E\u5230\u5BF9\u5E94\u6307\u4EE4
+one_message10=\u4EFB\u52A1\u53F7\u4E3A\u7A7A
+one_message11=\u672A\u627E\u5230\u8F7D\u5177\u53F7
+one_message13=\u7533\u8BF7\u4EFB\u52A1\u6210\u529F
+one_message14=\u7533\u8BF7\u4EFB\u52A1\u5931\u8D25
 one_mode1=\u7533\u8BF7\u5165\u5E93\u4EFB\u52A1
 one_mode2=\u7533\u8BF7\u7A7A\u6258\u76D8\u5165\u5E93
 one_mode3=\u7533\u8BF7AGV\u4EFB\u52A1