From 5810d14716ab701a8539cda4cfbdace8ae29548d Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 16 Jul 2023 10:52:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=8A=E6=96=AD=E7=8E=B0?= =?UTF-8?q?=E5=AD=98=E9=87=8F=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/inout/IoCodeTempController.java | 2 +- .../api/controller/thrsys/ThrInvProductsController.java | 2 +- .../com/glxp/api/service/inout/IoAddInoutService.java | 2 +- src/main/resources/application-dev.yml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 9c2fed714..a36b6c99b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -272,7 +272,7 @@ public class IoCodeTempController extends BaseController { checkSuccess = false; lostMsg = lostMsg + ",失效日期"; } - if (checkUdi.getAllowNoSerial()!=null && !checkUdi.getAllowNoSerial() && StrUtil.isEmpty(udiEntity.getSerialNo()) + if (checkUdi.getAllowNoSerial() != null && !checkUdi.getAllowNoSerial() && StrUtil.isEmpty(udiEntity.getSerialNo()) ) { checkSuccess = false; lostMsg = lostMsg + ",序列号"; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java index 66e759c3a..29bd75698 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java @@ -184,7 +184,7 @@ public class ThrInvProductsController { @GetMapping("/udiwms/inv/getInvProducts") public BaseResponse getInvProducts(ThrOnhandRequest thrOnhandRequest) { ThrSystemEntity thrSystemEntity = thrSystemService.selectByThirdId(thrOnhandRequest.getThirdSys()); - String url = thrSystemEntity.getThridUrl() + "/udiwms/erp/inv/getEnvProduct"; + String url = thrSystemEntity.getThridUrl() + "/udiwms/erp/inv/getInvProduct"; try { String response = httpOkClient.uCloudPost(url, thrOnhandRequest, thrSystemEntity); diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 94261fe9f..5d86fcc87 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -172,7 +172,7 @@ public class IoAddInoutService { if ((warehouseEntity.getRelId() == null)) { orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); orderEntity.setUpdateTime(new Date()); - orderEntity.setErrMsg("udi码：" + warehouseEntity.getCode() + "上传时对照数据丢失,请选择对！"); + orderEntity.setErrMsg("udi码：" + warehouseEntity.getCode() + "上传时对照数据丢失！"); orderService.update(orderEntity); return; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b9dfaf4b8..eda745787 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_pzh?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_pzh?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: 20 @@ -52,6 +52,6 @@ UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs back_file_path: D:/share/udisps/back/ -API_KEY: 1101 -API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L +API_KEY: 1102 +API_SECRET: oIHZqfbtoUNehgJ5MOp5GBlxBIwIo15d WEB_TITLE: 平潭协和医院