2022年11月9日19:23:39

blade-service-api/blade-box-tube-api/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>blade-service-api</artifactId>
+        <groupId>org.springblade</groupId>
+        <version>2.8.2.RELEASE</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>blade-box-tube-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

blade-service-api/pom.xml

@@ -33,6 +33,7 @@
         <module>blade-check-api</module>
         <module>blade-school-api</module>
         <module>blade-land-api</module>
+        <module>blade-box-tube-api</module>
     </modules>
 
     <dependencies>

blade-service/blade-box-tube/pom.xml

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>blade-service</artifactId>
+        <groupId>org.springblade</groupId>
+        <version>2.8.2.RELEASE</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>blade-box-tube</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok-mapstruct-binding</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-core-boot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-swagger</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-client-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-resource-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <version>2.0.8</version>
+        </dependency>
+        <!--Oss-->
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-oss</artifactId>
+        </dependency>
+        <!--MinIO-->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-transaction</artifactId>
+        </dependency>
+        <!-- websocket -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.10.10</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+        <!-- spring web排除tomcat -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-stock-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-purchase-sales-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>trade-finance-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-mocha-item-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

blade-service/blade-box-tube/src/main/java/org/springbladex/box/tube/BoxTubeApplication.java

@@ -0,0 +1,40 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springbladex.box.tube;
+
+import org.springblade.core.cloud.feign.EnableBladeFeign;
+import org.springblade.core.launch.BladeApplication;
+import org.springblade.core.transaction.annotation.SeataCloudApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * 箱管启动器
+ *
+ * @author Chill
+ */
+@EnableBladeFeign
+@EnableFeignClients({"org.springblade"})
+@SpringCloudApplication
+@SeataCloudApplication
+public class BoxTubeApplication {
+
+	public static void main(String[] args) {
+		BladeApplication.run("blade-box-tube", BoxTubeApplication.class, args);
+	}
+
+}

blade-service/blade-box-tube/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,8 @@
+{
+  "properties": [
+    {
+      "name": "oss.bucket-name",
+      "type": "java.lang.String",
+      "description": "Description for oss.bucket-name."
+  }
+] }

blade-service/blade-box-tube/src/main/resources/application-dev.yml

@@ -0,0 +1,20 @@
+#服务器端口
+server:
+  port: 8096
+  profile: D:/ruoyi/uploadPath
+
+#数据源配置
+spring:
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: ${blade.datasource.dev.url}
+    username: ${blade.datasource.dev.username}
+    password: ${blade.datasource.dev.password}
+#mybatis-plus:
+#  mapper-locations: classpath:com/yh/project/mapper/*Mapper.xml
+#  type-aliases-package: com.yh.project.*.entity
+#swagger文档
+swagger:
+  base-packages:
+    - org.springblade.box.tube
+

blade-service/blade-box-tube/src/main/resources/application-prod.yml

@@ -0,0 +1,10 @@
+#服务器端口
+server:
+  port: 9010
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.prod.url}
+    username: ${blade.datasource.prod.username}
+    password: ${blade.datasource.prod.password}

blade-service/blade-box-tube/src/main/resources/application-test.yml

@@ -0,0 +1,10 @@
+#服务器端口
+server:
+  port: 9010
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.test.url}
+    username: ${blade.datasource.test.username}
+    password: ${blade.datasource.test.password}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -383,8 +383,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			} else if (CollectionUtils.isNotEmpty(list) && order.getTradeType().equals(OrderTypeEnum.EXPORT.getType())) {
 				// 出口的毛利额=销售价 * 汇率 - (采购价+配件价格)    毛利率 =毛利额/（采购单价+配件价格）
 				// 金额求和
-				BigDecimal amount = list.stream().reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getPrice().multiply(y.getOrderQuantity())), BigDecimal::add);
-//				BigDecimal amount = list.stream().reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getOutFactoryPrice().multiply(y.getOrderQuantity())), BigDecimal::add);
+//				BigDecimal amount = list.stream().reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getPrice().multiply(y.getOrderQuantity())), BigDecimal::add);
+				BigDecimal amount = list.stream().reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getOutFactoryPrice().multiply(y.getOrderQuantity())), BigDecimal::add);
 				// 采购金额求和
 				BigDecimal purchaseAmount = list.stream().reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getPurchaseAmount().multiply(y.getOrderQuantity())), BigDecimal::add);
 				// 配件金额求和
@@ -1992,6 +1992,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		selectOrder.setGrossProfit(grossProfit);
 		selectOrder.setConfirmStatus(1);
 		baseMapper.updateById(selectOrder);
+		// 获取订单文件信息
+		List<OrderFiles> orderFilesList = orderFilesService.list(new QueryWrapper<OrderFiles>().eq("pid", selectOrder.getId())
+			.eq("tenant_id", SecureUtil.getTenantId()).eq("status", 0).eq("is_deleted", 0).orderByAsc("id"));
+		selectOrder.setOrderFilesList(orderFilesList);
 	/*	if (ObjectUtils.isNotNull(selectOrder.getCurrentAmount()) && !selectOrder.getCurrentAmount().equals(new BigDecimal(0))) {
 			List<Settlement> settlementList = new ArrayList<>();
 			if (ObjectUtils.isNotNull(order.getSettlementList()) && order.getSettlementList().size() > 0){

blade-service/blade-stock/src/main/java/org/springblade/stock/mapper/StockGoodsMapper.xml

@@ -147,7 +147,8 @@
         t1.remarks AS remarks,
         t1.update_time AS updateTime,
         t1.arrears AS arrears,
-        t1.status AS status
+        t1.status AS status,
+        t1.balance_amount AS balanceAmount
         FROM
         business_stock_goods t1
         LEFT JOIN basic_storage_desc t2 ON t1.storage_id = t2.id

blade-service/pom.xml

@@ -34,6 +34,7 @@
         <module>blade-rocket-mq</module>
         <module>blade-school</module>
         <module>blade-land</module>
+        <module>blade-box-tube</module>
     </modules>
 
     <dependencies>

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/ShippingEnquiry.java

@@ -281,4 +281,18 @@ public class ShippingEnquiry extends BladeController {
 		submitDto.setTradeTypeEnum(OrderTypeEnum.EXPORT);
 		return orderService.commit(submitDto);
 	}
+
+	/**
+	 * 修改 船务状态
+	 */
+	@PostMapping("/updateIfShipping")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入order")
+	public R updateIfShipping(@Valid @RequestBody Order order) {
+		if (order.getId() == null) {
+			return R.fail(500, "缺少必要参数");
+		}
+		orderService.updateById(order);
+		return R.success("操作成功");
+	}
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -814,7 +814,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		// 查询订单明细信息
 		List<OrderItems> orderItemsList = orderItemsService.list(Wrappers.<OrderItems>lambdaQuery()
 			.eq(OrderItems::getPid, orderId).eq(OrderItems::getTenantId, SecureUtil.getTenantId())
-			.eq(OrderItems::getIsDeleted, 0).eq(Func.isNotEmpty(createId), OrderItems::getCreateUser, createId).orderByAsc(OrderItems::getSort));
+//			.eq(OrderItems::getIsDeleted, 0).eq(Func.isNotEmpty(createId), OrderItems::getCreateUser, createId).orderByAsc(OrderItems::getSort));
+			.eq(OrderItems::getIsDeleted, 0).orderByAsc(OrderItems::getSort));
 		// 获取商品id、名称用于匹配明细汉字
 		List<GoodsDescVO> goodsDescVOList = goodsDescClient.selectGoodsBasic().getData();
 		orderItemsList.forEach(item -> {