新增库位管理功能

进出轴报警时,屏蔽库位,增加设备稳定性

README.md

@@ -400,3 +400,18 @@
 >> - code: 0为正常,其他为异常, 
 >> - code: 0为正常,其他为异常, 
 >> - msg:消息, 
 >> - msg:消息, 
 >> - data:  
 >> - data:  
+
+21.   料仓进出轴报警时,屏蔽正在执行的库位
+
+>地址: 
+>>/rest/api/qisda/device/disablePos
+>
+>参数:
+>>posName : 库位编号
+>
+>   返回: 
+>>` {"code":0,"msg":"ok","data":""}`
+>>
+>> - code: 0为正常,其他为异常, 
+>> - msg:消息, 
+>> - data:  
\ No newline at end of file

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

@@ -1403,4 +1403,33 @@ public class QisdaDeviceController extends BaseController {
         return ResultBean.newOkResult("料架放上AGV时,清理["+realRfid+"]的缓存信息成功");
         return ResultBean.newOkResult("料架放上AGV时,清理["+realRfid+"]的缓存信息成功");
     }
     }
 
 
+    /**
+     * 客户端进出轴报警时禁用库位
+     */
+    @RequestMapping("/disablePos")
+    @ResponseBody
+    public ResultBean enablePos(HttpServletRequest request) {
+        String posName = request.getParameter("posName");
+        try {
+            StoragePos pos = storagePosManager.getByPosName(posName);
+            if(pos != null){
+                log.info("客户端禁用库位["+posName+"]");
+                if(pos.isEnabled()){
+                    pos.setEnabled(false);
+                    storagePosManager.save(pos);
+                    Storage storage = dataCache.getStorageById(pos.getStorageId());
+                    dataCache.reloadStorage(storage);
+                    return ResultBean.newOkResult("库位["+posName+"]禁用成功","");
+                }else{
+                    return ResultBean.newErrorResult(4003,"库位["+posName+"]已被禁用");
+                }
+            }else{
+                return ResultBean.newErrorResult(4004,"未到到库位["+posName+"]");
+            }
+        }catch (Exception e){
+            log.error("禁用库位出错",e);
+            return ResultBean.newErrorResult(4005,"禁用库位出错:" + e.getMessage());
+        }
+    }
+
 }
 }

myproject/src/main/webapp/WEB-INF/pages/updateHistory.jsp

@@ -15,16 +15,17 @@
             <li class="timeline-green">
             <li class="timeline-green">
                 <div class="timeline-time">
                 <div class="timeline-time">
                     <span class="date">2021</span>
                     <span class="date">2021</span>
-                    <span class="time">01-25</span>
+                    <span class="time">03-10</span>
                 </div>
                 </div>
                 <div class="timeline-icon">
                 <div class="timeline-icon">
                     <i class="fa fa-clock-o"></i>
                     <i class="fa fa-clock-o"></i>
                 </div>
                 </div>
                 <div class="timeline-body">
                 <div class="timeline-body">
-                    <h2>版本: V2021012514</h2>
+                    <h2>版本: V2021031014</h2>
                     <div class="timeline-content">
                     <div class="timeline-content">
                         <ul>
                         <ul>
-                            <li>优化未出完的指定料需求单再次出库功能</li>
+                            <li>新增库位管理功能</li>
+                            <li>进出轴报警时,屏蔽库位,增加设备稳定性</li>
                         </ul>
                         </ul>
                     </div>
                     </div>
                 </div>
                 </div>