From 2a4f0f4a65d2850e5ef819cd7296e6ad3b894aae Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 14 三月 2025 15:46:51 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java | 2 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 84 +++++++++++++++++++++--------------------- src/main/resources/application.yml | 27 +++++++------ 3 files changed, 58 insertions(+), 55 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 954ea02..902fae5 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -529,7 +529,7 @@ continue; } - if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isPakMk() && staProtocol.getWorkNo()==0 && !staProtocol.isOutEnable() && staProtocol.isInEnable()) { + if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isPakMk() && staProtocol.getWorkNo()==0 && !staProtocol.isOutEnable()) {//&& staProtocol.isInEnable() WrkMast wrkMast = wrkMastMapper.selectPakInStep4(staProtocol.getSiteId(),"3"); if (wrkMast == null) { @@ -572,12 +572,12 @@ .doPost(); } catch(Exception e){ log.error("鍏ュ簱浣滀笟绔�"+pickSta.getStaNo()+"鐩樼偣鍐嶅叆搴撲换鍔¤姹俉MS===>>鍙傛暟锛�" + param); - log.error("stnToCrnStnPick2===>>鐩樼偣鏌ュ簱浣嶅叆搴撴帴鍙eけ璐�", e); - e.printStackTrace(); +// log.error("stnToCrnStnPick2===>>鐩樼偣鏌ュ簱浣嶅叆搴撴帴鍙eけ璐�", e); +// e.printStackTrace(); continue; } - log.info("鍏ュ簱浣滀笟绔�"+pickSta.getStaNo()+"鐩樼偣鍐嶅叆搴撲换鍔¤姹俉MS===>>鍙傛暟锛�" + param); - log.info("鍏ュ簱浣滀笟绔�"+pickSta.getStaNo()+"涓嬪彂鐩樼偣鍐嶅叆搴撲换鍔¤姹俉MS杩斿洖缁撴灉===>>" + response); +// log.info("鍏ュ簱浣滀笟绔�"+pickSta.getStaNo()+"鐩樼偣鍐嶅叆搴撲换鍔¤姹俉MS===>>鍙傛暟锛�" + param); +// log.info("鍏ュ簱浣滀笟绔�"+pickSta.getStaNo()+"涓嬪彂鐩樼偣鍐嶅叆搴撲换鍔¤姹俉MS杩斿洖缁撴灉===>>" + response); if(response.equals("")) { continue; } @@ -585,35 +585,35 @@ // LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed()); Integer code = jsonObject.getInteger("code"); if (code == 200) { - StartupDto dto = jsonObject.getObject("data", StartupDto.class); - if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getStaNo())) { - log.error("浠诲姟鍙�"+wrkMast.getWrkNo()+"鐩樼偣鍐嶅叆搴撴煡璇㈠簱浣嶅け璐�===>>" + jsonObject.toJSONString()); - } else { +// StartupDto dto = jsonObject.getObject("data", StartupDto.class); +// if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getStaNo())) { +// log.error("浠诲姟鍙�"+wrkMast.getWrkNo()+"鐩樼偣鍐嶅叆搴撴煡璇㈠簱浣嶅け璐�===>>" + jsonObject.toJSONString()); +// } else { log.info("浠诲姟鍙�"+wrkMast.getWrkNo()+"鐩樼偣鍐嶅叆搴撴煡璇㈠簱浣嶆垚鍔�===>>" + jsonObject.toJSONString()); - try { - // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护 - staProtocol.setWorkNo(wrkMast.getWrkNo()); - staProtocol.setStaNo(dto.getStaNo()); - devpThread.setPakMk(staProtocol.getSiteId(), false); -// ledThread.errorReset(); - boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); - if (!result) { - log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId()); - } - log.info("浠诲姟鍙�"+wrkMast.getWrkNo()+"鐩樼偣/鎷f枡鍐嶅叆搴撲换鍔′笅鍙戞垚鍔�===>>" + staProtocol); - } catch (Exception e) { - log.error("鐩樼偣鍐嶅叆搴撳け璐�===>>" + e); - e.printStackTrace(); - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - } - } +// try { +// // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护 +// staProtocol.setWorkNo(wrkMast.getWrkNo()); +// staProtocol.setStaNo(dto.getStaNo()); +// devpThread.setPakMk(staProtocol.getSiteId(), false); +//// ledThread.errorReset(); +// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); +// if (!result) { +// log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId()); +// } +// log.info("浠诲姟鍙�"+wrkMast.getWrkNo()+"鐩樼偣/鎷f枡鍐嶅叆搴撲换鍔′笅鍙戞垚鍔�===>>" + staProtocol); +// } catch (Exception e) { +// log.error("鐩樼偣鍐嶅叆搴撳け璐�===>>" + e); +// e.printStackTrace(); +// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); +// } +// } } else { log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin2/loc/v1", JSON.toJSONString(param), response); } } catch (Exception e) { log.error("stnToCrnStnPick2===>>fail", e); - e.printStackTrace(); - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); +// e.printStackTrace(); +// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); } // // 鑾峰彇鐩爣绔� @@ -862,7 +862,7 @@ continue; } - if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isPakMk() && staProtocol.getWorkNo()==0 && !staProtocol.isOutEnable() && staProtocol.isInEnable()) { + if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isPakMk() && staProtocol.getWorkNo()==0 && !staProtocol.isOutEnable()) { WrkMast wrkMast = wrkMastMapper.selectPakInStep4(staProtocol.getSiteId(),"3"); if (wrkMast == null) { WrkMast wrkMast1 = wrkMastMapper.selectPakInStep5(staProtocol.getSiteId(),"3"); @@ -3151,7 +3151,7 @@ } /** - * 鍏朵粬 ===>> 鐮佸灈瀹屾垚椹卞姩鎵樼洏杩涘叆涓嬩竴姝� + * 鍏朵粬 ===>> 鐮佸灈瀹屾垚椹卞姩鎵樼洏杩涘叆涓嬩竴姝� 2===銆�3 */ public synchronized void stackingCompletionDriveTrayOk2() { for (DevpSlave devp : slaveProperties.getDevp()) { @@ -3167,7 +3167,7 @@ staProtocol = staProtocol.clone(); } - if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isPakMk() && staProtocol.getWorkNo()!=0 && staProtocol.isOutEnable()) {// + if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isPakMk() && staProtocol.getWorkNo()!=0) {// WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo()); if (wrkMast == null) { @@ -3189,17 +3189,17 @@ continue; } //浠诲姟瀹屾垚 - boolean result1 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(3, staProtocol)); +// boolean result1 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(3, staProtocol)); wrkMast.setSheetNo("3"); wrkMastMapper.updateById(wrkMast); - try{ - Thread.sleep(100); - }catch (Exception e){ +// try{ +// Thread.sleep(100); +// }catch (Exception e){ +// +// } - } - - boolean result2 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(4, staProtocol)); +// boolean result2 = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(4, staProtocol)); } } @@ -3484,7 +3484,7 @@ log.error("鏈煡鍒板皬杞︽墽琛屼换鍔℃垨鑰呮墽琛屼换鍔$姸鎬佷笉绗﹀悎锛�"+wrkMastSta); continue; } - WrkMast wrkMast = wrkMastMapper.selectPakInStep3(wrkMastSta.getWrkNo().intValue()); + /* WrkMast wrkMast = wrkMastMapper.selectPakInStep3(wrkMastSta.getWrkNo().intValue()); if (!Cools.isEmpty(wrkMast) && wrkMastSta.getWrkType()!=5){ Thread.sleep(200); SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1); @@ -3520,7 +3520,7 @@ // }catch (Exception e){ // // } - } + }*/ boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo()); if (!rgvComplete){ log.error("灏忚溅澶嶄綅澶辫触锛屽皬杞﹀彿{}锛�",rgvProtocol.getRgvNo()); @@ -3547,7 +3547,7 @@ log.error("鏈煡鍒板皬杞︽墽琛屼换鍔℃垨鑰呮墽琛屼换鍔$姸鎬佷笉绗﹀悎锛�"+wrkMastSta); continue; } - WrkMast wrkMast = wrkMastMapper.selectPakInStep3(wrkMastSta.getWrkNo().intValue()); + /*WrkMast wrkMast = wrkMastMapper.selectPakInStep3(wrkMastSta.getWrkNo().intValue()); if (!Cools.isEmpty(wrkMast) && wrkMastSta.getWrkType()!=5){ Thread.sleep(200); DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1); @@ -3578,7 +3578,7 @@ // }catch (Exception e){ // // } - } + }*/ boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo()); if (!rgvComplete){ log.error("灏忚溅澶嶄綅澶辫触锛屽皬杞﹀彿{}锛�",rgvProtocol.getRgvNo()); diff --git a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java index 4da5dfd..8cce7ea 100644 --- a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java +++ b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java @@ -18,7 +18,7 @@ @Autowired private ReportToDismantleTheStackHandler reportToDismantleTheStackHandler; - @Scheduled(cron = "0/3 * * * * ? ") + @Scheduled(cron = "0/1 * * * * ? ") private void execute(){//鎷嗗灈淇℃伅涓婁紶 int[] staNos =new int[]{118,120,121}; for (int staNo : staNos){ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 49d5378..bab6506 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -11,6 +11,9 @@ url: jdbc:sqlserver://192.168.18.4:49977;databasename=srjtasrs username: sa password: sa@123 +# url: jdbc:sqlserver://192.168.4.191:50948;databasename=srjtasrs +# username: sa +# password: sa@123 # url: jdbc:sqlserver://127.0.0.1:50948;databasename=srjtasrs # username: sa # password: sa@123 @@ -361,13 +364,13 @@ emptyInSta2[0]: staNo: 118 # 鎷嗗灈鍙犵洏鍙�2 - emptyInSta2[1]: - staNo: 119 +# emptyInSta2[1]: +# staNo: 119 # 鎷嗗灈鍙犵洏鍙�3 - emptyInSta2[2]: + emptyInSta2[1]: staNo: 120 # 鎷嗗灈鍙犵洏鍙�4 - emptyInSta2[3]: + emptyInSta2[2]: staNo: 121 # 鍑哄簱鍙�1 outSta[0]: @@ -375,14 +378,14 @@ # 鎷f枡鍏ュ簱鍙�1 pickSta2[0]: staNo: 118 +# # 鎷f枡鍏ュ簱鍙�1 +# pickSta2[1]: +# staNo: 119 # 鎷f枡鍏ュ簱鍙�1 pickSta2[1]: - staNo: 119 - # 鎷f枡鍏ュ簱鍙�1 - pickSta2[2]: staNo: 120 # 鎷f枡鍏ュ簱鍙�1 - pickSta2[3]: + pickSta2[2]: staNo: 121 # 鎷f枡鍏ュ簱鍙�1 pickSta[0]: @@ -411,14 +414,14 @@ # Rgv鍏ュ簱鍙�1 inRgvSta[0]: staNo: 118 +# # Rgv鍏ュ簱鍙�1 +# inRgvSta[1]: +# staNo: 119 # Rgv鍏ュ簱鍙�1 inRgvSta[1]: - staNo: 119 - # Rgv鍏ュ簱鍙�1 - inRgvSta[2]: staNo: 120 # Rgv鍏ュ簱鍙�1 - inRgvSta[3]: + inRgvSta[2]: staNo: 121 # Rgv鍏ュ簱鍙�1 inRgvSta[4]: -- Gitblit v1.9.1