Commit 2e8c9ab99b955e6de80a8f0235ba3010d32e7314

Authored by 潘钊
1 parent f7ac73b1

update...

src/main/java/com/bsth/service/schedule/impl/InOutScheduleServiceImpl.java
... ... @@ -97,10 +97,10 @@ public class InOutScheduleServiceImpl implements InOutScheduleService {
97 97  
98 98 @Override
99 99 public void busInOutRfid(CarInOutEntity cio, ScheduleInOut sch) {
100   - if(sch.getOutTimeRfid() != null)
101   - return;
102   -
103   - sch.setOutTimeRfid(cio.getT());
  100 + /*if(sch.getOutTimeRfid() != null)
  101 + return;*/
  102 + if(null == sch.getOutTimeRfid())
  103 + sch.setOutTimeRfid(cio.getT());
104 104 //计划时间
105 105 cio.setPt(sch.getDfsjT());
106 106 cio.setLineCode(sch.getLineCode());
... ...
src/main/resources/static/index.html
... ... @@ -144,6 +144,16 @@
144 144 $(this.calendarContainer).addClass('showTimeInput');
145 145 }
146 146 };
  147 +
  148 +
  149 + UIkit.notification( {
  150 + status: 'danger',
  151 + message: '固定泊位对照的纸条丢了,快点重新发给潘钊'
  152 + });
  153 + UIkit.notification( {
  154 + status: 'danger',
  155 + message: '进出口的RFID接口,庄建传的好像是8位IC号,匹配不到现在10位ID号的人'
  156 + });
147 157 </script>
148 158 </body>
149 159 </html>
150 160 \ No newline at end of file
... ...
src/main/resources/static/pages/inout/signal/signal_inout_list.html
... ... @@ -103,7 +103,7 @@
103 103 {{/if}}
104 104 {{if obj.pCard==""}}
105 105 <span class="ct_badge_danger">未插卡</span>
106   - {{else if obj.pJsy!=null && obj.pJsy!=jgh}}
  106 + {{else if !obj.pcMatch}}
107 107 <span class="ct_badge_danger">人车不符</span>
108 108 {{/if}}
109 109  
... ...