From b4ed308afa61643bc5cf36b0f90a9d82566d10c2 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 7 Apr 2024 14:20:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E5=8C=BB=E9=99=A2=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 13ef1c0..d185aa7 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -256,9 +256,11 @@ public class CtqyyClient extends CommonHttpClient { materialDictEntity.setOperatType("2"); materialDictEntity.setMaterialName(udiRelevanceResponse.getCpmctymc()); materialDictEntity.setCostlySign("1"); - if (udiRelevanceResponse.getMainId().endsWith("x")) { + if (StrUtil.isNotEmpty(udiRelevanceResponse.getMainId()) && udiRelevanceResponse.getMainId().endsWith("x")) { materialDictEntity.setMaterialMasterCode(null); materialDictEntity.setHisMaterialCode(null); + materialDictEntity.setCostlySign("0"); + materialDictEntity.setOperatType("1"); } else { materialDictEntity.setMaterialMasterCode(udiRelevanceResponse.getNameCode()); materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getMainId()); @@ -839,7 +841,10 @@ public class CtqyyClient extends CommonHttpClient { thrInvResultResponse.setType("1"); thrInvResultResponse.setOutCount("1"); thrInvResultResponse.setReCount("1"); - IoCodeEntity codeEntity = codeDao.selectOne(new LambdaQueryWrapper().eq(IoCodeEntity::getErrUdiCode, ptxhInvResponse.getBarcode()).last("limit 1")); + IoCodeEntity codeEntity = codeDao.selectOne(new LambdaQueryWrapper().eq(IoCodeEntity::getCode, ptxhInvResponse.getBarcode()).last("limit 1")); + if (codeEntity == null) { + codeEntity = codeDao.selectOne(new LambdaQueryWrapper().eq(IoCodeEntity::getErrUdiCode, ptxhInvResponse.getBarcode()).last("limit 1")); + } thrInvResultResponse.setUdiCode(codeEntity.getCode()); thrInvResultResponses.add(thrInvResultResponse); }