From 789a2878debd0e9289c5c2cc2bc94dce3a5e4671 Mon Sep 17 00:00:00 2001 From: loujf Date: Thu, 29 Dec 2022 15:38:54 +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 --- .../lnsh/lnsh_rgv/LnshRGVDeviceDriver.java | 20 ++++- .../LnshSplitManipulatorDeviceDriver.java | 2 +- ...agePalletSplitManipulatorDeviceDriver.java | 2 +- .../auto/run/NDCSocketConnectionAutoRun.java | 82 +++++++++++-------- .../acs/service/impl/WmsToJnServiceImpl.java | 3 + .../wms/sch/manage/buss/CallMaterialTask.java | 20 ++--- 6 files changed, 80 insertions(+), 49 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java index cc2afaf..060c61b 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java @@ -126,6 +126,11 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi private Date instruction_require_time = new Date(); private Date instruction_finished_time = new Date(); private Date instruction_apply_time = new Date(); + + private Date instruction_require_time2 = new Date(); + private Date instruction_finished_time2 = new Date(); + private Date instruction_apply_time2 = new Date(); + private int instruction_require_time_out = 3000; @Override @@ -349,9 +354,12 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi instruction_require2(); } //前工位申请任务 - if (mode == 2 && move_2 == 0 && action_2 == 0 && move_1 == 0 && task2 == 0 && !requireSucess1) { + else if (mode == 2 && move_2 == 0 && action_2 == 0 && move_1 == 0 && task2 == 0 && !requireSucess1) { // System.out.println("move_2:" + move_2 + ",action_2:" + action_2 + ",move_1:" + move_1 + ",task2:" + task2 + ",requireSucess1:" + requireSucess1); + logServer.deviceExecuteLog(this.device_code, "", "", "move_2:" + move_2 + ",action_2:" + action_2 + ",move_1:" + move_1 + ",task2:" + task2 + ",requireSucess1:" + requireSucess1); instruction_require(); + } else { + System.out.println("111"); } break; case 3: @@ -400,11 +408,11 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi //申请前工位任务 public synchronized boolean instruction_require() throws Exception { Date date = new Date(); - if (date.getTime() - this.instruction_apply_time.getTime() < (long) this.instruction_require_time_out) { + if (date.getTime() - this.instruction_apply_time2.getTime() < (long) this.instruction_require_time_out) { log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); return false; } else { - this.instruction_apply_time = date; + this.instruction_apply_time2 = date; String linkobj = (String) this.getDevice().getExtraValue().get("get_device_code1"); String demosub = linkobj.substring(1, linkobj.length() - 1); String demoArray[] = demosub.split(","); @@ -557,7 +565,11 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi } else { - + if (mode == 2 && move_2 == 0 && action_2 == 0 && move_1 == 0 && task2 == 0 && !requireSucess1) { +// System.out.println("move_2:" + move_2 + ",action_2:" + action_2 + ",move_1:" + move_1 + ",task2:" + task2 + ",requireSucess1:" + requireSucess1); + logServer.deviceExecuteLog(this.device_code, "", "", "move_2:" + move_2 + ",action_2:" + action_2 + ",move_1:" + move_1 + ",task2:" + task2 + ",requireSucess1:" + requireSucess1); + instruction_require(); + } } } return true; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java index 534bf95..789df78 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java @@ -699,7 +699,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im json.put("device_code",this.device_code); json.put("material_code",material); json.put("qty",qty); - json.put("type","3"); + json.put("type","2"); enterProduction(json); } break; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java index 165d65f..bde04f7 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java @@ -758,7 +758,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe json.put("device_code",this.device_code); json.put("material_code",material); json.put("qty",qty); - json.put("type","3"); + json.put("type","2"); enterProduction(json); } break; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java index 4b2a23f..2b293ec 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java @@ -177,7 +177,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { switch (type) { case 0: if (phase == 0x01) { - data = AgvService.sendAgvOneModeInst(phase, index); +// data = AgvService.sendAgvOneModeInst(phase, index); if (!ObjectUtil.isEmpty(inst)) { inst.setInstruction_status("1"); inst.setAgv_jobno(String.valueOf(index)); @@ -219,14 +219,18 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { //嘉耐缓存货架 if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); - if (lnshLaminatingMachineDeviceDriver.getMove() != 0) { - inst.setExecute_status("1"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc","","", "AGV请求取货设备{}无货,无法反馈"); - } +// if (lnshLaminatingMachineDeviceDriver.getMove() != 0) { +// inst.setExecute_status("1"); +// instructionService.update(inst); +// data = AgvService.sendAgvOneModeInst(phase, index, 0); +// flag = true; +// } else { +// logServer.deviceExecuteLog("ndc","","", "AGV请求取货设备{}无货,无法反馈"); +// } + inst.setExecute_status("1"); + instructionService.update(inst); + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; } //嘉耐工位模板 if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { @@ -314,14 +318,18 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { //嘉耐缓存货架 if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); - if (lnshLaminatingMachineDeviceDriver.getMove() == 0) { - inst.setExecute_status("5"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc","","","AGV取货完成请求离开设备{}有货,无法反馈"); - } +// if (lnshLaminatingMachineDeviceDriver.getMove() == 0) { +// inst.setExecute_status("5"); +// instructionService.update(inst); +// data = AgvService.sendAgvOneModeInst(phase, index, 0); +// flag = true; +// } else { +// logServer.deviceExecuteLog("ndc","","","AGV取货完成请求离开设备{}有货,无法反馈"); +// } + inst.setExecute_status("5"); + instructionService.update(inst); + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; } //嘉耐工位模板 if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { @@ -432,14 +440,18 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { //嘉耐缓存货架 if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); - if (lnshLaminatingMachineDeviceDriver.getMove() == 0) { - inst.setExecute_status("3"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc","","","AGV请求放货设备{}有货,无法反馈"); - } +// if (lnshLaminatingMachineDeviceDriver.getMove() == 0) { +// inst.setExecute_status("3"); +// instructionService.update(inst); +// data = AgvService.sendAgvOneModeInst(phase, index, 0); +// flag = true; +// } else { +// logServer.deviceExecuteLog("ndc","","","AGV请求放货设备{}有货,无法反馈"); +// } + inst.setExecute_status("3"); + instructionService.update(inst); + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; } //嘉耐工位模板 if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { @@ -509,14 +521,18 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { //嘉耐缓存货架 if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); - if (lnshLaminatingMachineDeviceDriver.getMove() != 0) { - inst.setExecute_status("6"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc","","","AGV放货完成请求离开设备{}无货,无法反馈"); - } +// if (lnshLaminatingMachineDeviceDriver.getMove() != 0) { +// inst.setExecute_status("6"); +// instructionService.update(inst); +// data = AgvService.sendAgvOneModeInst(phase, index, 0); +// flag = true; +// } else { +// logServer.deviceExecuteLog("ndc","","","AGV放货完成请求离开设备{}无货,无法反馈"); +// } + inst.setExecute_status("6"); + instructionService.update(inst); + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; } //嘉耐工位模板 if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java index f9f2534..facaa46 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java @@ -75,6 +75,9 @@ public class WmsToJnServiceImpl implements WmsToJnService { String ITEMCODE = dayScheduleObj.getString("ITEMCODE"); //压机编号 String SBDM = dayScheduleObj.getString("SBDM"); + if (StrUtil.isEmpty(SBDM)) { + throw new BadRequestException("压机编号为空！"); + } JSONObject materialObj = material_table.query("material_code ='" + ITEMCODE + "'").uniqueResult(0); if (ObjectUtil.isEmpty(materialObj)) { this.synchroMaterial(new JSONObject()); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java index ac29694..f155e73 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java @@ -340,11 +340,11 @@ public class CallMaterialTask extends AbstractAcsTask { if (StrUtil.equals(point_status01, "00") && StrUtil.equals(point_status02, "00") && ObjectUtil.isEmpty(task1) && ObjectUtil.isEmpty(task2)) { JSONObject jo = new JSONObject(); JSONArray arr = new JSONArray(); - jo.put("device_code", "FJJXS1"); - jo.put("code", "to_feedback"); - jo.put("value", "10"); - arr.add(jo); - wmsToAcsService.action(arr); +// jo.put("device_code", "FJJXS1"); +// jo.put("code", "to_feedback"); +// jo.put("value", "10"); +// arr.add(jo); +// wmsToAcsService.action(arr); } } if (StrUtil.equals(next_point_code, "FJJXSSLW301") || StrUtil.equals(next_point_code, "FJJXSSLW301")) { @@ -353,11 +353,11 @@ public class CallMaterialTask extends AbstractAcsTask { if (StrUtil.equals(point_status01, "00") && StrUtil.equals(point_status02, "00")) { JSONObject jo = new JSONObject(); JSONArray arr = new JSONArray(); - jo.put("device_code", "FJJXS3"); - jo.put("code", "to_feedback"); - jo.put("value", "10"); - arr.add(jo); - wmsToAcsService.action(arr); +// jo.put("device_code", "FJJXS3"); +// jo.put("code", "to_feedback"); +// jo.put("value", "10"); +// arr.add(jo); +// wmsToAcsService.action(arr); } }