包装仓锁定料架NG库位

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

@@ -1507,6 +1507,38 @@ public class QisdaDeviceController extends BaseController {
     }
     }
 
 
     /**
     /**
+     * 包装仓锁定料架NG库位,用于包装料架锁定NG物料库位
+     */
+    @RequestMapping("/lockAShelfLoc")
+    @ResponseBody
+    public ResultBean lockAShelfNgLoc(HttpServletRequest request) {
+        String rfid = request.getParameter("rfid");
+        String rfidLoc = request.getParameter("rfidLoc");
+        try {
+            log.info("锁定料架["+rfid+"]的NG库位" + rfidLoc);
+            ReelLockPosInfo reelLocInfo = new ReelLockPosInfo();
+            String locStr = rfid+"-" + rfidLoc;
+            reelLocInfo.setBarcode(locStr);
+            reelLocInfo.setCid("NG");
+            reelLocInfo.setLockPosName(locStr);
+            reelLocInfo.setLockPosId(locStr);
+            reelLocInfo.setRfid(rfid);
+            reelLocInfo.setRfidLoc(rfidLoc);
+            reelLocInfo = QisdaCache.addReelLockPosInfo(reelLocInfo);
+            if(reelLocInfo == null){
+                return ResultBean.newErrorResult(5301,"锁定包装料架NG库位");
+            }else{
+                ResultBean.newOkResult("");
+            }
+
+            return ResultBean.newOkResult("");
+        }catch (Exception e){
+            log.error("锁定包装料架NG库位出错",e);
+            return ResultBean.newErrorResult(5302,"锁定包装料架NG库位出错:" + e.getMessage());
+        }
+    }
+
+    /**
      * AGV锁定包装仓入库料架, AGV从VMI拉上包装料架准备入库时,调用此接口,用于包装仓判断料架是否是入库料架
      * AGV锁定包装仓入库料架, AGV从VMI拉上包装料架准备入库时,调用此接口,用于包装仓判断料架是否是入库料架
      */
      */
     @RequestMapping("/lockPutInAShelf")
     @RequestMapping("/lockPutInAShelf")

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

@@ -12,6 +12,23 @@
 <div class="row">
 <div class="row">
     <div class="col-md-12">
     <div class="col-md-12">
         <ul class="timeline">
         <ul class="timeline">
+            <li class="timeline-purple">
+                <div class="timeline-time">
+                    <span class="date">2023</span>
+                    <span class="time">04-03</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2023040310</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>包装仓锁定料架NG库位</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
             <li class="timeline-green">
             <li class="timeline-green">
                 <div class="timeline-time">
                 <div class="timeline-time">
                     <span class="date">2023</span>
                     <span class="date">2023</span>

myproject/src/main/webapp/decorators/metro.jsp

@@ -239,7 +239,7 @@
   <div class="page-footer-inner">
   <div class="page-footer-inner">
     2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
     2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
   </div>
   </div>
-  <span class="right" style="color: #a3a3a3;">Version: V2023032111</span>
+  <span class="right" style="color: #a3a3a3;">Version: V2023040310</span>
   <div class="scroll-to-top">
   <div class="scroll-to-top">
     <i class="icon-arrow-up"></i>
     <i class="icon-arrow-up"></i>
   </div>
   </div>