4.入库可扫多盘修改。

5.转储出库（外协、发运单、成本中心）出库完成未结束出库单修改。

src/main/java/com/neotel/smfcore/core/hik/rest/SingleInController.java

@@ -189,7 +189,7 @@ public class SingleInController {
         Collection<DataLog> queueTasks = taskService.getQueueTasks();
         Collection<DataLog> queueTasks = taskService.getQueueTasks();
         ResultBean resultBean = null;
         ResultBean resultBean = null;
         for (DataLog queueTask : queueTasks) {
         for (DataLog queueTask : queueTasks) {
-            if (queueTask.isPutInTask() && queueTask.isWait()) {
+            if (queueTask.isPutInTask() &&(queueTask.isWait()||queueTask.isExecuting()) ) {
                 if (!Strings.isNullOrEmpty(storageId) && queueTask.getStorageId().equals(storageId)) {
                 if (!Strings.isNullOrEmpty(storageId) && queueTask.getStorageId().equals(storageId)) {
                     log.info("codeIn [" + code + "][" + storageId + "]入库失败:条码[" + queueTask.getBarcode() + "]的任务还未结束 ");
                     log.info("codeIn [" + code + "][" + storageId + "]入库失败:条码[" + queueTask.getBarcode() + "]的任务还未结束 ");
                     throw new ValidateException("smfcore.unfinished", "the task of [{0}] is unfinished", new String[]{queueTask.getBarcode()});
                     throw new ValidateException("smfcore.unfinished", "the task of [{0}] is unfinished", new String[]{queueTask.getBarcode()});

src/main/java/com/neotel/smfcore/core/outList/util/OutListCache.java

@@ -55,7 +55,7 @@ public class OutListCache implements ITaskListener {
             //只有任务完成或取消时才处理，任务未完成直接返回
             //只有任务完成或取消时才处理，任务未完成直接返回
             if (task.isFinished() || task.isCancel()) {
             if (task.isFinished() || task.isCancel()) {
                 //判断是否是转储单任务 
                 //判断是否是转储单任务 
-                if(OP.CHECKOUT == task.getType()&&task.getOutType()==3) {
+                if(OP.CHECKOUT == task.getType()&&(task.getOutType()==3||task.getOutType()==4)) {
                     finishedOrderTask(task);
                     finishedOrderTask(task);
                 }
                 }
             }
             }