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 62c051e60..9e65b1c2d 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
@@ -19,12 +19,14 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Singleton;
 import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
 import com.xdadan.erp.common.utils.DBUtil;
 import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
 import com.xdadan.erp.emis.domain.EmisWaybillCargo;
 import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
 import com.xdadan.erp.emis.domain.vo.*;
 import com.xdadan.erp.emis.service.*;
+import com.xdadan.erp.emis.utils.WaybillHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -163,6 +165,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
         }
     }
 
+
     @Override
     public WaybillOrder getWaybillDetail(String billCode){
 
@@ -233,10 +236,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
         // 新增
         if(isNew){
 
-            // 设置订单
-            Snowflake snowflake = Singleton.get(Snowflake.class, 1, 1, true);
-            Long orderId = snowflake.nextId();
-            String orderSn = "TAO" + orderId.toString();
+            String orderSn = WaybillHelper.genOrderSn();
             emisWaybillNew.setOrderSn(orderSn);
 
             emisWaybillMapper.insertEmisWaybill(emisWaybillNew);
@@ -286,16 +286,11 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
 
     public static void main(String[] args) {
 
-//        EmisWaybill emisWaybill =new EmisWaybill();
-//        emisWaybill.setBillCode("T123123");
-//
-//        // 忽略复制过程中出现的错误
-//        CopyOptions options = CopyOptions.create().setIgnoreError(true);
-//
-//        // 基础信息
-//        BeanUtil.copyProperties(emisWaybill,waybillOrder,options);
-//
-//        System.out.println(waybillOrder.toString());
+        Snowflake snowflake = IdUtil.getSnowflake(0, 0);
+        Long orderId = snowflake.nextId();
+        String orderSn = "TO" + orderId.toString();
+        System.out.println(orderSn);
+
 
     }
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
new file mode 100644
index 000000000..ca8d2cf04
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
@@ -0,0 +1,13 @@
+package com.xdadan.erp.emis.utils;
+
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
+
+public class WaybillHelper {
+
+    public static String genOrderSn(){
+        Snowflake snowflake = IdUtil.getSnowflake(0, 0);
+        Long orderId = snowflake.nextId();
+        return "TAO" + orderId.toString();
+    }
+}