From e95f058955f709cbbc9ab63b1d3652f11d6527fd Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 13 Jan 2023 10:59:48 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=202.=E6=81=A2=E5=A4=8D=E4=B8=9A=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=8F=90=E4=BA=A4=E5=88=B0=E5=8C=BB=E9=99=A2=E8=87=AA?= =?UTF-8?q?=E5=8A=A9=E5=B9=B3=E5=8F=B0=E6=A0=87=E8=AF=86=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/admin/config/HdSchemaExecutor.java | 6 ++---- .../api/admin/controller/business/StockOrderController.java | 1 + .../glxp/api/admin/service/inout/impl/OrderServiceImpl.java | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/HdSchemaExecutor.java b/api-admin/src/main/java/com/glxp/api/admin/config/HdSchemaExecutor.java index bbb0fbf6..7737e265 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/config/HdSchemaExecutor.java +++ b/api-admin/src/main/java/com/glxp/api/admin/config/HdSchemaExecutor.java @@ -9,8 +9,6 @@ import com.glxp.api.admin.entity.info.SchemaData; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.io.InputStream; @@ -18,8 +16,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -@Order(1) -@Component +//@Order(1) +//@Component @Slf4j public class HdSchemaExecutor implements ApplicationRunner { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java index f4eebdf4..331ff98a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java @@ -330,6 +330,7 @@ public class StockOrderController { //查询仓库名称 orderService.queryInvName(resultList); resultList = orderService.checkSubmitOrder(resultList); + orderService.setUploadFlag(resultList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(resultList); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index 028016e6..0c9101fd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -507,7 +507,6 @@ public class OrderServiceImpl implements OrderService { Long count = unitMaintainPlatformDao.selectCount(stockOrderResponse.getUnitIdFk(), stockOrderResponse.getBillType()); stockOrderResponse.setUploadFlag(count > 0 ? true : false); } - } @Transactional(rollbackFor = Exception.class)