1.资源翻译问题提交

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

@@ -397,7 +397,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
     public Barcode verifyBarcodePutIn(List<Storage> storageList, Barcode barcodeSave) throws ValidateException {
 
         if (barcodeSave == null) {
-            throw new ValidateException("条码无效", "无效的条码" );
+            throw new ValidateException("smfcore.error.barcode.noValidCode", "无效的条码" );
         }
 
         Date expireDate = barcodeSave.getExpireDate();

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

@@ -67,7 +67,7 @@ public class NLLShelfHandler extends BaseDeviceHandler {
         //判断库位信息是否存在
         StoragePos storagePos = storagePosManager.findByStorageName(code);
         if (storagePos == null) {
-            throw new ValidateException("smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"库位", code});
+            throw new ValidateException("smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"posName", code});
         }
 
         Barcode barcode = storagePos.getBarcode();
@@ -118,7 +118,7 @@ public class NLLShelfHandler extends BaseDeviceHandler {
         //判断库位是否存在
         StoragePos pos = storagePosManager.getByPosName(posName);
         if (pos == null) {
-            throw new ValidateException("smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"库位", posName});
+            throw new ValidateException("smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"posName", posName});
         }
 
         Storage storage = dataCache.getStorageById(pos.getStorageId());
@@ -205,7 +205,7 @@ public class NLLShelfHandler extends BaseDeviceHandler {
         //判断库位是否存在
         StoragePos pos = storagePosManager.getByPosName(posName);
         if (pos == null) {
-            throw new ValidateException("smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"库位", posName});
+            throw new ValidateException("smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"posName", posName});
         }
 
         Barcode posBarcode = pos.getBarcode();
@@ -254,7 +254,7 @@ public class NLLShelfHandler extends BaseDeviceHandler {
         //判断库位是否存在
         StoragePos pos = storagePosManager.getByPosName(posName);
         if (pos == null) {
-            throw new ValidateException("smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"库位", posName});
+            throw new ValidateException("smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"posName", posName});
         }
 
         Barcode posBarcode = pos.getBarcode();
@@ -301,7 +301,7 @@ public class NLLShelfHandler extends BaseDeviceHandler {
         //判断库位是否存在
         StoragePos pos = storagePosManager.getByPosName(posName);
         if (pos == null) {
-            throw new ValidateException("smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"库位", posName});
+            throw new ValidateException("smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"posName", posName});
         }
         opPosLight("close", pos, "");
         return ResultBean.newOkResult("");

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

@@ -106,7 +106,7 @@ public class TailingMaterialBoxHandler extends BaseDeviceHandler {
                     }
                 }
             }
-        }, 1, 5, TimeUnit.MINUTES);
+        }, 1, 60, TimeUnit.MINUTES);
     }
 
 
@@ -222,7 +222,7 @@ public class TailingMaterialBoxHandler extends BaseDeviceHandler {
         //判断库位中的物料是否一样
         StoragePos pos = storagePosManager.getByPosName(posName);
         if (pos == null) {
-            return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"柜体", posName});
+            return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"posName", posName});
         }
         Barcode posBarcode = getPosBarcode(pos);
         posBarcode.setPutInTime(System.currentTimeMillis());
@@ -334,7 +334,7 @@ public class TailingMaterialBoxHandler extends BaseDeviceHandler {
         //判断库位中的物料是否一样
         StoragePos pos = storagePosManager.getByPosName(posName);
         if (pos == null) {
-            return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"柜体", posName});
+            return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"posName", posName});
         }
         Storage storage = dataCache.getStorageById(pos.getStorageId());
         Barcode posBarcode = getPosBarcode(pos);

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

@@ -193,7 +193,7 @@ public class DeviceController {
         Map<String, Object> resultMap = Maps.newHashMap();
 
         if (dataCache.getCache(Constants.CACHE_StopOut)) {
-            lineMsg = "系统更新中,暂停出入库";
+            lineMsg = MessageUtils.getText("smfcore.linemsg.update", MessageUtils.getDefaultLocal(), "系统更新中,暂停出入库");
             DeviceMessageUtil.updateLineMsg(lineMsg,code,cids,"" ,"smfcore.linemsg.update",null);
             resultMap.put("result", "100");
             resultMap.put("msg", lineMsg);
@@ -204,7 +204,8 @@ public class DeviceController {
         String errorMsg = "";
         if (Strings.isNullOrEmpty(cids)) {
             resultMap.put("result", "101");
-            resultMap.put("msg", "未指定料仓 cids ");
+            String msg = MessageUtils.getText("smfcore.storage.noCids", MessageUtils.getDefaultLocal(), "未指定料仓CID");
+            resultMap.put("msg", msg);
         } else {
             List<Storage> storageList = Lists.newArrayList();
             List<String> cidList = Lists.newArrayList();
@@ -224,7 +225,7 @@ public class DeviceController {
             }
             if (storageList.isEmpty()) {
                 resultMap.put("result", "99");
-                errorMsg = "无可用的料仓";
+                errorMsg = MessageUtils.getText("smfcore.storage.noCanUseStorage",MessageUtils.getDefaultLocal(),"无可用的料仓");
                 resultMap.put("msg", errorMsg);
             } else {
                 try {
@@ -307,7 +308,7 @@ public class DeviceController {
                         if (oldLockInfo != null) {
                             if (!oldLockInfo.getBarcode().equals(barcode.getBarcode())) {
                                 String result = "-1";
-                                okMsg = rfid + "[" + rfidLoc + "][" + barcode.getBarcode() + "]锁定库位[" + pos.getPosName() + "],清理旧有锁定信息";
+                                okMsg = MessageUtils.getText("smfcore.barcode.clearOldLock",new String[]{rfid,rfidLoc,barcode.getBarcode(),pos.getPosName()},MessageUtils.getDefaultLocal(),"{0}[{1}][{2}]锁定库位[{3}],清理旧有锁定信息");
                                 resultMap.put("result", result);
                                 resultMap.put("msg", okMsg);
                                 //已经锁定过库位,但不是同一个条码,需要把对应位置的锁定信息清理掉
@@ -328,7 +329,7 @@ public class DeviceController {
 
                         reelLocInfo = ReelLockPosUtil.addReelLockPosInfo(reelLocInfo, cidList);
                         if (reelLocInfo == null) {
-                            errorMsg = "[" + barcode.getBarcode() + "]库位["+reelLocInfo.getLockPosName()+"]已被锁定,暂停入库";
+                            errorMsg = MessageUtils.getText("smfcore.linemsg.posLock",new String[]{barcode.getBarcode(),reelLocInfo.getLockPosName()},MessageUtils.getDefaultLocal(),"[{0}]库位[{1}]已被锁定,暂停入库");
                             lineMsg = errorMsg;
 
                             DeviceMessageUtil.updateLineMsg(lineMsg,code,cids, reelLocInfo.getLockPosName(),"smfcore.linemsg.posLock",new String[]{barcode.getBarcode(),reelLocInfo.getLockPosName()});
@@ -343,7 +344,7 @@ public class DeviceController {
 
                     } else {
                         resultMap.put("result", "104");
-                        errorMsg = "[" + barcode.getBarcode() + "]未找到可用的[" + barcode.getPlateSize() + "x" + barcode.getHeight() + "]仓位";
+                        errorMsg = MessageUtils.getText("smfcore.barcode.noPutInPos",new String[]{barcode.getBarcode(),barcode.getPlateSize()+"",barcode.getHeight()+""},MessageUtils.getDefaultLocal(),"[{0}]未找到[{1}x{2}]仓位");
                         resultMap.put("msg", errorMsg);
 
                     }

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

@@ -89,7 +89,7 @@ public class DualPosNameDeviceController {
         Map<String, Object> resultMap = Maps.newHashMap();
 
         if (dataCache.getCache(Constants.CACHE_StopOut)) {
-            lineMsg = "系统更新中,暂停出入库";
+            lineMsg = MessageUtils.getText("smfcore.linemsg.update", MessageUtils.getDefaultLocal(), "系统更新中,暂停出入库");
             DeviceMessageUtil.updateLineMsg(lineMsg, code, cids, "", "smfcore.linemsg.update", null);
             resultMap.put("result", "100");
             resultMap.put("msg", lineMsg);
@@ -103,7 +103,8 @@ public class DualPosNameDeviceController {
 
         if (Strings.isNullOrEmpty(cids)) {
             resultMap.put("result", "101");
-            resultMap.put("msg", "未指定料仓 cids ");
+            String msg = MessageUtils.getText("smfcore.storage.noCids", MessageUtils.getDefaultLocal(), "未指定料仓CID");
+            resultMap.put("msg", msg);
         } else {
             List<Storage> storageList = Lists.newArrayList();
             List<String> cidList = Lists.newArrayList();
@@ -123,7 +124,7 @@ public class DualPosNameDeviceController {
             }
             if (storageList.isEmpty()) {
                 resultMap.put("result", "99");
-                errorMsg = "无可用的料仓";
+                errorMsg = MessageUtils.getText("smfcore.storage.noCanUseStorage",MessageUtils.getDefaultLocal(),"无可用的料仓");
                 resultMap.put("msg", errorMsg);
             } else {
                 try {
@@ -145,7 +146,7 @@ public class DualPosNameDeviceController {
                                 return resultMap;
                             } else {
                                 //已有出库任务
-                                errorMsg = "物料[" + dataLog.getBarcode() + "]已有出库任务,需继续执行出库动作";
+                                errorMsg= MessageUtils.getText("smfcore.barcode.hasOutTask",new String[]{dataLog.getBarcode()},MessageUtils.getDefaultLocal(),"物料[{0}]已有出库任务,需继续执行出库动作");
                                 resultMap.put("result", "98");
                                 resultMap.put("msg", errorMsg);
                                 resultMap.put("posId", dataLog.getPosName());
@@ -255,7 +256,7 @@ public class DualPosNameDeviceController {
                         if (oldLockInfo != null) {
                             if (!oldLockInfo.getLockPosId().equals(pos.getId())) {
                                 String result = "-1";
-                                okMsg = rfid + "[" + rfidLoc + "][" + barcode.getBarcode() + "]锁定库位[" + pos.getPosName() + "],清理旧有锁定信息";
+                                okMsg = MessageUtils.getText("smfcore.barcode.clearOldLock",new String[]{rfid,rfidLoc,barcode.getBarcode(),pos.getPosName()},MessageUtils.getDefaultLocal(),"{0}[{1}][{2}]锁定库位[{3}],清理旧有锁定信息");
                                 resultMap.put("result", result);
                                 resultMap.put("msg", okMsg);
                                 //已经锁定过库位,但不是同一个条码,需要把对应位置的锁定信息清理掉
@@ -273,7 +274,7 @@ public class DualPosNameDeviceController {
                         reelLocInfo.setLockPosId(pos.getId());
                         reelLocInfo = ReelLockPosUtil.addReelLockPosInfo(reelLocInfo, findCidList);
                         if (reelLocInfo == null) {
-                            errorMsg = "[" + barcode.getBarcode() + "]库位[" + reelLocInfo.getLockPosName() + "]已被锁定,暂停入库";
+                            errorMsg = MessageUtils.getText("smfcore.linemsg.posLock",new String[]{barcode.getBarcode(),reelLocInfo.getLockPosName()},MessageUtils.getDefaultLocal(),"[{0}]库位[{1}]已被锁定,暂停入库");
                             lineMsg = errorMsg;
                             DeviceMessageUtil.updateLineMsg(lineMsg, code, cids, reelLocInfo.getLockPosName(), "smfcore.linemsg.posLock", new String[]{barcode.getBarcode(), reelLocInfo.getLockPosName()});
                             resultMap.put("result", "99");
@@ -286,7 +287,7 @@ public class DualPosNameDeviceController {
                         }
                     } else {
                         resultMap.put("result", "104");
-                        errorMsg = "[" + barcode.getBarcode() + "]未找到可用的[" + barcode.getPlateSize() + "x" + barcode.getHeight() + "]仓位";
+                        errorMsg = MessageUtils.getText("smfcore.barcode.noPutInPos",new String[]{barcode.getBarcode(),barcode.getPlateSize()+"",barcode.getHeight()+""},MessageUtils.getDefaultLocal(),"[{0}]未找到[{1}x{2}]仓位");
                         resultMap.put("msg", errorMsg);
 
                     }

src/main/java/com/neotel/smfcore/core/system/rest/SettingsController.java

@@ -141,7 +141,7 @@ public class SettingsController {
 //        String type=map.get("checkOutType");
         dataCache.updateCache(Constants.CACHE_CheckOutType, type);
         log.info("更改出库策略：checkOutType=" + type);
-        return ResultBean.newOkResult("保存成功");
+        return ResultBean.newOkResult("ok");
 
     }
 

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -17,6 +17,7 @@ import com.neotel.smfcore.core.device.bean.StatusBean;
 import com.neotel.smfcore.core.device.enums.OP;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
 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.order.LiteOrderCache;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
@@ -1027,7 +1028,9 @@ public class TaskService {
             log.info("出库已在库位中的物料[" + barcodeSave.getBarcode() + "]");
             Storage storage = dataCache.getStorageById(pos.getStorageId());
             //checkout(storage, pos, true, "");
-            checkout(storage,pos,true,true,"","",barcodeSave.getBarcode()+"已存在库位:"+pos.getPosName());
+            String msg= MessageUtils.getText("smfcore.error.barcode.inStorage",new String[]{barcodeSave.getBarcode(), storage.getName(), pos.getPosName()},MessageUtils.getDefaultLocal(),
+                    "[{0}]已在{1}[{2}]中");
+            checkout(storage,pos,true,true,"","",msg);
             throw new ValidateException("smfcore.error.barcode.exist", "[{0}}]已在{1}}[{2}}]中", new String[]{barcodeSave.getBarcode(), storage.getName(), pos.getPosName()});
         }
 

src/main/java/com/neotel/smfcore/custom/hicks20714/rest/HicksController.java

@@ -120,7 +120,7 @@ public class HicksController {
             HicksUtil.setIsRefresh(true);
         } catch (Exception e) {
             e.printStackTrace();
-            return ResultBean.newErrorResult(-1, "", "设置失败,请确认格式是否为数字");
+            return ResultBean.newErrorResult(-1, "smfcore.time.error", "设置失败,请确认格式是否为数字");
         }
         return ResultBean.newOkResult("");
     }

src/main/java/com/neotel/smfcore/custom/neotel/NeotelController.java

@@ -187,7 +187,7 @@ public class NeotelController {
             }
             return ResultBean.newOkResult(resultMapList);
         }
-        return ResultBean.newErrorResult(1, "", "未找到实时库存信息");
+        return ResultBean.newErrorResult(1, "smfcore.pos.noInventory", "未找到实时库存信息");
     }
 
     @ApiOperation("6.4 设备状态获取")

src/main/java/com/neotel/smfcore/custom/sp/SpController.java

@@ -186,6 +186,6 @@ public class SpController {
             }
             return ResultBean.newOkResult(resultMapList);
         }
-        return ResultBean.newErrorResult(1, "", "未找到实时库存信息");
+        return ResultBean.newErrorResult(1, "smfcore.pos.noInventory", "未找到实时库存信息");
     }
 }

src/main/resources/messages.properties

@@ -437,8 +437,6 @@ smfcore.virtual.quantityError=\u53D6\u51FA\u6570\u91CF\u5E94\u4E3A[{0}]
 smfcore.virtual.enter=\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u6761\u7801\u540E\u6309\u56DE\u8F66\u786E\u8BA4
 smfcore.auth.expire=\u6388\u6743\u5DF2\u8FC7\u671F
 smfcore.order.slotNum=\u7AD9\u4F4D\u7F16\u53F7
-smfcore.reelPosMove.paramerror=\u53C2\u6570\u4E0D\u5B8C\u6574
-smfcore.reelPosMove.posIsNull=\u5E93\u4F4D[{1}]\u4E3A\u7A7A
 smf.nexim.getInventoryFaile=\u83B7\u53D6did\u4FE1\u606F\u5931\u8D25:[{0}] 
 smfcore.registerdid.false=[{0}]\u6CE8\u518Cdid\u5931\u8D25:[{1}]
 smfcore.accessToken.ng=\u83B7\u53D6AccessToken\u5931\u8D25
@@ -448,3 +446,19 @@ smfcore.tailingmaterial.pnError=\u5165\u5E93\u7684\u7269\u6599[{0}]\u4E0E\u67DC\
 smfcore.nlp.posRecovered=\u5E93\u4F4D[{0}]\u6062\u590D\u6B63\u5E38
 smfcore.nlp.posNoReelError=\u5E93\u4F4D[{0}]\u68C0\u6D4B\u5230\u6CA1\u6709\u7269\u6599\uFF0C\u4F46\u7CFB\u7EDF\u6709\u5E93\u5B58\u8BB0\u5F55
 smfcore.nlp.posHasReelError=\u5E93\u4F4D[{0}]\u68C0\u6D4B\u5230\u6709\u7269\u6599\uFF0C\u4F46\u7CFB\u7EDF\u65E0\u5E93\u5B58\u8BB0\u5F55
+smfcore.storage.noCids=\u672A\u6307\u5B9A\u6599\u4ED3CID
+smfcore.storage.noCanUseStorage=\u65E0\u53EF\u7528\u7684\u6599\u4ED3
+smfcore.barcode.clearOldLock={0}[{1}][{2}]\u9501\u5B9A\u5E93\u4F4D[{3}],\u6E05\u7406\u65E7\u6709\u9501\u5B9A\u4FE1\u606F
+smfcore.barcode.noPutInPos=[{0}]\u672A\u627E\u5230[{1}x{2}]\u4ED3\u4F4D
+smfcore.alreadyHasPos=\u6599\u4ED3[{0}]\u5DF2\u6709\u5E93\u4F4D\u6570\uFF1A[{1}]
+smfcore.msd.noPos=\u672A\u627E\u5230\u53EF\u5F00\u5C01\u7684\u7269\u6599
+smfcore.labelWithStoragePos=\u6807\u7B7E[{0}]\u5DF2\u548C\u5E93\u4F4D\u5173\u8054
+smfcore.login.codeError=\u767B\u5F55\u7801[{0}]\u9519\u8BEF
+smfcore.haman.loadOk=\u64CD\u4F5C\u6210\u529F, \u8BF7\u5C06\u7269\u6599\u653E\u5165\u4EAE\u706F\u67B6\u4F4D
+smfcore.time.error=\u8BBE\u7F6E\u5931\u8D25,\u8BF7\u786E\u8BA4\u683C\u5F0F\u662F\u5426\u4E3A\u6570\u5B57
+smfcore.pos.noInventory=\u672A\u627E\u5230\u5B9E\u65F6\u5E93\u5B58\u4FE1\u606F
+smfcore.reelPosMove.paramerror=\u53C2\u6570\u4E0D\u5B8C\u6574
+smfcore.reelPosMove.posIsNull=\u5E93\u4F4D[{1}]\u4E3A\u7A7A
+smfcore.liteOrder.exist=\u9700\u6C42\u5355{0}\u5DF2\u5B58\u5728
+smfcore.reelPosMove.barcodeError=\u5E93\u4F4D{0}\u6761\u7801\u4E3A{1}\uFF0C\u4E0E\u79FB\u5E93\u6761\u7801{1}\u4E0D\u4E00\u81F4
+

src/main/resources/messages_de_DE.properties

@@ -435,4 +435,19 @@ smfcore.tailingmaterial.noPos=Kein verf\u00FCgbarer Schrank gefunden
 smfcore.tailingmaterial.pnError=Das eingelagerte Material [{0}] unterscheidet sich von dem im Schrank [{1}]
 smfcore.nlp.posRecovered=Position [{0}] wieder normal
 smfcore.nlp.posNoReelError=Position [{0}] hat kein Material erkannt, aber das System hat einen Bestandsdatensatz
-smfcore.nlp.posHasReelError=Position [{0}] hat Material erkannt, aber das System hat keinen Bestandsdatensatz
\ No newline at end of file
+smfcore.nlp.posHasReelError=Position [{0}] hat Material erkannt, aber das System hat keinen Bestandsdatensatz
+smfcore.storage.noCids=Keine Silo-CID angegeben
+smfcore.storage.noCanUseStorage=Keine verf\u00FCgbaren Silos
+smfcore.barcode.clearOldLock={0}[{1}][{2}] Lagerort [{3}] sperren, alte Sperrinformationen l\u00F6schen
+smfcore.barcode.noPutInPos=[{0}] Lagerplatz [{1}x{2}] nicht gefunden
+smfcore.alreadyHasPos=Silo [{0}] hat bereits [{1}] Lagerpl\u00E4tze
+smfcore.msd.noPos=Keine Materialien zum \u00D6ffnen gefunden
+smfcore.labelWithStoragePos=Etikette [{0}] ist bereits mit einem Lagerort verkn\u00FCpft
+smfcore.login.codeError=Anmeldeschl\u00FCssel [{0}] ist falsch
+smfcore.haman.loadOk=Vorgang erfolgreich, bitte legen Sie das Material in die leuchtende Regalposition
+smfcore.time.error=Einstellung fehlgeschlagen, bitte pr\u00FCfen Sie, ob das Format numerisch ist
+smfcore.pos.noInventory=Echtzeit-Bestandsinformationen nicht gefunden
+smfcore.reelPosMove.paramerror=Incomplete Parameter
+smfcore.reelPosMove.posIsNull=Lagerort [{1}] ist leer
+smfcore.liteOrder.exist=Bedarfsauftrag {0} existiert bereits
+smfcore.reelPosMove.barcodeError=Der Barcode des Lagerorts {0} ist {1}, nicht identisch mit dem Umzugscode {1}
\ No newline at end of file

src/main/resources/messages_en_US.properties

@@ -393,7 +393,7 @@ smfcore.storagePos.yes=Yes
 smfcore.storagePos.no=No
 smfcore.dashBoard=Dashboard
 smfcore.spHumiture=Temperature & Humidity
-smfcore.storageOther = Other Devices
+smfcore.storageOther=Other Devices
 smfcore.humiture.ntemperature2=Refrigeration zone temperature 2
 smfcore.humiture.ntemperature3=Refrigeration zone temperature 3
 smfcore.humiture.codetemperature2=Cooling Temperature 2
@@ -436,4 +436,19 @@ smfcore.tailingmaterial.noPos=No available cabinet found
 smfcore.tailingmaterial.pnError=The material [{0}] put in is different from the one in the cabinet [{1}]
 smfcore.nlp.posRecovered=Position [{0}] returned to normal
 smfcore.nlp.posNoReelError=Position [{0}] detected no material, but system has inventory record
-smfcore.nlp.posHasReelError=Position [{0}] detected material, but system has no inventory record
\ No newline at end of file
+smfcore.nlp.posHasReelError=Position [{0}] detected material, but system has no inventory record
+smfcore.storage.noCids=No storage bin CID specified
+smfcore.storage.noCanUseStorage=No available storage bins
+smfcore.barcode.clearOldLock={0}[{1}][{2}] Lock location [{3}], clear old lock information
+smfcore.barcode.noPutInPos=[{0}] No [{1}x{2}] location found
+smfcore.alreadyHasPos=Storage bin [{0}] already has [{1}] locations
+smfcore.msd.noPos=No materials found for opening
+smfcore.labelWithStoragePos=Label [{0}] is already associated with a location
+smfcore.login.codeError=Login code [{0}] is incorrect
+smfcore.haman.loadOk=Operation successful, please place the material in the lit shelf position
+smfcore.time.error=Setting failed, please confirm if the format is numeric
+smfcore.pos.noInventory=Real-time inventory information not found
+smfcore.reelPosMove.paramerror=Incomplete parameters
+smfcore.reelPosMove.posIsNull=Location [{1}] is empty
+smfcore.liteOrder.exist=Requirement order {0} already exists
+smfcore.reelPosMove.barcodeError=Location {0} barcode is {1}, inconsistent with the transfer barcode {1}
\ No newline at end of file

src/main/resources/messages_fr_FR.properties

@@ -435,4 +435,19 @@ smfcore.tailingmaterial.noPos=Aucun cabinet disponible trouv\u00E9
 smfcore.tailingmaterial.pnError=Le mat\u00E9riau [{0}] mis en stock est diff\u00E9rent de celui dans le cabinet [{1}]
 smfcore.nlp.posRecovered=Position [{0}] revenue \u00E0 la normale
 smfcore.nlp.posNoReelError=Position [{0}] n'a d\u00E9tect\u00E9 aucun mat\u00E9riau, mais le syst\u00E8me a un enregistrement d'inventaire
-smfcore.nlp.posHasReelError=Position [{0}] a d\u00E9tect\u00E9 du mat\u00E9riau, mais le syst\u00E8me n'a pas d'enregistrement d'inventaire
\ No newline at end of file
+smfcore.nlp.posHasReelError=Position [{0}] a d\u00E9tect\u00E9 du mat\u00E9riau, mais le syst\u00E8me n'a pas d'enregistrement d'inventaire
+smfcore.storage.noCids=CID de silo non sp\u00E9cifi\u00E9
+smfcore.storage.noCanUseStorage=Aucun silo disponible
+smfcore.barcode.clearOldLock={0}[{1}][{2}] Verrouillage de l'emplacement [{3}], suppression des anciennes informations de verrouillage
+smfcore.barcode.noPutInPos=[{0}] Emplacement [{1}x{2}] non trouv\u00E9
+smfcore.alreadyHasPos=Le silo [{0}] a d\u00E9j\u00E0 [{1}] emplacements
+smfcore.msd.noPos=Aucun mat\u00E9riau \u00E0 ouvrir trouv\u00E9
+smfcore.labelWithStoragePos=L'\u00E9tiquette [{0}] est d\u00E9j\u00E0 associ\u00E9e \u00E0 un emplacement
+smfcore.login.codeError=Code de connexion [{0}] incorrect
+smfcore.haman.loadOk=Op\u00E9ration r\u00E9ussie, veuillez placer le mat\u00E9riau dans le rayon lumineux
+smfcore.time.error=Param\u00E9trage \u00E9chou\u00E9, veuillez v\u00E9rifier si le format est num\u00E9rique
+smfcore.pos.noInventory=Informations de stock en temps r\u00E9el non trouv\u00E9es
+smfcore.reelPosMove.paramerror=Param\u00E8tres incomplets
+smfcore.reelPosMove.posIsNull=L'emplacement [{1}] est vide
+smfcore.liteOrder.exist=Le bon de commande {0} existe d\u00E9j\u00E0
+smfcore.reelPosMove.barcodeError=Le code-barres de l'emplacement {0} est {1}, incompatible avec le code-barres de transfert {1}
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -389,7 +389,7 @@ smfcore.storagePos.yes=\u662F
 smfcore.storagePos.no=\u5426
 smfcore.dashBoard=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9
 smfcore.spHumiture=\u6E29\u6E7F\u5EA6
-smfcore.storageOther = \u305D\u306E\u4ED6\u6A5F\u5668
+smfcore.storageOther=\u305D\u306E\u4ED6\u6A5F\u5668
 smfcore.humiture.ntemperature2=\u51B7\u85CF\u6E29\u5EA62
 smfcore.humiture.ntemperature3=\u51B7\u85CF\u6E29\u5EA63
 smfcore.humiture.codetemperature2=\u5236\u51B7\u6E29\u5EA62
@@ -432,4 +432,19 @@ smfcore.tailingmaterial.noPos=\u5229\u7528\u53EF\u80FD\u306A\u30AD\u30E3\u30D3\u
 smfcore.tailingmaterial.pnError=\u5165\u5E93\u3055\u308C\u305F\u6750\u6599[{0}]\u306F\u30AD\u30E3\u30D3\u30CD\u30C3\u30C8\u5185\u306E[{1}]\u3068\u7570\u306A\u308A\u307E\u3059
 smfcore.nlp.posRecovered=\u5EAB\u4F4D[{0}]\u304C\u6B63\u5E38\u306B\u623B\u308A\u307E\u3057\u305F
 smfcore.nlp.posNoReelError=\u5EAB\u4F4D[{0}]\u306B\u7269\u6599\u304C\u691C\u51FA\u3055\u308C\u307E\u305B\u3093\u304C\u3001\u30B7\u30B9\u30C6\u30E0\u306B\u306F\u5728\u5EAB\u8A18\u9332\u304C\u3042\u308A\u307E\u3059
-smfcore.nlp.posHasReelError=\u5EAB\u4F4D[{0}]\u306B\u7269\u6599\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u30B7\u30B9\u30C6\u30E0\u306B\u306F\u5728\u5EAB\u8A18\u9332\u304C\u3042\u308A\u307E\u305B\u3093
\ No newline at end of file
+smfcore.nlp.posHasReelError=\u5EAB\u4F4D[{0}]\u306B\u7269\u6599\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u30B7\u30B9\u30C6\u30E0\u306B\u306F\u5728\u5EAB\u8A18\u9332\u304C\u3042\u308A\u307E\u305B\u3093
+smfcore.storage.noCids=\u6599\u5009 CID \u672A\u6307\u5B9A
+smfcore.storage.noCanUseStorage=\u4F7F\u7528\u53EF\u80FD\u306A\u6599\u5009\u304C\u3042\u308A\u307E\u305B\u3093
+smfcore.barcode.clearOldLock={0}[{1}][{2}] \u5EAB\u4F4D [{3}] \u3092\u30ED\u30C3\u30AF\u3001\u53E4\u3044\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u30AF\u30EA\u30A2
+smfcore.barcode.noPutInPos=[{0}] [{1} x {2}] \u306E\u4ED3\u4F4D\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+smfcore.alreadyHasPos=\u6599\u5009 [{0}] \u306E\u5EAB\u4F4D\u6570\u306F\u65E2\u306B [{1}] \u3067\u3059
+smfcore.msd.noPos=\u958B\u5C01\u53EF\u80FD\u306A\u90E8\u54C1\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+smfcore.labelWithStoragePos=\u30E9\u30D9\u30EB [{0}] \u306F\u65E2\u306B\u5EAB\u4F4D\u3068\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u307E\u3059
+smfcore.login.codeError=\u30ED\u30B0\u30A4\u30F3\u30B3\u30FC\u30C9 [{0}] \u304C\u8AA4\u308A\u3067\u3059
+smfcore.haman.loadOk=\u64CD\u4F5C\u6210\u529F\u3001\u90E8\u54C1\u3092\u70B9\u706F\u3057\u305F\u68DA\u306E\u4F4D\u7F6E\u306B\u5165\u308C\u3066\u304F\u3060\u3055\u3044
+smfcore.time.error=\u8A2D\u5B9A\u5931\u6557\u3001\u5F62\u5F0F\u304C\u6570\u5B57\u304B\u3069\u3046\u304B\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044
+smfcore.pos.noInventory=\u30EA\u30A2\u30EB\u30BF\u30A4\u30E0\u5728\u5EAB\u60C5\u5831\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+smfcore.reelPosMove.paramerror=\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u4E0D\u5B8C\u5168\u3067\u3059
+smfcore.reelPosMove.posIsNull=\u5EAB\u4F4D [{1}] \u304C\u7A7A\u3067\u3059
+smfcore.liteOrder.exist=\u8981\u6C42\u5358 {0} \u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059
+smfcore.reelPosMove.barcodeError=\u5EAB\u4F4D {0} \u306E\u30D0\u30FC\u30B3\u30FC\u30C9\u306F {1} \u3067\u3001\u79FB\u5EAB\u30D0\u30FC\u30B3\u30FC\u30C9 {1} \u3068\u4E0D\u4E00\u81F4\u3067\u3059
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -432,4 +432,19 @@ smfcore.tailingmaterial.noPos=\u672A\u627E\u5230\u53EF\u7528\u7684\u67DC\u4F53
 smfcore.tailingmaterial.pnError=\u5165\u5E93\u7684\u7269\u6599[{0}]\u4E0E\u67DC\u4F53\u4E2D[{1}]\u4E0D\u540C
 smfcore.nlp.posRecovered=\u5E93\u4F4D[{0}]\u6062\u590D\u6B63\u5E38
 smfcore.nlp.posNoReelError=\u5E93\u4F4D[{0}]\u68C0\u6D4B\u5230\u6CA1\u6709\u7269\u6599\uFF0C\u4F46\u7CFB\u7EDF\u6709\u5E93\u5B58\u8BB0\u5F55
-smfcore.nlp.posHasReelError=\u5E93\u4F4D[{0}]\u68C0\u6D4B\u5230\u6709\u7269\u6599\uFF0C\u4F46\u7CFB\u7EDF\u65E0\u5E93\u5B58\u8BB0\u5F55
\ No newline at end of file
+smfcore.nlp.posHasReelError=\u5E93\u4F4D[{0}]\u68C0\u6D4B\u5230\u6709\u7269\u6599\uFF0C\u4F46\u7CFB\u7EDF\u65E0\u5E93\u5B58\u8BB0\u5F55
+smfcore.storage.noCids=\u672A\u6307\u5B9A\u6599\u4ED3CID
+smfcore.storage.noCanUseStorage=\u65E0\u53EF\u7528\u7684\u6599\u4ED3
+smfcore.barcode.clearOldLock={0}[{1}][{2}]\u9501\u5B9A\u5E93\u4F4D[{3}],\u6E05\u7406\u65E7\u6709\u9501\u5B9A\u4FE1\u606F
+smfcore.barcode.noPutInPos=[{0}]\u672A\u627E\u5230[{1}x{2}]\u4ED3\u4F4D
+smfcore.alreadyHasPos=\u6599\u4ED3[{0}]\u5DF2\u6709\u5E93\u4F4D\u6570\uFF1A[{1}]
+smfcore.msd.noPos=\u672A\u627E\u5230\u53EF\u5F00\u5C01\u7684\u7269\u6599
+smfcore.labelWithStoragePos=\u6807\u7B7E[{0}]\u5DF2\u548C\u5E93\u4F4D\u5173\u8054
+smfcore.login.codeError=\u767B\u5F55\u7801[{0}]\u9519\u8BEF
+smfcore.haman.loadOk=\u64CD\u4F5C\u6210\u529F, \u8BF7\u5C06\u7269\u6599\u653E\u5165\u4EAE\u706F\u67B6\u4F4D
+smfcore.time.error=\u8BBE\u7F6E\u5931\u8D25,\u8BF7\u786E\u8BA4\u683C\u5F0F\u662F\u5426\u4E3A\u6570\u5B57
+smfcore.pos.noInventory=\u672A\u627E\u5230\u5B9E\u65F6\u5E93\u5B58\u4FE1\u606F
+smfcore.reelPosMove.paramerror=\u53C2\u6570\u4E0D\u5B8C\u6574
+smfcore.reelPosMove.posIsNull=\u5E93\u4F4D[{1}]\u4E3A\u7A7A
+smfcore.liteOrder.exist=\u9700\u6C42\u5355{0}\u5DF2\u5B58\u5728
+smfcore.reelPosMove.barcodeError=\u5E93\u4F4D{0}\u6761\u7801\u4E3A{1}\uFF0C\u4E0E\u79FB\u5E93\u6761\u7801{1}\u4E0D\u4E00\u81F4
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -422,8 +422,8 @@ smfcore.equipment.view.ncgroup=Neo Counter
 smfcore.virtual.boxInPos=[{0}]\u5DF2\u5728\u5EAB\u4F4D[{1}]\u4E2D,\u8ACB\u5148\u53D6\u51FA
 smfcore.virtual.quantityError=\u53D6\u51FA\u6578\u91CF\u61C9\u70BA[{0}]
 smfcore.virtual.enter=\u8ACB\u6383\u63CF\u6216\u8F38\u5165\u689D\u78BC\u5F8C\u6309\u56DE\u8ECA\u78BA\u8A8D
-smfcore.auth.expire = \u6388\u6B0A\u5DF2\u904E\u671F
-smfcore.order.slotNum = \u7AD9\u4F4D\u7DE8\u865F
+smfcore.auth.expire=\u6388\u6B0A\u5DF2\u904E\u671F
+smfcore.order.slotNum=\u7AD9\u4F4D\u7DE8\u865F
 smf.nexim.getInventoryFaile=\u53D6\u5F97 did \u8CC7\u8A0A\u5931\u6557:[{0}]
 smfcore.registerdid.false=[{0}]\u8A3B\u518Adid\u5931\u6557:[{1}]
 smfcore.accessToken.ng=\u7372\u53D6AccessToken\u5931\u6557
@@ -432,4 +432,19 @@ smfcore.tailingmaterial.noPos=\u672A\u627E\u5230\u53EF\u7528\u7684\u6AC3\u9AD4
 smfcore.tailingmaterial.pnError=\u5165\u5EAB\u7684\u7269\u6599[{0}]\u8207\u6AC3\u9AD4\u4E2D[{1}]\u4E0D\u540C
 smfcore.nlp.posRecovered=\u5EAB\u4F4D[{0}]\u6062\u5FA9\u6B63\u5E38
 smfcore.nlp.posNoReelError=\u5EAB\u4F4D[{0}]\u6AA2\u6E2C\u5230\u6C92\u6709\u7269\u6599\uFF0C\u4F46\u7CFB\u7D71\u6709\u5EAB\u5B58\u8A18\u9304
-smfcore.nlp.posHasReelError=\u5EAB\u4F4D[{0}]\u6AA2\u6E2C\u5230\u6709\u7269\u6599\uFF0C\u4F46\u7CFB\u7D71\u7121\u5EAB\u5B58\u8A18\u9304
\ No newline at end of file
+smfcore.nlp.posHasReelError=\u5EAB\u4F4D[{0}]\u6AA2\u6E2C\u5230\u6709\u7269\u6599\uFF0C\u4F46\u7CFB\u7D71\u7121\u5EAB\u5B58\u8A18\u9304
+smfcore.storage.noCids=\u672A\u6307\u5B9A\u6599\u5009 CID
+smfcore.storage.noCanUseStorage=\u7121\u53EF\u7528\u7684\u6599\u5009
+smfcore.barcode.clearOldLock={0}[{1}][{2}] \u9396\u5B9A\u5EAB\u4F4D [{3}]\uFF0C\u6E05\u7406\u820A\u6709\u9396\u5B9A\u8CC7\u8A0A
+smfcore.barcode.noPutInPos=[{0}] \u672A\u627E\u5230 [{1} x {2}] \u5009\u4F4D
+smfcore.alreadyHasPos=\u6599\u5009 [{0}] \u5DF2\u6709\u5EAB\u4F4D\u6578\uFF1A[{1}]
+smfcore.msd.noPos=\u672A\u627E\u5230\u53EF\u958B\u5C01\u7684\u7269\u6599
+smfcore.labelWithStoragePos=\u6A19\u7C64 [{0}] \u5DF2\u548C\u5EAB\u4F4D\u95DC\u806F
+smfcore.login.codeError=\u767B\u5165\u78BC [{0}] \u932F\u8AA4
+smfcore.haman.loadOk=\u64CD\u4F5C\u6210\u529F\uFF0C\u8ACB\u5C07\u7269\u6599\u653E\u5165\u4EAE\u71C8\u67B6\u4F4D
+smfcore.time.error=\u8A2D\u5B9A\u5931\u6557\uFF0C\u8ACB\u78BA\u8A8D\u683C\u5F0F\u662F\u5426\u70BA\u6578\u5B57
+smfcore.pos.noInventory=\u672A\u627E\u5230\u5373\u6642\u5EAB\u5B58\u8CC7\u8A0A
+smfcore.reelPosMove.paramerror=\u53C3\u6578\u4E0D\u5B8C\u6574
+smfcore.reelPosMove.posIsNull=\u5EAB\u4F4D [{1}] \u70BA\u7A7A
+smfcore.liteOrder.exist=\u9700\u6C42\u55AE {0} \u5DF2\u5B58\u5728
+smfcore.reelPosMove.barcodeError=\u5EAB\u4F4D {0} \u689D\u78BC\u70BA {1}\uFF0C\u8207\u79FB\u5EAB\u689D\u78BC {1} \u4E0D\u4E00\u81F4
\ No newline at end of file