From bb5b93aa317e91aabb3d2f5d7e176c3aa7ba811e Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 05 六月 2024 16:12:37 +0800 Subject: [PATCH] #初始化 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 12 ++-- src/main/java/com/zy/core/thread/SiemensDevpThread.java | 85 ++++------------------------ src/main/resources/application.yml | 73 +++++++++++++++++++----- 3 files changed, 76 insertions(+), 94 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 b18f627..ab2630e 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -973,9 +973,9 @@ crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶆帓 crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅垪 crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶅眰 - crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 鐩爣搴撲綅鎺� - crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒� - crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞� + crnCommand.setDestinationPosX((short)(locMast.getRow1()+slave.getOffset())); // 鐩爣搴撲綅鎺� + crnCommand.setDestinationPosY((short)(locMast.getBay1()+slave.getOffset())); // 鐩爣搴撲綅鍒� + crnCommand.setDestinationPosZ((short)(locMast.getLev1()+slave.getOffset())); // 鐩爣搴撲綅灞� crnCommand.setTraySize(locMast.getLocType1() == 2); if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) { News.error(""+mark+" - 1"+" - 16"+" - 鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand)); @@ -1132,9 +1132,9 @@ crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙� // crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆 - crnCommand.setSourcePosX(sourceSta.getRow1().shortValue()); // 婧愬簱浣嶆帓 - crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 婧愬簱浣嶅垪 - crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 婧愬簱浣嶅眰 + crnCommand.setSourcePosX((short)(sourceSta.getRow1()+slave.getOffset())); // 婧愬簱浣嶆帓 + crnCommand.setSourcePosY((short)(sourceSta.getBay1()+slave.getOffset())); // 婧愬簱浣嶅垪 + crnCommand.setSourcePosZ((short)(sourceSta.getBay1()+slave.getOffset())); // 婧愬簱浣嶅眰 crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺� crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒� crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞� diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index 4cad002..84431b6 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -55,27 +55,21 @@ add(104);add(105);add(106);add(107); add(108);add(109);add(110);add(111); add(112);add(113);add(114);add(115); - add(116);add(117);add(118);add(119); - add(120);add(121);add(122);add(123); - add(124);add(125);add(126);add(127); - add(128);add(129);add(130);add(131); - add(132);add(133);add(134);add(135); - add(136);add(137);add(138);add(139); - add(140);add(141);add(142);add(143); - add(144);add(145);add(146);add(147); - add(148);add(149);add(150);add(151); - add(152);add(153);add(154);add(155); - add(156);add(157);add(158);add(159); - add(160);add(161); - add(1); -// add(200);add(201);add(202); + add(116);add(117); + + add(200);add(201);add(202);add(203); + add(204);add(205);add(206);add(207); + add(208);add(209);add(210);add(211); + add(212);add(213);add(214);add(215); + add(216);add(217);add(218);add(219); + add(220);add(221);add(222);add(223); }}; public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{ - add(0); add(1); add(2); + add(101); add(201); }}; public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{ - add(106); add(107); add(159); + add(101); add(201); }}; private Integer count=0; @@ -83,7 +77,7 @@ /** * 鏉$爜鏁伴噺 */ - private int barcodeSize = 6; + private int barcodeSize = 2; /** * 鍏ュ嚭搴撴ā寮� @@ -150,7 +144,7 @@ private void initSite() { count ++; ArrayList<Integer> staNos = getStaNo(); - if(count > 77) { + if(count > 40) { // 绔欑偣缂栧彿 for (Integer siteId : staNos) { StaProtocol staProtocol = station.get(siteId); @@ -232,60 +226,6 @@ } } } - BasRgvMapService basRgvMapService = SpringUtils.getBean(BasRgvMapService.class); - //RGV灏忚溅1 -// Thread.sleep(100); - OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB50.200",(short)10); - if (result3.IsSuccess) { - BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)); - if (!Cools.isEmpty(basRgvMap)){ - Integer siteId = 1; - StaProtocol staProtocol = station.get(siteId); - if (null == staProtocol) { - staProtocol = new StaProtocol(); - staProtocol.setSiteId(siteId); - station.put(siteId, staProtocol); - } - staProtocol.setAutoing(true); - staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 8))); - } - } - //RGV灏忚溅2 -// Thread.sleep(100); - OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB50.212",(short)10); - if (result4.IsSuccess) { - BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result4.Content, 0)); - if (!Cools.isEmpty(basRgvMap)){ - Integer siteId = 2; - StaProtocol staProtocol = station.get(siteId); - if (null == staProtocol) { - staProtocol = new StaProtocol(); - staProtocol.setSiteId(siteId); - station.put(siteId, staProtocol); - } - staProtocol.setAutoing(true); - staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result4.Content, 8))); - } - } - - //RGV灏忚溅3 -// Thread.sleep(100); - OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB50.224",(short)10); - if (result5.IsSuccess) { - BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result5.Content, 0)); - if (!Cools.isEmpty(basRgvMap)){ - Integer siteId = 3; - StaProtocol staProtocol = station.get(siteId); - if (null == staProtocol) { - staProtocol = new StaProtocol(); - staProtocol.setSiteId(siteId); - station.put(siteId, staProtocol); - } - staProtocol.setAutoing(true); - staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result5.Content, 8))); - } - } - //鏉$爜鎵弿鍣� ArrayList<Integer> barcodeList = BarcodeList; OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840", (short) (barcodeList.size() * 8)); @@ -318,6 +258,7 @@ } } + //plc鏁呴殰 OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB13.2", (short) (staNoSize*4)); if (resultErr2.IsSuccess) { for (int i = 0; i < staNoSize; i++) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 21170cd..cbb8d47 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -51,22 +51,36 @@ port: 102 rack: 0 slot: 0 - # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 - offset: 2 + # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1 + offset: 1 demo: false # 鍫嗗灈鏈哄叆搴撶珯鐐� crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 123 - row: 3 + staNo: 103 + row: 1 bay: 1 lev: 1 # 鍫嗗灈鏈哄嚭搴撶珯鐐� crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 118 + staNo: 106 row: 2 bay: 1 + lev: 1 + # 鍫嗗灈鏈哄叆搴撶珯鐐� + crnInStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 204 + row: 1 + bay: 41 + lev: 1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐� + crnOutStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 208 + row: 2 + bay: 41 lev: 1 # 鍫嗗灈鏈�2 crn[1]: @@ -76,21 +90,35 @@ rack: 0 slot: 0 # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 - offset: 2 + offset: 1 demo: false # 鍫嗗灈鏈哄叆搴撶珯鐐� crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 131 - row: 7 + staNo: 108 + row: 3 bay: 1 lev: 1 # 鍫嗗灈鏈哄嚭搴撶珯鐐� crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 127 - row: 6 + staNo: 111 + row: 4 bay: 1 + lev: 1 + # 鍫嗗灈鏈哄叆搴撶珯鐐� + crnInStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 211 + row: 3 + bay: 41 + lev: 1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐� + crnOutStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 215 + row: 4 + bay: 41 lev: 1 # 鍫嗗灈鏈�3 crn[2]: @@ -100,23 +128,36 @@ rack: 0 slot: 0 # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 - offset: 2 + offset: 1 demo: false # 鍫嗗灈鏈哄叆搴撶珯鐐� crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 135 - row: 10 + staNo: 113 + row: 5 bay: 1 lev: 1 # 鍫嗗灈鏈哄嚭搴撶珯鐐� crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 139 - row: 11 + staNo: 116 + row: 6 bay: 1 lev: 1 - + # 鍫嗗灈鏈哄叆搴撶珯鐐� + crnInStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 218 + row: 5 + bay: 41 + lev: 1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐� + crnOutStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 222 + row: 6 + bay: 41 + lev: 1 # 杈撻�佺嚎1 devp[0]: id: 1 -- Gitblit v1.9.1