出库的同时可以入库

myproject/src/main/java/com/myproject/webapp/controller/webService/StorageDataController.java

@@ -646,20 +646,20 @@ public class StorageDataController extends BaseController {
 
 
                     if(pos != null){
                     if(pos != null){
 
 
-                        Storage storage = dataCache.getStorageById(pos.getStorageId());
-                        if(!storage.isPackage()){
-                            //不是包装仓,如果所在料仓有出库任务,暂停入库
-                            Collection<DataLog> tasks = taskService.getQueueTasks();
-                            for (DataLog task : tasks) {
-                                if(task.isCheckOutTask() && task.getStorageId().equals(pos.getStorageId())){
-                                    errorMsg = "库位["+ pos.getPosName() + "]所在料仓有出库任务,暂停入库";
-                                    lineMsg = errorMsg;
-                                    resultMap.put("result","99");
-                                    resultMap.put("msg",errorMsg);
-                                    return resultMap;
-                                }
-                            }
-                        }
+//                        Storage storage = dataCache.getStorageById(pos.getStorageId());
+//                        if(!storage.isPackage()){
+//                            //不是包装仓,如果所在料仓有出库任务,暂停入库
+//                            Collection<DataLog> tasks = taskService.getQueueTasks();
+//                            for (DataLog task : tasks) {
+//                                if(task.isCheckOutTask() && task.getStorageId().equals(pos.getStorageId())){
+//                                    errorMsg = "库位["+ pos.getPosName() + "]所在料仓有出库任务,暂停入库";
+//                                    lineMsg = errorMsg;
+//                                    resultMap.put("result","99");
+//                                    resultMap.put("msg",errorMsg);
+//                                    return resultMap;
+//                                }
+//                            }
+//                        }
 
 
 
 
                         Storage theStorage = dataCache.getStorageById(pos.getStorageId());
                         Storage theStorage = dataCache.getStorageById(pos.getStorageId());