diff --git a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java
index f20f06e5..144f1c28 100644
--- a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java
+++ b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java
@@ -344,6 +344,12 @@ public class OmsSaleOrderApi {
         return R.byPageHelperList(list);
     }
 
+    @GetMapping("/cancelUncheckOrder")
+    public R<?> cancelOrder(String id){
+        omsSaleOrderService.cancelErpOrder(id);
+        return R.ok();
+    }
+
     /**
      * 根据ID查询
      * @param id
diff --git a/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java b/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java
index 77b5075f..ee05ff5e 100644
--- a/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java
+++ b/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java
@@ -150,5 +150,7 @@ public interface OmsSaleOrderService extends IService<OmsSaleOrder> {
                                BmsRegion bmsRegion);
 
 
+    public void cancelErpOrder(String orderId);
+
 }
 
diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java
index bca1dfac..e0ba47de 100644
--- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java
@@ -46,6 +46,7 @@ import com.qs.serve.modules.sale.entity.SalePlanGoods;
 import com.qs.serve.modules.sale.mapper.SalePlanGoodsMapper;
 import com.qs.serve.modules.sale.mapper.SalePlanMapper;
 import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
+import com.qs.serve.modules.sys.entity.SysDept;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysDeptService;
 import com.qs.serve.modules.sys.service.SysUserService;
@@ -145,6 +146,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
                 if(order.getPreDeliveryState()==null||order.getPreDeliveryState().equals(0)){
                     OmsSaleOrder updSaleOrder = new OmsSaleOrder();
                     updSaleOrder.setId(order.getId());
+                    updSaleOrder.setPreDeliveryDate(DateUtils.toLocalDate(deliveryDate));
                     updSaleOrder.setPreProductionDate(DateUtils.toLocalDate(deliveryDate));
                     updSaleOrder.setProductionRemark(remark);
                     this.updateById(updSaleOrder);
@@ -1105,12 +1107,12 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
             List<Long> erpOrderIds = omsSaleOrderList.stream().map(OmsSaleOrder::getId).collect(Collectors.toList());
             List<OmsSaleOrderItem> itemList = omsSaleOrderItemService.list(new LambdaQueryWrapper<OmsSaleOrderItem>()
                     .eq(OmsSaleOrderItem::getOrderSn, code)
+                    .eq(OmsSaleOrderItem::getDelFlag,0)
                     .in(OmsSaleOrderItem::getOrderId,erpOrderIds)
             );
             if(CollUtil.isNotEmpty(itemList)){
                 Map<String,List<OmsSaleOrderItem>> verAndItemList = itemList.stream()
                         .collect(Collectors.groupingBy(OmsSaleOrderItem::getVersion));
-
                 for (OmsSaleOrder omsSaleOrder : omsSaleOrderList) {
                     List<OmsSaleOrderItem> orderItems = verAndItemList.get(omsSaleOrder.getVersion());
                     omsSaleOrder.setItemList(orderItems);
@@ -1348,6 +1350,19 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
 
     }
 
+    @Override
+    public void cancelErpOrder(String orderId) {
+        OmsSaleOrder saleOrder = this.getById(orderId);
+        if(saleOrder.getStatus().equals(2)&&saleOrder.getOrderStatusCombo().equals(0)){
+            OmsSaleOrder upd = new OmsSaleOrder();
+            upd.setId(saleOrder.getId());
+            upd.setStatus(0);
+            this.updateById(upd);
+        }else {
+            Assert.throwEx("当前状态不支持退回");
+        }
+    }
+
     @Override
     public void saveToErpOrder(OmsSaleOrder omsOrder,
                                List<OmsSaleOrderItem> orderItemList,
@@ -1357,6 +1372,11 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
         omsOrder.setStatus(2);
         omsOrder.setCheckTime(LocalDateTime.now());
         omsOrder.setCheckUserId(omsOrder.getCreateBy());
+        if(omsOrder.getOrderSn().contains("SN")){
+            omsOrder.setBusinessType("普通销售");
+        }
+        omsOrder.setSaleDept("客户服务部");
+        omsOrder.setSaleType("常规销售");
         if(!omsOrder.getOrderType().equals(3)){
             omsOrder.setCheckUserId(AuthContextUtils.getSysUserId());
         }
@@ -1366,7 +1386,9 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
         }
         String remark = omsOrder.getRemark()==null?"":omsOrder.getRemark();
         String userAndPhone = omsOrder.getUserName()+"("+omsOrder.getUserPhone()+")";
-        omsOrder.setRemark(userAndPhone + remark.replace(userAndPhone,""));
+        String remarkNew = remark.replace(userAndPhone,"")
+                .replace(supplierAddress.getDetail(),"");
+        omsOrder.setRemark(userAndPhone +supplierAddress.getDetail() +";" + remarkNew );
         this.updateById(omsOrder);
 
         this.flushPreDelivery(omsOrder.getId()+"");