root/yiBinGaoCe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
psh
2024-04-12 11:04:44 +08:00
parent 7b8ab73513
commit 327664faea
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java
View File

@@ -345,11 +345,11 @@ public class SsxSiteDeviceDriver extends AbstractOpcDeviceDriver implements Devi
} }
String resp = acsToWmsService.applyTask(request); String resp = acsToWmsService.applyTask(request);
JSONObject res_jo = JSONObject.parseObject(resp); 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.writing(type);
this.setRequireSucess(true); this.setRequireSucess(true);
log.info("acs申请任务", this.devicecode, "任务申请成功!"); log.info("acs申请任务", this.devicecode, "任务申请成功!");
} // }
return true; return true;
} }
} }

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
View File

@@ -85,6 +85,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
} }
@Override @Override
@SneakyThrows
public BaseResponse acsApply(JSONObject param) { public BaseResponse acsApply(JSONObject param) {
String requestNo = param.getString("requestNo"); String requestNo = param.getString("requestNo");
String requestMethodCode = param.getString("request_medthod_code"); // 获取请求方法名 String requestMethodCode = param.getString("request_medthod_code"); // 获取请求方法名
@@ -101,7 +102,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
task.apply(param); task.apply(param);
} catch (Exception e) { } catch (Exception e) {
String message = e.getMessage(); String message = e.getMessage();
log.error("ACS请求LMS出现错误: {}", message); log.error("ACS请求LMS出现错误: {}{}", e,e.getMessage());
result.setCode(HttpStatus.HTTP_BAD_REQUEST); result.setCode(HttpStatus.HTTP_BAD_REQUEST);
result.setMessage(message); result.setMessage(message);
result.setRequestNo(requestNo); result.setRequestNo(requestNo);

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
View File

@@ -57,7 +57,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
Boolean parent_point = ObjectUtil.isNotEmpty(whereJson.get("parent_point")) ? Boolean.valueOf(whereJson.get("parent_point").toString()) : false; Boolean parent_point = ObjectUtil.isNotEmpty(whereJson.get("parent_point")) ? Boolean.valueOf(whereJson.get("parent_point").toString()) : false;
LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
lam.like(ObjectUtil.isNotEmpty(blurry), SchBasePoint::getPoint_code, blurry) 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(workshop_code), SchBasePoint::getWorkshop_code, workshop_code)
.eq(ObjectUtil.isNotEmpty(region_code), SchBasePoint::getRegion_code, region_code) .eq(ObjectUtil.isNotEmpty(region_code), SchBasePoint::getRegion_code, region_code)
.eq(ObjectUtil.isNotEmpty(point_type), SchBasePoint::getPoint_type, point_type) .eq(ObjectUtil.isNotEmpty(point_type), SchBasePoint::getPoint_type, point_type)