diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
index 4a64a8ac3..b9ae3acd5 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
@@ -393,7 +393,7 @@ public class EmisSettleBillController extends BaseController
                 }
             }
         }
-        return AjaxResult.success("确认成功");
+        return AjaxResult.success("删除成功");
     }
 
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
index 526d67cdd..da05d9aa6 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
@@ -367,7 +367,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
         // 获取
         EmisSettleBill bill = selectEmisSettleBillById(id);
         if(!"0".equals(bill.getPaymentStatus())){
-            throw  new EmisBizError(EmisBizErrorType.FAIL,"已收款不允许删除");
+            throw  new EmisBizError(EmisBizErrorType.FAIL,"已存在收款不允许删除");
         }
 
         if(!"0".equals(bill.getBlConfirmSite())){
@@ -375,7 +375,11 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
         }
 
         if(!"0".equals(bill.getOpenBillStatus())){
-            throw  new EmisBizError(EmisBizErrorType.FAIL,"已开票已确认不允许删除");
+            throw  new EmisBizError(EmisBizErrorType.FAIL,"已存在开票不允许删除");
+        }
+
+        if(!"0".equals(bill.getChargeStatus()) ){
+            throw  new EmisBizError(EmisBizErrorType.FAIL,"已核销不允许删除");
         }
 
         // 清除子账单关联
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index e14d29749..aa7118660 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -864,6 +864,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             dispatchOrSendManCode=emisWaybillSave.getTakePieceEmployeeCode();
         }
 
+        // 做订单接单确认
+        emisWaybillMapper.confirmOrder(emisWaybillSave);
+
+        // 增加扫描记录
         Map<String,Object> scanDateItem = new HashMap<>();
         scanDateItem.put("billCode",emisWaybillSave.getBillCode());
         scanDateItem.put("dispatchOrSendManCode",dispatchOrSendManCode);