diff --git a/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_12_0.xml b/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_12_0.xml
new file mode 100644
index 000000000..ed9025ca8
--- /dev/null
+++ b/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_12_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.rabbitmq:amqp-client:5.12.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/rabbitmq/amqp-client/5.12.0/amqp-client-5.12.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/rabbitmq/amqp-client/5.12.0/amqp-client-5.12.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/rabbitmq/amqp-client/5.12.0/amqp-client-5.12.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_3_14.xml b/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_3_14.xml
new file mode 100644
index 000000000..e50ff9bdf
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_3_14.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.amqp:spring-amqp:2.3.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-amqp/2.3.14/spring-amqp-2.3.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-amqp/2.3.14/spring-amqp-2.3.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-amqp/2.3.14/spring-amqp-2.3.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_3_14.xml b/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_3_14.xml
new file mode 100644
index 000000000..cfc940fff
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_3_14.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.amqp:spring-rabbit:2.3.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/2.3.14/spring-rabbit-2.3.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/2.3.14/spring-rabbit-2.3.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/2.3.14/spring-rabbit-2.3.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_5_10.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_5_10.xml
new file mode 100644
index 000000000..bc40e1916
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_5_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.5.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-amqp/2.5.10/spring-boot-starter-amqp-2.5.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-amqp/2.5.10/spring-boot-starter-amqp-2.5.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-amqp/2.5.10/spring-boot-starter-amqp-2.5.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_3_1.xml b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_3_1.xml
new file mode 100644
index 000000000..36bb30bc1
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_3_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.retry:spring-retry:1.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.3.1/spring-retry-1.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.3.1/spring-retry-1.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.3.1/spring-retry-1.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/emis-biz-web/emis-biz-web.iml b/emis-biz-web/emis-biz-web.iml
index 8924b7606..a15f9c34e 100644
--- a/emis-biz-web/emis-biz-web.iml
+++ b/emis-biz-web/emis-biz-web.iml
@@ -66,6 +66,12 @@
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.14" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.14" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.12.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
     <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.1.2" level="project" />
@@ -120,7 +126,6 @@
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.5.9" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.5.9" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:3.6.3" level="project" />
     <orderEntry type="library" name="Maven: org.redisson:redisson:3.10.0" level="project" />
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 3a96ec083..61f96dfa3 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
@@ -21,6 +21,7 @@ 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.common.utils.SecurityUtils;
 import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
 import com.xdadan.erp.emis.domain.EmisWaybillCargo;
 import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
@@ -238,7 +239,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
 
             String orderSn = WaybillHelper.genOrderSn();
             emisWaybillNew.setOrderSn(orderSn);
-
+            emisWaybillNew.preInsert();
             emisWaybillMapper.insertEmisWaybill(emisWaybillNew);
             // 产生主键插入其他数据
 
@@ -276,6 +277,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
         }else{
 
             emisWaybillNew.setId(emisWaybillOld.getId());
+            emisWaybillNew.preUpdate();
             emisWaybillMapper.updateEmisWaybill(emisWaybillNew);
         }
 
diff --git a/emis-wms-web/emis-wms-web.iml b/emis-wms-web/emis-wms-web.iml
index da407f45f..eb6755b7d 100644
--- a/emis-wms-web/emis-wms-web.iml
+++ b/emis-wms-web/emis-wms-web.iml
@@ -66,6 +66,12 @@
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.14" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.14" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.12.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
     <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.1.2" level="project" />
@@ -120,7 +126,6 @@
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.5.9" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.5.9" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:3.6.3" level="project" />
     <orderEntry type="library" name="Maven: org.redisson:redisson:3.10.0" level="project" />