This commit is contained in:
linfso 2024-04-28 09:27:12 +08:00
parent a70772c2ba
commit 91f566d7fa
8 changed files with 80 additions and 3 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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" />

View File

@ -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);
}

View File

@ -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" />