云仓看板取消建议时间，不管是否到达必须时间，优先队列不能空，等待队列往上补

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

@@ -245,7 +245,7 @@
                     '<ul class="list-inline">' +
                     '<ul class="list-inline">' +
                     '<li><i class="fa fa-tasks"></i>工单: '+outInfo.so+'</li>' +
                     '<li><i class="fa fa-tasks"></i>工单: '+outInfo.so+'</li>' +
                     '<li><i class="fa fa-briefcase"></i>备料单: '+outInfo.refno+'</li>' +
                     '<li><i class="fa fa-briefcase"></i>备料单: '+outInfo.refno+'</li>' +
-                    '<li><i class="fa fa-calendar"></i>建议时间:'+sdate+'</li>' +
+//                    '<li><i class="fa fa-calendar"></i>建议时间:'+sdate+'</li>' +
                     '<li><i class="fa fa-star"></i>必须出仓日期:'+mdate+'</li>' +
                     '<li><i class="fa fa-star"></i>必须出仓日期:'+mdate+'</li>' +
                     '<li><i class="fa fa-star"></i>创建时间:'+createDate+'</li>' +
                     '<li><i class="fa fa-star"></i>创建时间:'+createDate+'</li>' +
                     '</ul>' +
                     '</ul>' +
@@ -269,6 +269,8 @@
                     var waitHtml = '';
                     var waitHtml = '';
                     var unfinishedHtml = '';
                     var unfinishedHtml = '';
 
 
+                    //第一个等待列表中的需求单,用于优先队列无任务时,将第一个等待列表中的需求单显示到优先队列中
+                    var firstWaitHtml = '';
                     for(var i in data){
                     for(var i in data){
                         var outInfo = data[i];
                         var outInfo = data[i];
                         if(outInfo.preTailAction){
                         if(outInfo.preTailAction){
@@ -307,9 +309,21 @@
                                 }
                                 }
                             }
                             }
                         }else{
                         }else{
+                            if(firstWaitHtml == ''){
+                                firstWaitHtml = infoHtml;
+                            }else{
                                 waitHtml = waitHtml + infoHtml;
                                 waitHtml = waitHtml + infoHtml;
                             }
                             }
                         }
                         }
+                    }
+
+                    //优先队列为空,将等待列表中的第一个需求单显示到优先队列中,不为空时还显示在等待队列中
+                    if(priorityHtml == ''){
+                        priorityHtml = firstWaitHtml;
+                    }else{
+                        waitHtml = firstWaitHtml + waitHtml;
+                    }
+
                     $("#executing").html(executingHtml);
                     $("#executing").html(executingHtml);
                     $("#priority").html(priorityHtml);
                     $("#priority").html(priorityHtml);
                     $("#wait").html(waitHtml);
                     $("#wait").html(waitHtml);

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

@@ -12,6 +12,23 @@
 <div class="row">
 <div class="row">
     <div class="col-md-12">
     <div class="col-md-12">
         <ul class="timeline">
         <ul class="timeline">
+            <li class="timeline-purple">
+                <div class="timeline-time">
+                    <span class="date">2021</span>
+                    <span class="time">08-02</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2021080214</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>云仓看板取消建议时间，不管是否到达必须时间，优先队列不能空，等待队列往上补</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
             <li class="timeline-green">
             <li class="timeline-green">
                 <div class="timeline-time">
                 <div class="timeline-time">
                     <span class="date">2021</span>
                     <span class="date">2021</span>