diff --git a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java index 1e04c55..2fa72ca 100644 --- a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java @@ -312,6 +312,7 @@ public abstract class CommonHttpClient implements BaseHttpClient { public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) { return null; } + @Override public BaseResponse uploadCollectOrder(PostCollectOrderRequest postCollectOrderRequest) { return null; @@ -325,7 +326,7 @@ public abstract class CommonHttpClient implements BaseHttpClient { @Resource private DataSource dataSource; - public String getDataSourceType(){ + public String getDataSourceType() { Connection conn = null; DatabaseMetaData metaData = null; String databaseProductName = ""; @@ -335,7 +336,7 @@ public abstract class CommonHttpClient implements BaseHttpClient { databaseProductName = metaData.getDatabaseProductName();//MySQL //Oracle } catch (SQLException throwables) { throwables.printStackTrace(); - }finally { + } finally { // 释放连接资源 if (conn != null) { try { @@ -345,10 +346,11 @@ public abstract class CommonHttpClient implements BaseHttpClient { } } } - + log.info("数据库类型为:" + databaseProductName); return databaseProductName; } + @Override public BaseResponse getBuyType() { return null; diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 539d0ad..53cb24c 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1779,7 +1779,7 @@ public class CtqyyClient extends CommonHttpClient { List bizList = new ArrayList<>(); value.forEach(entity -> { IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); - BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()).last(" limit 1")); + BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getCOUNTRY_CODE()).last(" limit 1")); if (basicUdirelEntity != null) { collectOrderBiz.setRelId(basicUdirelEntity.getId()); } else { @@ -1793,7 +1793,7 @@ public class CtqyyClient extends CommonHttpClient { collectOrderBiz.setGgxh(entity.getPACK_SPEC()); collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT()); collectOrderBiz.setCount(IntUtil.value(entity.getLAY_PHYSIC_QUANTITY())); - collectOrderBiz.setThrCode(entity.getPHYSIC_CODE()); + collectOrderBiz.setThrCode(entity.getCOUNTRY_CODE()); collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME()); collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); collectOrderBiz.setYbbm(entity.getCOUNTRY_CODE());