From 7b2e36e5961d0517af4c2f9642637e2e79ac86be Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 26 Sep 2024 16:57:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=99=A8=E6=A2=B0=E5=A4=84=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) 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 9a5c161..2b0be4d 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1832,20 +1832,33 @@ 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.getFIXMEDINS_HILIST_ID()).last(" limit 1")); - if (basicUdirelEntity != null) { - collectOrderBiz.setRelId(basicUdirelEntity.getId()); - } else { + String med_list_codg = entity.getMED_LIST_CODG(); + BasicProductsEntity basicProductsEntity = null; + if (StrUtil.isNotBlank(med_list_codg)) { + basicProductsEntity = basicProductsDao.selectOne(new LambdaQueryWrapper() + .eq(BasicProductsEntity::getYbbm, med_list_codg).last(" limit 1")); + if (basicProductsEntity != null) { + collectOrderBiz.setGgxh(basicProductsEntity.getGgxh()); + collectOrderBiz.setMeasureUnit(basicProductsEntity.getPackUnit()); + + BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper() + .eq(BasicUdirelEntity::getUuid, basicProductsEntity.getUuid()).last(" limit 1")); + if (basicProductsEntity != null) { + collectOrderBiz.setRelId(basicUdirelEntity.getId()); + collectOrderBiz.setThrCode(basicUdirelEntity.getMainId()); + }else { + errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";"); + } + } else { + errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";"); + } + }else { errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";"); } //==================================== -// collectOrderBiz.setGgxh(entity.getPACK_SPEC()); -// collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT()); -// collectOrderBiz.setCount(IntUtil.value(entity.getLAY_PHYSIC_QUANTITY())); -// collectOrderBiz.setThrCode(entity.getPHYSIC_CODE()); -// collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME()); -// collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); -// collectOrderBiz.setYbbm(entity.getCOUNTRY_CODE()); + collectOrderBiz.setCpmctymc(entity.getFIXMEDINS_HILIST_NAME()); + collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); + collectOrderBiz.setYbbm(entity.getMED_LIST_CODG()); //==================================== collectOrderBiz.setTagStatus(1); collectOrderBiz.setUnTagCount(0);