提示信息修改

src/main/java/com/neotel/smfcore/core/device/bean/StatusBean.java

@@ -529,7 +529,7 @@ public class StatusBean {
             return getMsgEn();
         }
         //提示信息国际化
-        if (ObjectUtil.isEmpty(getMsgCode()) || ObjectUtil.isEmpty(getMsgEn())) {
+        if (ObjectUtil.isEmpty(getMsgCode())) {
 
             return this.msg;
         } else {

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -22,6 +22,7 @@ import com.neotel.smfcore.core.device.enums.OP;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.handler.IDeviceHandler;
 import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.message.util.DeviceMessageUtil;
 import com.neotel.smfcore.core.msd.bean.MSDSettiings;
 import com.neotel.smfcore.core.order.LiteOrderCache;
@@ -286,10 +287,15 @@ public class BaseDeviceHandler implements IDeviceHandler {
             serverExceptions.remove(storage.getCid());
 
         } catch (ValidateException e) {
-            log.warn(statusBean.getCode() + "入库到" + storage.getCid() + "失败:" + e.getMessage());
+            String msgEn = MessageUtils.getText(e.getMsgKey(), e.getMsgParam(), new Locale("en","US"), e.getMessage());
+            String msgJp = MessageUtils.getText(e.getMsgKey(), e.getMsgParam(), new Locale("ja","JP"), e.getMessage());
+            log.warn(statusBean.getCode() + "入库到" + storage.getCid() + "失败:" + e.getMessage()+","+msgEn+","+msgJp);
             statusBean.setMsg(e.getMessage());
+            statusBean.setMsgCode(e.getMsgKey());
+            statusBean.setMsgEn(msgEn);
+            statusBean.setMsgJp(msgJp);
             serverExceptions.put(storage.getCid(), e);
-        } catch (Exception e) {
+        }catch (Exception e) {
             log.error(statusBean.getCode() + "入库到" + storage.getCid() + "失败", e);
             statusBean.setMsg(e.getMessage());
             serverExceptions.put(storage.getCid(), e);
@@ -379,7 +385,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
 
         if (pos != null) {
             Storage storage = dataCache.getStorageById(pos.getStorageId());
-            throw new ValidateException("error.barcode.inStorage", "[ " + barcodeSave.getBarcode() + "]已在" + storage.getName() + "[" + pos.getPosName() + "]中", new String[]{barcodeSave.getBarcode(), storage.getName(), pos.getPosName()});
+            throw new ValidateException("smfcore.error.barcode.inStorage", "[ " + barcodeSave.getBarcode() + "]已在" + storage.getName() + "[" + pos.getPosName() + "]中", new String[]{barcodeSave.getBarcode(), storage.getName(), pos.getPosName()});
         }
 
         for (DataLog task : taskService.getQueueTasks()) {

src/main/java/com/neotel/smfcore/core/language/util/MessageUtils.java

@@ -120,7 +120,7 @@ public class MessageUtils {
                 return MessageFormat.format(msg,params);
             }
         }catch (Exception ex){
-            log.error("获取资源["+msgKey+"]["+defaultMsg+"]["+locale.getLanguage()+"]出错："+ex.toString());
+            log.error("获取资源["+msgKey+"]["+defaultMsg+"]["+locale.toLanguageTag()+"]出错："+ex.toString());
             if(defaultMsg != null){
                 return defaultMsg;
             }

src/main/java/com/neotel/smfcore/core/solder/handler/SpBoxHandler.java

@@ -19,6 +19,7 @@ import com.neotel.smfcore.core.device.enums.BOX_STATUS;
 import com.neotel.smfcore.core.device.enums.OP;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.handler.impl.BaseDeviceHandler;
+import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
@@ -33,10 +34,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 锡膏料仓
@@ -205,6 +203,11 @@ public class SpBoxHandler extends BaseDeviceHandler {
         } catch (ValidateException e) {
             log.warn(statusBean.getCode() + "入库到" + storage.getCid() + "失败:" + e.getMessage());
             statusBean.setMsg(e.getMessage());
+            statusBean.setMsgCode(e.getMsgKey());
+            String msgEn = MessageUtils.getText(e.getMsgKey(), e.getMsgParam(), new Locale("en","US"), e.getMessage());
+            String msgJp = MessageUtils.getText(e.getMsgKey(), e.getMsgParam(), new Locale("ja","JP"), e.getMessage());
+            statusBean.setMsgEn(msgEn);
+            statusBean.setMsgJp(msgJp);
             serverExceptions.put(storage.getCid(), e);
         } catch (Exception e) {
             log.error(statusBean.getCode() + "入库到" + storage.getCid() + "失败", e);

src/main/resources/messages.properties

@@ -265,6 +265,7 @@ smfcore.order.uploadFailure=\u4E0A\u4F20\u5931\u8D25
 error.storage.outNotEnd=\u6599\u4ED3{0}\u6709\u51FA\u5E93\u4EFB\u52A1\u672A\u5B8C\u6210\uFF0C\u4E0D\u5141\u8BB8\u5165\u5E93
 smfcore.order.exception=\u5F02\u5E38
 smfcore.order.yes=\u662F
+smfcore.error.barcode.inStorage=[{0}]\u5DF2\u5728{1}[{2}]\u4E2D
 smfcore.take_out_reel_failure=
 #smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
 #smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}

src/main/resources/messages_en_US.properties

@@ -263,3 +263,4 @@ smfcore.order.uploadFailure=Upload failed
 error.storage.outNotEnd= {0}There are outgoing tasks not yet completed, not allowed to be warehoused
 smfcore.order.exception=Exceptions
 smfcore.order.yes=Yes
+smfcore.error.barcode.inStorage=[{0}}] is already in {1}}[{2}}]

src/main/resources/messages_ja_JP.properties

@@ -261,3 +261,4 @@ smfcore.order.uploadFailure=\u4E0A\u4F20\u5931\u8D25
 error.storage.outNotEnd= {0} \u672A\u5B8C\u4E86\u306E\u9001\u4FE1\u30BF\u30B9\u30AF\u304C\u3042\u308A\u3001\u30B9\u30C8\u30C3\u30AF\u3092\u8A31\u53EF\u3057\u306A\u3044
 smfcore.order.exception=\u4F8B\u5916\u4E8B\u9805
 smfcore.order.yes=\u306F\u3044
+smfcore.error.barcode.inStorage=[0}}]\u306F\u3059\u3067\u306B{1}[{2}}\u306B\u5165\u3063\u3066\u3044\u307E\u3059\u3002

src/main/resources/messages_zh_CN.properties

@@ -260,4 +260,5 @@ smfcore.micron.checkoutByPnFail=\u672A\u627E\u5230\u53EF\u51FA\u5E93\u7269\u6599
 smfcore.order.uploadFailure=\u4E0A\u4F20\u5931\u8D25
 error.storage.outNotEnd=\u6599\u4ED3{0}\u6709\u51FA\u5E93\u4EFB\u52A1\u672A\u5B8C\u6210\uFF0C\u4E0D\u5141\u8BB8\u5165\u5E93
 smfcore.order.exception=\u5F02\u5E38
-smfcore.order.yes=\u662F
\ No newline at end of file
+smfcore.order.yes=\u662F
+smfcore.error.barcode.inStorage=[{0}]\u5DF2\u5728{1}[{2}]\u4E2D
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -262,3 +262,4 @@ smfcore.order.uploadFailure=\u4E0A\u4F20\u5931\u8D25
 error.storage.outNotEnd=\u6599\u5009{0}\u6709\u51FA\u5EAB\u4EFB\u52D9\u672A\u5B8C\u6210\uFF0C\u4E0D\u5141\u8A31\u5165\u5EAB
 smfcore.order.exception=\u7570\u5E38
 smfcore.order.yes=\u662F
+smfcore.error.barcode.inStorage=[{0}]\u5DF2\u5728{1}[{2}]\u4E2D