diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
index 27b0419..ae65142 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
@@ -149,7 +149,7 @@ public class WaybillController extends BaseController
         String msg="下单成功";
         try {
 
-            emisWaybillService.draftSubmitOrder(emisWaybillSave,true);
+            emisWaybillService.draftSubmitOrderByOms(emisWaybillSave,true);
             jObjOut.put("billDetail", emisWaybillSave);
 
         }catch(EmisBizError ex){
@@ -192,6 +192,7 @@ public class WaybillController extends BaseController
 
             EmisWaybill emisWaybill = new EmisWaybill();
             emisWaybill.setOrderSn(waybillOrder.getOrderSn());
+            emisWaybill.setBillCode(waybillOrder.getBillCode());
             emisWaybill.setOrderRemark(waybillOrder.getOrderRemark());
             emisWaybillService.cancelOrder(emisWaybill);