自动关闭工单周期改为10天

统计需求时,如果人为调整的时间与出库时间间隔一天,使用出库时间进行统计

myproject/src/main/java/com/myproject/bean/update/qisda/OutInfo.java

@@ -448,6 +448,14 @@ public class OutInfo extends BaseMongoBean {
         this.totalBindNum = totalBindNum;
     }
 
+    public Date getTaskNeedOutDate() {
+        return taskNeedOutDate;
+    }
+
+    public void setTaskNeedOutDate(Date taskNeedOutDate) {
+        this.taskNeedOutDate = taskNeedOutDate;
+    }
+
     @Override
     public String toString() {
         return "OutInfo{" +

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

@@ -204,12 +204,12 @@ public class OutInfoCache {
         List<OutInfo> unEndOutInfoList = outInfoDao.findUnEndOutInfos();
         long now = System.currentTimeMillis();
         for (OutInfo outInfo : unEndOutInfoList) {
-            if(now - outInfo.getMdate().getTime() > 3 * 24 * 60 * 60 * 1000){
-                //3天前的需求单(非紧急料),关闭,并解绑
+            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+"]为3天前,关闭并解绑工单");
+                    log.info("需求单hSerial=["+outInfo.gethSerial()+"]工单so=["+so+"]soseq=["+outInfo.getSoseq()+"]的必须出库日期["+mDataStr+"]为10天前,关闭并解绑工单");
                     closeSoSeq(outInfo.getSoseq());
                 }
 
@@ -542,8 +542,8 @@ public class OutInfoCache {
     public void updateMustExeOutInfo(){
         Date now = new Date();
         for (OutInfo outInfo : outInfoMap.values()) {
-            if(now.getTime() - outInfo.getMdate().getTime() > 3 * 24 * 60 * 60 * 1000){
-                //3天前的需求单(非紧急料),关闭,并解绑
+            if(now.getTime() - outInfo.getMdate().getTime() > 10 * 24 * 60 * 60 * 1000){
+                //10天前的需求单(非紧急料),关闭,并解绑
                 if(!outInfo.isUrgentAction()){
                     String so = outInfo.getSo();
                     log.info("需求单hSerial=["+outInfo.gethSerial()+"]工单so=["+so+"]soseq=["+outInfo.getSoseq()+"]的必须出库日期["+outInfo.getMdate()+"]为3天前,关闭并解绑工单");
@@ -696,9 +696,27 @@ public class OutInfoCache {
         boolean outInfoExecuted = outInfo.getFirstExecuteTime() > 0;
 
         if(!outInfoExecuted){
+            //如果需求时间与当前时间不是同一天,更新需求时间为当前时间
+            Date needOutDate = outInfo.getTaskNeedOutDate();
+            if(needOutDate != null){
+                Date now = new Date();
+                String needOutDateStr = DateUtil.toDateString(needOutDate);
+                String todayDateStr = DateUtil.toDateString(now);
+                if(!needOutDateStr.equals(todayDateStr)){
+                    log.info("需求单["+outInfo.gethSerial()+"]需求时间不是当天,修改为执行时间");
+                    outInfo.setTaskNeedOutDate(now);
+                    outInfo = outInfoDao.save(outInfo);
+                }
+            }
             if(outInfo.isFirstReelAction() || outInfo.isTailAction()){
                 QisdaCache.setCurrentOrderHSerial(outInfo.gethSerial());
             }
+        }else{
+            //已经执行过的首盘和补料,关闭需求单
+            if(outInfo.isFirstReelAction() || outInfo.isTailAction()){
+                //log.info("需求单["+outInfo.gethSerial()+"]已执行过,关闭");
+                //closeHSerial(outInfo.gethSerial());
+            }
         }
 
         log.info("执行需求单["+hSerial+"]出库");

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

@@ -12,6 +12,25 @@
 <div class="row">
     <div class="col-md-12">
         <ul class="timeline">
+
+            <li class="timeline-blue">
+                <div class="timeline-time">
+                    <span class="date">2020 </span>
+                    <span class="time">09-18 </span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2020091811</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>自动关闭工单周期改为10天</li>
+                            <li>统计需求时,如果人为调整的时间与出库时间间隔一天,使用出库时间进行统计</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
             <li class="timeline-yellow">
                 <div class="timeline-time">
                     <span class="date">2020 </span>