2023年9月21日13:37:18

blade-cargo-api/pom.xml → blade-service-api/blade-cargo-api/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>BladeX</artifactId>
+        <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
         <version>2.8.2.RELEASE</version>
     </parent>

blade-cargo-api/src/main/java/org/springblade/cargo/parities/entity/Parities.java → blade-service-api/blade-cargo-api/src/main/java/org/springblade/cargo/parities/entity/Parities.java

@@ -156,5 +156,17 @@ public class Parities implements Serializable {
 	@ApiModelProperty(value = "汇率类型")
 	private String paritiesType;
 
+	/**
+	 * 所属公司id
+	 */
+	@ApiModelProperty(value = "所属公司id")
+	private Long salesCompanyId;
+
+	/**
+	 * 所属公司名称
+	 */
+	@ApiModelProperty(value = "所属公司名称")
+	private String salesCompanyName;
+
 
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/parities/entity/Parities.java

@@ -157,5 +157,17 @@ public class Parities implements Serializable {
 	@ApiModelProperty(value = "汇率类型")
 	private String paritiesType;
 
+	/**
+	 * 所属公司id
+	 */
+	@ApiModelProperty(value = "所属公司id")
+	private Long salesCompanyId;
+
+	/**
+	 * 所属公司名称
+	 */
+	@ApiModelProperty(value = "所属公司名称")
+	private String salesCompanyName;
+
 
 }

blade-service-api/pom.xml

@@ -36,6 +36,7 @@
         <module>blade-box-tube-api</module>
         <module>blade-payment-api</module>
         <module>blade-sales-part-api</module>
+        <module>blade-cargo-api</module>
     </modules>
 
     <dependencies>

blade-cargo/pom.xml → blade-service/blade-cargo/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>BladeX</artifactId>
+        <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
         <version>2.8.2.RELEASE</version>
     </parent>

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -226,7 +226,6 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		//从缓存中获得库存
 //		redisClient.basicData("all");
 		List<StockGoods> stockGoodsList = stockGoodsClient.selectStockGoodsAll();
-		;
 
 		if (CollectionUtils.isNotEmpty(collect)) {
 			List<DeliveryItems> deliveryItemsList1 = new ArrayList<>();

blade-service/pom.xml

@@ -37,6 +37,7 @@
         <module>blade-box-tube</module>
         <module>blade-pay</module>
         <module>blade-sales-part</module>
+        <module>blade-cargo</module>
     </modules>
 
     <dependencies>

pom.xml

@@ -41,8 +41,6 @@
         <module>blade-plugin-api</module>
         <module>blade-service</module>
         <module>blade-service-api</module>
-        <module>blade-cargo</module>
-        <module>blade-cargo-api</module>
     </modules>
 
     <dependencyManagement>