潘钊 / bsth_control · Commits

Commit 7f1b45f65c2d20f09fec592d46b36708d4b3a654

Authored by 廖磊
1 parent 61a7ddc8
build: skipped

0113

Inline Side-by-side
Showing 3 changed files with 8 additions and 4 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @7f1b45f
... ... @@ -507,6 +507,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
507 507  
508 508 map = new HashMap<String, Object>();
509 509 try {
  510 + scheduleRealInfo.setjName(scheduleRealInfo.getjGh()+scheduleRealInfo.getjName());
  511 + scheduleRealInfo.setsName(scheduleRealInfo.getsGh()+scheduleRealInfo.getsName());
510 512 map = rru.getMapValue(scheduleRealInfo);
511 513 String zdsj = scheduleRealInfo.getZdsj();
512 514 String zdsjActual = scheduleRealInfo.getZdsjActual();
... ... @@ -2454,6 +2456,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2454 2456 sjlc =scheduleRealInfo.getJhlc();
2455 2457 }
2456 2458 }
  2459 + scheduleRealInfo.setjName(scheduleRealInfo.getjGh()+scheduleRealInfo.getjName());
  2460 + scheduleRealInfo.setsName(scheduleRealInfo.getsGh()+scheduleRealInfo.getsName());
2457 2461 scheduleRealInfo.setSjlc(format.format(sjlc));
2458 2462 map = rru.getMapValue(scheduleRealInfo);
2459 2463 String zdsj = scheduleRealInfo.getZdsj();
... ...
src/main/resources/static/pages/forms/statement/waybill.html
  View file @7f1b45f
... ... @@ -307,8 +307,8 @@
307 307 {{each list as obj i}}
308 308 <tr>
309 309 <td>{{i+1}}</td>
310   - <td>{{obj.jName}}</td>
311   - <td>{{obj.sName}}</td>
  310 + <td>{{obj.jGh}}{{obj.jName}}</td>
  311 + <td>{{obj.sGh}}{{obj.sName}}</td>
312 312 <td>&nbsp;</td>
313 313 <td>{{obj.qdzName}}</td>
314 314 <td>{{obj.zdzName}}</td>
... ...
src/main/resources/static/pages/forms/statement/waybillQp.html
  View file @7f1b45f
... ... @@ -298,8 +298,8 @@
298 298 <tr>
299 299 <td>{{i+1}}</td>
300 300 <td>{{obj.lpName}}</td>
301   - <td>{{obj.jName}}</td>
302   - <td>{{obj.sName}}</td>
  301 + <td>{{obj.jGh}}{{obj.jName}}</td>
  302 + <td>{{obj.sGh}}{{obj.sName}}</td>
303 303 <td>&nbsp;</td>
304 304 <td>{{obj.qdzName}}</td>
305 305 <td>{{obj.zdzName}}</td>
... ...