From 44afbdd6512d1b73b5b5454ad3fdf6ecefb02ec9 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 23 Feb 2023 09:49:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=9B=B8=E5=85=B3bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/service/inout/IoGenInvService.java | 4 ++-- .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java | 6 +++--- src/main/resources/application-dev.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index 2b2c78742..b2ad983ea 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -298,9 +298,9 @@ public class IoGenInvService { if (CollUtil.isNotEmpty(resultLists)) { for (InvProductDetailEntity invProductDetailEntity : resultLists) { if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - invCount = invCount - invProductDetailEntity.getCount(); + invCount = invCount - invProductDetailEntity.getReCount(); } else { - invCount = invCount + invProductDetailEntity.getCount(); + invCount = invCount + invProductDetailEntity.getReCount(); } } } 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 52cf1d164..98e5ccb62 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 @@ -452,9 +452,9 @@ public class IoOrderServiceImpl implements IoOrderService { //查询单据类型名称 String busTypeName = basicBussinessTypeDao.selectNameByAction(order.getAction()); response.setBillTypeName(busTypeName); - //查询往来单位名称 - BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp()); - response.setFromName(corpEntity.getName()); + //查询往来单位名称 TODO 有bug +// BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp()); +// response.setFromName(corpEntity.getName()); //查询部门名称 String deptName = deptDao.selectNameByCode(order.getDeptCode()); response.setDeptName(deptName); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c450cfd9b..973044518 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms?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_wms?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