纬创增加新接口获取设备中的物料信息

myproject/src/main/java/com/myproject/bean/json/UsageItem.java

+package com.myproject.bean.json;
+
+/**
+ * Created by sunke on 2020/3/9.
+ */
+public class UsageItem {
+
+    /**
+     * 直径
+     */
+    private int w;
+
+    /**
+     * 高度
+     */
+    private int h;
+
+    /**
+     * 使用仓位数
+     */
+    private int usedCount;
+
+    /**
+     * 总仓位数
+     */
+    private int totalCount;
+
+    public int getH() {
+        return h;
+    }
+
+    public void setH(int h) {
+        this.h = h;
+    }
+
+    public int getUsedCount() {
+        return usedCount;
+    }
+
+    public void setUsedCount(int usedCount) {
+        this.usedCount = usedCount;
+    }
+
+    public int getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(int totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public int getW() {
+        return w;
+    }
+
+    public void setW(int w) {
+        this.w = w;
+    }
+
+    public String getSizeStr(){
+        return w+"x"+h;
+    }
+
+}

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

@@ -539,6 +539,7 @@ public class MesApiController extends BaseController {
             towerMap.put("usedSlot",usedSlot);
             towerMap.put("usedSlot",usedSlot);
             towerMap.put("freeSlot",freeSlot);
             towerMap.put("freeSlot",freeSlot);
             towerMap.put("material",materialList);
             towerMap.put("material",materialList);
+            resultMap.add(towerMap);
         }
         }
 
 
         return resultMap;
         return resultMap;