From 7bdb4433cdeff7729611c72a2c4199f0decb99c6 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 21 一月 2024 15:05:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 1055 +------------------------------------------------------
src/main/java/com/zy/core/MainProcess.java | 39 -
src/main/resources/application.yml | 3
3 files changed, 32 insertions(+), 1,065 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 c8364a7..d9f635e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -395,15 +395,6 @@
continue;
}
- // 鎷ｃ�佺洏銆佸苟 浣滀笟绔欒浆鎹�
-// int stnNo = 0;
-// if (wrkMast.getStaNo() == 109) {
-// stnNo = 127;
-// } else if (wrkMast.getStaNo() == 113) {
-// stnNo = 128;
-// } else {
-// log.error("{}鍙蜂换鍔℃暟鎹紓甯革紒", wrkMast.getWrkNo());
-// }
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", wrkMast.getIoType() - 50)
@@ -807,366 +798,6 @@
}catch (Exception e){
log.error("鎼滅储RGV杞︺�傞�氳繃鐩爣绔欐悳绱㈠摢鍙拌溅鍙敤"+e);
return null;
- }
- }
-
-// /**
-// * 缁戝畾灏忚溅鏂规硶
-// */
-// public synchronized void rgvBindSte() {
-// //鑾峰彇绛夊緟缁戝畾RGV鐨勪换鍔�
-// List<WrkMast> wrkMasts = wrkMastMapper.selectWaitBindRGV();
-// for (WrkMast wrkMast : wrkMasts) {
-// //鐩爣绔�
-// Integer staNo = wrkMast.getStaNo();
-// //婧愮珯
-// Integer sourceStaNo = wrkMast.getSourceStaNo();
-// //閫氳繃鐩爣绔欐悳绱gv鍙�
-// Integer rgvNo=0;
-// if (wrkMast.getCrnNo()==1){
-// rgvNo=1;
-// }else if (wrkMast.getCrnNo()==6){
-// rgvNo=2;
-// }else {
-// rgvNo = this.searchRgvNo(staNo);
-// }
-// if (rgvNo == null || rgvNo==0) {//鏈壘鍒板彲鐢ㄧ殑rgv
-// continue;
-// }
-//
-// wrkMast.setRgvNo(rgvNo);//缁戝畾rgv鍙�
-// wrkMast.setRgvDstaNo(wrkMast.getSourceStaNo());//璁剧疆RGV鍓嶅線宸ヤ綔妗ｆ簮绔欏彇璐�
-// if (wrkMastMapper.updateById(wrkMast)==0){
-// log.error("缁戝畾灏忚溅鏇存柊宸ヤ綔妗ｅけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", wrkMast.getWrkNo());
-// }
-// }
-// }
-
- /**
- * 缁戝畾灏忚溅鏂规硶
- */
- public synchronized void rgvBindSte() {
- try {
- // 鏍规嵁杈撻�佺嚎plc閬嶅巻
- for (DevpSlave devp : slaveProperties.getDevp()) {
- if (devp.getId()==2){
- continue;
- }
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- //鍏ュ簱缁戝皬杞�
- for (DevpSlave.Sta Sta : devp.getInRgvSta()) {
- StaProtocol staProtocol = devpThread.getStation().get(Sta.getStaNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() != 0 && staProtocol.getWorkNo() < 9990){
- List<WrkMast> wrkMasts = wrkMastMapper.selectList(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()).eq("wrk_sts", 2L));
- if (Cools.isEmpty(wrkMasts) || wrkMasts.size()!=1){
- continue;
- }
- WrkMast wrkMast = wrkMasts.get(0);
- //鐩爣绔�
- Integer staNo = wrkMast.getStaNo();
- //閫氳繃鐩爣绔欐悳绱gv鍙�
- Integer rgvNo=0;
- if (wrkMast.getCrnNo()==1){
- rgvNo=1;
- }else if (wrkMast.getCrnNo()==6){
- rgvNo=2;
- }else {
- rgvNo = this.searchRgvNo(staNo);
- }
- if (rgvNo == null || rgvNo==0) {//鏈壘鍒板彲鐢ㄧ殑rgv
- continue;
- }
- wrkMast.setRgvNo(rgvNo);//缁戝畾rgv鍙�
- if (wrkMastMapper.updateById(wrkMast)==0){
- log.error("缁戝畾灏忚溅鏇存柊宸ヤ綔妗ｅけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", wrkMast.getWrkNo());
- }
- }
- }
- //鍑哄簱缁戝皬杞�
- for (DevpSlave.Sta Sta : devp.getOutRgvSta()) {
- StaProtocol staProtocol = devpThread.getStation().get(Sta.getStaNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() != 0 && staProtocol.getWorkNo() < 9990){
- List<WrkMast> wrkMasts = wrkMastMapper.selectList(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()).eq("wrk_sts", 14L));
- if (Cools.isEmpty(wrkMasts) || wrkMasts.size()!=1){
- continue;
- }
- WrkMast wrkMast = wrkMasts.get(0);
- //鐩爣绔�
- Integer staNo = wrkMast.getStaNo();
- //閫氳繃鐩爣绔欐悳绱gv鍙�
- Integer rgvNo=0;
- if (wrkMast.getCrnNo()==1){
- rgvNo=1;
- }else if (wrkMast.getCrnNo()==6){
- rgvNo=2;
- }else {
- rgvNo = this.searchRgvNo(staNo);
- }
- if (rgvNo == null || rgvNo==0) {//鏈壘鍒板彲鐢ㄧ殑rgv
- continue;
- }
- wrkMast.setRgvNo(rgvNo);//缁戝畾rgv鍙�
- if (wrkMastMapper.updateById(wrkMast)==0){
- log.error("缁戝畾灏忚溅鏇存柊宸ヤ綔妗ｅけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", wrkMast.getWrkNo());
- }
- }
- }
- }
- }catch (Exception e){
- log.error("缁戝畾灏忚溅寮傚父锛歿}", e.getMessage());
- }
- }
-
- /**
- * 缁戝畾灏忚溅鏂规硶
- */
- public synchronized void rgvBindSte2() {
- try{
- for (RgvSlave rgv : slaveProperties.getRgv()) {
- List<WrkMast> wrkMasts = wrkMastMapper.selectWaitBindRGVRgvNo(rgv.getId());
- if (!Cools.isEmpty(wrkMasts) && wrkMasts.size()!=0){
- continue;
- }
- List<WrkMast> wrkMasts2 = wrkMastMapper.selectWaitBindRgvNo2(rgv.getId());
- for (WrkMast wrkMast : wrkMasts2) {
- if (wrkMastMapper.selectWaitBindRgvNoOneWrkNo(wrkMast.getWrkNo())!=null){
- continue;
- }
- //鐩爣绔�
- BasDevp basDevp = basDevpService.selectById(wrkMast.getRgvDstaNo());
- if (Cools.isEmpty(basDevp) || !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("N") || basDevp.getWrkNo()!=0){
- continue;
- }
- wrkMastMapper.insertRgvMast(wrkMast.getWrkNo());
- wrkMastMapper.updateRgvMast(wrkMast.getWrkNo());
- break;
- }
- }
- }catch (Exception e){
- log.error("灏忚溅鎼繍浠诲姟寮傚父锛歿}", e.getMessage());
- }
- }
-
- /**
- * 鍏ュ嚭搴� ===>> RGV鍏ュ嚭搴撲綔涓氫笅鍙�
- */
- public synchronized void rgvIoExecuteOld() {
- for (RgvSlave rgv : slaveProperties.getRgv()) {
- // 鑾峰彇RGV淇℃伅
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
- RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
- if (rgvProtocol == null) {
- continue;
- }
- BasRgv basRgv = basRgvService.selectById(rgv.getId());
- if (basRgv == null) {
- log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", rgv.getId());
- continue;
- }
-
- // 鍙湁褰揜GV绌洪棽銆佽嚜鍔�,
- if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
- && rgvProtocol.getModeType() == RgvModeType.AUTO
-// && rgvProtocol.getTaskNo1() == 0 && rgvProtocol.getTaskNo2() == 0
-// && rgvProtocol.getLoaded1() == 0 && rgvProtocol.getLoaded2() == 0
- ) {
-
- //鏌ユ壘鏄惁瀛樺湪鍏ュ嚭搴撳伐浣滀腑绛夊緟RGV鎼繍鐨勪换鍔�
- List<WrkMast> wrkMasts = wrkMastMapper.selectIoRgvNo(rgv.getId());
- for (WrkMast wrkMast : wrkMasts) {
- if (wrkMast.getWrkSts() == 2) {//2.璁惧涓婅蛋1 => 3.RGV鍙栬揣涓�
- if (rgvProtocol.getTaskNo1() != 0 || rgvProtocol.getLoaded1() != 0) {//RGV鏄惁鏃犱换鍔°�丷GV鏄惁鏃犺揣
- continue;
- }
-
- //鍒ゆ柇琛岃蛋璺緞鏄惁琚崰鐢�
- Integer staNo = wrkMast.getSourceStaNo();
- BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp == null) {
- continue;//鐩爣绔欎笉瀛樺湪
- }
- //璧峰璺緞
- int startPath = rgvProtocol.getRgvPos().intValue();
- //鐩爣璺緞鍊�
- int endPath = basDevp.getLocType3().intValue();
-// boolean pathUsed = RgvUtils.isPathUsed(startPath, endPath);//鍒ゆ柇琛岃蛋璺緞鏄惁琚崰鐢�
- boolean pathUsed = RgvUtils.isPathUsed(startPath, endPath);//鍒ゆ柇琛岃蛋璺緞鏄惁琚崰鐢�
- if (pathUsed) {
- //琛岃蛋璺緞琚崰鐢紝绂佹涓嬪彂鍛戒护
- continue;
- }
- //琛岃蛋璺緞绌洪棽锛岄攣瀹氳矾寰�
- RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), wrkMast.getWrkNo(), true);
-
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setRgvNo(wrkMast.getRgvNo()); // RGV缂栧彿
- rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo1(wrkMast.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
- rgvCommand.setTaskMode1(RgvTaskModeType.FETCH); // 宸ヤ綅1浠诲姟妯″紡: 鍙栬揣
- rgvCommand.setDestinationStaNo1(wrkMast.getRgvDstaNo().shortValue()); //宸ヤ綅1鐩爣绔欑偣
- rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getRgvNo(), new Task(4, rgvCommand))) {
- //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", wrkMast.getRgvNo(), JSON.toJSON(rgvCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋1 => 3.RGV鍙栬揣涓�
- Date now = new Date();
- wrkMast.setWrkSts(3L);
- wrkMast.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋1 => 3.RGV鍙栬揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
- }
- }
- } else if (wrkMast.getWrkSts() == 14) {//4.RGV鍙栬揣瀹屾垚 => 5.RGV鏀捐揣涓� 14鍑哄簱瀹屾垚
- if (rgvProtocol.getTaskNo1() == 0 || !rgvProtocol.getTaskNo1().equals(wrkMast.getWrkNo().shortValue())) {//RGV蹇呴』鏈変换鍔′笖浠诲姟鍜屽綋鍓嶅伐浣滄。涓�鑷�
- continue;
- }
- if (rgvProtocol.getLoaded1() == 0) {//RGV蹇呴』鏈夌墿
- continue;
- }
-
- //鍒ゆ柇琛岃蛋璺緞鏄惁琚崰鐢�
- Integer staNo = wrkMast.getStaNo();
- BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp == null) {
- continue;//鐩爣绔欎笉瀛樺湪
- }
- //璧峰璺緞
- int startPath = rgvProtocol.getRgvPos().intValue();
- //鐩爣璺緞鍊�
- int endPath = basDevp.getLocType3().intValue();
- boolean pathUsed = RgvUtils.isPathUsed(startPath, endPath);//鍒ゆ柇琛岃蛋璺緞鏄惁琚崰鐢�
- if (pathUsed) {
- //琛岃蛋璺緞琚崰鐢紝绂佹涓嬪彂鍛戒护
- continue;
- }
- //琛岃蛋璺緞绌洪棽锛岄攣瀹氳矾寰�
- RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), wrkMast.getWrkNo(), true);
-
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setRgvNo(wrkMast.getRgvNo()); // RGV缂栧彿
- rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo1(wrkMast.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
- rgvCommand.setTaskMode1(RgvTaskModeType.PUT); // 宸ヤ綅1浠诲姟妯″紡: 鏀捐揣
- rgvCommand.setDestinationStaNo1(wrkMast.getRgvDstaNo().shortValue()); //宸ヤ綅1鐩爣绔欑偣
- rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getRgvNo(), new Task(4, rgvCommand))) {
- //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", wrkMast.getRgvNo(), JSON.toJSON(rgvCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 4.RGV鍙栬揣瀹屾垚 => 5.RGV鏀捐揣涓�
- Date now = new Date();
- wrkMast.setWrkSts(5L);
- wrkMast.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 4.RGV鍙栬揣瀹屾垚 => 5.RGV鏀捐揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
- }
- }
- } else if (wrkMast.getWrkSts() == 23) {//23.璁惧涓婅蛋1 => 24.RGV鍙栬揣涓�
- if (rgvProtocol.getTaskNo1() != 0 || rgvProtocol.getLoaded1() != 0) {//RGV鏄惁鏃犱换鍔°�丷GV鏄惁鏃犺揣
- continue;
- }
-
- //鍒ゆ柇琛岃蛋璺緞鏄惁琚崰鐢�
- Integer staNo = wrkMast.getSourceStaNo();
- BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp == null) {
- continue;//鐩爣绔欎笉瀛樺湪
- }
- //璧峰璺緞
- int startPath = rgvProtocol.getRgvPos().intValue();
- //鐩爣璺緞鍊�
- int endPath = basDevp.getLocType3().intValue();
- boolean pathUsed = RgvUtils.isPathUsed(startPath, endPath);//鍒ゆ柇琛岃蛋璺緞鏄惁琚崰鐢�
- if (pathUsed) {
- //琛岃蛋璺緞琚崰鐢紝绂佹涓嬪彂鍛戒护
- continue;
- }
- //琛岃蛋璺緞绌洪棽锛岄攣瀹氳矾寰�
- RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), wrkMast.getWrkNo(), true);
-
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setRgvNo(wrkMast.getRgvNo()); // RGV缂栧彿
- rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo1(wrkMast.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
- rgvCommand.setTaskMode1(RgvTaskModeType.FETCH); // 宸ヤ綅1浠诲姟妯″紡: 鍙栬揣
- rgvCommand.setDestinationStaNo1(wrkMast.getRgvDstaNo().shortValue()); //宸ヤ綅1鐩爣绔欑偣
- rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getRgvNo(), new Task(4, rgvCommand))) {
- //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", wrkMast.getRgvNo(), JSON.toJSON(rgvCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 23.璁惧涓婅蛋1 => 24.RGV鍙栬揣涓�
- Date now = new Date();
- wrkMast.setWrkSts(24L);
- wrkMast.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 23.璁惧涓婅蛋1 => 24.RGV鍙栬揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
- }
- }
- } else if (wrkMast.getWrkSts() == 25) {//25.RGV鍙栬揣瀹屾垚 => 26.RGV鏀捐揣涓�
- if (rgvProtocol.getTaskNo1() == 0 || !rgvProtocol.getTaskNo1().equals(wrkMast.getWrkNo().shortValue())) {//RGV蹇呴』鏈変换鍔′笖浠诲姟鍜屽綋鍓嶅伐浣滄。涓�鑷�
- continue;
- }
- if (rgvProtocol.getLoaded1() == 0) {//RGV蹇呴』鏈夌墿
- continue;
- }
-
- //鍒ゆ柇琛岃蛋璺緞鏄惁琚崰鐢�
- Integer staNo = wrkMast.getStaNo();
- BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp == null) {
- continue;//鐩爣绔欎笉瀛樺湪
- }
- //璧峰璺緞
- int startPath = rgvProtocol.getRgvPos().intValue();
- //鐩爣璺緞鍊�
- int endPath = basDevp.getLocType3().intValue();
- boolean pathUsed = RgvUtils.isPathUsed(startPath, endPath);//鍒ゆ柇琛岃蛋璺緞鏄惁琚崰鐢�
- if (pathUsed) {
- //琛岃蛋璺緞琚崰鐢紝绂佹涓嬪彂鍛戒护
- continue;
- }
- //琛岃蛋璺緞绌洪棽锛岄攣瀹氳矾寰�
- RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), wrkMast.getWrkNo(), true);
-
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setRgvNo(wrkMast.getRgvNo()); // RGV缂栧彿
- rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo1(wrkMast.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
- rgvCommand.setTaskMode1(RgvTaskModeType.PUT); // 宸ヤ綅1浠诲姟妯″紡: 鏀捐揣
- rgvCommand.setDestinationStaNo1(wrkMast.getRgvDstaNo().shortValue()); //宸ヤ綅1鐩爣绔欑偣
- rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getRgvNo(), new Task(4, rgvCommand))) {
- //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", wrkMast.getRgvNo(), JSON.toJSON(rgvCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 25.RGV鍙栬揣瀹屾垚 => 26.RGV鏀捐揣涓�
- Date now = new Date();
- wrkMast.setWrkSts(26L);
- wrkMast.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 25.RGV鍙栬揣瀹屾垚 => 26.RGV鏀捐揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
- }
- }
- }
- }
-
- }
}
}
@@ -1847,201 +1478,6 @@
}
/**
- * 鍏ュ簱 ===>> RGV鍏ュ簱绔欏埌绔�
- */
- public synchronized void rgvInStn(RgvSlave slave, RgvProtocol rgvProtocol) {
- WrkMast wrkMast = wrkMastMapper.selectRgvInSteNo(slave.getId());
-
-
- //鏌ユ壘宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級,涓擱GV鍏ュ簱鎺ラ┏绔欑鍚堢殑鐨勫叆搴撳伐浣滄。锛屾彁鍙栧嚭鏈�澶�2绗�
- List<WrkMast> wrkMastTask = getRgvInTask(slave);
- if(wrkMastTask.size() <= 0){
- return;
- }
-
- // RGV鎺у埗杩囨护锛� 蹇呴』婊¤冻鑷姩銆佺┖闂诧紝娌℃湁浠诲姟鍙�
- if (!rgvProtocol.getStatusType().equals(CrnStatusType.IDLE)
- || rgvProtocol.getModeType() != RgvModeType.AUTO
- || rgvProtocol.getTaskNo1() != 0 || rgvProtocol.getTaskNo2() != 0) {
- return;
- }
-
- // 宸茬粡瀛樺湪RGV鎵ц浠诲姟鏃讹紝鍒欒繃婊�
- if(wrkMastMapper.selectRgvInWorking(slave.getId()).size() > 0){
- return;
- }
-
- if(wrkMastTask.size() == 2){
- //鏈�2绗擱GV寰呭叆搴撲换鍔★紝2涓伐浣嶏紝鍙栬揣銆佹斁璐т换鍔″悓鏃朵笅鍙�
- WrkMast wrkMast1 = wrkMastTask.get(0);
- WrkMast wrkMast2 = wrkMastTask.get(1);
- if(Cools.isEmpty(wrkMast1) || Cools.isEmpty(wrkMast2)){
- log.error("宸ヤ綔妗GV鍏ュ簱鏁版嵁涓虹┖");
- return;
- }
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setRgvNo(slave.getId()); // RGV缂栧彿
- rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo1(wrkMast1.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
- rgvCommand.setTaskMode1(RgvTaskModeType.FETCH_PUT); // 宸ヤ綅1浠诲姟妯″紡: 鍙栨斁璐�
- rgvCommand.setSourceStaNo1(wrkMast1.getRgvSstaNo().shortValue()); //宸ヤ綅1婧愮珯鐐�
- rgvCommand.setDestinationStaNo1(wrkMast1.getRgvDstaNo().shortValue()); //宸ヤ綅1鐩爣绔欑偣
- rgvCommand.setAckFinish2((short) 0); // 宸ヤ綅2浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo2(wrkMast2.getWrkNo().shortValue()); // 宸ヤ綅2宸ヤ綔鍙�
- rgvCommand.setTaskMode2(RgvTaskModeType.FETCH_PUT); // 宸ヤ綅2浠诲姟妯″紡: 鍙栨斁璐�
- rgvCommand.setSourceStaNo2(wrkMast2.getRgvSstaNo().shortValue()); //宸ヤ綅2婧愮珯鐐�
- rgvCommand.setDestinationStaNo2(wrkMast2.getRgvDstaNo().shortValue()); //宸ヤ綅2鐩爣绔欑偣
- rgvCommand.setCommand((short) 0); //宸ヤ綅1銆�2浠诲姟纭
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast1.getRgvNo(), new Task(2, rgvCommand))) {
- //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", slave.getId(), JSON.toJSON(rgvCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 6.RGV鍏ュ簱鍙栬揣涓�
- Date now = new Date();
- wrkMast1.setWrkSts(6L);
- wrkMast1.setCrnStrTime(now);
- wrkMast1.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast1) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 6.RGV鍏ュ簱鍙栬揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast1.getWrkNo());
- }
-
- wrkMast2.setWrkSts(6L);
- wrkMast2.setCrnStrTime(now);
- wrkMast2.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast2) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 6.RGV鍏ュ簱鍙栬揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast2.getWrkNo());
- }
- }
- } else if(wrkMastTask.size() == 1){
- //鍙湁1绗擱GV寰呭叆搴撲换鍔★紝鍏堜笅鍙戝彇璐т换鍔★紝鍙栬揣鍚庡啀鍒ゆ柇鏄惁鏈変笅涓�绗斿緟鍏ュ簱浠诲姟
- WrkMast wrkMast1 = wrkMastTask.get(0);
- if(Cools.isEmpty(wrkMast1)){
- log.error("宸ヤ綔妗GV鍏ュ簱鏁版嵁涓虹┖");
- return;
- }
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setRgvNo(slave.getId()); // RGV缂栧彿
- rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo1(wrkMast1.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
- rgvCommand.setTaskMode1(RgvTaskModeType.FETCH); // 宸ヤ綅1浠诲姟妯″紡: 鍙栬揣
- rgvCommand.setSourceStaNo1(wrkMast1.getRgvSstaNo().shortValue()); //宸ヤ綅1婧愮珯鐐�
- rgvCommand.setDestinationStaNo1(wrkMast1.getRgvDstaNo().shortValue()); //宸ヤ綅1鐩爣绔欑偣
- rgvCommand.setCommand((short) 0); //宸ヤ綅1銆�2浠诲姟纭
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast1.getRgvNo(), new Task(4, rgvCommand))) {
- //step=2,宸ヤ綅1銆�2浠诲姟纭锛� step=4锛屽伐浣�1纭锛� step=5锛屽伐浣�2浠诲姟纭
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", slave.getId(), JSON.toJSON(rgvCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 6.RGV鍏ュ簱鍙栬揣涓�
- Date now = new Date();
- wrkMast1.setWrkSts(6L);
- wrkMast1.setCrnStrTime(now);
- wrkMast1.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast1) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 6.RGV鍏ュ簱鍙栬揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast1.getWrkNo());
- }
- }
- }
- }
-
- /**
- * 鍑哄簱 ===>> RGV鍑哄簱绔欏埌绔�
- */
- public synchronized void rgvOutStn(RgvSlave slave, RgvProtocol rgvProtocol) {
- //鏌ユ壘宸ヤ綔鐘舵�佷负14锛堝嚭搴撳畬鎴愶級,涓擱GV鍑哄簱鎺ラ┏绔欑鍚堢殑鐨勫嚭搴撳伐浣滄。锛屾彁鍙栧嚭鏈�澶�2绗�
- List<WrkMast> wrkMastTask = getRgvOutTask(slave);
- if(wrkMastTask.size() <= 0){
- return;
- }
-
- // RGV鎺у埗杩囨护锛� 蹇呴』婊¤冻鑷姩銆佺┖闂诧紝娌℃湁浠诲姟鍙�
- if (!rgvProtocol.getStatusType().equals(CrnStatusType.IDLE)
- || rgvProtocol.getModeType() != RgvModeType.AUTO
- || rgvProtocol.getTaskNo1() != 0 || rgvProtocol.getTaskNo2() != 0) {
- return;
- }
-
- // 宸茬粡瀛樺湪RGV鎵ц浠诲姟鏃讹紝鍒欒繃婊�
- if(wrkMastMapper.selectRgvOutWorking(slave.getId()).size() > 0){
- return;
- }
-
- if(wrkMastTask.size() == 2){
- //鏈�2绗擱GV寰呭叆搴撲换鍔★紝2涓伐浣嶏紝鍙栬揣銆佹斁璐т换鍔″悓鏃朵笅鍙�
- WrkMast wrkMast1 = wrkMastTask.get(0);
- WrkMast wrkMast2 = wrkMastTask.get(1);
- if(Cools.isEmpty(wrkMast1) || Cools.isEmpty(wrkMast2)){
- log.error("宸ヤ綔妗GV鍏ュ簱鏁版嵁涓虹┖");
- return;
- }
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setRgvNo(slave.getId()); // RGV缂栧彿
- rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo1(wrkMast1.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
- rgvCommand.setTaskMode1(RgvTaskModeType.FETCH_PUT); // 宸ヤ綅1浠诲姟妯″紡: 鍙栨斁璐�
- rgvCommand.setSourceStaNo1(wrkMast1.getRgvSstaNo().shortValue()); //宸ヤ綅1婧愮珯鐐�
- rgvCommand.setDestinationStaNo1(wrkMast1.getRgvDstaNo().shortValue()); //宸ヤ綅1鐩爣绔欑偣
- rgvCommand.setAckFinish2((short) 0); // 宸ヤ綅2浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo2(wrkMast2.getWrkNo().shortValue()); // 宸ヤ綅2宸ヤ綔鍙�
- rgvCommand.setTaskMode2(RgvTaskModeType.FETCH_PUT); // 宸ヤ綅2浠诲姟妯″紡: 鍙栨斁璐�
- rgvCommand.setSourceStaNo2(wrkMast2.getRgvSstaNo().shortValue()); //宸ヤ綅2婧愮珯鐐�
- rgvCommand.setDestinationStaNo2(wrkMast2.getRgvDstaNo().shortValue()); //宸ヤ綅2鐩爣绔欑偣
- rgvCommand.setCommand((short) 0); //宸ヤ綅1銆�2浠诲姟纭
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast1.getRgvNo(), new Task(2, rgvCommand))) {
- //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", slave.getId(), JSON.toJSON(rgvCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 14.鍑哄簱瀹屾垚 => 16.RGV鍑哄簱鍙栬揣涓�
- Date now = new Date();
- wrkMast1.setWrkSts(16L);
- wrkMast1.setCrnStrTime(now);
- wrkMast1.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast1) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 14.鍑哄簱瀹屾垚 => 16.RGV鍑哄簱鍙栬揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast1.getWrkNo());
- }
-
- wrkMast2.setWrkSts(16L);
- wrkMast2.setCrnStrTime(now);
- wrkMast2.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast2) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 14.鍑哄簱瀹屾垚 => 16.RGV鍑哄簱鍙栬揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast2.getWrkNo());
- }
- }
- } else if(wrkMastTask.size() == 1){
- //鍙湁1绗擱GV寰呭叆搴撲换鍔★紝鍏堜笅鍙戝彇璐т换鍔★紝鍙栬揣鍚庡啀鍒ゆ柇鏄惁鏈変笅涓�绗斿緟鍏ュ簱浠诲姟
- WrkMast wrkMast1 = wrkMastTask.get(0);
- if(Cools.isEmpty(wrkMast1)){
- log.error("宸ヤ綔妗GV鍏ュ簱鏁版嵁涓虹┖");
- return;
- }
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setRgvNo(slave.getId()); // RGV缂栧彿
- rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo1(wrkMast1.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
- rgvCommand.setTaskMode1(RgvTaskModeType.FETCH); // 宸ヤ綅1浠诲姟妯″紡: 鍙栬揣
- rgvCommand.setSourceStaNo1(wrkMast1.getRgvSstaNo().shortValue()); //宸ヤ綅1婧愮珯鐐�
- rgvCommand.setDestinationStaNo1(wrkMast1.getRgvDstaNo().shortValue()); //宸ヤ綅1鐩爣绔欑偣
- rgvCommand.setCommand((short) 0); //宸ヤ綅1銆�2浠诲姟纭
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast1.getRgvNo(), new Task(4, rgvCommand))) {
- //step=2,宸ヤ綅1銆�2浠诲姟纭锛� step=4锛屽伐浣�1纭锛� step=5锛屽伐浣�2浠诲姟纭
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", slave.getId(), JSON.toJSON(rgvCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 14.鍑哄簱瀹屾垚 => 16.RGV鍑哄簱鍙栬揣涓�
- Date now = new Date();
- wrkMast1.setWrkSts(16L);
- wrkMast1.setCrnStrTime(now);
- wrkMast1.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast1) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 14.鍑哄簱瀹屾垚 => 16.RGV鍑哄簱鍙栬揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast1.getWrkNo());
- }
- }
- }
- }
-
- /**
* 鏌ユ壘宸ヤ綔鐘舵�佷负14锛堝嚭搴撳畬鎴愶級,涓擱GV鍑哄簱鎺ラ┏绔欑鍚堢殑鐨勫嚭搴撳伐浣滄。锛屾彁鍙栧嚭鏈�澶�2绗�
* @param slave
* @return
@@ -2110,347 +1546,6 @@
}
}
return wrkMastTask;
- }
-
- /**
- * 鏍规嵁RGV瀹屾垚淇″彿锛屾墽琛屽宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔锛屽拰RGV鐨勪换鍔′笅鍙�
- */
- public synchronized void rgvFinished() {
- Date now = new Date();
- for (RgvSlave rgv : slaveProperties.getRgv()) {
- // 鑾峰彇RGV淇℃伅
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
- RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
- if (rgvProtocol == null) {
- continue;
- }
- //鍒ゆ柇RGV鏄惁绌洪棽锛屽伐浣�1鏄惁绌洪棽锛屽伐浣�1鏄惁鏈夌墿锛屾槸鍚︿负鐢佃剳妯″紡锛屽伐浣�1鏄惁鏈夊伐浣滃彿
- if (rgvProtocol.statusType1 == RgvStatusType.FETCHWAITING
- && rgvProtocol.getModeType() == RgvModeType.AUTO
- && rgvProtocol.getTaskNo1() != 0
- && rgvProtocol.getStatus() != 0
- && rgvProtocol.getStatus1() != 0
- ) {
- WrkMast wrkMast1 = wrkMastMapper.selectPakInStep3(rgvProtocol.getTaskNo1().intValue());
- if (wrkMast1 == null) {
- log.error("RGV宸ヤ綅1澶勪簬绛夊緟纭涓斿彇璐т换鍔″畬鎴愮姸鎬侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�俁GV鍙�={}锛屽伐浣滃彿={}", rgv.getId(), rgvProtocol.getTaskNo1());
- continue;
- }
-
- if (wrkMast1.getWrkSts() == 3) {//3.RGV鍙栬揣涓� => 4.RGV鍙栬揣瀹屾垚
- wrkMast1.setWrkSts(4L);
- }else if(wrkMast1.getWrkSts() == 5){//5.RGV鏀捐揣涓� => 6.RGV鏀捐揣瀹屾垚
- rgvProtocol.setTaskNo1((short) 0);//鍏ュ簱浠诲姟瀹屾垚锛屾竻绌轰换鍔″彿
- wrkMast1.setWrkSts(6L);
- } else if (wrkMast1.getWrkSts() == 24) {//24.RGV鍙栬揣涓� => 25.RGV鍙栬揣瀹屾垚
- wrkMast1.setWrkSts(25L);//
- } else if (wrkMast1.getWrkSts() == 26) {//26.RGV鏀捐揣涓� => 27.RGV鏀捐揣瀹屾垚
- rgvProtocol.setTaskNo1((short) 0);//鍑哄簱浠诲姟瀹屾垚锛屾竻绌轰换鍔″彿
- wrkMast1.setWrkSts(27L);//27.RGV鏀捐揣瀹屾垚
- }
-
- //瑙ｉ攣璺緞
- RgvUtils.unLockPath(wrkMast1.getRgvNo());
-
- wrkMast1.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast1) == 0) {
- log.error("宸ヤ綅1淇敼宸ヤ綔妗ｇ姸鎬佸け璐ワ紒锛侊紝宸ヤ綔鍙�={}", wrkMast1.getWrkNo());
- }
-
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setRgvNo(rgv.getId()); // RGV缂栧彿
- rgvCommand.setAckFinish1((short) 1); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- rgvCommand.setTaskNo1(wrkMast1.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
- rgvCommand.setTaskMode1(RgvTaskModeType.NONE); // 宸ヤ綅1浠诲姟妯″紡: 鏃�
- rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast1.getRgvNo(), new Task(4, rgvCommand))) {
- //step=2,宸ヤ綅1銆�2浠诲姟纭锛� step=4锛屽伐浣�1纭锛� step=5锛屽伐浣�2浠诲姟纭
- log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgv.getId(), JSON.toJSON(rgvCommand));
- }
-
-// //宸ヤ綅1鍙栬揣瀹屾垚鍚庯紝宸ヤ綅2鏄棤璐х┖闂茬姸鎬佹椂锛屽噯澶囩粰宸ヤ綅2鍙戜换鍔★紝纭鏄惁鏈夊緟鎵цRGV浠诲姟
-// if (rgvProtocol.getModeType() == RgvModeType.AUTO
-// && rgvProtocol.getTaskNo1() > 0 && rgvProtocol.getTaskNo2() == 0
-// && rgvProtocol.getLoaded1() > 0 && rgvProtocol.getLoaded2() == 0
-// && rgvProtocol.getStatusType2() == RgvStatusType.IDLE
-// ) {
-// WrkMast wrkMast1 = wrkMastMapper.selectPakInStep3(rgvProtocol.getTaskNo1().intValue());
-// if (wrkMast1 == null) {
-// log.error("RGV宸ヤ綅1澶勪簬绛夊緟纭涓斿彇璐т换鍔″畬鎴愮姸鎬侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�俁GV鍙�={}锛屽伐浣滃彿={}", rgv.getId(), rgvProtocol.getTaskNo1());
-// continue;
-// }
-// List<WrkMast> wrkMastTask = new ArrayList<>();
-// List<WrkMast> list = new ArrayList<>();
-// Integer type = 0;//1鍏ュ簱锛�2鍑哄簱
-// if(wrkMast1.getWrkSts()==6L){
-// wrkMastTask = getRgvInTask(rgv);
-// list = wrkMastMapper.selectRgvInWorking(rgv.getId());
-// type = 1;
-// } else if(wrkMast1.getWrkSts()==16L){
-// wrkMastTask = getRgvOutTask(rgv);
-// list = wrkMastMapper.selectRgvOutWorking(rgv.getId());
-// type = 2;
-// }
-// if(wrkMastTask.size() > 0){//鏈夌户缁墽琛屼换鍔★紝涓嬪彂鍙栬揣浠诲姟缁欏伐浣�2
-// // 宸茬粡瀛樺湪RGV鎵ц浠诲姟鏃讹紝鍒欒繃婊�
-// if (list.size() > 1) {
-// continue;
-// }
-// WrkMast wrkMast2 = wrkMastTask.get(0);
-// // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-// RgvCommand rgvCommand = new RgvCommand();
-// rgvCommand.setRgvNo(rgv.getId()); // RGV缂栧彿
-// rgvCommand.setAckFinish2((short) 0); // 宸ヤ綅2浠诲姟瀹屾垚纭浣�
-// rgvCommand.setTaskNo2(wrkMast2.getWrkNo().shortValue()); // 宸ヤ綅2宸ヤ綔鍙�
-// rgvCommand.setTaskMode2(RgvTaskModeType.FETCH); // 宸ヤ綅2浠诲姟妯″紡: 鍙栬揣
-// rgvCommand.setSourceStaNo2(wrkMast2.getRgvSstaNo().shortValue()); //宸ヤ綅2婧愮珯鐐�
-// rgvCommand.setDestinationStaNo2(wrkMast2.getRgvDstaNo().shortValue()); //宸ヤ綅2鐩爣绔欑偣
-// rgvCommand.setCommand((short) 0); //宸ヤ綅1銆�2浠诲姟纭
-// if (!MessageQueue.offer(SlaveType.Crn, wrkMast2.getRgvNo(), new Task(5, rgvCommand))) {
-// //step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
-// log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgv.getId(), JSON.toJSON(rgvCommand));
-// } else {
-// // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 6.RGV鍏ュ簱鍙栬揣涓�
-// Date now = new Date();
-// wrkMast2.setWrkSts(type==1 ? 6L : 16L);
-// wrkMast2.setCrnStrTime(now);
-// wrkMast2.setModiTime(now);
-// if (wrkMastMapper.updateById(wrkMast2) == 0) {
-// log.error("宸ヤ綅2淇敼宸ヤ綔妗ｇ姸鎬� 2/14.璁惧涓婅蛋 => 6/16.RGV鍏ュ簱鍙栬揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast2.getWrkNo());
-// }
-// }
-// } else {//娌℃湁缁х画鎵ц浠诲姟锛屼笅鍙戞斁璐т换鍔＄粰宸ヤ綅1
-// if(type == 1 && wrkMast1.getWrkSts() != 6L){//RGV鍏ュ簱鍙栬揣涓�
-// continue;
-// }
-// if(type == 2 && wrkMast1.getWrkSts() != 16L){//RGV鍑哄簱鍙栬揣涓�
-// continue;
-// }
-//
-// // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-// RgvCommand rgvCommand = new RgvCommand();
-// rgvCommand.setRgvNo(rgv.getId()); // RGV缂栧彿
-// rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
-// rgvCommand.setTaskNo1(wrkMast1.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
-// rgvCommand.setTaskMode1(RgvTaskModeType.PUT); // 宸ヤ綅1浠诲姟妯″紡: 鏀捐揣
-// rgvCommand.setSourceStaNo1(wrkMast1.getRgvSstaNo().shortValue()); //宸ヤ綅1婧愮珯鐐�
-// rgvCommand.setDestinationStaNo1(wrkMast1.getRgvDstaNo().shortValue()); //宸ヤ綅1鐩爣绔欑偣
-// rgvCommand.setCommand((short) 0); //宸ヤ綅1銆�2浠诲姟纭
-// if (!MessageQueue.offer(SlaveType.Crn, wrkMast1.getRgvNo(), new Task(4, rgvCommand))) {
-// //step=2,宸ヤ綅1銆�2浠诲姟纭锛� step=4锛屽伐浣�1纭锛� step=5锛屽伐浣�2浠诲姟纭
-// log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgv.getId(), JSON.toJSON(rgvCommand));
-// } else {
-// // 淇敼宸ヤ綔妗ｇ姸鎬� 6.RGV鍏ュ簱鍙栬揣涓� => 7.RGV鍏ュ簱鏀捐揣涓�
-// Date now = new Date();
-// wrkMast1.setWrkSts(type==1 ? 7L : 17L);
-// wrkMast1.setCrnEndTime(now);
-// wrkMast1.setModiTime(now);
-// if (wrkMastMapper.updateById(wrkMast1) == 0) {
-// log.error("淇敼宸ヤ綔妗ｇ姸鎬� 6/16.RGV鍏ュ簱鍙栬揣涓� => 7/17.RGV鍏ュ簱鏀捐揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast1.getWrkNo());
-// }
-// log.error("RGV鍛戒护涓嬪彂鎴愬姛锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgv.getId(), JSON.toJSON(rgvCommand));
-// }
-// }
-// } else if (rgvProtocol.getModeType() == RgvModeType.AUTO
-// && rgvProtocol.getTaskNo1() > 0 && rgvProtocol.getTaskNo2() > 0
-// && rgvProtocol.getLoaded1() > 0 && rgvProtocol.getLoaded2() > 0
-// && rgvProtocol.statusType2 == RgvStatusType.FETCHWAITING){
-// // 宸ヤ綅2鐘舵�侊細涔熸槸鍙栬揣瀹屾垚绛夊緟纭91 骞朵笖 浠诲姟瀹屾垚浣� = 1, 宸ヤ綅1銆�2鍚屾椂涓嬪彂鏀捐揣浠诲姟
-// WrkMast wrkMast1 = wrkMastMapper.selectPakInStep3(rgvProtocol.getTaskNo1().intValue());
-// WrkMast wrkMast2 = wrkMastMapper.selectPakInStep3(rgvProtocol.getTaskNo2().intValue());
-// // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-// RgvCommand rgvCommand = new RgvCommand();
-// rgvCommand.setRgvNo(rgv.getId()); // RGV缂栧彿
-// rgvCommand.setAckFinish1((short) 0); // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
-// rgvCommand.setTaskNo1(wrkMast1.getWrkNo().shortValue()); // 宸ヤ綅1宸ヤ綔鍙�
-// rgvCommand.setTaskMode1(RgvTaskModeType.PUT); // 宸ヤ綅1浠诲姟妯″紡: 鏀捐揣
-// rgvCommand.setSourceStaNo1(wrkMast1.getRgvSstaNo().shortValue()); //宸ヤ綅1婧愮珯鐐�
-// rgvCommand.setDestinationStaNo1(wrkMast1.getRgvDstaNo().shortValue()); //宸ヤ綅1鐩爣绔欑偣
-// rgvCommand.setAckFinish2((short) 0); // 宸ヤ綅2浠诲姟瀹屾垚纭浣�
-// rgvCommand.setTaskNo2(wrkMast2.getWrkNo().shortValue()); // 宸ヤ綅2宸ヤ綔鍙�
-// rgvCommand.setTaskMode2(RgvTaskModeType.PUT); // 宸ヤ綅2浠诲姟妯″紡: 鏀捐揣
-// rgvCommand.setSourceStaNo2(wrkMast2.getRgvSstaNo().shortValue()); //宸ヤ綅2婧愮珯鐐�
-// rgvCommand.setDestinationStaNo2(wrkMast2.getRgvDstaNo().shortValue()); //宸ヤ綅2鐩爣绔欑偣
-// rgvCommand.setCommand((short) 0); //宸ヤ綅1銆�2浠诲姟纭
-// if (!MessageQueue.offer(SlaveType.Crn, wrkMast1.getRgvNo(), new Task(2, rgvCommand))) {
-// //step=2,宸ヤ綅1銆�2浠诲姟纭锛� step=4锛屽伐浣�1纭锛� step=5锛屽伐浣�2浠诲姟纭
-// log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgv.getId(), JSON.toJSON(rgvCommand));
-// } else {
-// // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 6.RGV鍏ュ簱鍙栬揣涓�
-// Date now = new Date();
-// wrkMast1.setWrkSts(wrkMast1.getWrkSts()==6L ? 7L : 17L);
-// wrkMast1.setCrnStrTime(now);
-// wrkMast1.setModiTime(now);
-// if (wrkMastMapper.updateById(wrkMast1) == 0) {
-// log.error("淇敼宸ヤ綔妗ｇ姸鎬� 6/16.RGV鍏ュ簱鍙栬揣涓� => 7/17.RGV鍏ュ簱鏀捐揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast1.getWrkNo());
-// }
-//
-// wrkMast2.setWrkSts(wrkMast2.getWrkSts()==6L ? 7L : 17L);
-// wrkMast2.setCrnStrTime(now);
-// wrkMast2.setModiTime(now);
-// if (wrkMastMapper.updateById(wrkMast2) == 0) {
-// log.error("淇敼宸ヤ綔妗ｇ姸鎬� 6/16.RGV鍏ュ簱鍙栬揣涓� => 7/17.RGV鍏ュ簱鏀捐揣涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast2.getWrkNo());
-// }
-// }
-// }
- }
-
- }
- }
-
- /**
- * 鍏ュ嚭搴� ===>> RGV鍑哄簱绔欏埌鍫嗗灈鏈哄叆搴撶珯/绯荤粺鍏ュ簱绔�
- * rgvInDStnToCrnStn
- */
- public synchronized void rgvDestStnToCrnStn() {
- for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
- // 閬嶅巻鍏ュ簱浠诲姟鐨凴GV鍑哄簱绔�
- for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvDestStn()) {
- // 鑾峰彇RGV鍑哄簱绔欎俊鎭�
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, rgvStn.getDevpPlcId());
- StaProtocol staProtocol = devpThread.getStation().get(rgvStn.getStaNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
- // 鏌ヨ宸ヤ綔妗ist
-// List<WrkMast> wrkMasts = wrkMastMapper.selectRgvInStep2(staProtocol.getSiteId());
- List<WrkMast> wrkMasts = wrkMastMapper.selectRgvDestStep2(staProtocol.getSiteId());
- for(WrkMast wrkMast : wrkMasts){
- // 鍒ゆ柇宸ヤ綔妗ｆ潯浠�
- if (wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null
- || wrkMast.getRgvSstaNo() == null || wrkMast.getRgvDstaNo() == null) {
- continue;
- }
-
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, wrkMast.getRgvNo());
- RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
- // 鍒ゆ柇RGV鐘舵�佺瓑寰呯‘璁�,宸ヤ綅1
- if (rgvProtocol.modeType == RgvModeType.AUTO && rgvProtocol.getTaskNo1().equals(wrkMast.getWrkNo().shortValue())
- && rgvProtocol.statusType1 == RgvStatusType.WAITING) {
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- // 涓嬪彂绔欑偣淇℃伅
- staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(wrkMast.getStaNo());
- if (!MessageQueue.offer(SlaveType.Devp, rgvStn.getDevpPlcId(), new Task(2, staProtocol))) {
- continue;
- }
- // 鏇存柊宸ヤ綔妗ｇ姸鎬佷负2,14
- wrkMast.setWrkSts(wrkMast.getWrkSts()==7L ? 2L : 14L);
- wrkMast.setOnlineYn("Y");
- wrkMast.setCrnEndTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) != 0) {
- // 澶嶄綅RGV宸ヤ綅1
- rgvThread.setResetFlag1(true);
- } else {
- log.error("RGV宸ヤ綅1鎺ラ┏锛屾洿鏂板伐浣滄。鐨勫伐浣滅姸鎬佷负{}澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkSts()==7L ? 2L : 14L, wrkMast.getWrkNo());
- }
- }
- // 鍒ゆ柇RGV鐘舵�佺瓑寰呯‘璁�,宸ヤ綅2
- if (rgvProtocol.modeType == RgvModeType.AUTO && rgvProtocol.getTaskNo2().equals(wrkMast.getWrkNo().shortValue())
- && rgvProtocol.statusType2 == RgvStatusType.WAITING) {
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- // 涓嬪彂绔欑偣淇℃伅
- staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(wrkMast.getStaNo());
- if (!MessageQueue.offer(SlaveType.Devp, rgvStn.getDevpPlcId(), new Task(2, staProtocol))) {
- continue;
- }
- // 鏇存柊宸ヤ綔妗ｇ姸鎬佷负2,14
- wrkMast.setWrkSts(wrkMast.getWrkSts()==7L ? 2L : 14L);
- wrkMast.setOnlineYn("Y");
- wrkMast.setCrnEndTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) != 0) {
- // 澶嶄綅RGV宸ヤ綅2
- rgvThread.setResetFlag2(true);
- } else {
- log.error("RGV宸ヤ綅2鎺ラ┏锛屾洿鏂板伐浣滄。鐨勫伐浣滅姸鎬佷负{}澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkSts()==7L ? 2L : 14L, wrkMast.getWrkNo());
- }
- }
- }
-
- }
- }
- }
- }
-
- /**
- * 鍑哄簱 ===>> RGV鍑哄簱绔欏埌绯荤粺鍑哄簱绔�
- */
- public synchronized void rgvOutDStnToOutStn() {
- for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
- // 閬嶅巻鍑哄簱浠诲姟鐨凴GV鍑哄簱绔�
- for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvDestStn()) {
- // 鑾峰彇RGV鍑哄簱绔欎俊鎭�
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, rgvStn.getDevpPlcId());
- StaProtocol staProtocol = devpThread.getStation().get(rgvStn.getStaNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
- // 鏌ヨ宸ヤ綔妗ist
- List<WrkMast> wrkMasts = wrkMastMapper.selectRgvOutStep2(staProtocol.getSiteId());
- for(WrkMast wrkMast : wrkMasts){
- // 鍒ゆ柇宸ヤ綔妗ｆ潯浠�
- if (wrkMast.getIoType() < 100 || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null
- || wrkMast.getRgvSstaNo() == null || wrkMast.getRgvDstaNo() == null) {
- continue;
- }
-
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, wrkMast.getRgvNo());
- RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
- // 鍒ゆ柇RGV鐘舵�佺瓑寰呯‘璁�,宸ヤ綅1
- if (rgvProtocol.modeType == RgvModeType.AUTO && rgvProtocol.getTaskNo1().equals(wrkMast.getWrkNo().shortValue())
- && rgvProtocol.statusType1 == RgvStatusType.WAITING) {
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- // 涓嬪彂绔欑偣淇℃伅
- staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(wrkMast.getStaNo());
- if (!MessageQueue.offer(SlaveType.Devp, rgvStn.getDevpPlcId(), new Task(2, staProtocol))) {
- continue;
- }
- // 鏇存柊宸ヤ綔妗ｇ姸鎬佷负14
- wrkMast.setWrkSts(14L);
- wrkMast.setOnlineYn("Y"); //鎺у埗WMS灏嗗伐浣滅姸鎬�14杞�15鐨勬椂鏈猴紝鍙湁RGV杩愭惉瀹屾垚鍚庢墠鍙互杞�
- wrkMast.setCrnEndTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) != 0) {
- // 澶嶄綅RGV宸ヤ綅1
- rgvThread.setResetFlag1(true);
- } else {
- log.error("RGV宸ヤ綅1鎺ラ┏锛屾洿鏂板伐浣滄。鐨勫伐浣滅姸鎬佷负2澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
- }
- }
- // 鍒ゆ柇RGV鐘舵�佺瓑寰呯‘璁�,宸ヤ綅2
- if (rgvProtocol.modeType == RgvModeType.AUTO && rgvProtocol.getTaskNo2().equals(wrkMast.getWrkNo().shortValue())
- && rgvProtocol.statusType2 == RgvStatusType.WAITING) {
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- // 涓嬪彂绔欑偣淇℃伅
- staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(wrkMast.getStaNo());
- if (!MessageQueue.offer(SlaveType.Devp, rgvStn.getDevpPlcId(), new Task(2, staProtocol))) {
- continue;
- }
- // 鏇存柊宸ヤ綔妗ｇ姸鎬佷负14
- wrkMast.setWrkSts(14L);
- wrkMast.setOnlineYn("Y"); //鎺у埗WMS灏嗗伐浣滅姸鎬�14杞�15鐨勬椂鏈猴紝鍙湁RGV杩愭惉瀹屾垚鍚庢墠鍙互杞�
- wrkMast.setCrnEndTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) != 0) {
- // 澶嶄綅RGV宸ヤ綅2
- rgvThread.setResetFlag2(true);
- } else {
- log.error("RGV宸ヤ綅2鎺ラ┏锛屾洿鏂板伐浣滄。鐨勫伐浣滅姸鎬佷负2澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
- }
- }
- }
-
- }
- }
- }
}
/**
@@ -3338,26 +2433,26 @@
}
}
- /**
- * 鍒濆鍖朢GV鍦板浘
- */
- public synchronized void initRgvMap() {
- Object data = redisUtil.get("rgv_map");
- if (data == null) {
- //閲嶆柊鑾峰彇鍏ㄨ矾寰勫湴鍥�
- BasRgvPath basRgvPath = basRgvPathService.selectByRgvNo(0);//鑾峰彇榛樿璺緞
- if (basRgvPath != null) {
- ArrayList<RgvNode> rgvNodes = new ArrayList<>();
- List<Integer> rgvPath = JSON.parseArray(basRgvPath.getPath(), Integer.class);
- for (Integer integer : rgvPath) {
- RgvNode rgvNode = new RgvNode(integer);
- rgvNodes.add(rgvNode);
- }
- //灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
- redisUtil.set("rgv_map", JSON.toJSONString(rgvNodes));
- }
- }
- }
+// /**
+// * 鍒濆鍖朢GV鍦板浘
+// */
+// public synchronized void initRgvMap() {
+// Object data = redisUtil.get("rgv_map");
+// if (data == null) {
+// //閲嶆柊鑾峰彇鍏ㄨ矾寰勫湴鍥�
+// BasRgvPath basRgvPath = basRgvPathService.selectByRgvNo(0);//鑾峰彇榛樿璺緞
+// if (basRgvPath != null) {
+// ArrayList<RgvNode> rgvNodes = new ArrayList<>();
+// List<Integer> rgvPath = JSON.parseArray(basRgvPath.getPath(), Integer.class);
+// for (Integer integer : rgvPath) {
+// RgvNode rgvNode = new RgvNode(integer);
+// rgvNodes.add(rgvNode);
+// }
+// //灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
+// redisUtil.set("rgv_map", JSON.toJSONString(rgvNodes));
+// }
+// }
+// }
/**
* 鍫嗗灈鏈烘紨绀� ===>> 搴撲綅绉昏浆
@@ -3571,97 +2666,6 @@
}
- }
-
- public synchronized void outOfDevp() {
- List<WrkMast> wrkMasts = wrkMastMapper.selectPick();
- for (WrkMast wrkMast : wrkMasts) {
- if (basDevpService.selectCount(new EntityWrapper<BasDevp>().eq("wrk_no", wrkMast.getWrkNo())) == 0) {
- wrkMast.setCtnNo("Y");
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- log.error("淇敼{}宸ヤ綔妗ｅけ璐ワ紝ctn_no", wrkMast.getWrkNo());
- }
- }
-
- }
- }
-
-
- public synchronized void autoEmptyOut() {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- Integer autoOutSite = 12;
- //濡傛灉绔欑偣鍙嚭绂佺敤锛屽垯涓嶇敓鎴愮┖鐩樺嚭搴撲换鍔�
- StaProtocol staProtocol = devpThread.getStation().get(autoOutSite);
- if (staProtocol == null) {
- return;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (staProtocol.isAutoing() //鑷姩
- && !staProtocol.isLoading() //鏃犵墿
- && staProtocol.isOutEnable() //鍙嚭淇″彿
- && staProtocol.getWorkNo() == 0
- ) {
- WrkMast pakoutEmpty = wrkMastMapper.selectPakoutEmpty(autoOutSite);
- if (null != pakoutEmpty) {
- return;
- }
- try {
- String response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/auto/emptyOut/v1")
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- JSONObject data = (JSONObject) jsonObject.get("data");
- log.info((String) data.get("msg"));
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/auto/emptyOut/v1","", response);
- }
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }
- }
- }
-
- public synchronized void autoEmptyIn() {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- Integer autoInSite = 12;
- StaProtocol staProtocol = devpThread.getStation().get(autoInSite);
- if (staProtocol == null) {
- return;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (staProtocol.isAutoing() //鑷姩
- && staProtocol.isLoading() //鏈夌墿
- && staProtocol.isInEnable() //鍙叆淇″彿
- && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990) //宸ヤ綔鍙蜂负0鎴栬�呭伐浣滃彿鏄�9991~9999锛堣緭閫佹満鐣欑敤锛�
- ) {
-
- try {
- LocTypeDto locTypeDto = new LocTypeDto((short) 1, (short) 1, (short) 1);
-
-
- String response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/auto/emptyIn/v1")
- .setJson(JSON.toJSONString(locTypeDto))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- log.info((String) jsonObject.get("msg"));
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/auto/emptyIn/v1", JSON.toJSONString(locTypeDto), response);
- }
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }
- }
}
// /**
@@ -4276,9 +3280,11 @@
&& rgvProtocol.getTaskNo1()==0 && rgvProtocol.getTaskNo2()==0
) {
switch (sign){
- case 1://鎵ц灏忚溅璐х墿鎼繍浠诲姟
+ //鎵ц灏忚溅璐х墿鎼繍浠诲姟
+ case 1:
signWork = rgvRunWrkMastFullSta();
break;
+ //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
case 2://鏀�//鎷嗙洏
signWork = rgvRunWrkMastEmptyStaPut();
break;
@@ -4295,7 +3301,6 @@
// signWork = qwe();
break;
default:
-// signWork = rgvRunWrkMastEmptyStaAvoidance();//閬胯
break;
}
}
@@ -4320,7 +3325,10 @@
// signWork = rgvRunWrkMastEmptyStaPut();
break;
default:
-// signWork = rgvRunWrkMastEmptyStaAvoidance();//閬胯
+ if (sign>6){
+ rgvRunWrkMastEmptyStaAvoidance();//閬胯
+ signWork = true;
+ }
break;
}
}
@@ -4506,7 +3514,7 @@
List<Integer> route = RouteUtils.getRoute(basRgvMap.getStartRoute(), basRgvMap.getEndRoute());//鑾峰彇娲诲姩鑼冨洿
List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectNoInterfereList(route, route);//鏌ヨ鍙墽琛屼换鍔�
for (WrkMastSta wrkMastSta : wrkMastStaList){
- if (wrkMastSta.getType()!=2 || wrkMastSta.getWrkType()!=6){// 2:绌烘澘 || 宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 5锛氭弧鍙� 6锛氭弧鏀�
+ if (wrkMastSta.getType()!=2 || wrkMastSta.getWrkType()!=6){// 2:绌烘澘 || 宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 5锛氭弧鍙� 6锛氭弧鏀� 7:鎻愬崌
continue;
}
boolean sign = false;
@@ -4694,13 +3702,6 @@
public synchronized void rgvRunWrkMastEmptyStaAvoidance() {
try{
Integer integer = wrkMastStaMapper.selectAllWrkStsCount(null,0);//鏌ヨ鐘舵�佷负0鐨勪换鍔�
- if (integer==0){
- return;
- }
- //鏌ヨ鏄惁闇�瑕侀伩璁�
- //鏈畬鎴�
- Thread.sleep(1000);
- integer = wrkMastStaMapper.selectAllWrkStsCount(null,0);//鏌ヨ鐘舵�佷负0鐨勪换鍔�
if (integer==0){
return;
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 48c9273..da89273 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -71,21 +71,6 @@
mainService.storeFinished();
/////////////////////////////////////RGV璋冨害/////////////////////////////////////
-
-// //缁戝畾灏忚溅鏂规硶
-// mainService.rgvBindSte();
-// mainService.rgvBindSte2();
-//// // 鍏ュ嚭搴� ===>> RGV鍏ュ嚭搴撲綔涓氫笅鍙�
-// mainService.rgvIoExecute();
-// // RGV鍏ュ簱 ===>> 鏍规嵁RGV瀹屾垚淇″彿,鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
-// mainService.rgvFinished();
-// // 鍏ュ嚭搴� ===>> RGV鍑哄簱绔欏埌绯荤粺鍏ュ嚭搴撶珯
-// mainService.rgvDestStnToCrnStn();
-// // 鍑哄簱 ===>> RGV鍑哄簱绔欏埌绯荤粺鍑哄簱绔�
-// mainService.rgvOutDStnToOutStn();
-
- //瀹屾垚灏忚溅浠诲姟
- mainService.rgvCompleteWrkMastSta();
i++;
if (i<7) {
// RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
@@ -97,40 +82,24 @@
}else {
i = 0;
}
-
-
-// //鎵ц灏忚溅璐х墿鎼繍浠诲姟
-// mainService.rgvRunWrkMastFullSta();
-// //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
-// mainService.rgvRunWrkMastEmptyStaPut();//鏀�//鎷嗙洏
-// mainService.rgvRunWrkMastEmptyStaPutFull();//婊℃斁
-// mainService.rgvRunWrkMastEmptyStaTake();//鍙栧彔鐩�
-// mainService.rgvRunWrkMastEmptyStaTakeFull();////婊″彇
-// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-
+ //瀹屾垚灏忚溅浠诲姟
+ mainService.rgvCompleteWrkMastSta();
/////////////////////////////////////RGV璋冨害/////////////////////////////////////
// 寮傚父淇℃伅璁板綍
mainService.recErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐� 2妤�
mainService.storeEmptyPlt();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
- mainService.storeEmptyPlt2();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満绌烘澘鍏ュ簱
mainService.storeEmptyPlt3();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
+ mainService.storeEmptyPlt2();
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖� 1妤兼媶鍨涗綅缃� 绌烘澘鍙犵洏
mainService.storeEmptyPlt4();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
-
-// mainService.outOfDevp();
-
-// //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
-// mainService.autoEmptyOut();
-// //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-// mainService.autoEmptyIn();
// // 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
// i++;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7e5742b..59554c9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -339,9 +339,6 @@
port: 102
rack: 0
slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 122
# WMS鍏ュ簱鍙�1
inWmsSta[0]:
staNo: 145
--
Gitblit v1.9.1