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 161e83f77..9739c806e 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
@@ -226,6 +226,38 @@ public class EmisWaybillController extends EmisBaseController
         }
     }
 
+    @Log(title = "取消运单", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/cancelOrder")
+    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());
+            emisWaybillService.cancelOrder(emisWaybill);
+
+            return AjaxResult.success("取消成功");
+        }catch(EmisBizError ex){
+            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.INSERT)
     @PostMapping(value = "/realSubmitOrder")
     public AjaxResult realSubmitOrder(@Valid @RequestBody WaybillOrder waybillOrder,Integer isModify)