长泰医院更新

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<IoCodeEntity>().eq(IoCodeEntity::getErrUdiCode, ptxhInvResponse.getBarcode()).last("limit 1"));
+                    IoCodeEntity codeEntity = codeDao.selectOne(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getCode, ptxhInvResponse.getBarcode()).last("limit 1"));
+                    if (codeEntity == null) {
+                        codeEntity = codeDao.selectOne(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getErrUdiCode, ptxhInvResponse.getBarcode()).last("limit 1"));
+                    }
                     thrInvResultResponse.setUdiCode(codeEntity.getCode());
                     thrInvResultResponses.add(thrInvResultResponse);
                 }