关闭两天前的未完成需求单

myproject/src/main/java/com/myproject/webapp/controller/qisda/util/OutInfoCache.java

@@ -443,21 +443,17 @@ public class OutInfoCache {
         List<OutInfo> unEndOutInfoList = outInfoDao.findUnEndOutInfos();
         List<OutInfo> unEndOutInfoList = outInfoDao.findUnEndOutInfos();
         long now = System.currentTimeMillis();
         long now = System.currentTimeMillis();
         for (OutInfo outInfo : unEndOutInfoList) {
         for (OutInfo outInfo : unEndOutInfoList) {
-//            if(now - outInfo.getMdate().getTime() > 10 * 24 * 60 * 60 * 1000){
-//                //10天前的需求单(非紧急料),关闭,并解绑
-//                if(!outInfo.isUrgentAction()){
-//                    String so = outInfo.getSo();
-//                    String mDataStr = DateUtil.toDateString(outInfo.getMdate(),"yyyy-MM-dd HH:mm");
-//                    log.info("需求单hSerial=["+outInfo.gethSerial()+"]工单so=["+so+"]soseq=["+outInfo.getSoseq()+"]的必须出库日期["+mDataStr+"]为10天前,关闭并解绑工单");
-//                    closeSoSeq(outInfo.getSoseq());
-//                }
-//
-//            }else{
-//                addOutInfo(outInfo);
-//                updateSendStatus(outInfo.gethSerial());
-//            }
-            addOutInfo(outInfo);
-            updateSendStatus(outInfo.gethSerial());
+            if(now - outInfo.getCreateDate().getTime() > 2 * 24 * 60 * 60 * 1000){
+                //2天前的需求单,关闭,并解绑
+                log.info("需求单hSerial=["+outInfo.gethSerial()+"]为2天前,关闭并解绑工单");
+                closeHSerial(outInfo.gethSerial());
+
+            }else{
+                addOutInfo(outInfo);
+                updateSendStatus(outInfo.gethSerial());
+            }
+//            addOutInfo(outInfo);
+//            updateSendStatus(outInfo.gethSerial());
         }
         }
     }
     }
 
 
@@ -891,6 +887,12 @@ public class OutInfoCache {
 //                    continue;
 //                    continue;
 //                }
 //                }
 //            }
 //            }
+            if(now.getTime() - outInfo.getCreateDate().getTime() > 2 * 24 * 60 * 60 * 1000){
+                //2天前的需求单,关闭,并解绑
+                log.info("需求单hSerial=["+outInfo.gethSerial()+"]为2天前,关闭并解绑工单");
+                closeHSerial(outInfo.gethSerial());
+                continue;
+            }
 
 
             if(outInfo.getFirstExecuteTime() == 0){
             if(outInfo.getFirstExecuteTime() == 0){
                 boolean needToWaitQueue = false;
                 boolean needToWaitQueue = false;

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="">SMD BOX</a>
     2016&copy; <a href="">SMD BOX</a>
   </div>
   </div>
-  <span class="right" style="color: #a3a3a3;">Version: 1.8.1110</span>
+  <span class="right" style="color: #a3a3a3;">Version: 1.9.1418</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>