From 138d45ee5c90d7fff06c42be2fe5869efb259dde Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 13 Feb 2025 16:11:45 +0800 Subject: [PATCH] =?UTF-8?q?1/3=20=E5=8F=82=E6=95=B0=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/lhzyy/LhzyyClient.java | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/lhzyy/LhzyyClient.java b/src/main/java/com/glxp/mipsdl/client/lhzyy/LhzyyClient.java index 34dd4c0..ee13e99 100644 --- a/src/main/java/com/glxp/mipsdl/client/lhzyy/LhzyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/lhzyy/LhzyyClient.java @@ -200,17 +200,28 @@ public class LhzyyClient extends CommonHttpClient { dsOrderRequest.setCorpName(corpName); } else if (basicBussinessTypeEntity.getCorpType().equals(Constants.CORP_INTTERNAL)) { //内部科室 - AuthWarehouseEntity warehouseEntity = authWarehouseDao.selectOne(new LambdaQueryWrapper().eq(AuthWarehouseEntity::getCode, udiwmsOrderRequest.getCorpId())); - try { - //根据第三方系统标识，获取对应字段的值 - ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectOne(new LambdaQueryWrapper() - .eq(ThrInvWarehouseEntity::getCode, authWarehouseService.getThirdInvCode(warehouseEntity)) - .eq(ThrInvWarehouseEntity::getThirdSysFk, thirdSysConfig.getThirdId())); - - dsOrderRequest.setCorpId(thrInvWarehouseEntity.getCode()); - dsOrderRequest.setCorpName(thrInvWarehouseEntity.getName()); - } catch (Exception e) { - log.error("查询单据对应往来单位的第三方仓库信息异常", e); + + //内部科室 + BasicCorpEntity basicCorpEntity = null; + if (StrUtil.isNotEmpty(orderEntity.getFromCorp())) { + basicCorpEntity = basicCorpDao.selectByErpId(orderEntity.getFromCorp()); + } + if (basicCorpEntity != null) { + dsOrderRequest.setCorpId(basicCorpEntity.getThirdId()); + dsOrderRequest.setCorpName(basicCorpEntity.getName()); + } else{ + AuthWarehouseEntity warehouseEntity = authWarehouseDao.selectOne(new LambdaQueryWrapper().eq(AuthWarehouseEntity::getCode, udiwmsOrderRequest.getCorpId())); + try { + //根据第三方系统标识，获取对应字段的值 + ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectOne(new LambdaQueryWrapper() + .eq(ThrInvWarehouseEntity::getCode, authWarehouseService.getThirdInvCode(warehouseEntity)) + .eq(ThrInvWarehouseEntity::getThirdSysFk, thirdSysConfig.getThirdId())); + + dsOrderRequest.setCorpId(thrInvWarehouseEntity.getCode()); + dsOrderRequest.setCorpName(thrInvWarehouseEntity.getName()); + } catch (Exception e) { + log.error("查询单据对应往来单位的第三方仓库信息异常", e); + } } } else if (basicBussinessTypeEntity.getCorpType().equals(Constants.CORP_SP)) { //供应商