From fa6ec539a0e2131584451bb468a6347bdd69660f Mon Sep 17 00:00:00 2001 From: loujf Date: Mon, 10 Oct 2022 09:43:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=AE=8C=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=97=B6=E4=B9=9F=E8=A6=81=E5=90=91=E7=94=B5=E6=B0=94?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E4=B8=80=E4=B8=AA=E4=BF=A1=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lnsh/lnsh_rgv/LnshRGVDeviceDriver.java | 18 ++++++------- .../impl/ProduceshiftorderServiceImpl.java | 26 +++++++++++++++++++ .../wms/sch/manage/buss/CallMaterialTask.java | 2 +- 3 files changed, 36 insertions(+), 10 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 67a90a2..1b42691 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 @@ -219,10 +219,10 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi // logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); // logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); // } - if (error_time != last_error_time) { - logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); - } +// if (error_time != last_error_time) { +// logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); +// logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); +// } if (task_qty != last_task_qty) { logServer.deviceItemValue(this.device_code,"task_qty" ,String.valueOf(task_qty)); logServer.deviceExecuteLog(this.device_code,"","","信号task_qty：" + last_task_qty + "->" + task_qty); @@ -308,11 +308,11 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi //执行单任务下的业务逻辑 //给后工位下发空盘放货信号 //判断条件 前工位无任务、无货 后工位有任务取货完成 - if(mode ==3 && action_2 == 2 && move_2 != 0 && move_1 == 0 && ObjectUtil.isNotEmpty(inst2) && ObjectUtil.isEmpty(inst1) ){ + if(mode == 3 && action_2 == 2 && move_2 != 0 && move_1 == 0 && ObjectUtil.isNotEmpty(inst2) && ObjectUtil.isEmpty(inst1) ){ writing("to_command2","2"); } //给前工位取满托下发放货信号 - if(mode ==3 && action_1 == 2 && move_1 != 0 && move_2 == 0 && task1>0 && ObjectUtil.isNotEmpty(inst1) && ObjectUtil.isEmpty(inst2) ){ + if(mode == 3 && action_1 == 2 && move_1 != 0 && move_2 == 0 && task1>0 && ObjectUtil.isNotEmpty(inst1) && ObjectUtil.isEmpty(inst2) ){ writing("to_command1","2"); } @@ -350,15 +350,15 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi if (mode == 2 && move_2 == 0 && action_2 == 0 && !requireSucess2) { instruction_require2(); } + if (mode == 2 && move_2 == 0 && action_2 == 0 && move_1 == 0 && ObjectUtil.isEmpty(inst2) && !requireSucess1){ + instruction_require(); + } break; case 3: //前工位申请任务 if (mode == 3 && move_2 == 1 && action_2 == 1 && move_1 == 0 && !requireSucess1) { instruction_require(); } - if(mode == 2 && move_2 == 0 && action_2 == 0 && move_1 == 0 && ObjectUtil.isEmpty(inst2) && !requireSucess1){ - instruction_require(); - } } switch (flag) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index 468856c..597e4e7 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -6,7 +6,12 @@ import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; +import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator_site.LnshPalletizingManipulatorSiteDeviceDriver; +import org.nl.acs.device_driver.lnsh.lnsh_split_manipulator.LnshSplitManipulatorDeviceDriver; +import org.nl.acs.device_driver.lnsh.rljn_package_palletSplit_manipulator.RljnPackagePalletSplitManipulatorDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.opc.Device; +import org.nl.acs.opc.DeviceAppService; import org.nl.acs.order.service.ProduceshiftorderService; import org.nl.acs.order.service.dto.ProduceshiftorderDto; import org.nl.exception.BadRequestException; @@ -48,6 +53,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { @Autowired AcsConfigService acsConfigService; + @Autowired + DeviceAppService deviceAppService; + @Override public Map queryAll(Map whereJson, Pageable page) { HashMap map = new HashMap<>(); @@ -170,6 +178,24 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { dto.setOrder_status("3"); this.update(dto); + Device device = deviceAppService.findDeviceByCode(dto.getDevice_code()); + LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; + LnshSplitManipulatorDeviceDriver lnshSplitManipulatorDeviceDriver; + RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver; + + if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { + lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); + lnshPalletizingManipulatorSiteDeviceDriver.writing(9); + } + if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { + lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver(); + lnshSplitManipulatorDeviceDriver.writing(9); + } + if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) { + rljnPackagePalletSplitManipulatorDeviceDriver = (RljnPackagePalletSplitManipulatorDeviceDriver) device.getDeviceDriver(); + rljnPackagePalletSplitManipulatorDeviceDriver.writing(9); + } + //判断是否为wms下发的排产单 String hasWms = acsConfigService.findConfigFromCache().get(AcsConfig.HASWMS); if (StrUtil.isNotEmpty(dto.getProduct_type()) && hasWms.equals("1")) { 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 e8efa0e..96a3a2f 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 @@ -136,7 +136,7 @@ public class CallMaterialTask extends AbstractAcsTask { if (StrUtil.equals(next_point_code, "FJJXSSLW101") || StrUtil.equals(next_point_code, "FJJXSSLW102")) { flag = "7"; } - JSONArray paramArr = WQL.getWO("ACSTOMES_001.wql").addParam("flag", flag).process().getResultJSONArray(0); + JSONArray paramArr = WQL.getWO("ACSTOMES_001").addParam("flag", flag).process().getResultJSONArray(0); for (int i = 0; i < paramArr.size(); i++) { JSONObject jo = paramArr.getJSONObject(i); SortingUtil.record(jo);