关闭手动解绑工单功能

条码无效时原因提醒
导出数据时限定最大数量,防止导出占用太大内存

myproject/src/main/java/com/myproject/dao/mongo/AbstractMongoDao.java

@@ -4,6 +4,7 @@ import com.mongodb.DBObject;
 import com.myproject.bean.BaseMongoBean;
 import com.myproject.bean.Sequence;
 import com.myproject.bean.search.PageList;
+import com.myproject.util.StorageConstants;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.displaytag.properties.SortOrderEnum;
@@ -147,6 +148,9 @@ public abstract class AbstractMongoDao implements IMongoDao {
         int pageNumber = pageList.getPageNumber();
         if(pageNumber == -1){
             sizePerPage = totalSize;
+            if(sizePerPage > StorageConstants.MAX_EXPORT_ITEMS){
+                sizePerPage = StorageConstants.MAX_EXPORT_ITEMS;
+            }
             pageNumber = 1;
         }
         pageList.setList(findByQuery(query, pageNumber, sizePerPage));

myproject/src/main/java/com/myproject/util/StorageConstants.java

@@ -30,6 +30,11 @@ public class StorageConstants {
 
     public final static int DEFAULT_HEIGHT = 20;
 
+    /**
+     * 导出数据最大数量
+     */
+    public final static int MAX_EXPORT_ITEMS = 300000;
+
 
     /**
      *  /// <summary>

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

@@ -156,7 +156,7 @@ public class QisdaController extends BaseController {
     /**
      * 清除所有的绑定信息
      */
-    @RequestMapping("/service/store/qisda/clearAllBind")
+    @RequestMapping("/service/store/qisda/clearAllBindSoseq")
     @ResponseBody
     public String unBindAllReel(HttpServletRequest request){
         String soseq = request.getParameter("soseq");

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

@@ -290,7 +290,7 @@ public class DataCache{
                             barcode.setHeight(codeBeanFromRule.getReelHeight());
                             barcode = barcodeManager.save(barcode);
                         }catch (Exception ve){
-
+                            log.error(ve);
                         }
                     }
                 }
@@ -355,7 +355,7 @@ public class DataCache{
                 return codeBeanFromRule;
             }else{
                 //在数据库中不存在,且未解析成功,用其他规则再解析
-                codeBeanFromRule.setError(barcodeItemStr + "不是有效的条码");
+                codeBeanFromRule.setError(barcodeItemStr + ":" + codeBeanFromRule.getError());
             }
         }
 

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

@@ -603,17 +603,17 @@ public class QisdaApiController extends BaseController {
         }else if(outInfo.isFirstReelAction()){
             //首盘
             int bindNum = 0;
-//            OutInfo cutOutInfo = soseqCache.getCutActionInfoFromCache(outInfo.getSoseq());
-//            if(cutOutInfo != null){
-//                for (OutItem outItem : cutOutInfo.getOutItems()) {
-//                    if(outItem.getRealLockQty()>0){
-//                        bindNum++;
-//                    }
-//                }
-//            }else{
+            OutInfo cutOutInfo = soseqCache.getCutActionInfoFromCache(outInfo.getSoseq());
+            if(cutOutInfo != null){
+                for (OutItem outItem : cutOutInfo.getOutItems()) {
+                    if(outItem.getRealLockQty()>0){
+                        bindNum++;
+                    }
+                }
+            }else{
                 //每一条有料的是一盘
-                bindNum = allItems.size();
-//            }
+                //bindNum = allItems.size();
+            }
 
             return bindNum;
         }else if(outInfo.isTailAction()){

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

@@ -12,6 +12,23 @@
 <div class="row">
     <div class="col-md-12">
         <ul class="timeline">
+            <li class="timeline-grey">
+                <div class="timeline-time">
+                    <span class="date">2021</span>
+                    <span class="time">03-24</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2021032417</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>取消任务时同时取消同一条码未完成的其他任务</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
             <li class="timeline-purple">
                 <div class="timeline-time">
                     <span class="date">2021</span>