update...

潘钊
1 parent b8003da3
Showing 4 changed files with 47 additions and 6 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
src/main/resources/static/real_control_v2/js/forms/wrap.html
@@ -431,7 +431,7 @@ public class DayOfSchedule {
                     ps.setInt(3, sch.getBcs()==null?0:sch.getBcs());
                     ps.setInt(4, sch.getBcsj()==null?0:sch.getBcsj());
                     ps.setString(5, sch.getClZbh());
-                    ps.setDate(6, new java.sql.Date(sch.getCreateDate().getTime()));
+                    ps.setTimestamp(6, new java.sql.Timestamp(sch.getCreateDate().getTime()));
                     ps.setString(7, sch.getDfsj());
                     ps.setInt(8, sch.getDirectiveState());
                     ps.setInt(9, sch.getFcno()==null?0:sch.getFcno());
@@ -447,12 +447,12 @@ public class DayOfSchedule {
                     ps.setString(19, sch.getRemarks());
                     ps.setString(20, sch.getsGh());
                     ps.setString(21, sch.getsName());
-                    ps.setDate(22, new java.sql.Date(sch.getScheduleDate().getTime()));
+                    ps.setTimestamp(22, new java.sql.Timestamp(sch.getScheduleDate().getTime()));
                     ps.setString(23, sch.getScheduleDateStr());
                     ps.setBoolean(24, sch.isSflj());
                     ps.setLong(25, sch.getSpId());
                     ps.setInt(26, sch.getStatus());
-                    ps.setDate(27, new java.sql.Date(sch.getUpdateDate().getTime()));
+                    ps.setTimestamp(27, new java.sql.Timestamp(sch.getUpdateDate().getTime()));
                     ps.setString(28, sch.getXlBm());
                     ps.setString(29, sch.getXlDir());
                     ps.setString(30, sch.getXlName());
@@ -206,6 +206,8 @@ public class SchAttrCalculator {
      * @return
      */
     public ScheduleRealInfo calcCurrentExecSch(List<ScheduleRealInfo> list) {
+        if(list.size()==0)
+            return null;
         String lineCode = list.get(0).getXlBm();
         LineConfig conf = lineConfigData.get(lineCode);
  
@@ -37,6 +37,8 @@
                     </div>
                     <button class="uk-button">检索</button>
                     <a class="add_lp_link" ><i class="uk-icon-plus"></i> 临加路牌</a>
+                    <button id="reCountBtn" class="uk-button uk-button-danger uk-button-mini" style="position: absolute;right: 12px;bottom: 14px;">
+                        重新统计</button>
                 </fieldset>
             </form>
         </div>
@@ -414,6 +416,39 @@
  
                 return true;
             }
+
+            /**
+             * 重新统计
+             */
+            $('#reCountBtn', modal).on('click', function () {
+                $(this).attr('disabled', 'disabled');
+                $(this).prepend('<i class="uk-icon-spinner uk-icon-spin"></i>');
+
+                var rq = $('.h-s-time li.uk-active', modal).text(),
+                        lineName = $('.h-s-line li.uk-active', modal).text(),
+                        lineCode = $('.h-s-line li.uk-active', modal).data('id');
+
+                var that = this;
+                alt_confirm('确定要重新统计 ' + lineName + '（'+rq+'）的数据吗？',function () {
+
+                    var reCountEp = EventProxy.create('calcWaybill', 'ylbUpdate', function () {
+                        $('i.uk-icon-spin', that).remove();
+                        $(this).removeAttr('disabled');
+                        notify_succ('重新统计成功！');
+                    });
+
+                    //统计路单 -娄高峰
+                    gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
+                        reCountEp.emitLater('calcWaybill');
+                    });
+
+                    //统计油 -廖磊
+                    gb_common.$post('/ylb/updateHistory', {date:rq, line: lineCode}, function () {
+                        reCountEp.emitLater('ylbUpdate');
+                    });
+
+                }, '我确定');
+            });
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -100,9 +100,13 @@
                     //ed=d.format(f),
                     //sd=d.subtract(3, 'days').format(f);
  
-            $('#date', '.form-page-content').data('DateTimePicker')
-                    .defaultDate(d.format(f));
-                    //.maxDate(ed).minDate(sd);
+            try{
+                $('#date', '.form-page-content').data('DateTimePicker')
+                        .defaultDate(d.format(f));
+                        //.maxDate(ed).minDate(sd);
+            }catch (e){
+                console.log(e);
+            }
  
             if($("#ddrbBody").length > 0){
                 $("#ddrbBody").height("620px");