Commit 82767007ac27b363c183a7e8a320f978ce905fab

Authored by 王通
1 parent 480b5411

1.merge pudong分支

src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
@@ -105,12 +105,11 @@ public class InStationProcess { @@ -105,12 +105,11 @@ public class InStationProcess {
105 105
106 boolean isEnd = false; 106 boolean isEnd = false;
107 107
108 - //进终点 rfid状态复位 108 + //进终点
109 if (flow && null != sch && 109 if (flow && null != sch &&
110 ((sch.getZdzCode().equals(gps.getStopNo()) && gps.getInstation() > 0) || sch.getZdzCode().equals(gps.getCarparkNo()))) { 110 ((sch.getZdzCode().equals(gps.getStopNo()) && gps.getInstation() > 0) || sch.getZdzCode().equals(gps.getCarparkNo()))) {
111 inEndStation(sch, gps); 111 inEndStation(sch, gps);
112 isEnd = true; 112 isEnd = true;
113 - resetRfid(sch);  
114 } 113 }
115 114
116 GpsCacheData.in(gps, isEnd); 115 GpsCacheData.in(gps, isEnd);