1.一键上架功能优化

2.增加批量禁用/启用库位

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -561,7 +561,6 @@ public class StoragePosController {
             baseCriteria.and("barcode.type").is(componentType);
             baseCriteria.and("barcode.type").is(componentType);
         }
         }
 
 
-
         String expire = criteria.getExpire();
         String expire = criteria.getExpire();
         if (!Strings.isNullOrEmpty(expire)) {
         if (!Strings.isNullOrEmpty(expire)) {
             if ("solder".equalsIgnoreCase(expire)) {
             if ("solder".equalsIgnoreCase(expire)) {
@@ -571,6 +570,15 @@ public class StoragePosController {
             }
             }
         }
         }
 
 
+        Integer barcodeStatus = criteria.getBarcodeStatus();
+        if (barcodeStatus != null && barcodeStatus != -1){
+            if (barcodeStatus == 0){
+                baseCriteria.and("barcode.status").is(BARCODE_STATUS.IN_STORE);
+            } else {
+                baseCriteria.and("barcode.status").ne(BARCODE_STATUS.IN_STORE);
+            }
+        }
+
         query.addCriteria(baseCriteria);
         query.addCriteria(baseCriteria);
         return query;
         return query;
     }
     }
@@ -847,7 +855,11 @@ public class StoragePosController {
     @ApiOperation("一键上架")
     @ApiOperation("一键上架")
     @RequestMapping("/oneClickPutaway")
     @RequestMapping("/oneClickPutaway")
     //@AnonymousAccess
     //@AnonymousAccess
-    public ResultBean oneClickPutaway(@RequestBody Map<String, String> paramMap) {
+    public ResultBean oneClickPutaway(@RequestBody List<Map<String, String>> paramMapList) {
+        if (paramMapList == null || paramMapList.isEmpty()){
+            return ResultBean.newErrorResult(-1,"","请选择对应的料箱");
+        }
+        for (Map<String, String> paramMap : paramMapList) {
             String posName = paramMap.get("posName");
             String posName = paramMap.get("posName");
             String boxStr = paramMap.get("boxStr");
             String boxStr = paramMap.get("boxStr");
             log.info("收到一键上架请求,操作人:" + SecurityUtils.getLoginUsername() + ",库位号:" + posName + ",料箱号:" + boxStr);
             log.info("收到一键上架请求,操作人:" + SecurityUtils.getLoginUsername() + ",库位号:" + posName + ",料箱号:" + boxStr);
@@ -868,39 +880,37 @@ public class StoragePosController {
             } catch (ValidateException e) {
             } catch (ValidateException e) {
                 return ResultBean.newErrorResult(-1, e.getMsgKey(), e.getMessage(), e.getMsgParam());
                 return ResultBean.newErrorResult(-1, e.getMsgKey(), e.getMessage(), e.getMsgParam());
             }
             }
-
+            //判断料箱是否在库
+            if (barcode.getStatus() == BARCODE_STATUS.IN_STORE){
+                continue;
+            }
             //判断库位是否绑定其他料箱
             //判断库位是否绑定其他料箱
             Barcode posBarcode = pos.getBarcode();
             Barcode posBarcode = pos.getBarcode();
-        if (posBarcode != null){
-            if (!posBarcode.getBarcode().equals(barcode.getBarcode())){
-                return ResultBean.newErrorResult(-1,"",posName+",已经绑定其他料箱号:"+posBarcode.getBarcode());
+            if (posBarcode != null) {
+                if (!posBarcode.getBarcode().equals(barcode.getBarcode())) {
+                    return ResultBean.newErrorResult(-1, "", posName + ",已经绑定其他料箱号:" + posBarcode.getBarcode());
                 }
                 }
             }
             }
-
             List<DataLog> allTasks = taskService.getAllTasks();
             List<DataLog> allTasks = taskService.getAllTasks();
             //判断当前料箱有没有任务
             //判断当前料箱有没有任务
             for (DataLog task : allTasks) {
             for (DataLog task : allTasks) {
                 if (!task.isCancel() && !task.isFinished()) {
                 if (!task.isCancel() && !task.isFinished()) {
                     if (barcode.getBarcode().equals(task.getBarcode())) {
                     if (barcode.getBarcode().equals(task.getBarcode())) {
-                    return ResultBean.newErrorResult(-1,"",barcode.getBarcode()+"有正在执行中的任务,请确认");
+                        return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "有正在执行中的任务,请确认");
                     }
                     }
                     if (pos.getId().equals(task.getPosId())) {
                     if (pos.getId().equals(task.getPosId())) {
-                    return ResultBean.newErrorResult(-1,"",posName+"有正在执行中的任务,请确认");
+                        return ResultBean.newErrorResult(-1, "", posName + "有正在执行中的任务,请确认");
                     }
                     }
                 }
                 }
             }
             }
-
-
-
             Storage storage = dataCache.getStorageById(pos.getStorageId());
             Storage storage = dataCache.getStorageById(pos.getStorageId());
             DataLog dataLog = new DataLog(storage, barcode, pos);
             DataLog dataLog = new DataLog(storage, barcode, pos);
             dataLog.setOperator(SecurityUtils.getLoginUsername());
             dataLog.setOperator(SecurityUtils.getLoginUsername());
             dataLog.setType(OP.PUT_IN);
             dataLog.setType(OP.PUT_IN);
             dataLog.setStatus(OP_STATUS.FINISHED.name());
             dataLog.setStatus(OP_STATUS.FINISHED.name());
             taskService.updateFinishedTask(dataLog);
             taskService.updateFinishedTask(dataLog);
-
             BoxHandleUtil.intoPos(dataLog);
             BoxHandleUtil.intoPos(dataLog);
-
+        }
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
 
 
@@ -1213,5 +1223,4 @@ public class StoragePosController {
         }
         }
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
-
 }
 }

src/main/java/com/neotel/smfcore/core/storage/rest/query/StoragePosFindCriteria.java

@@ -110,6 +110,8 @@ public class StoragePosFindCriteria {
 
 
     private String machineTypes;
     private String machineTypes;
 
 
+    private Integer barcodeStatus = -1;
+
     @ApiModelProperty("料箱状态,是否在库")
     @ApiModelProperty("料箱状态,是否在库")
     @QueryCondition(type = QueryCondition.Type.IN,propName = "barcode.status")
     @QueryCondition(type = QueryCondition.Type.IN,propName = "barcode.status")
     private List<Integer> boxStatusList;
     private List<Integer> boxStatusList;