1053修改：入库任务在线体上时可以发出库任务

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

@@ -333,12 +333,12 @@ public class BaseDeviceHandler implements IDeviceHandler {
                 storagePos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds);
             } else {
                 log.info("料仓" + storageCid + "有出库任务未完成,不允许入库");
-                throw new ValidateException("error.storage.outNotEnd", "料仓{0}有出库任务未完成，不允许入库", new String[]{storageCid});
+                throw new ValidateException("smfcore.error.storage.outNotEnd", "料仓{0}有出库任务未完成，不允许入库", new String[]{storageCid});
 
             }
         }
         if (storagePos == null) {
-            throw new ValidateException("error.storage.noPos", storage.getName() + "的料格[" + barcode.getPlateSize() + "x" + barcode.getHeight() + "]已满,无法继续放入", new String[]{barcode.getPlateSize() + "x" + barcode.getHeight()});
+            throw new ValidateException("smfcore.error.storage.noPos", "{0}的料格[{1}]已满,无法继续放入", new String[]{ storage.getName(),barcode.getPlateSize() + "x" + barcode.getHeight()});
         }
         log.info("[" + barcode.getBarcode() + "]寻找到" + storage.getName() + "的空仓位[" + storagePos.getPosName() + "]");
         return storagePos;

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

@@ -107,7 +107,8 @@ public class RobotBoxHandler extends BaseDeviceHandler {
             for (DataLog queueTask : queueTasks) {
                 if (queueTask.getCid().equals(cid)) {
                     //有入库任务不分配出库任务
-                    if (queueTask.isPutInTask()) {
+                    //入库任务如果在线体上时不影响
+                    if (queueTask.isPutInTask()&&(!queueTask.isInLine())) {
                         return statusBean;
                     } else {
                         if (queueTask.isExecuting()) {

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

@@ -93,7 +93,8 @@ public class ThirdBoxHandler extends BaseDeviceHandler{
             for (DataLog queueTask : queueTasks) {
                 if (queueTask.getCid().equals(cid)) {
                     //有入库任务不分配出库任务
-                    if (queueTask.isPutInTask()) {
+                    //入库任务如果在线体上时不影响
+                    if (queueTask.isPutInTask()&&(!queueTask.isInLine()))  {
                         return statusBean;
                     } else {
                         if (queueTask.isExecuting()) {

src/main/resources/messages.properties

@@ -302,6 +302,7 @@ smfcore.ml=MI1
 smfcore.ml2=MI2
 smfcore.diagnosis=Diagnosis
 smfcore.helps=Help
+smfcore.error.storage.noPos={0}\u7684\u6599\u683C[{1}]\u5DF2\u6EE1,\u65E0\u6CD5\u7EE7\u7EED\u653E\u5165
 #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

@@ -300,4 +300,5 @@ smfcore.mt=MT
 smfcore.ml=MI1
 smfcore.ml2=MI2
 smfcore.diagnosis=Diagnosis
-smfcore.helps=Help
\ No newline at end of file
+smfcore.helps=Help
+smfcore.error.storage.noPos={0}'s cell [{1}] is full and cannot be added
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -298,3 +298,4 @@ smfcore.ml=MI1
 smfcore.ml2=MI2
 smfcore.diagnosis=Diagnosis
 smfcore.helps=Help
+smfcore.error.storage.noPos={0}\u7684\u6599\u683C[{1}]\u5DF2\u6EE1,\u65E0\u6CD5\u7EE7\u7EED\u653E\u5165

src/main/resources/messages_zh_CN.properties

@@ -297,4 +297,5 @@ smfcore.mt=MT
 smfcore.ml=MI1
 smfcore.ml2=MI2
 smfcore.diagnosis=Diagnosis
-smfcore.helps=Help
\ No newline at end of file
+smfcore.helps=Help
+smfcore.error.storage.noPos={0}\u7684\u6599\u683C[{1}]\u5DF2\u6EE1,\u65E0\u6CD5\u7EE7\u7EED\u653E\u5165
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -298,4 +298,5 @@ smfcore.mt=MT
 smfcore.ml=MI1
 smfcore.ml2=MI2
 smfcore.diagnosis=Diagnosis
-smfcore.helps=Help
\ No newline at end of file
+smfcore.helps=Help
+smfcore.error.storage.noPos={0}\u7684\u6599\u683C[{1}]\u5DF2\u6EFF,\u7121\u6CD5\u7E7C\u7E8C\u653E\u5165
\ No newline at end of file