|
|
@ -2063,7 +2063,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
return R.error(String.format("结算单号%s明细行合并失败",ddh)); |
|
|
|
return R.error(String.format("结算单号%s明细行合并失败",ddh)); |
|
|
|
} |
|
|
|
} |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
log.error("批量合并报错orderInfoId:{},entId:{},报错信息:{}",orderInfoId,entId,e.getMessage()); |
|
|
|
log.error("批量合并报错orderInfoId:{},entId:{},报错信息:{}",orderInfoId,entId,e); |
|
|
|
return R.error(String.format("结算单号%s明细行合并失败",ddh)); |
|
|
|
return R.error(String.format("结算单号%s明细行合并失败",ddh)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|