1.nexim解析did信息修改

2.获取库位号,返回中文信息修改

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -247,8 +247,7 @@ public class DeviceController {
                                 resultMap.put("cid", dataLog.getCid());
                                 resultMap.put("cid", dataLog.getCid());
                                 return resultMap;
                                 return resultMap;
                             } else {
                             } else {
-                                //已有出库任务
-                                errorMsg = "物料[" + dataLog.getBarcode() + "]已有出库任务,需继续执行出库动作";
+                                errorMsg= MessageUtils.getText("smfcore.barcode.hasOutTask",new String[]{dataLog.getBarcode()},MessageUtils.getDefaultLocal(),"物料[{0}]已有出库任务,需继续执行出库动作");
                                 resultMap.put("result", "98");
                                 resultMap.put("result", "98");
                                 resultMap.put("msg", errorMsg);
                                 resultMap.put("msg", errorMsg);
 
 

src/main/java/com/neotel/smfcore/custom/nexim/NeximApi.java

@@ -188,7 +188,7 @@ public class NeximApi extends BaseSmfApiListener {
             result = HttpHelper.getParam(getInventoryDids(), headerMap, paramMap);
             result = HttpHelper.getParam(getInventoryDids(), headerMap, paramMap);
             log.info(code + "获取did信息请求结果为:" + result);
             log.info(code + "获取did信息请求结果为:" + result);
             //判断是否异常
             //判断是否异常
-            JSONObject jsonObject = JSONObject.parseObject("result");
+            JSONObject jsonObject = JSONObject.parseObject(result);
             String datas = jsonObject.getString("datas");
             String datas = jsonObject.getString("datas");
             List<DIdInfo> didInfoList = JSONObject.parseArray(datas, DIdInfo.class);
             List<DIdInfo> didInfoList = JSONObject.parseArray(datas, DIdInfo.class);
             for (DIdInfo dIdInfo : didInfoList) {
             for (DIdInfo dIdInfo : didInfoList) {

src/main/resources/messages.properties

@@ -441,3 +441,5 @@ smfcore.reelPosMove.paramerror=\u53C2\u6570\u4E0D\u5B8C\u6574
 smfcore.reelPosMove.posIsNull=\u5E93\u4F4D[{1}]\u4E3A\u7A7A
 smfcore.reelPosMove.posIsNull=\u5E93\u4F4D[{1}]\u4E3A\u7A7A
 smf.nexim.getInventoryFaile=\u83B7\u53D6did\u4FE1\u606F\u5931\u8D25:[{0}] 
 smf.nexim.getInventoryFaile=\u83B7\u53D6did\u4FE1\u606F\u5931\u8D25:[{0}] 
 smfcore.registerdid.false=[{0}]\u6CE8\u518Cdid\u5931\u8D25:[{1}]
 smfcore.registerdid.false=[{0}]\u6CE8\u518Cdid\u5931\u8D25:[{1}]
+smfcore.accessToken.ng=\u83B7\u53D6AccessToken\u5931\u8D25
+smfcore.barcode.hasOutTask=\u7269\u6599[{0}]\u5DF2\u6709\u51FA\u5E93\u4EFB\u52A1,\u9700\u7EE7\u7EED\u6267\u884C\u51FA\u5E93\u52A8\u4F5C

src/main/resources/messages_de_DE.properties

@@ -429,3 +429,5 @@ smfcore.auth.expire=Die Autorisierung ist abgelaufen
 smfcore.order.slotNum=Standnummer
 smfcore.order.slotNum=Standnummer
 smf.nexim.getInventoryFaile=Fehler beim Abrufen der did-Information: [{0}]
 smf.nexim.getInventoryFaile=Fehler beim Abrufen der did-Information: [{0}]
 smfcore.registerdid.false=[{0}] Registrierung von did fehlgeschlagen:[{1}]
 smfcore.registerdid.false=[{0}] Registrierung von did fehlgeschlagen:[{1}]
+smfcore.accessToken.ng=Fehler beim Abrufen des AccessToken
+smfcore.barcode.hasOutTask=Material [{0}] hat bereits einen Ausgangsauftrag; die Ausgangsaktion muss fortgesetzt werden
\ No newline at end of file

src/main/resources/messages_en_US.properties

@@ -430,3 +430,5 @@ smfcore.auth.expire=Authorization has expired
 smfcore.order.slotNum=Station Number
 smfcore.order.slotNum=Station Number
 smf.nexim.getInventoryFaile=Failed to retrieve did information: [{0}]
 smf.nexim.getInventoryFaile=Failed to retrieve did information: [{0}]
 smfcore.registerdid.false=[{0}] Failed to register did:[{1}]
 smfcore.registerdid.false=[{0}] Failed to register did:[{1}]
+smfcore.accessToken.ng=Failed to obtain AccessToken
+smfcore.barcode.hasOutTask=Material [{0}] already has an outbound task; the outbound action needs to be continued.
\ No newline at end of file

src/main/resources/messages_fr_FR.properties

@@ -429,3 +429,5 @@ smfcore.auth.expire=L'autorisation a expir\u00E9
 smfcore.order.slotNum=num\u00E9ro de position
 smfcore.order.slotNum=num\u00E9ro de position
 smf.nexim.getInventoryFaile=\u00C9chec de r\u00E9cup\u00E9ration des informations did:[{0}]
 smf.nexim.getInventoryFaile=\u00C9chec de r\u00E9cup\u00E9ration des informations did:[{0}]
 smfcore.registerdid.false=[{0}] \u00C9chec de l'enregistrement de did:[{1}]
 smfcore.registerdid.false=[{0}] \u00C9chec de l'enregistrement de did:[{1}]
+smfcore.accessToken.ng=\u00C9chec de l'obtention de l'AccessToken
+smfcore.barcode.hasOutTask=La mati\u00E8re [{0}] a d\u00E9j\u00E0 une t\u00E2che de sortie ; l'action de sortie doit \u00EAtre poursuivie
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -426,3 +426,5 @@ smfcore.auth.expire=\u8A8D\u8A3C\u304C\u671F\u9650\u5207\u308C\u3067\u3059
 smfcore.order.slotNum=\u30B9\u30BF\u30F3\u30C9\u756A\u53F7
 smfcore.order.slotNum=\u30B9\u30BF\u30F3\u30C9\u756A\u53F7
 smf.nexim.getInventoryFaile=did \u60C5\u5831\u306E\u53D6\u5F97\u306B\u5931\u6557\u3057\u307E\u3057\u305F: [{0}]
 smf.nexim.getInventoryFaile=did \u60C5\u5831\u306E\u53D6\u5F97\u306B\u5931\u6557\u3057\u307E\u3057\u305F: [{0}]
 smfcore.registerdid.false=[{0}] did \u306E\u767B\u9332\u306B\u5931\u6557\u3057\u307E\u3057\u305F:[{1}]
 smfcore.registerdid.false=[{0}] did \u306E\u767B\u9332\u306B\u5931\u6557\u3057\u307E\u3057\u305F:[{1}]
+smfcore.accessToken.ng=AccessToken \u306E\u53D6\u5F97\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+smfcore.barcode.hasOutTask=\u8CC7\u6750 [{0}] \u306B\u306F\u65E2\u306B\u51FA\u5EAB\u30BF\u30B9\u30AF\u304C\u3042\u308A\u3001\u51FA\u5EAB\u30A2\u30AF\u30B7\u30E7\u30F3\u3092\u7D9A\u884C\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -426,3 +426,5 @@ smfcore.auth.expire=\u6388\u6743\u5DF2\u8FC7\u671F
 smfcore.order.slotNum=\u7AD9\u4F4D\u7F16\u53F7
 smfcore.order.slotNum=\u7AD9\u4F4D\u7F16\u53F7
 smf.nexim.getInventoryFaile=\u83B7\u53D6did\u4FE1\u606F\u5931\u8D25:[{0}]
 smf.nexim.getInventoryFaile=\u83B7\u53D6did\u4FE1\u606F\u5931\u8D25:[{0}]
 smfcore.registerdid.false=[{0}]\u6CE8\u518Cdid\u5931\u8D25:[{1}]
 smfcore.registerdid.false=[{0}]\u6CE8\u518Cdid\u5931\u8D25:[{1}]
+smfcore.accessToken.ng=\u83B7\u53D6AccessToken\u5931\u8D25
+smfcore.barcode.hasOutTask=\u7269\u6599[{0}]\u5DF2\u6709\u51FA\u5E93\u4EFB\u52A1,\u9700\u7EE7\u7EED\u6267\u884C\u51FA\u5E93\u52A8\u4F5C
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -426,3 +426,5 @@ smfcore.auth.expire = \u6388\u6B0A\u5DF2\u904E\u671F
 smfcore.order.slotNum = \u7AD9\u4F4D\u7DE8\u865F
 smfcore.order.slotNum = \u7AD9\u4F4D\u7DE8\u865F
 smf.nexim.getInventoryFaile=\u53D6\u5F97 did \u8CC7\u8A0A\u5931\u6557:[{0}]
 smf.nexim.getInventoryFaile=\u53D6\u5F97 did \u8CC7\u8A0A\u5931\u6557:[{0}]
 smfcore.registerdid.false=[{0}]\u8A3B\u518Adid\u5931\u6557:[{1}]
 smfcore.registerdid.false=[{0}]\u8A3B\u518Adid\u5931\u6557:[{1}]
+smfcore.accessToken.ng=\u7372\u53D6AccessToken\u5931\u6557
+smfcore.barcode.hasOutTask=\u7269\u6599[{0}]\u5DF2\u6709\u51FA\u5EAB\u4EFB\u52D9\uFF0C\u9700\u7E7C\u7E8C\u57F7\u884C\u51FA\u5EAB\u52D5\u4F5C
\ No newline at end of file