增加查询托盘禁用接口

myproject/src/main/java/com/myproject/webapp/controller/qisda/DifferentInventoryController.java

@@ -113,6 +113,20 @@ public class DifferentInventoryController extends BaseController {
                 if(sameDiff != null){
                     //两边都有,但有字段值不一样
                     sameDiffList.add(sameDiff);
+//                    StoragePos pos = storagePosManager.getByBarcode(reelId);
+//                    if(pos != null){
+//                        try {
+//                            log.info("更新料盘["+reelId+"]的数量["+neotelInfo.getQty()+"]=>" + qisdaINfo.getQty());
+//                            Barcode barcode = pos.getBarcode();
+//                            Integer qisdaAmount = Integer.valueOf(qisdaINfo.getQty());
+//                            barcode.setAmount(qisdaAmount);
+//                            barcode.setInitialAmount(qisdaAmount);
+//                            pos.setBarcode(barcode);
+//                            storagePosManager.save(pos);
+//                        } catch (ValidateException e) {
+//                            log.error("更新数量出错",e);
+//                        }
+//                    }
                 }
             }
         }

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

+package com.myproject.webapp.controller.webService;
+
+import com.myproject.bean.qisda.ResultBean;
+import com.myproject.bean.update.Barcode;
+import com.myproject.bean.update.Component;
+import com.myproject.bean.update.StoragePos;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.util.Strings;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 禁用托盘信息
+ * @author sunke
+ * @date 2023/1/10 9:07 AM
+ */
+
+@Controller
+@RequestMapping("/rest/api/qisda/device")
+public class QisdaDisabledTrayController {
+
+    /**
+     * 环形线禁用托盘信息
+     */
+    protected String disabledTray = "";
+
+    protected final static Logger log = LogManager.getLogger(QisdaDisabledTrayController.class);
+
+    /**
+     * 获取工单的小料盘绑定数量
+     */
+    @RequestMapping(value = "/getDisabledTray")
+    @ResponseBody
+    public String smallBindCount(HttpServletRequest request){
+        return disabledTray;
+    }
+
+    @RequestMapping(value = "/updateDisabledTray")
+    @ResponseBody
+    public ResultBean getReelSize(HttpServletRequest request) {
+        try{
+            String trayList = request.getParameter("disabledTray");
+            if(Strings.isEmpty(trayList)){
+                trayList = "";
+            }
+            if(!disabledTray.equals(trayList)){
+                log.info("收到禁用托盘更新信息:"+trayList);
+            }
+            disabledTray = trayList;
+            return ResultBean.newOkResult("");
+        }catch(Exception e){
+            log.error("上传禁用托盘信息出错",e);
+            return ResultBean.newErrorResult(500,e.getMessage());
+        }
+    }
+
+}

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

@@ -12,6 +12,44 @@
 <div class="row">
     <div class="col-md-12">
         <ul class="timeline">
+            <li class="timeline-purple">
+                <div class="timeline-time">
+                    <span class="date">2023</span>
+                    <span class="time">01-10</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2023011010</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>增加查询托盘禁用接口,接口地址: http://ip/myproject/rest/api/qisda/device/getDisabledTray
+
+                                返回说明:  返回禁用托盘列表, 多个托盘用,分割</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
+            <li class="timeline-green">
+                <div class="timeline-time">
+                    <span class="date">2022</span>
+                    <span class="time">11-18</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2022111814</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>增加维护尺寸导入功能</li>
+                            <li>三楼增加开关机功能</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
+
             <li class="timeline-blue">
                 <div class="timeline-time">
                     <span class="date">2022</span>

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

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