From d8cc1b75c7590ea3a7e65f61c0f07b131fef0ca0 Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期三, 28 八月 2024 23:03:45 +0800 Subject: [PATCH] 配置 --- src/main/java/com/zy/core/thread/SiemensCrnThread.java | 33 ++++--- src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 30 +++++++ src/main/resources/application.yml | 140 +++++++++++++++++----------------- 3 files changed, 117 insertions(+), 86 deletions(-) diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java index a63b90b..0736d69 100644 --- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java @@ -40,6 +40,11 @@ public Short taskNo = 0; /** + * 浠诲姟鍙� + */ + public Short taskNoTwo = 0; + + /** * 鍫嗗灈鏈哄綋鍓嶇姸鎬� * 0锛氱┖闂诧紝鏃犱换鍔� * 1锛氬彇璐у畾浣嶄腑 @@ -53,7 +58,7 @@ * 99锛氭姤璀� */ public Short status; - + public Short statusTwo; /** * 鐘舵�佹灇涓� */ @@ -65,9 +70,18 @@ public Short bay; /** + * 鍫嗗灈鏈哄綋鍓嶅垪鍙� + */ + public Short bayTwo; + + /** * 鍫嗗灈鏈哄綋鍓嶅眰鍙� */ public Short level; + /** + * 鍫嗗灈鏈哄綋鍓嶅眰鍙� + */ + public Short levelTwo; /** * 褰撳墠璐у弶浣嶇疆 @@ -76,6 +90,8 @@ * 2 = 璐у弶鍦ㄥ彸渚� */ public Short forkPos; + + public Short forkPosTwo; public CrnForkPosType forkPosType; @@ -86,6 +102,8 @@ */ public Short liftPos; + public Short liftPosTwo; + public CrnLiftPosType liftPosType; /** @@ -94,11 +112,21 @@ * 1 = 涓嶅湪瀹氫綅 */ public Short walkPos; + /** + * 璧拌鍦ㄥ畾浣� + * 0 = 鍦ㄥ畾浣� + * 1 = 涓嶅湪瀹氫綅 + */ + public Short walkPosTwo; /** * 杞借揣鍙版湁鐗� */ public Short loaded; + /** + * 杞借揣鍙版湁鐗� + */ + public Short loadedTwo; private Short temp1; diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java index 2c9e8f3..76682f4 100644 --- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java +++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java @@ -156,26 +156,29 @@ crnProtocol.setCrnNo(slave.getId()); } crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0)); + //宸ヤ綅1 crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2)); crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4)); crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6)); crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8)); crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10)); - crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12)); - crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14)); - crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16)); - crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18)); - crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20)); - crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22)); - crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24)); - crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26)); - crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28)); - crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32)); - crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36)); - crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40)); - crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44)); - crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48)); - crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52)); + crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 12)); + //宸ヤ綅2 + crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 14)); + crnProtocol.setStatusTwo(siemensNet.getByteTransform().TransInt16(result.Content, 16)); + crnProtocol.setBayTwo(siemensNet.getByteTransform().TransInt16(result.Content, 18)); + crnProtocol.setLevelTwo(siemensNet.getByteTransform().TransInt16(result.Content, 20)); + crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 22)); + crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 24)); + + crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 26)); + crnProtocol.setWalkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 28)); + crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 30)); + crnProtocol.setError1(siemensNet.getByteTransform().TransInt16(result.Content, 32)); + crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 34)); + crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 38)); + crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42)); + crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 52)); OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId())); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4f537d9..c1b852d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -98,62 +98,62 @@ staNo: 101 led: ${wcs-slave.led[0].id} # 杈撻�佺嚎2 - devp[1]: - id: 2 - ip: 10.10.10.130 - port: 102 - rack: 0 - slot: 0 - # 鍏ュ簱鍙�1 - inSta[0]: - staNo: 201 - barcode: ${wcs-slave.barcode[1].id} - backSta: 200 - led: ${wcs-slave.led[3].id} - # 绌烘澘鍏ュ簱鍙�1 - emptyInSta[0]: - staNo: 201 - barcode: ${wcs-slave.barcode[1].id} - backSta: 200 - led: ${wcs-slave.led[3].id} - # 鎷f枡鍏ュ簱鍙�1 - pickSta[0]: - staNo: 201 - barcode: ${wcs-slave.barcode[1].id} - led: ${wcs-slave.led[3].id} - # 鍑哄簱鍙�1 - outSta[0]: - staNo: 206 - led: ${wcs-slave.led[2].id} - - # 杈撻�佺嚎3 - devp[2]: - id: 3 - ip: 10.10.10.130 - port: 102 - rack: 0 - slot: 0 - # 鍏ュ簱鍙�1 - inSta[0]: - staNo: 301 - barcode: ${wcs-slave.barcode[2].id} - backSta: 300 - led: ${wcs-slave.led[5].id} - # 绌烘澘鍏ュ簱鍙�1 - emptyInSta[0]: - staNo: 301 - barcode: ${wcs-slave.barcode[2].id} - backSta: 200 - led: ${wcs-slave.led[5].id} - # 鎷f枡鍏ュ簱鍙�1 - pickSta[0]: - staNo: 301 - barcode: ${wcs-slave.barcode[2].id} - led: ${wcs-slave.led[5].id} - # 鍑哄簱鍙�1 - outSta[0]: - staNo: 306 - led: ${wcs-slave.led[4].id} +# devp[1]: +# id: 2 +# ip: 10.10.10.130 +# port: 102 +# rack: 0 +# slot: 0 +# # 鍏ュ簱鍙�1 +# inSta[0]: +# staNo: 201 +# barcode: ${wcs-slave.barcode[1].id} +# backSta: 200 +# led: ${wcs-slave.led[3].id} +# # 绌烘澘鍏ュ簱鍙�1 +# emptyInSta[0]: +# staNo: 201 +# barcode: ${wcs-slave.barcode[1].id} +# backSta: 200 +# led: ${wcs-slave.led[3].id} +# # 鎷f枡鍏ュ簱鍙�1 +# pickSta[0]: +# staNo: 201 +# barcode: ${wcs-slave.barcode[1].id} +# led: ${wcs-slave.led[3].id} +# # 鍑哄簱鍙�1 +# outSta[0]: +# staNo: 206 +# led: ${wcs-slave.led[2].id} +# +# # 杈撻�佺嚎3 +# devp[2]: +# id: 3 +# ip: 10.10.10.130 +# port: 102 +# rack: 0 +# slot: 0 +# # 鍏ュ簱鍙�1 +# inSta[0]: +# staNo: 301 +# barcode: ${wcs-slave.barcode[2].id} +# backSta: 300 +# led: ${wcs-slave.led[5].id} +# # 绌烘澘鍏ュ簱鍙�1 +# emptyInSta[0]: +# staNo: 301 +# barcode: ${wcs-slave.barcode[2].id} +# backSta: 200 +# led: ${wcs-slave.led[5].id} +# # 鎷f枡鍏ュ簱鍙�1 +# pickSta[0]: +# staNo: 301 +# barcode: ${wcs-slave.barcode[2].id} +# led: ${wcs-slave.led[5].id} +# # 鍑哄簱鍙�1 +# outSta[0]: +# staNo: 306 +# led: ${wcs-slave.led[4].id} # 鏉$爜鎵弿浠�1 barcode[0]: @@ -198,17 +198,17 @@ port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 126 - # LED5 - led[4]: - id: 5 - ip: 10.10.10.245 - port: 5005 - devpPlcId: ${wcs-slave.devp[0].id} - staArr: 134 - # LED6 - led[5]: - id: 6 - ip: 10.10.10.244 - port: 5005 - devpPlcId: ${wcs-slave.devp[1].id} - staArr: 201 \ No newline at end of file +# # LED5 +# led[4]: +# id: 5 +# ip: 10.10.10.245 +# port: 5005 +# devpPlcId: ${wcs-slave.devp[0].id} +# staArr: 134 +# # LED6 +# led[5]: +# id: 6 +# ip: 10.10.10.244 +# port: 5005 +# devpPlcId: ${wcs-slave.devp[1].id} +# staArr: 201 \ No newline at end of file -- Gitblit v1.9.1