From 7acc2d0fb6e6b6265bb381e029cb01e70d05eb64 Mon Sep 17 00:00:00 2001 From: loujf Date: Tue, 1 Nov 2022 18:57:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/server/impl/MagicAgvServiceImpl.java | 10 +++---- ...hPackagePalletManipulatorDeviceDriver.java | 2 +- .../lnsh_station/LnshStationDeviceDriver.java | 30 +++++++++---------- .../quartz/task/QueryMagicAgvTaskStatus.java | 7 +++++ .../group/service/impl/GroupServiceImpl.java | 1 + 5 files changed, 29 insertions(+), 21 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java index 3abb678..281d120 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java @@ -652,17 +652,17 @@ public class MagicAgvServiceImpl implements MagicAgvService { if (lnshLaminatingMachineDeviceDriver.getMode() != 0) { inst.setExecute_device_code(address); inst.setExecute_status("4"); - lnshLaminatingMachineDeviceDriver.writing(1); - } - //如果组盘绑定条码成功，就允许agv离开 - if (lnshLaminatingMachineDeviceDriver.getMode() == 6 && lnshLaminatingMachineDeviceDriver.getResult()) { - is_feedback = true; } } else if ("NOP".equals(action)) { if (lnshLaminatingMachineDeviceDriver.getMode() != 0 && lnshLaminatingMachineDeviceDriver.getMode() != 6) { inst.setExecute_device_code(address); inst.setExecute_status("4"); lnshLaminatingMachineDeviceDriver.writing(3,Integer.parseInt(inst.getInstruction_code())); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } lnshLaminatingMachineDeviceDriver.writing(1); } //如果组盘绑定条码成功，就允许agv离开 diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java index 2ea855e..fffaef4 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java @@ -908,7 +908,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD String demoArray[] = demosub.split(","); List demoList = Arrays.asList(demoArray); json.put("device_code",demoList.get(put_station-1).replace("\"","")); - json.put("vehicle_code",this.autoGenericCode(String.valueOf(barcode))); +// json.put("vehicle_code",this.autoGenericCode(String.valueOf(barcode))); HttpResponse result = acsToWmsService.queryCribbingInfo(json); if (ObjectUtil.isNotEmpty(result)) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java index cec4cbd..d783c20 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java @@ -188,19 +188,19 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications); } - if (mode == 2 && move != 0 && task > 0) { - //inst_message - inst = instructionService.findByCodeFromCache(String.valueOf(task)); - if (inst != null) { - if (StrUtil.equals(inst.getInstruction_status(), "1") && StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) { - finish_instruction(); - } - if (StrUtil.equals(inst.getInstruction_status(), "0") && StrUtil.equals(this.getDeviceCode(), inst.getStart_device_code())) { - inst.setInstruction_status("1"); - instructionService.update(inst); - } - } - } +// if (mode == 2 && move != 0 && task > 0) { +// //inst_message +// inst = instructionService.findByCodeFromCache(String.valueOf(task)); +// if (inst != null) { +// if (StrUtil.equals(inst.getInstruction_status(), "1") && StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) { +// finish_instruction(); +// } +// if (StrUtil.equals(inst.getInstruction_status(), "0") && StrUtil.equals(this.getDeviceCode(), inst.getStart_device_code())) { +// inst.setInstruction_status("1"); +// instructionService.update(inst); +// } +// } +// } } catch (Exception var17) { return; @@ -567,7 +567,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements json.put("type","2"); json.put("is_full","1"); - HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); + HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { @@ -625,7 +625,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements json.put("device_code",this.device_code); json.put("type",type); // json.put("material",material); -// json.put("vehicle_code",this.autoGenericCode(String.valueOf(barcode))); + json.put("vehicle_code",this.autoGenericCode(String.valueOf(barcode))); // json.put("is_full","1"); HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvTaskStatus.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvTaskStatus.java index 2c12844..9f24155 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvTaskStatus.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvTaskStatus.java @@ -11,10 +11,12 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.agv.server.MagicAgvService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; +import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Locale; /** * 查询AGV任务状态 @@ -28,9 +30,13 @@ public class QueryMagicAgvTaskStatus { @Autowired MagicAgvService magicAgvService; + private String log_file_type = "log_file_type"; + private String log_type = "agv接口日志"; public void run() throws Exception { + List instList = instructionService.findAllInstFromCache(); + MDC.put(log_file_type, log_type); if (instList.size() > 0) { for (int i = 0; i < instList.size(); i++) { Instruction inst = instList.get(i); @@ -67,6 +73,7 @@ public class QueryMagicAgvTaskStatus { instructionService.update(inst); } } else if ("FINISHED".equals(state)) { + log.info("agv指令状态：{}",state); if (inst != null) { inst.setInstruction_status("2"); instructionService.finish(inst); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/service/impl/GroupServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/service/impl/GroupServiceImpl.java index 8afce3e..5c689bf 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/service/impl/GroupServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/service/impl/GroupServiceImpl.java @@ -51,6 +51,7 @@ public class GroupServiceImpl implements GroupService { if (StrUtil.isEmpty(task_code)) { throw new BadRequestException("任务号不能为空！"); } + param.put("device_code","RYSMW01"); acsToWmsServiceImpl.group(param); JSONObject returnjo = new JSONObject(); returnjo.put("code", "1");