From 9de3416685c72271935595d9e7e667f26d9a3b68 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Mon, 9 Sep 2024 10:55:17 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BC=98=E5=8C=96=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=94=B3=E8=AF=B7=E4=BB=BB=E5=8A=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ConveyorWithScannerWeightDeviceDriver.java | 61 +++++++++++-------- .../org/nl/acs/task/service/TaskService.java | 2 + .../task/service/impl/TaskServiceImpl.java | 9 +++ 3 files changed, 47 insertions(+), 25 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index 224b3eefb..59ea5ed79 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -500,20 +500,8 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); - HttpResponse httpResponse = acsToWmsService.applyTwo(param); - JSONObject jsonObject = null; - if(ObjectUtil.isNotEmpty(httpResponse)){ - String body = httpResponse.body(); - jsonObject = JSONObject.parseObject(body); - } - message = "申请退货入库,返回参数:" + jsonObject; - if (ObjectUtil.isNotNull(jsonObject) && jsonObject.getInteger("status") == 200) { - LuceneLogDto logDto2 = LuceneLogDto.builder() - .device_code(device_code) - .content("申请退货入库,参数,接口返回:" + jsonObject) - .build(); - logDto2.setLog_level(4); - luceneExecuteLogService.deviceExecuteLog(logDto2); + TaskDto dto = taskserver.findByBarcodeFromCache(barcode); + if (ObjectUtil.isNotEmpty(dto)) { List list1 = new ArrayList(); Map map = new HashMap(); map.put("code", "to_command"); @@ -522,14 +510,37 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv this.writing(list1); this.requireSucess = true; } else { - this.iserror = true; - LuceneLogDto logDto2 = LuceneLogDto.builder() - .device_code(device_code) - .content("申请退货入库,返回参数:" + jsonObject) - .build(); - logDto2.setLog_level(4); - luceneExecuteLogService.deviceExecuteLog(logDto2); - message = "申请退货入库报错,返回参数:" + jsonObject; + HttpResponse httpResponse = acsToWmsService.applyTwo(param); + JSONObject jsonObject = null; + if (ObjectUtil.isNotEmpty(httpResponse)) { + String body = httpResponse.body(); + jsonObject = JSONObject.parseObject(body); + } + message = "申请退货入库,返回参数:" + jsonObject; + if (ObjectUtil.isNotNull(jsonObject) && jsonObject.getInteger("status") == 200) { + LuceneLogDto logDto2 = LuceneLogDto.builder() + .device_code(device_code) + .content("申请退货入库,参数,接口返回:" + jsonObject) + .build(); + logDto2.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto2); + List list1 = new ArrayList(); + Map map = new HashMap(); + map.put("code", "to_command"); + map.put("value", mode); + list1.add(map); + this.writing(list1); + this.requireSucess = true; + } else { + this.iserror = true; + LuceneLogDto logDto2 = LuceneLogDto.builder() + .device_code(device_code) + .content("申请退货入库,返回参数:" + jsonObject) + .build(); + logDto2.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto2); + message = "申请退货入库报错,返回参数:" + jsonObject; + } } } catch (Exception e) { e.printStackTrace(); @@ -618,7 +629,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv luceneExecuteLogService.deviceExecuteLog(logDto); HttpResponse httpResponse = acsToWmsService.applyTwo(param); JSONObject jsonObject = null; - if(ObjectUtil.isNotEmpty(httpResponse)){ + if (ObjectUtil.isNotEmpty(httpResponse)) { String body = httpResponse.body(); jsonObject = JSONObject.parseObject(body); } @@ -687,12 +698,12 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv luceneExecuteLogService.deviceExecuteLog(logDto); HttpResponse httpResponse = acsToWmsService.applyTwo(param); JSONObject jsonObject = null; - if(ObjectUtil.isNotEmpty(httpResponse)){ + if (ObjectUtil.isNotEmpty(httpResponse)) { String body = httpResponse.body(); jsonObject = JSONObject.parseObject(body); } message = "木箱、子卷入库申请入库任务,返回参数:" + jsonObject; - if (ObjectUtil.isNotNull(jsonObject) && jsonObject.getInteger("status") == 200) { + if (ObjectUtil.isNotNull(jsonObject) && jsonObject.getInteger("status") == 200) { LuceneLogDto logDto2 = LuceneLogDto.builder() .device_code(device_code) .content("木箱、子卷入库申请入库任务,参数,接口返回:" + jsonObject) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java index 396482337..1a28f1e6c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java @@ -199,6 +199,8 @@ public interface TaskService extends CommonService { */ TaskDto findByCode(String code); + TaskDto findByBarcodeFromCache(String barcode); + /** * 根据设备号查询未执行的任务 * diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 4a4ae493f..79a268c7c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -430,6 +430,15 @@ public class TaskServiceImpl extends CommonServiceImpl impleme return ConvertUtil.convert(task, TaskDto.class); } + @Override + public TaskDto findByBarcodeFromCache(String barcode) { + Task task = new LambdaQueryChainWrapper<>(taskMapper) + .eq(Task::getVehicle_code, barcode) + .eq(Task::getTask_status,TaskStatusEnum.READY.getIndex()) + .one(); + return ConvertUtil.convert(task, TaskDto.class); + } + @Override public List queryTaskByDeviceCode(String device_code) { return Optional