From 2e0ce6f7864c8b891239f243904fe37ad617918c Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Thu, 20 Feb 2025 09:02:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E4=B8=80=E6=9C=9F?= =?UTF-8?q?=E7=AB=8B=E5=BA=93=E6=8C=87=E4=BB=A4=E6=9C=AA=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/impl/LiKuToAcsServiceImpl.java | 18 ++++++++++-------- .../service/impl/InstructionServiceImpl.java | 10 +++++----- .../PlugPullDeviceSiteDeviceDriver.java | 6 +++--- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java index eb1ba397e..729920c47 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java @@ -145,7 +145,7 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { public Resp outStoreReport(OutStoreReportRequest requestParam) throws Exception { try { MDC.put(log_file_type, log_type); - log.info("出库任务状态反馈-----输入参数{}", JSON.toJSONString(requestParam)); + log.info("出库任务状态反馈1-----输入参数{}", JSON.toJSONString(requestParam)); String inst_code = requestParam.getOrderId(); String status = requestParam.getState(); String carNo = requestParam.getRobotId(); @@ -158,7 +158,7 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { result.put("code", "0"); result.put("comment", "未找到对应指令"); result.put("data", outStoreReportResponse ); - log.info("出库任务状态反馈-----输出参数{}", result); + log.info("出库任务状态反馈2-----输出参数{}", result); return RespUtil.getResp(result.toString(), new OutStoreReportResponse()); } if (!StrUtil.equals(inst.getInstruction_status(),"0") && !StrUtil.equals(inst.getInstruction_status(),"1")) { @@ -169,7 +169,7 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { result.put("code", "0"); result.put("comment", "未找到对应未完成的指令"); result.put("data", outStoreReportResponse ); - log.info("出库任务状态反馈-----输出参数{}", result); + log.info("出库任务状态反馈3-----输出参数{}", result); return RespUtil.getResp(result.toString(), new OutStoreReportResponse()); } TaskDto task = taskService.findByCode(inst.getTask_code()); @@ -181,7 +181,7 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { result.put("code", "0"); result.put("comment", "未找到对应任务"); result.put("data", outStoreReportResponse ); - log.info("出库任务状态反馈-----输出参数{}", result); + log.info("出库任务状态反馈4-----输出参数{}", result); return RespUtil.getResp(result.toString(), new OutStoreReportResponse()); } if (!StrUtil.equals(task.getTask_status(),"0") && !StrUtil.equals(task.getTask_status(),"1")) { @@ -192,7 +192,7 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { result.put("code", "0"); result.put("comment", "未找到未完成的对应任务"); result.put("data", outStoreReportResponse ); - log.info("出库任务状态反馈-----输出参数{}", result); + log.info("出库任务状态反馈5-----输出参数{}", result); return RespUtil.getResp(result.toString(), new OutStoreReportResponse()); } // 1 已接收 2 开始执行 3执行完成 4 阻挡 5 空洞 @@ -216,8 +216,10 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { inst.setInstruction_status("2"); instructionService.finish(inst.getInstruction_id()); } - inst.setRemark("立库已反馈完成，待输送上报任务号"); - instructionService.update(inst); + if (!"2".equals(inst.getInstruction_status())) { + inst.setRemark("立库已反馈完成，待输送上报任务号"); + instructionService.update(inst); + } } } else if(StrUtil.equals(status,"4")){ @@ -233,7 +235,7 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { result.put("code", "0"); result.put("comment", ""); result.put("data", outStoreReportResponse ); - log.info("出库任务状态反馈-----输出参数{}", result); + log.info("出库任务状态反馈6-----输出参数{}", result); return RespUtil.getResp(result.toString(), new OutStoreReportResponse()); } finally { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index ab420da23..24180970a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -481,7 +481,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu try{ instructions.add(dto); - log.warn("指令添加到指令列表:"+dto.toString()); + log.warn("指令添加到指令列表1:"+dto.toString()); } catch (Exception e){ log.warn("指令添加到指令列表异常:" + dto.toString() +e.getMessage()); } @@ -603,7 +603,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu wo.insert(json); try{ instructions.add(dto); - log.warn("指令添加到指令列表:"+dto.toString()); + log.warn("指令添加到指令列表2:"+dto.toString()); } catch (Exception e){ log.warn("指令添加到指令列表异常:"+e.getMessage()); } @@ -723,7 +723,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu wo.insert(json); try{ instructions.add(dto); - log.warn("指令添加到指令列表:"+dto.toString()); + log.warn("指令添加到指令列表3:"+dto.toString()); } catch (Exception e){ log.warn("指令添加到指令列表异常:" + dto.toString() +e.getMessage()); } @@ -827,7 +827,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu // } try{ instructions.add(dto); - log.warn("指令添加到指令列表:"+dto.toString()); + log.warn("指令添加到指令列表4:"+dto.toString()); } catch (Exception e){ log.warn("指令添加到指令列表异常:" + dto.toString() +e.getMessage()); } @@ -847,7 +847,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu removeByCodeFromCache(dto.getInstruction_code()); try{ instructions.add(dto); - log.warn("指令添加到指令列表:"+dto.toString()); + log.warn("指令添加到指令列表5:"+dto.toString()); } catch (Exception e){ log.warn("指令添加到指令列表异常:" + dto.toString() +e.getMessage()); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java index 8f27441de..b57acd76f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java @@ -698,18 +698,18 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl message = "生成行架任务成功"; LuceneLogDto logDto1 = LuceneLogDto.builder() .device_code(device_code) - .content("申请行架任务,返回参数：" + applyPlugPullSitResponse.getData()) + .content("申请行架任务,返回参数：" + applyPlugPullSitResponse.getMessage()) .build(); logDto1.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto1); requireSucess = true; } else { message = applyPlugPullSitResponse.getMessage(); - requireSucess = true; +// requireSucess = true; message = "申请行架任务失败"; LuceneLogDto logDto1 = LuceneLogDto.builder() .device_code(device_code) - .content("申请行架任务失败,返回参数：" + applyPlugPullSitResponse.getData()) + .content("申请行架任务失败,返回参数：" + applyPlugPullSitResponse.getMessage()) .build(); logDto1.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto1);