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)