云霄妇幼相关修改

pom.xml

@@ -84,8 +84,8 @@
 
         <dependency>
             <groupId>com.oracle</groupId>
-            <artifactId>ojdbc8</artifactId>
+            <artifactId>ojdbc6</artifactId>
-            <version>19.18.0.0</version>
+            <version>11.2.0.4</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

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<VInsurNationGoodsPhysic> 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<VInsurNationGoodsPhysic> page = goodsPhysicMapper
@@ -1346,7 +1347,7 @@ public class YxfyyyClient extends CommonHttpClient {
         PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>();
         if (udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.CGJH001.getBusType())) {
             LambdaQueryWrapper<VYpzsPlanInfo> wrapper = new LambdaQueryWrapper<>();
-            //补充其他查询条件
+            //补充其他查询条件  todo
             wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsPlanInfo::getCGDBH, udiwmsThrOrderRequest.getBillNo());
             IPage<VYpzsPlanInfo> page = vYpzsPlanInfoMapper.selectPage(new Page<VYpzsPlanInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper);
             List<VYpzsPlanInfo> planInfos = page.getRecords();
@@ -1398,7 +1399,7 @@ public class YxfyyyClient extends CommonHttpClient {
             pageSimpleResponse.setList(ioCollectOrders);
         } else {
             LambdaQueryWrapper<VYpzsIoInfo> 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<VYpzsIoInfo> page = vYpzsIoInfoMapper.selectPage(new Page<VYpzsIoInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper);

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
+          #          username: I_YPZS
-          #          password: SD_UDIJK
+          #          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

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
+
+