From 81c2c429b006b5af4fbb1a6a72ee03f8fed8e236 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 13 Dec 2022 15:50:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=97=A0=E7=94=9F=E6=88=90=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/controller/inout/utils/CheckOrderUtils.java | 5 ++--- api-admin/src/main/resources/application-dev.properties | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java index 9bd8e247..c048671e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java @@ -119,8 +119,7 @@ public class CheckOrderUtils { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS); orderEntity.setUpdateTime(new Date()); - - + orderService.updateOrder(orderEntity); //更新业务单据为已校验 List erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk()); String status = ""; @@ -138,9 +137,9 @@ public class CheckOrderUtils { } if (status.equals(ConstantStatus.SORDER_DELIVER)) { orderEntity.setReceiveStatus(1); + orderService.updateOrder(orderEntity); invProductsTrService.genInvProducts(orderEntity.getId()); } - orderService.updateOrder(orderEntity); } else { for (ErpOrderEntity erpOrderEntity : vailOrderEntities) { diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 2c87aee0..8a813a25 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,8 +1,8 @@ -server.port=9991 +server.port=9992 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph1?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3364/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=123456 +spring.datasource.password=Glxp@6066 spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.minimum-idle=10