From 52e7c1432848d805e6a0f4daaf4ee17ec362e790 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 13 Jul 2023 19:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=84=E5=94=AE=E5=AE=9E=E9=99=85=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E8=A1=A5=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/res/inout/IoOrderResponse.java | 2 +- .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java | 5 ++++- src/main/resources/application-dev.yml | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 3562d89f..771ce485 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -231,7 +231,7 @@ public class IoOrderResponse { private Integer deliveryStatus; private Integer processStatus; - private int inCodeStatus; + private Integer inCodeStatus; private Integer allCout; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index b4bd9bf4..8547e608 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -41,8 +41,10 @@ import com.glxp.api.service.inout.*; import com.glxp.api.service.inv.*; import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.util.DateUtil; +import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -588,7 +590,7 @@ public class IoOrderServiceImpl implements IoOrderService { && StrUtil.isEmpty(orderEntity.getSupplementNo()) ) { if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) { - if (orderEntity.getOutChangeEnable()) { + if (IntUtil.value(orderEntity.getOutChangeEnable())) { response.setEnableSupplementOrder(true); } } else @@ -597,6 +599,7 @@ public class IoOrderServiceImpl implements IoOrderService { result.add(response); } catch (Exception e) { e.printStackTrace(); + log.error(ExceptionUtils.getStackTrace(e)); log.error(orderEntity.getBillNo() + "平衡补单出错\n"); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 49e15b9b..498c0745 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,9 +3,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_zzzyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 60