系统更新时不允许入库

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

@@ -489,7 +489,7 @@ public class QisdaDeviceController extends BaseController {
             return ResultBean.newErrorResult(302, "料盘["+barcode+"]的任务已完成");
         }
         statusStr = statusStr.toUpperCase();
-        log.info("更新料盘的任务状态["+task.getStatus()+"=" + task.getLocInfo() + "]为["+statusStr+"="+locInfo+"]");
+        log.info("更新料盘["+barcode+"]的任务状态["+task.getStatus()+"=" + task.getLocInfo() + "]为["+statusStr+"="+locInfo+"]");
         task.setStatus(statusStr);
         task.setLocInfo(locInfo);
         task = dataLogDao.save(task);

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

@@ -551,6 +551,14 @@ public class StorageDataController extends BaseController {
 //        }
         log.info("流水线["+cids+"]获取["+rfid+"]["+code+"]的入库库位");
         Map<String,Object> resultMap = Maps.newHashMap();
+
+        if(dataCache.getSettings().isStopOut()){
+            lineMsg = "系统更新中,暂停出入库";
+            resultMap.put("result","100");
+            resultMap.put("msg",lineMsg);
+            return resultMap;
+        }
+
         String okMsg = "";
         String errorMsg = "";
         if(Strings.isNullOrEmpty(cids)){

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

@@ -1277,9 +1277,15 @@ public class TaskService implements ITaskService {
                     resultStatus = statusBean;
 
                 } else if(statusBean.getOp() == StorageConstants.OP.PUT_IN){
+                    if(!dataCache.getSettings().isStopOut()){
                         log.debug("入库:"+mapper.writeValueAsString(statusBean));
                         resultStatus = putInLine(storage, statusBean);
                     }else {
+                        resultStatus.setMsg("系统更新中,暂停出入库");
+                        serverMsgs.put(cid,"系统更新中,暂停出入库");
+                    }
+
+                }else {
                     if(dataCache.needUpdateHumidiy(cid)){
                         log.info("发送温湿度报警值");
                         statusBean.setTemperature(dataCache.getSettings().getMaxTemperature());

myproject/src/main/webapp/WEB-INF/pages/qisda/orderOut.jsp

@@ -124,7 +124,7 @@
 
                     var mdate = new Date(outInfo.mdate).Format("yyyy-MM-dd hh:mm:ss");
                     var sdate = new Date(outInfo.sdate).Format("yyyy-MM-dd hh:mm:ss");
-                    var infoHtml = '<div class="panel panel-default" id='+data[i].hSerial+'>' +
+                    var infoHtml = '<div class="panel panel-default">' +
                             '<div class="panel-heading">' +
                             '<h4 class="panel-title">' +
                             '<a class="accordion-toggle" data-toggle="collapse" data-parent="#executing" href="#'+data[i].hSerial+'">' +
@@ -148,9 +148,9 @@
 
             });
         }
-        setInterval(function(){
+        //setInterval(function(){
             flushOutInfos();
-        }, 1000);
+        //}, 1000);
 
 
 //        var dragOptions = {

myproject/src/main/webapp/WEB-INF/pages/qisda/outInfoSearch.jsp

@@ -97,6 +97,9 @@
                         <display:column titleKey="创建时间" sortable="true" sortProperty="createDate">
                             <fmt:formatDate value="${outInfo.createDate}" pattern="yyyy-MM-dd HH:mm"/>
                         </display:column>
+                        <display:column titleKey="更新时间" sortable="true" sortProperty="updateDate">
+                            <fmt:formatDate value="${outInfo.updateDate}" pattern="yyyy-MM-dd HH:mm"/>
+                        </display:column>
 
                         <display:column titleKey="checkOut.operate" media="html" sortProperty="sendStatus" sortable="true">
                             <span class="hide">${outInfo.sendStatus}</span>