aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-02-22 23:41:30 +08:00
parent 51c6bfcb09
commit af17f2a9e7
2 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerInvoiceInfoController.java
View File

@ -109,14 +109,6 @@ public class EmisCustomerInvoiceInfoController extends BaseController
public AjaxResult add(@RequestBody EmisCustomerInvoiceInfo emisCustomerInvoiceInfo) public AjaxResult add(@RequestBody EmisCustomerInvoiceInfo emisCustomerInvoiceInfo)
{ {
return toAjax(emisCustomerInvoiceInfoService.insertEmisCustomerInvoiceInfo(emisCustomerInvoiceInfo)); return toAjax(emisCustomerInvoiceInfoService.insertEmisCustomerInvoiceInfo(emisCustomerInvoiceInfo));
// try {
// }
// catch (DuplicateKeyException e) {
// e.printStackTrace();
// return AjaxResult.error("公司重复");
// }
} }
/** /**

35
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -246,11 +246,9 @@ public class EmisWaybillController extends EmisBaseController
public AjaxResult cancelOrder(@Valid @RequestBody WaybillOrder waybillOrder) public AjaxResult cancelOrder(@Valid @RequestBody WaybillOrder waybillOrder)
{ {
try { try {
if(StringUtils.isEmpty(waybillOrder.getOrderSn()) ){ if(StringUtils.isEmpty(waybillOrder.getOrderSn()) ){
return AjaxResult.error("订单号不能为空"); return AjaxResult.error("订单号不能为空");
} }
EmisWaybill emisWaybill = new EmisWaybill(); EmisWaybill emisWaybill = new EmisWaybill();
emisWaybill.setOrderSn(waybillOrder.getOrderSn()); emisWaybill.setOrderSn(waybillOrder.getOrderSn());
emisWaybill.setOrderRemark(waybillOrder.getOrderRemark()); emisWaybill.setOrderRemark(waybillOrder.getOrderRemark());
@ -261,15 +259,7 @@ public class EmisWaybillController extends EmisBaseController
ex.printStackTrace(); ex.printStackTrace();
return AjaxResult.error("("+ex.getErrorCode()+")"+ex.getMessage()); 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) @Log(title = "指派网点", businessType = BusinessType.UPDATE)
@ -408,19 +398,20 @@ public class EmisWaybillController extends EmisBaseController
ex.printStackTrace(); ex.printStackTrace();
return AjaxResult.error("("+ex.getErrorCode()+")"+ex.getMessage()); 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("服务器异常，联系客服");
// }
} }