|
|
@@ -893,16 +893,17 @@ public class ERPServiceImpl implements ERPService {
|
|
|
LogisticsPrice logisticsPrice=baseDao.getJdbcTemplate().queryForObject("select * from LogisticsPrice where lp_id="+id, new BeanPropertyRowMapper<LogisticsPrice>(LogisticsPrice.class));
|
|
|
if(logisticsPrice != null){
|
|
|
if("顺丰".equals(logisticsPrice.getLp_FinalCompany())){
|
|
|
- creatOrder_SF(logisticsPrice);
|
|
|
+ modelMap=creatOrder_SF(logisticsPrice);
|
|
|
}else if("德邦".equals(logisticsPrice.getLp_FinalCompany())){
|
|
|
- creatOrder_DoP(logisticsPrice);
|
|
|
+ modelMap=creatOrder_DoP(logisticsPrice);
|
|
|
}else if("跨越".equals(logisticsPrice.getLp_FinalCompany())){
|
|
|
try {
|
|
|
- creatOrder_KY(logisticsPrice);
|
|
|
+ modelMap=creatOrder_KY(logisticsPrice);
|
|
|
} catch (IOException e) {
|
|
|
throw new RuntimeException(e);
|
|
|
}
|
|
|
}
|
|
|
+ return modelMap;
|
|
|
}else{
|
|
|
modelMap.put("message", "单据不存在!");
|
|
|
modelMap.put("success", false);
|
|
|
@@ -917,12 +918,13 @@ public class ERPServiceImpl implements ERPService {
|
|
|
LogisticsPrice logisticsPrice=baseDao.getJdbcTemplate().queryForObject("select * from LogisticsPrice where lp_id="+id, new BeanPropertyRowMapper<LogisticsPrice>(LogisticsPrice.class));
|
|
|
if(logisticsPrice != null){
|
|
|
if("顺丰".equals(logisticsPrice.getLp_FinalCompany())){
|
|
|
- cancelOrder_SF(logisticsPrice);
|
|
|
+ modelMap=cancelOrder_SF(logisticsPrice);
|
|
|
}else if("德邦".equals(logisticsPrice.getLp_FinalCompany())){
|
|
|
- cancelOrder_DoP(logisticsPrice);
|
|
|
+ modelMap=cancelOrder_DoP(logisticsPrice);
|
|
|
}else if("跨越".equals(logisticsPrice.getLp_FinalCompany())){
|
|
|
- cancelOrder_KY(logisticsPrice);
|
|
|
+ modelMap=cancelOrder_KY(logisticsPrice);
|
|
|
}
|
|
|
+ return modelMap;
|
|
|
}else{
|
|
|
modelMap.put("message", "单据不存在!");
|
|
|
modelMap.put("success", false);
|