From 42ec82bfcf21d34e4d183aff84495fb66b5641f2 Mon Sep 17 00:00:00 2001 From: yewj Date: Fri, 13 Sep 2024 11:10:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E9=9C=84=E5=A6=87=E5=B9=BC=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java | 5 +++-- src/main/resources/application-dev.yml | 6 +++--- src/main/resources/application-pro.yml | 11 +++++++++++ 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 425837d..91ed9b6 100644 --- a/pom.xml +++ b/pom.xml @@ -84,8 +84,8 @@ com.oracle - ojdbc8 - 19.18.0.0 + ojdbc6 + 11.2.0.4 runtime diff --git a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java index 2cd47b7..8481367 100644 --- a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java @@ -1318,6 +1318,7 @@ public class YxfyyyClient extends CommonHttpClient { public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { if (IntUtil.value(udiwmsBasicSkPrescribeRequest.getInOutType()) == 0) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + // TODO: 2024/9/13 缺少查询条件 String code = udiwmsBasicSkPrescribeRequest.getCode(); wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsPhysic::getSTOOUT_NO, code).or().eq(VInsurNationGoodsPhysic::getRXNO, code)); IPage page = goodsPhysicMapper @@ -1346,7 +1347,7 @@ public class YxfyyyClient extends CommonHttpClient { PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); if (udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.CGJH001.getBusType())) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - //补充其他查询条件 + //补充其他查询条件 todo wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsPlanInfo::getCGDBH, udiwmsThrOrderRequest.getBillNo()); IPage page = vYpzsPlanInfoMapper.selectPage(new Page(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper); List planInfos = page.getRecords(); @@ -1398,7 +1399,7 @@ public class YxfyyyClient extends CommonHttpClient { pageSimpleResponse.setList(ioCollectOrders); } else { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - //补充其他查询条件 + //补充其他查询条件 todo wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsIoInfo::getPHYSIC_CODE, udiwmsThrOrderRequest.getBillNo()); wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()), VYpzsIoInfo::getIO_SORT, udiwmsThrOrderRequest.getBusType()); Page page = vYpzsIoInfoMapper.selectPage(new Page(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c9ae32e..fa1224c 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,7 +5,7 @@ spring: strict: false datasource: master: - 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 + url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_yxfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver @@ -34,8 +34,8 @@ spring: driver-class-name: com.p6spy.engine.spy.P6SpyDriver ctqyySql: # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy - # username: SD_UDIJK - # password: SD_UDIJK + # username: I_YPZS + # password: zy02v4ys # driver-class-name: oracle.jdbc.driver.OracleDrive 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 diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 8598a46..9843b51 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -19,6 +19,15 @@ spring: username: root password: Glxp@6066 driver-class-name: com.mysql.cj.jdbc.Driver + ctqyySql: + driver-class-name: oracle.jdbc.driver.OracleDriver + url: jdbc:oracle:thin:@192.168.0.3:1521/yxfybjy + username: I_YPZS + password: zy02v4ys + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 hikari: connection-timeout: 60000 maximum-pool-size: 60 @@ -28,3 +37,5 @@ spring: maximum-pool-size: 60 minimum-idle: 10 UDIWMS_IP: http://127.0.0.1:9991 + +