查询库位是否有料或物料是否在库位中

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -530,6 +530,45 @@ public class DeviceController {
 
         return ResultBean.newOkResult(cid);
     }
+
+    @ApiOperation("查询库位是否有料或物料是否在库位中")
+    @RequestMapping(value = "/service/store/posQuery")
+    @ResponseBody
+    @AnonymousAccess
+    public ResultBean queryPos(HttpServletRequest request) {
+        String posName = request.getParameter("posName");
+        String barcode = request.getParameter("barcode");
+        //参数：发送posName 或 barcode
+        //返回code=0,有料或在库位中，data中返回 posName,barcode,plateW,plateH
+        //返回code=101： 未找到库位号
+        //返回code=102：条码未找到库位
+        //返回code=100：库位中无料
+
+        StoragePos pos = null;
+        if (ObjectUtil.isNotEmpty(posName)) {
+            //查询库位中是否有料
+            pos = storagePosManager.getByPosName(posName);
+            if (pos == null) {
+                return ResultBean.newErrorResult(101, "smfcore.queryPos.cannotFind", "cannot find posName ["+posName+"]", new String[]{posName});
+            } else if (pos.getBarcode() == null) {
+                return ResultBean.newErrorResult(100, "smfcore.queryPos.posIsEmpty", "["+posName+"] is empty", new String[]{posName});
+            }
+        } else if (ObjectUtil.isNotEmpty(barcode)) {
+            pos = storagePosManager.getByBarcode(barcode);
+            if (pos == null) {
+                return  ResultBean.newErrorResult(102, "smfcore.queryPos.cannotFindBarcode", "cannot find barcode ["+barcode+"] In storage", new String[]{barcode});
+            }
+        }else{
+            return ResultBean.newErrorResult(101, "smfcore.queryPos.cannotFind", "cannot find posName ["+posName+"]", new String[]{posName});
+        }
+        Map<String, String> data = new HashMap<>();
+        data.put("posName", pos.getPosName());
+        data.put("barcode", pos.getBarcode().getBarcode());
+        data.put("plateW", pos.getBarcode().getPlateSize() + "");
+        data.put("plateH", pos.getBarcode().getHeight() + "");
+        return ResultBean.newOkResult(data);
+    }
+
     private StoragePos findFormList(List<StoragePos> list ,String posName)
     {
         for (StoragePos pos :