From d5c288c5e0167676299d2818673e28cfffddcf81 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Mon, 6 Jun 2022 20:28:38 +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 --- .../device_driver/driver/OpcDeviceDriver.java | 4 +++ .../HaiLiangFeedingTrunkDeviceDriver.java | 13 ++++---- .../hailiang_feeding_trunk/ItemProtocol.java | 30 ++++++++++++++++--- .../impl/ProduceshiftorderServiceImpl.java | 9 +++--- .../ProduceshiftorderdetailServiceImpl.java | 5 ++-- qd/src/router/routers.js.rej | 10 ------- 6 files changed, 44 insertions(+), 27 deletions(-) delete mode 100644 qd/src/router/routers.js.rej diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java index 7bca6bb..1a068a8 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java @@ -69,6 +69,10 @@ public interface OpcDeviceDriver extends DeviceDriver { return (String) this.getOpcValueAccessor().getValue(this.getItem(protocol)); } + default Float getFloatValue(String protocol) { + return (Float) this.getOpcValueAccessor().getValue(this.getItem(protocol)); + } + default Object getValue(String protocol) { return this.getOpcValueAccessor().getValue(this.getItem(protocol)); } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java index 7b3ad53..43bd874 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java @@ -70,7 +70,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im int labeling_order = 0; int detail_labeling_qualified_qty = 0; int detail_labeling_qty = 0; - int line_speed = 0; + Float line_speed = 0.0f; int feeding_mouth = 0; int is_lettering = 0; int is_risking = 0; @@ -79,7 +79,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im int is_labeling = 0; int delay_time = 0; int lettering_frequency = 0; - int one_speed = 0; + Float one_speed = 0.0f; int coating_frequency = 0; int last_mode = 0; @@ -104,7 +104,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im int last_labeling_order = 0; int last_detail_labeling_qualified_qty = 0; int last_detail_labeling_qty = 0; - int last_line_speed = 0; + Float last_line_speed = 0.0f; int last_feeding_mouth = 0; int last_is_lettering = 0; int last_is_risking = 0; @@ -113,7 +113,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im int last_is_labeling = 0; int last_delay_time = 0; int last_lettering_frequency = 0; - int last_one_speed = 0; + Float last_one_speed = 0.0f; int last_coating_frequency = 0; Boolean send_letter_flag_back = false; @@ -520,6 +520,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im public boolean apply_order() throws Exception { ProduceshiftorderDto dto = produceshiftorderService.apply_order(); if(ObjectUtil.isEmpty(dto)){ + logServer.deviceLogToacs(this.device_code,"","","未找到"); throw new BadRequestException("未找到可下发工单!"); } String order = dto.getOrder_code(); @@ -592,8 +593,8 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im writing(ItemProtocol.item_to_coating_qty,strap_pack_number); writing(ItemProtocol.item_to_labeling_qty,strap_pack_number); writing(ItemProtocol.item_to_command,String.valueOf(mode)); -// dto.setOrder_detail_status("01"); -// produceshiftorderdetailService.update(dto); + dto.setOrder_detail_status("02"); + produceshiftorderdetailService.update(dto); send_letter_flag = false; send_letter_flag_back = false; requireSucess = true; diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/ItemProtocol.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/ItemProtocol.java index a666acd..fbc5ba5 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/ItemProtocol.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/ItemProtocol.java @@ -1,5 +1,6 @@ package org.nl.acs.device_driver.hailiang.hailiang_feeding_trunk; +import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; @@ -182,8 +183,8 @@ public class ItemProtocol { - public int getLine_speed() { - return this.getOpcIntegerValue(item_line_speed); + public Float getLine_speed() { + return this.getOpcFloatValue(item_line_speed); } public int getFeeding_mouth() { @@ -218,8 +219,8 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_lettering_frequency); } - public int getOne_speed() { - return this.getOpcIntegerValue(item_one_speed); + public Float getOne_speed() { + return this.getOpcFloatValue(item_one_speed); } public int getCoating_frequency() { @@ -367,6 +368,27 @@ public class ItemProtocol { } + + public Float getOpcFloatValue(String protocol) { + Float value = this.driver.getFloatValue(protocol); + if (ObjectUtil.isEmpty(value)) { +// log.error("读取错误!"); + } else { + return value; + } + return 0.0f; + } + + public String getOpcStringValue(String protocol) { + String value = this.driver.getStringValue(protocol); + if (value == null) { +// log.error("读取错误!"); + } else { + return value; + } + return "0"; + } + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); list.add(new ItemDto(item_heartbeat, "心跳", "DB600.W0")); diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index 3553531..9b9bd04 100644 --- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -59,7 +59,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A @Override public void autoInitial() throws Exception { - //this.reload(); + this.reload(); } public synchronized void reload() { @@ -69,7 +69,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A @Override public Map queryAll(Map whereJson, Pageable page) { WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder"); - String where = "1=1 and is_deleted= '0'"; + String where = "1=1 and is_deleted= '0' and (order_status !='07' or order_status !='08' or order_status !='09' )"; ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), where, "order_id desc"); final JSONObject json = rb.pageResult(); JSONArray newja = new JSONArray(); @@ -464,9 +464,8 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder"); JSONObject json= (JSONObject) JSONObject.toJSON(entity); wo.update(json); - HashMap map = new HashMap<>(); - map.put("is_deleted","1"); + map.put("order_status","09"); WQLObject.getWQLObject("acs_produceshiftorderdetail").update(map,"order_id = '"+ id + "'"); } @@ -489,7 +488,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A List deviceAll = deviceAppService.findDeviceDriver(HaiLiangFeedingTrunkDeviceDriver.class); if (deviceAll.get(0) instanceof HaiLiangFeedingTrunkDeviceDriver) { haiLiangFeedingTrunkDeviceDriver = (HaiLiangFeedingTrunkDeviceDriver) deviceAll.get(0); - if(haiLiangFeedingTrunkDeviceDriver.getMode() !=2 || haiLiangFeedingTrunkDeviceDriver.getReady() != 1){ + if(haiLiangFeedingTrunkDeviceDriver.getMode() <2 || haiLiangFeedingTrunkDeviceDriver.getReady() != 1){ throw new BadRequestException("设备未就绪,无法下发!"); } } diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java index 852731a..639c33b 100644 --- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java @@ -121,7 +121,8 @@ public class ProduceshiftorderdetailServiceImpl implements Produceshiftorderdeta iterator.remove(); } } - if (!StrUtil.equals(dto.getOrder_detail_status(), "07") || !StrUtil.equals(dto.getOrder_detail_status(), "08")) { + if (!StrUtil.equals(dto.getOrder_detail_status(), "07") || !StrUtil.equals(dto.getOrder_detail_status(), "08") + ||!StrUtil.equals(dto.getOrder_detail_status(), "09")) { detail.add(dto); } @@ -248,7 +249,7 @@ public class ProduceshiftorderdetailServiceImpl implements Produceshiftorderdeta String msg1 = dto.getLettering_message(); String msg2 = dto.getLettering_message2(); String icon = dto.getLettering_icon(); - + message = msg1 + msg2; //清缓存 try { LetteringSocketConnectionAutoRun.write("BUFFERCLEAR" + "\r\n"); diff --git a/qd/src/router/routers.js.rej b/qd/src/router/routers.js.rej deleted file mode 100644 index 98ecec3..0000000 --- a/qd/src/router/routers.js.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/src/router/routers.js b/src/router/routers.js (rejected hunks) -@@ -52,7 +52,7 @@ - children: [ - { - path: 'dashboard', -- component: (resolve) => require(['@/views/acs/monitor/device/index'], resolve), -+ component: (resolve) => require(['@/views/home2'], resolve), - name: 'Dashboard', - meta: { title: '首页', icon: 'index', affix: true, noCache: false } - }