From 3f06c5a1dd96d0785556ed4e9a3ae15206a66206 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 2 Feb 2024 14:24:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BA=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/service/inout/IoCheckInoutService.java | 3 +-- src/main/resources/application-dev.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 487cd8f8e..1ed257e40 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -1046,11 +1046,10 @@ public class IoCheckInoutService { if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) { orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK); orderEntity.setUpdateTime(new Date()); - orderEntity.setReviewUser(orderEntity.getCheckUser()); if (IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP) orderEntity.setAuditTime(new Date()); if (StrUtil.isEmpty(orderEntity.getReviewUser())) { - orderEntity.setReviewUser(orderEntity.getReviewUser()); + orderEntity.setReviewUser(orderEntity.getCheckUser()); } orderService.update(orderEntity); genInv(orderEntity, bussinessTypeEntity); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 96245d007..eff144325 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_za?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_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: