update...

潘钊
1 parent afe60cad
Showing 6 changed files with 75 additions and 11 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
@@ -144,6 +144,16 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
+	 * 撤销执行
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/revokeRealArrive", method = RequestMethod.POST)
+	public Map<String, Object> revokeRealArrive(@RequestParam Long id){
+		return scheduleRealInfoService.revokeRealArrive(id);
+	}
+
+	/**
 	 * 
 	 * @Title: spaceAdjust 
 	 * @Description: TODO(间隔调整) 
@@ -39,7 +39,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Transactional
 	@Modifying
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and fgsdm=?3 ",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 ",nativeQuery=true)
 	List<Ylb> queryListYlb(String rq,String nbbm);
 	/**
 	 * 查询当天总的加注量和总里程
@@ -157,4 +157,6 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     Map<String,Object> lpChangeMulti(String leftIdx, String rightIdx, int type);
 	void lpChange(ScheduleRealInfo leftSch, ScheduleRealInfo rightSch, int type);
+
+    Map<String,Object> revokeRealArrive(Long id);
 }
@@ -9,8 +9,6 @@ import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.controller.realcontrol.dto.LpData;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.arrival.ArrivalData_GPS;
-import com.bsth.data.arrival.ArrivalEntity;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.SchAttrCalculator;
 import com.bsth.data.schedule.ScheduleComparator;
@@ -812,8 +810,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "无实发时间，无法撤销！");
             } else {
-                //将对应的到离站数据标记为不可信
-                List<ArrivalEntity> list = ArrivalData_GPS.findByNbbm(sch.getClZbh());
+                //将对应的到离站数据标记为不可信  ### 废弃的代码 ####
+                /*List<ArrivalEntity> list = ArrivalData_GPS.findByNbbm(sch.getClZbh());
                 for (ArrivalEntity arr : list) {
                     if (arr.getInOut() == 1
                             && arr.getUpDown() == Integer.parseInt(sch.getXlDir())
@@ -822,7 +820,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         arr.setEnable(false);
                         break;
                     }
-                }
+                }*/
                 sch.clearFcsjActual();
                 rs.put("status", ResponseCode.SUCCESS);
@@ -830,6 +828,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 ts.add(sch);
                 rs.put("ts", ts);
+                dayOfSchedule.save(sch);
+
             }
         } catch (Exception e) {
             logger.error("", e);
@@ -2997,7 +2997,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					jzl += y.getJzl();
 				}
-				List<Ylb> listYlb=ylbRepository.queryListYlb(s.getClZbh(), fcrq);
+				List<Ylb> listYlb=ylbRepository.queryListYlb( fcrq,s.getClZbh());
 				Double ccyl=0.0;
 				Double jcyl=0.0;
 				Double yh=0.0;
@@ -3460,4 +3460,39 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         leftData.appendTo(rightSch, type);
         rightData.appendTo(leftSch, type);
     }
+
+    @Override
+    public Map<String, Object> revokeRealArrive(Long id) {
+        Map<String, Object> rs = new HashMap<>();
+        List<ScheduleRealInfo> ts = new ArrayList<>();
+
+        try {
+            ScheduleRealInfo sch = dayOfSchedule.get(id);
+            if (sch.getZdsjActual() == null) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "无实际到达时间，无法撤销！");
+            } else {
+
+                sch.clearZdsjActual();
+                //清除下一个班次的起点到达时间
+                ScheduleRealInfo next = dayOfSchedule.next(sch);
+                if (null != next) {
+                    next.setQdzArrDateSJ(null);
+                    ts.add(next);
+                }
+
+                rs.put("status", ResponseCode.SUCCESS);
+
+                ts.add(sch);
+                rs.put("ts", ts);
+
+                dayOfSchedule.save(sch);
+
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
 }
 \ No newline at end of file
@@ -330,11 +330,11 @@
           <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:&nbsp;   日期:{{scheduleDate}}</td>
       </tr>
       <tr>
-          <td colspan="2">出场存油 {{map.ccyl}};升</td>
-          <td colspan="2">加注油量 {{map.jzl}}升</td>
-          <td colspan="2">进场存油 {{map.jcyl}}升</td>
+          <td colspan="2">出场存油 {{ccyl}};升</td>
+          <td colspan="2">加注油量 {{jzl}}升</td>
+          <td colspan="2">进场存油 {{jcyl}}升</td>
           <td colspan="4">加注机油 &nbsp;升</td>
-          <td colspan="4">本日耗油 {{map.yh}}升</td>
+          <td colspan="4">本日耗油 {{yh}}升</td>
       </tr>
       <tr>
           <td rowspan="2">调度章</td>
@@ -130,6 +130,20 @@ var gb_schedule_context_menu = (function () {
             open_modal(folder + '/lp_change.html', {
                 sch: sch
             }, modal_opts);
+        },
+        cxzx: function (sch) {
+            if (!sch.zdsjActual)
+                return notify_err('车辆未执行，无法撤销执行！');
+
+            var content = '<h3>确定要撤销<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>的实达时间?</h3>'
+            alt_confirm(content, function () {
+                gb_common.$post('/realSchedule/revokeRealArrive', {
+                    id: sch.id
+                }, function (rs) {
+                    gb_schedule_table.updateSchedule(rs.ts);
+                    notify_succ('撤销执行成功！');
+                });
+            }, '确认撤销执行');
         }
     };
@@ -161,6 +175,9 @@ var gb_schedule_context_menu = (function () {
             'cxsf': {
                 name: '撤销实发'
             },
+            'cxzx': {
+                name: '撤销执行'
+            },
             'sep2': '---------',
             'fcxxwt': {
                 name: '发车信息微调'