From 327664faea719c3fca92d3113248edb4d3fec654 Mon Sep 17 00:00:00 2001 From: psh Date: Fri, 12 Apr 2024 11:04:44 +0800 Subject: [PATCH] fix --- .../basedriver/ssx_site/SsxSiteDeviceDriver.java | 4 ++-- .../java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java | 3 ++- .../wms/sch/point/service/impl/SchBasePointServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java index 71cf944..bc34c2a 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java @@ -345,11 +345,11 @@ public class SsxSiteDeviceDriver extends AbstractOpcDeviceDriver implements Devi } String resp = acsToWmsService.applyTask(request); JSONObject res_jo = JSONObject.parseObject(resp); - if (StrUtil.equals(res_jo.getString("code"), "200")) { +// if (StrUtil.equals(res_jo.getString("code"), "200")) { this.writing(type); this.setRequireSucess(true); log.info("acs申请任务", this.devicecode, "任务申请成功!"); - } +// } return true; } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java index 01b0b7a..ea8ef2a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java @@ -85,6 +85,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } @Override + @SneakyThrows public BaseResponse acsApply(JSONObject param) { String requestNo = param.getString("requestNo"); String requestMethodCode = param.getString("request_medthod_code"); // 获取请求方法名 @@ -101,7 +102,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { task.apply(param); } catch (Exception e) { String message = e.getMessage(); - log.error("ACS请求LMS出现错误: {}", message); + log.error("ACS请求LMS出现错误: {}{}", e,e.getMessage()); result.setCode(HttpStatus.HTTP_BAD_REQUEST); result.setMessage(message); result.setRequestNo(requestNo); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index 0d6afcc..0915af9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -57,7 +57,7 @@ public class SchBasePointServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper<>(); lam.like(ObjectUtil.isNotEmpty(blurry), SchBasePoint::getPoint_code, blurry) - .or(ObjectUtil.isNotEmpty(blurry), lam1 -> lam1.like(SchBasePoint::getPoint_name, blurry)) +// .or(ObjectUtil.isNotEmpty(blurry), lam1 -> lam1.like(SchBasePoint::getPoint_name, blurry)) .eq(ObjectUtil.isNotEmpty(workshop_code), SchBasePoint::getWorkshop_code, workshop_code) .eq(ObjectUtil.isNotEmpty(region_code), SchBasePoint::getRegion_code, region_code) .eq(ObjectUtil.isNotEmpty(point_type), SchBasePoint::getPoint_type, point_type)