From 6579f0b743e4d8262fc58fc25f7215aebf2246d1 Mon Sep 17 00:00:00 2001 From: Administrator <335182714> Date: 星期四, 25 七月 2024 10:46:47 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/CrnSlave.java | 3 +++ src/main/java/com/zy/core/thread/SiemensCrnThread.java | 14 +++++++------- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 ++ src/main/webapp/static/js/common.js | 2 +- src/main/resources/application.yml | 6 +++++- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 2d8e3d4..df5335b 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -1409,6 +1409,7 @@ crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 鐩爣搴撲綅鎺� crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒� crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞� + crnCommand.setSourceStaNo(crnStn.getPlatNo().shortValue()); // 婧愬簱浣嶆帓 if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) { log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand)); } else { @@ -1704,6 +1705,7 @@ crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺� crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒� crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞� + crnCommand.setDestinationStaNo(crnStn.getPlatNo().shortValue()); if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) { log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand)); } else { diff --git a/src/main/java/com/zy/core/model/CrnSlave.java b/src/main/java/com/zy/core/model/CrnSlave.java index cfee50d..04a4dcb 100644 --- a/src/main/java/com/zy/core/model/CrnSlave.java +++ b/src/main/java/com/zy/core/model/CrnSlave.java @@ -37,6 +37,9 @@ // 鍫嗗灈鏈虹珯鐐圭紪鍙� private Integer staNo; + // 鍫嗗灈鏈虹珯鐐圭紪鍙� + private Integer platNo; + // 鎺� private Integer row; diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java index 3da01f5..cc4f6c1 100644 --- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java +++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java @@ -242,7 +242,7 @@ } // convertRow(command); command.setCrnNo(slave.getId()); - short[] array = new short[10]; + short[] array = new short[12]; array[0] = command.getAckFinish(); array[1] = command.getTaskNo(); array[2] = command.getTaskMode(); @@ -252,9 +252,9 @@ array[6] = command.getDestinationPosX(); array[7] = command.getDestinationPosY(); array[8] = command.getDestinationPosZ(); -// array[9] = command.getSourceStaNo(); -// array[10] = command.getDestinationStaNo(); - array[9] = command.getCommand(); + array[9] = command.getSourceStaNo(); + array[10] = command.getDestinationStaNo(); + array[11] = command.getCommand(); OperateResult result = siemensNet.Write("DB100.0", array); if (command.getAckFinish() == 0) { @@ -273,12 +273,12 @@ command.getTaskModeType().toString(), // 妯″紡 command.getSourcePosX().intValue(), // 婧愭帓 command.getSourcePosY().intValue(), // 婧愬垪 - command.getSourcePosZ().intValue(), // 婧愬眰 - null, // 婧愮珯 + command.getSourceStaNo().intValue(), // 婧愬眰 + command.getDestinationPosZ().intValue(), // 婧愮珯 command.getDestinationPosX().intValue(), // 鐩爣鎺� command.getDestinationPosY().intValue(), // 鐩爣鍒� command.getDestinationPosZ().intValue(), // 鐩爣灞� - null, // 鐩爣绔� + command.getDestinationStaNo().intValue(), // 鐩爣绔� null, // 鍝嶅簲缁撴灉 null, // 淇敼鏃堕棿 null // 淇敼浜哄憳 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index cfeeadf..d3e1ab9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -240,7 +240,7 @@ # 鍫嗗灈鏈�6 crn[5]: id: 6 - ip: 192.168.18.53 + ip: 192.168.14.190 port: 102 rack: 0 slot: 0 @@ -251,6 +251,7 @@ crnInStn[0]: # devpPlcId: ${wcs-slave.devp[0].id} staNo: 2077 + platNo: 1 row: 23 bay: 1 lev: 1 @@ -258,6 +259,7 @@ crnInStn[1]: # devpPlcId: ${wcs-slave.devp[1].id} staNo: 3011 + platNo: 3 row: 23 bay: 1 lev: 2 @@ -265,6 +267,7 @@ crnOutStn[0]: # devpPlcId: ${wcs-slave.devp[0].id} staNo: 2076 + platNo: 2 row: 22 bay: 1 lev: 1 @@ -272,6 +275,7 @@ crnOutStn[1]: # devpPlcId: ${wcs-slave.devp[1].id} staNo: 3012 + platNo: 4 row: 22 bay: 1 lev: 2 diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index cb1aa78..efe3abf 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -1,4 +1,4 @@ -var baseUrl = "/jtwcs"; +var baseUrl = "/ghjtwcs"; // 璧嬪�� function setVal(el, val) { -- Gitblit v1.9.1