入库时条码异常增加展示入料口信息

清理出库托盘时,通知佳世达系统(E状态)

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

@@ -24,6 +24,7 @@ import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -676,6 +677,24 @@ public class QisdaDeviceController extends BaseController {
         return ResultBean.newErrorResult(2003, "客户端取消任务["+codeStr+"]失败");
         return ResultBean.newErrorResult(2003, "客户端取消任务["+codeStr+"]失败");
     }
     }
 
 
+    @RequestMapping(value="/clearOutTask",method= RequestMethod.POST)
+    @ResponseBody
+    public ResultBean removeTaskFromQueue(HttpServletRequest request) throws Exception{
+        String codeStr = request.getParameter("barcode");
+        DataLog task = taskService.getFinishedTask(codeStr);
+        if(task == null){
+            return ResultBean.newErrorResult(3001,"清除出库任务时,未找到条码["+codeStr+"]的出库任务");
+        }else{
+            log.info("环形线客户端清理料盘["+codeStr+"]");
+            String taskId = request.getParameter("tid");
+            //禁用库位
+            boolean prohibitePos = false;
+            taskService.hideTask(taskId, prohibitePos);
+            return ResultBean.newOkResult("");
+        }
+
+    }
+
     /**
     /**
      * 取消出库任务
      * 取消出库任务
      */
      */

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

@@ -557,6 +557,7 @@ public class StorageDataController extends BaseController {
         String code = request.getParameter("code");
         String code = request.getParameter("code");
         String cids = request.getParameter("cids");
         String cids = request.getParameter("cids");
         String rfid = request.getParameter("rfid");
         String rfid = request.getParameter("rfid");
+        String entrance = request.getParameter("entrance");
         String rfidLoc = request.getParameter("rfidLoc");
         String rfidLoc = request.getParameter("rfidLoc");
 
 
         lineMsg = "";
         lineMsg = "";
@@ -749,8 +750,11 @@ public class StorageDataController extends BaseController {
         if(!errorMsg.isEmpty()){
         if(!errorMsg.isEmpty()){
             //有错误,记录日志
             //有错误,记录日志
             AlarmInfo alarmInfo = new AlarmInfo();
             AlarmInfo alarmInfo = new AlarmInfo();
+            if(entrance == null){
+                entrance = "流水线";
+            }
             alarmInfo.setBoxId("0");
             alarmInfo.setBoxId("0");
-            alarmInfo.setStorageName("流水线");
+            alarmInfo.setStorageName(entrance);
             alarmInfo.setInOutStatus("1");
             alarmInfo.setInOutStatus("1");
             alarmInfo.setAlarmType("入库");
             alarmInfo.setAlarmType("入库");
             Date date = new Date();
             Date date = new Date();

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

@@ -12,6 +12,25 @@
 <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-grey">
+                <div class="timeline-time">
+                    <span class="date">2022</span>
+                    <span class="time">07-04</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2022070415</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>入库时条码异常增加展示入料口信息</li>
+                            <li>清理出库托盘时,通知佳世达系统(E状态)</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
             <li class="timeline-purple">
             <li class="timeline-purple">
                 <div class="timeline-time">
                 <div class="timeline-time">
                     <span class="date">2022</span>
                     <span class="date">2022</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: 2022.06.2115</span>
+  <span class="right" style="color: #a3a3a3;">Version: 2022.07.0415</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>