切换数据源，拉取采购单问题

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -65,6 +65,7 @@ import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -156,6 +157,10 @@ public class CtqyyClient extends CommonHttpClient {
     @Resource
     private RelCodeDetailService relCodeDetailService;
 
+
+    @Value("${DBTYPE}")
+    private String DBTYPE;
+
     /**
      * 拼接xml请求头
      *
@@ -1576,7 +1581,7 @@ public class CtqyyClient extends CommonHttpClient {
                     .or().like(VYpzsIoInfo::getIO_SORT, keywords)//收货方
             );
 
-            udiwmsThrOrderRequest.setDatabaseProductName(getDataSourceType());
+            udiwmsThrOrderRequest.setDatabaseProductName(DBTYPE);
 
             Page<VYpzsIoInfo> page = vYpzsIoInfoMapper.selectGroupedWithPagination(new Page<VYpzsIoInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), udiwmsThrOrderRequest);
 
@@ -1612,13 +1617,13 @@ public class CtqyyClient extends CommonHttpClient {
                     List<IoCollectOrderBiz> bizList = new ArrayList<>();
                     value.forEach(entity -> {
                         IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
-                        BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()).last("limit 1"));
+                        BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getCOUNTRY_CODE()).last("limit 1"));
                         if (basicUdirelEntity != null) {
                             collectOrderBiz.setRelId(basicUdirelEntity.getId());
                         } else {
                             errorMsg.append(entity.getPHYSIC_NAME()).append("字典未对照").append(";");
                         }
-                        collectOrderBiz.setThrCode(entity.getPHYSIC_CODE());
+                        collectOrderBiz.setThrCode(entity.getCOUNTRY_CODE());
                         collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME());
                         collectOrderBiz.setBatchNo(entity.getBATCH_NO());
                         collectOrderBiz.setCount(entity.getQUANTITY());

src/main/resources/application.yml

@@ -18,7 +18,7 @@ server:
 #第三方系统标识
 THIRD_ID: thirdId
 THIRD_NAME: thirdName
-
+DBTYPE: Oracle
 #UDI管理系统地址
 UDIWMS_IP: http://127.0.0.1:9991
 
@@ -32,7 +32,9 @@ mybatis-plus:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     banner: false
-
+logging:
+  level:
+    com.glxp.mipsdl.dao: debug
 ok:
   http:
     connect-timeout: 30000

src/main/resources/logback-spring.xml

@@ -36,9 +36,7 @@
         </rollingPolicy>
         <!-- 此日志文档只记录debug级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
+
         </filter>
     </appender>