diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerInvoiceInfoController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerInvoiceInfoController.java index 4741b9cd2..635c68ace 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerInvoiceInfoController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerInvoiceInfoController.java @@ -109,14 +109,6 @@ public class EmisCustomerInvoiceInfoController extends BaseController public AjaxResult add(@RequestBody EmisCustomerInvoiceInfo emisCustomerInvoiceInfo) { return toAjax(emisCustomerInvoiceInfoService.insertEmisCustomerInvoiceInfo(emisCustomerInvoiceInfo)); - -// try { -// } -// catch (DuplicateKeyException e) { -// e.printStackTrace(); -// return AjaxResult.error("公司重复"); -// } - } /** diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index 75e50eb16..4e2fbf460 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -246,11 +246,9 @@ public class EmisWaybillController extends EmisBaseController public AjaxResult cancelOrder(@Valid @RequestBody WaybillOrder waybillOrder) { try { - if(StringUtils.isEmpty(waybillOrder.getOrderSn()) ){ return AjaxResult.error("订单号不能为空"); } - EmisWaybill emisWaybill = new EmisWaybill(); emisWaybill.setOrderSn(waybillOrder.getOrderSn()); emisWaybill.setOrderRemark(waybillOrder.getOrderRemark()); @@ -261,15 +259,7 @@ public class EmisWaybillController extends EmisBaseController ex.printStackTrace(); return AjaxResult.error("("+ex.getErrorCode()+")"+ex.getMessage()); } - catch (Exception ex){ - ex.printStackTrace(); - // 返回子定义异常 - if(ex instanceof EmisBizError){ - return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode()); - } - return AjaxResult.error("服务器异常,联系客服"); - } } @Log(title = "指派网点", businessType = BusinessType.UPDATE) @@ -408,19 +398,20 @@ public class EmisWaybillController extends EmisBaseController ex.printStackTrace(); return AjaxResult.error("("+ex.getErrorCode()+")"+ex.getMessage()); } - catch (DuplicateKeyException e) { - e.printStackTrace(); - return AjaxResult.error("运单号重复!"); - } - catch (Exception ex){ - ex.printStackTrace(); - // 返回子定义异常 - if(ex instanceof EmisBizError){ - return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode()); - } - return AjaxResult.error("服务器异常,联系客服"); - } +// catch (DuplicateKeyException e) { +// e.printStackTrace(); +// return AjaxResult.error("运单号重复!"); +// } +// catch (Exception ex){ +// ex.printStackTrace(); +// // 返回子定义异常 +// if(ex instanceof EmisBizError){ +// return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode()); +// } +// +// return AjaxResult.error("服务器异常,联系客服"); +// } }