Commit 78022dce28eab8d7b513b6e0e2ab668b019259e3
Merge branch 'pudong' of http://192.168.168.201:8888/panzhaov5/bsth_control into pudong
Showing
1 changed file
with
6 additions
and
6 deletions
src/main/java/com/bsth/service/calc/impl/CalcToolServiceImpl.java
| @@ -181,12 +181,12 @@ public class CalcToolServiceImpl implements CalcToolService { | @@ -181,12 +181,12 @@ public class CalcToolServiceImpl implements CalcToolService { | ||
| 181 | if(i != l){ | 181 | if(i != l){ |
| 182 | CalcWaybill c1 = listCal.get(i); | 182 | CalcWaybill c1 = listCal.get(i); |
| 183 | CalcWaybill c2 = listCal.get(l); | 183 | CalcWaybill c2 = listCal.get(l); |
| 184 | - | ||
| 185 | - c1.setSjyylc(c1.getSjyylc() + c2.getSjyylc()); | ||
| 186 | - c1.setSjfyylc(c1.getSjfyylc() + c2.getSjfyylc()); | ||
| 187 | - c1.setLjyylc(c1.getLjyylc() + c2.getLjyylc()); | ||
| 188 | - c1.setLjfyylc(c1.getLjfyylc() + c2.getLjfyylc()); | ||
| 189 | - | 184 | +// |
| 185 | +// c1.setSjyylc(c1.getSjyylc() + c2.getSjyylc()); | ||
| 186 | +// c1.setSjfyylc(c1.getSjfyylc() + c2.getSjfyylc()); | ||
| 187 | +// c1.setLjyylc(c1.getLjyylc() + c2.getLjyylc()); | ||
| 188 | +// c1.setLjfyylc(c1.getLjfyylc() + c2.getLjfyylc()); | ||
| 189 | +// | ||
| 190 | listCal.remove(l); | 190 | listCal.remove(l); |
| 191 | } else { | 191 | } else { |
| 192 | break; | 192 | break; |