fixed:停止入库时,料仓验证入库不通过的问题

myproject/src/main/java/com/myproject/bean/excel/CNCsvView.java

@@ -12,12 +12,12 @@ import java.io.Writer;
 public class CNCsvView extends CsvView{
 public class CNCsvView extends CsvView{
     @Override
     @Override
     public String getMimeType() {
     public String getMimeType() {
-        return "text/csv";
+        return "text/csv;charset=GB2312";
     }
     }
 
 
-    @Override
-    public void doExport(Writer out) throws IOException, JspException {
-        out.write(new String(new byte[] { (byte) 0xEF, (byte) 0xBB,(byte) 0xBF }));
-        super.doExport(out);
-    }
+//    @Override
+//    public void doExport(Writer out) throws IOException, JspException {
+//        out.write(new String(new byte[] { (byte) 0xEF, (byte) 0xBB,(byte) 0xBF }));
+//        super.doExport(out);
+//    }
 }
 }

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

@@ -228,7 +228,7 @@ public class TaskService implements ITaskService {
                 throw new ValidateException("尺寸["+w+"x"+h+"]不符");
                 throw new ValidateException("尺寸["+w+"x"+h+"]不符");
             }
             }
 
 
-            StoragePos storagePos;
+            StoragePos storagePos = null;
             DataLog executingTask = null;
             DataLog executingTask = null;
             //如果有正在执行的任务,把库位发过去
             //如果有正在执行的任务,把库位发过去
             for (DataLog task : taskMap.values()) {
             for (DataLog task : taskMap.values()) {
@@ -276,7 +276,13 @@ public class TaskService implements ITaskService {
                         storagePos = storagePosManager.get(lockPosId);
                         storagePos = storagePosManager.get(lockPosId);
                         log.info(barcodeSave.getBarcode() + "入库时查找到锁定的库位["+storagePos.getPosName()+"]");
                         log.info(barcodeSave.getBarcode() + "入库时查找到锁定的库位["+storagePos.getPosName()+"]");
                     }else{
                     }else{
-                        storagePos = findLineEmptyPosForPutIn(storage, barcodeSave);
+                        if(!dataCache.getSettings().isStopIn()){
+                            storagePos = findLineEmptyPosForPutIn(storage, barcodeSave);
+                        }else {
+                            statusBean.setMsg("系统已暂停入库");
+                            serverMsgs.put(storage.getCid(),"系统已暂停出入库");
+                            return statusBean;
+                        }
                     }
                     }
                 }
                 }
 
 
@@ -1417,13 +1423,13 @@ public class TaskService implements ITaskService {
                     resultStatus = statusBean;
                     resultStatus = statusBean;
 
 
                 } else if(statusBean.getOp() == StorageConstants.OP.PUT_IN){
                 } else if(statusBean.getOp() == StorageConstants.OP.PUT_IN){
-                    if(!dataCache.getSettings().isStopIn()){
+//                    if(!dataCache.getSettings().isStopIn()){
                         log.debug("入库:"+mapper.writeValueAsString(statusBean));
                         log.debug("入库:"+mapper.writeValueAsString(statusBean));
                         resultStatus = putInLine(storage, statusBean);
                         resultStatus = putInLine(storage, statusBean);
-                    }else {
-                        resultStatus.setMsg("系统已暂停入库");
-                        serverMsgs.put(cid,"系统已暂停出入库");
-                    }
+//                    }else {
+//                        resultStatus.setMsg("系统已暂停入库");
+//                        serverMsgs.put(cid,"系统已暂停出入库");
+//                    }
 
 
                 }else {
                 }else {
                     if(dataCache.needUpdateHumidiy(cid)){
                     if(dataCache.needUpdateHumidiy(cid)){

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

@@ -15,6 +15,23 @@
             <li class="timeline-blue">
             <li class="timeline-blue">
                 <div class="timeline-time">
                 <div class="timeline-time">
                     <span class="date">2021</span>
                     <span class="date">2021</span>
+                    <span class="time">11-3</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2021110316</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>fixed:停止入库时,料仓验证入库不通过的问题</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
+            <li class="timeline-blue">
+                <div class="timeline-time">
+                    <span class="date">2021</span>
                     <span class="time">10-13</span>
                     <span class="time">10-13</span>
                 </div>
                 </div>
                 <div class="timeline-icon">
                 <div class="timeline-icon">

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: 2021.10.13</span>
+  <span class="right" style="color: #a3a3a3;">Version: 2021.11.3</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>