获取库位号时提示修改

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

@@ -314,7 +314,7 @@ public class RobotBoxHandler extends BaseDeviceHandler {
             code = "=1+0x0-" + barcode.getPlateSize() + "x" + barcode.getHeight() + "=" + code;
             log.info(" renewPosForPutin 处理后条码：" + code);
         }
-        return posForPutin(code, cids, preCid, rfid);
+        return posForPutin(code, cids, preCid, rfid,request.getLocale());
 
     }
 
@@ -349,11 +349,11 @@ public class RobotBoxHandler extends BaseDeviceHandler {
         String lastPosId = "";
         String lineMsg = "";
         log.info("流水线[" + cids + "]获取[" + code + "],rfid=["+rfid+"]的入库库位");
-        return posForPutin(code,cids,"",rfid);
+        return posForPutin(code,cids,"",rfid,request.getLocale());
 
     }
 
-    public Map<String, Object> posForPutin(String code,String cids,String preCid,String rfid){
+    public Map<String, Object> posForPutin(String code,String cids,String preCid,String rfid,Locale locale){
         log.info("posForPutin,code=["+code+"],cids=["+cids+"],preCid=["+preCid+"]");
         String lastPosId = "";
         String lineMsg = "";
@@ -506,9 +506,14 @@ public class RobotBoxHandler extends BaseDeviceHandler {
 //                            resultMap.put("taskId", dataLog.getId());
 //                            return resultMap;
                         } else {
+//                            重复ID，入库时，error提示 改成：
+//                            序列号[CARRIERPCB-010] 已有出库任务，出库前不得入库相同序列号物料
+//                            Serial No.(S)[CARRIERPCB-010] already have retrieval task, cannot store same Serial No. material before retrieval finish
                             //已有出库任务
 //                            errorMsg = "条码[" + dataLog.getBarcode() + "]已有出库任务,需继续执行出库动作";
-                            errorMsg = "Serial No.(S)[" + dataLog.getBarcode() + "] already have outbound tasks,Continue with the outbound action";
+                            errorMsg = "Serial No.(S)[" + dataLog.getBarcode() + "]  already have retrieval task, cannot store same Serial No. material before retrieval finish";
+                            errorMsg=MessageUtils.getText("smfcore.error.barcode.hasOutTask",new String[]{dataLog.getBarcode()},locale,
+                                    "Serial No.(S)[0] already have retrieval task, cannot store same Serial No. material before retrieval finish");
                             resultMap.put("result", "98");
                             resultMap.put("msg", errorMsg);
 

src/main/resources/messages.properties

@@ -359,6 +359,7 @@ smfcore.api.toXray={0}\u9700\u8981\u53BB\u70B9\u6599
 smfcore.paretoChart=\u5E15\u7D2F\u6258\u56FE
 smfcore.selfAudit.hasOutTask=\u5E93\u4F4D[{0}]\u5DF2\u6709\u51FA\u5E93\u4EFB\u52A1
 smfcore.error.barcode.hastask=\u6761\u7801[0]\u5DF2\u6709\u5165\u5E93\u4EFB\u52A1
+smfcore.error.barcode.hasOutTask=\u5E8F\u5217\u53F7[0] \u5DF2\u6709\u51FA\u5E93\u4EFB\u52A1\uFF0C\u51FA\u5E93\u524D\u4E0D\u5F97\u5165\u5E93\u76F8\u540C\u5E8F\u5217\u53F7\u7269\u6599 
 #smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
 #smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
 #smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F

src/main/resources/messages_en_US.properties

@@ -358,3 +358,4 @@ smfcore.api.toXray={0}Need to Xray
 smfcore.paretoChart=Pareto chart
 smfcore.selfAudit.hasOutTask=The location [{0}] already has a release task
 smfcore.error.barcode.hastask=Serial No.(S)[0] already have storage task
+smfcore.error.barcode.hasOutTask=Serial No.(S)[0] already have retrieval task, cannot store same Serial No. material before retrieval finish
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -353,3 +353,4 @@ smfcore.micron.apiClose=Not yet open
 smfcore.paretoChart=\u30D1\u30EC\u30FC\u30C8\u56F3
 smfcore.selfAudit.hasOutTask=\u5E93\u4F4D[{0}]\u5DF2\u6709\u51FA\u5E93\u4EFB\u52A1
 smfcore.error.barcode.hastask=Serial No.(S)[0] already have storage task
+smfcore.error.barcode.hasOutTask=Serial No.(S)[0] already have retrieval task, cannot store same Serial No. material before retrieval finish
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -353,3 +353,4 @@ smfcore.micron.apiClose=API\u529F\u80FD\u672A\u5F00\u653E
 smfcore.paretoChart=\u5E15\u7D2F\u6258\u56FE
 smfcore.selfAudit.hasOutTask=\u5E93\u4F4D[{0}]\u5DF2\u6709\u51FA\u5E93\u4EFB\u52A1
 smfcore.error.barcode.hastask=Serial No.(S)[0] already have storage task
+smfcore.error.barcode.hasOutTask=\u5E8F\u5217\u53F7[0] \u5DF2\u6709\u51FA\u5E93\u4EFB\u52A1\uFF0C\u51FA\u5E93\u524D\u4E0D\u5F97\u5165\u5E93\u76F8\u540C\u5E8F\u5217\u53F7\u7269\u6599
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -354,3 +354,4 @@ smfcore.api.fail={0} \u83B7\u53D6\u6570\u636E\u5931\u8D25
 smfcore.micron.apiClose=API\u529F\u80FD\u672A\u5F00\u653E
 smfcore.paretoChart=\u5E15\u7D2F\u6258\u5716
 smfcore.selfAudit.hasOutTask=\u5E93\u4F4D[{0}]\u5DF2\u6709\u51FA\u5E93\u4EFB\u52A1
+smfcore.error.barcode.hasOutTask=\u5E8F\u5217\u865F[0] \u5DF2\u6709\u51FA\u5EAB\u4EFB\u52D9\uFF0C\u51FA\u5EAB\u524D\u4E0D\u5F97\u5165\u5EAB\u76F8\u540C\u5E8F\u5217\u865F\u7269\u6599
\ No newline at end of file