From 1dfc984b833dc27256a84db4ccbf8ce44c5c6342 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Mon, 20 Oct 2025 16:00:12 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paper_tube_pick_site/ItemProtocol.java | 46 ++++ .../PaperTubePickSiteDeviceDriver.java | 203 +++++++++++++----- 2 files changed, 201 insertions(+), 48 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/ItemProtocol.java index e31cf2fcb..5e42e4428 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/ItemProtocol.java @@ -111,6 +111,51 @@ public class ItemProtocol { return this.getOpcStringValue(item_to_material); } + public String getTo_spec() { + return this.getOpcStringValue(item_to_spec); + } + + public String getTo_qty() { + return this.getOpcStringValue(item_to_qty); + } + + public String getTo_material1() { + return this.getOpcStringValue(item_to_material1); + } + + public String getTo_spec1() { + return this.getOpcStringValue(item_to_spec1); + } + + public String getTo_qty1() { + return this.getOpcStringValue(item_to_qty1); + } + + public String getTo_material2() { + return this.getOpcStringValue(item_to_material2); + } + + public String getTo_spec2() { + return this.getOpcStringValue(item_to_spec2); + } + + public String getTo_qty2() { + return this.getOpcStringValue(item_to_qty2); + } + + public String getTo_material3() { + return this.getOpcStringValue(item_to_material3); + } + + public String getTo_spec3() { + return this.getOpcStringValue(item_to_spec3); + } + + public String getTo_qty3() { + return this.getOpcStringValue(item_to_qty3); + } + + Boolean isonline; @@ -169,4 +214,5 @@ public class ItemProtocol { list.add(new ItemDto(item_to_qty3, "下发BH-19物料数量", "DB2.W8")); return list; } + } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java index c80d8d170..2315b6fb9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java @@ -97,44 +97,44 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple int to_command = 0; int last_to_command = 0; //下发物料类型 - String to_material =null; - String last_to_material =null; + String to_material = null; + String last_to_material = null; //下发物料规格 - int to_spec=0; - int last_to_spec=0; + String to_spec = null; + String last_to_spec = null; //下发物料数量 - int to_qty=0; - int last_to_qty=0; + String to_qty = null; + String last_to_qty = null; //下发物料类型 - String to_material1 =null; - String last_to_material1 =null; + String to_material1 = null; + String last_to_material1 = null; //下发物料规格 - int to_spec1=0; - int last_to_spec1=0; + String to_spec1 = null; + String last_to_spec1 = null; //下发物料数量 - int to_qty1=0; - int last_to_qty1=0;//下发物料类型 - String to_material2 =null; - String last_to_material2 =null; + String to_qty1 = null; + String last_to_qty1 = null;//下发物料类型 + String to_material2 = null; + String last_to_material2 = null; //下发物料规格 - int to_spec2=0; - int last_to_spec2=0; + String to_spec2 = null; + String last_to_spec2 = null; //下发物料数量 - int to_qty2=0; - int last_to_qty2=0;//下发物料类型 - String to_material3 =null; - String last_to_material3 =null; + String to_qty2 = null; + String last_to_qty2 = null;//下发物料类型 + String to_material3 = null; + String last_to_material3 = null; //下发物料规格 - int to_spec3=0; - int last_to_spec3=0; + String to_spec3 = null; + String last_to_spec3 = null; //下发物料数量 - int to_qty3=0; - int last_to_qty3=0; + String to_qty3 = null; + String last_to_qty3 = null; //管芯编码 String paper_code = null; - int paper_location = 0 ; + int paper_location = 0; Boolean isonline = true; @@ -164,20 +164,118 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple public void execute() { String message = null; try { - device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - error = this.itemProtocol.getError(); - move = this.itemProtocol.getMove(); - action = this.itemProtocol.getAction(); - paper_code = this.itemProtocol.getPaperCode(); - paper_location = this.itemProtocol.getPaperLocation(); + device_code = this.getDeviceCode(); + mode = this.itemProtocol.getMode(); + error = this.itemProtocol.getError(); + move = this.itemProtocol.getMove(); + action = this.itemProtocol.getAction(); + paper_code = this.itemProtocol.getPaperCode(); + paper_location = this.itemProtocol.getPaperLocation(); - if (mode != last_mode) { - this.setRequireSucess(false); - if (mode == 2) { - this.writing(0); + to_spec = this.itemProtocol.getTo_spec(); + to_qty = this.itemProtocol.getTo_qty(); + to_material = this.itemProtocol.getTo_material(); + to_spec1 = this.itemProtocol.getTo_spec1(); + to_qty1 = this.itemProtocol.getTo_qty1(); + to_material1 = this.itemProtocol.getTo_material1(); + to_spec2 = this.itemProtocol.getTo_spec2(); + to_qty2 = this.itemProtocol.getTo_qty2(); + to_material2 = this.itemProtocol.getTo_material2(); + to_spec3 = this.itemProtocol.getTo_spec3(); + to_qty3 = this.itemProtocol.getTo_qty3(); + to_material3 = this.itemProtocol.getTo_material3(); + + if (!StrUtil.equals(to_spec, last_to_spec)) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() + .device_code(device_code) + .content("信号: to_spec, 由" + last_to_spec + "->" + to_spec) + .log_level(4) + .build()); + } + if (!StrUtil.equals(to_qty, last_to_qty)) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() + .device_code(device_code) + .content("信号: to_qty, 由" + last_to_qty + "->" + to_qty) + .log_level(4) + .build()); + } + if (!StrUtil.equals(to_material, last_to_material)) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() + .device_code(device_code) + .content("信号: to_material, 由" + last_to_material + "->" + to_material) + .log_level(4) + .build()); + } + if (!StrUtil.equals(to_spec1, last_to_spec1)) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() + .device_code(device_code) + .content("信号: to_spec1, 由" + last_to_spec1 + "->" + to_spec1) + .log_level(4) + .build()); + } + if (!StrUtil.equals(to_qty1, last_to_qty1)) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() + .device_code(device_code) + .content("信号: to_qty1, 由" + last_to_qty1 + "->" + to_qty1) + .log_level(4) + .build()); + } + if (!StrUtil.equals(to_material1, last_to_material1)) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() + .device_code(device_code) + .content("信号: to_material1, 由" + last_to_material1 + "->" + to_material1) + .log_level(4) + .build()); + } + if (!StrUtil.equals(to_spec2, last_to_spec2)) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() + .device_code(device_code) + .content("信号: to_spec2, 由" + last_to_spec2 + "->" + to_spec2) + .log_level(4) + .build()); + } + if (!StrUtil.equals(to_qty2, last_to_qty2)) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() + .device_code(device_code) + .content("信号: to_qty2, 由" + last_to_qty2 + "->" + to_qty2) + .log_level(4) + .build()); + } + if (!StrUtil.equals(to_material2, last_to_material2)) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() + .device_code(device_code) + .content("信号: to_material2, 由" + last_to_material2 + "->" + to_material2) + .log_level(4) + .build()); + } + if (!StrUtil.equals(to_spec3, last_to_spec3)) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() + .device_code(device_code) + .content("信号: to_spec3, 由" + last_to_spec3 + "->" + to_spec3) + .log_level(4) + .build()); + } + if (!StrUtil.equals(to_qty3, last_to_qty3)) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() + .device_code(device_code) + .content("信号: to_qty3, 由" + last_to_qty3 + "->" + to_qty3) + .log_level(4) + .build()); + } + if (!StrUtil.equals(to_material3, last_to_material3)) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() + .device_code(device_code) + .content("信号: to_material3, 由" + last_to_material3 + "->" + to_material3) + .log_level(4) + .build()); + } + + if (mode != last_mode) { + this.setRequireSucess(false); + if (mode == 2) { + this.writing(0); + } } - } } catch (Exception var17) { return; } @@ -210,9 +308,9 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple case 2: break; case 6: - if(!this.getRequireSucess() && StrUtil.isNotEmpty(this.getPaper_code()) && this.getPaper_location() > 0 && this.getPaper_location() < 6){ + if (!this.getRequireSucess() && StrUtil.isNotEmpty(this.getPaper_code()) && this.getPaper_location() > 0 && this.getPaper_location() < 6) { boolean b = feedbackDie(); - if(b){ + if (b) { requireSucess = true; } } @@ -239,13 +337,22 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple last_action = action; last_move = move; last_qty = qty; - last_error =error; + last_error = error; last_material = material; last_Itemized_qty = Itemized_qty; last_to_command = to_command; last_to_spec = to_spec; last_to_material = to_material; last_to_qty = to_qty; + last_to_spec1 = to_spec1; + last_to_material1 = to_material1; + last_to_qty1 = to_qty1; + last_to_spec2 = to_spec2; + last_to_material2 = to_material2; + last_to_qty2 = to_qty2; + last_to_spec3 = to_spec3; + last_to_material3 = to_material3; + last_to_qty3 = to_qty3; } private boolean feedbackDie() { @@ -255,9 +362,9 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple return false; } else { JSONObject jo = new JSONObject(); - jo.put("device_code",this.getDevice_code()); - jo.put("row_num",this.getPaper_location()); - jo.put("material_code",this.getPaper_code()); + jo.put("device_code", this.getDevice_code()); + jo.put("row_num", this.getPaper_location()); + jo.put("material_code", this.getPaper_code()); LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content("反馈管芯抓取位,请求参数:" + jo) @@ -267,11 +374,11 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple logServer.deviceExecuteLog(this.device_code, "", "", "反馈管芯抓取位,参数:" + jo); HttpResponse httpResponse = acsToWmsService.feedbackDies(jo); JSONObject jsonObject = null; - if(ObjectUtil.isNotEmpty(httpResponse)){ + if (ObjectUtil.isNotEmpty(httpResponse)) { String body = httpResponse.body(); jsonObject = JSONObject.parseObject(body); } - if(ObjectUtil.isNotNull(jsonObject) && jsonObject.getInteger("status") == 200){ + if (ObjectUtil.isNotNull(jsonObject) && jsonObject.getInteger("status") == 200) { Map map = new HashMap(); map.put("to_command", 6); try { @@ -291,7 +398,7 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple luceneExecuteLogService.deviceExecuteLog(logDto1); } return true; - }else{ + } else { LuceneLogDto logDto2 = LuceneLogDto.builder() .device_code(device_code) .content("反馈LMS管芯失败" + httpResponse.body()) @@ -370,7 +477,8 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple String action = ""; jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); - jo.put("move", move);jo.put("action", action); + jo.put("move", move); + jo.put("action", action); jo.put("isOnline", true); jo.put("error", ErrorUtil.getDictDetail("gxhj_error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); @@ -383,5 +491,4 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple } - }