From 4ee4a2c9ed0ad3d99925ebef95cdba0836f0e217 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 12 十月 2022 10:55:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 275 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 179 insertions(+), 96 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 d57809e..39cac0e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.mapper.WrkChargeMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
@@ -85,6 +86,8 @@
private BasSteErrService basSteErrService;
@Autowired
private CommonService commonService;
+ @Autowired
+ private WrkChargeMapper wrkChargeMapper;
/**
* 缁勬墭
@@ -481,6 +484,8 @@
}
// 搴撲綅绉昏浆
this.locToLoc(crn, crnProtocol);
+ // 婕旂ず浠诲姟
+ this.steMoveDemo(crn, crnProtocol);
}
}
}
@@ -549,10 +554,10 @@
if (steNo != null) {
// 灏忚溅琛岃蛋鍒板爢鍨涙満寰呮惉绉荤偣
if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
-// if (null != wrkMastMapper.selectPakin(slave.getId(), steNo)) {
-// continue;
-// }
- this.letCarBeReady(wrkMast, steNo, wrkMast.getLocNo());
+ // 娌℃湁鍏朵粬浠诲姟
+ if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
+ this.letCarBeReady(wrkMast, steNo, wrkMast.getLocNo());
+ }
}
// 灏忚溅鎼蛋
if (wrkMast.getWrkSts() == 3L) {
@@ -608,7 +613,10 @@
if (steNo != null) {
// 灏忚溅琛岃蛋鍒板爢鍨涙満寰呮惉绉荤偣
if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
- this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());
+ // 娌℃湁鍏朵粬浠诲姟
+ if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
+ this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());
+ }
}
// 鍫嗗灈鏈哄皢璐ф斁鑷冲皬杞︿笂 3.灏忚溅寰呮惉锛堝皬杞︿笉鐢ㄦ惉杩愶紝宸茬粡鍦ㄥ綋鍓嶇粍搴撲綅锛� / 6.灏忚溅寰呭叆 ===>> 7.鍚婅溅鍏ュ簱涓�
if (wrkMast.getWrkSts() == 3L || wrkMast.getWrkSts() == 6L) {
@@ -655,8 +663,11 @@
// 瀵绘壘褰撳墠鍫嗗灈鏈哄搴旂殑灏忚溅
SteThread steThread = queryIdleCar(wrkMast);
if (steThread != null) {
- // 璁╁皬杞︾瓑寰呮惉杩愬緟缁�
- this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getLocNo());
+ // 娌℃湁鍏朵粬浠诲姟
+ if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
+ // 璁╁皬杞︾瓑寰呮惉杩愬緟缁�
+ this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getLocNo());
+ }
}
}
// 鍫嗗灈鏈烘惉杩愬皬杞�
@@ -835,8 +846,11 @@
// 瀵绘壘鏈�杩戠殑灏忚溅
SteThread steThread = queryIdleCar(wrkMast);
if (steThread != null) {
- // 璁╁皬杞︾瓑寰呮惉杩愬緟缁�
- this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getSourceLocNo());
+ // 娌℃湁鍏朵粬浠诲姟
+ if (null == wrkMastMapper.selectPakout(slave.getId(), steNo)) {
+ // 璁╁皬杞︾瓑寰呮惉杩愬緟缁�
+ this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getSourceLocNo());
+ }
}
}
// 鍫嗗灈鏈烘惉杩愬皬杞�
@@ -1296,6 +1310,40 @@
}
/**
+ * 璁╁皬杞︿粠 杩滅偣 ====>> 绉诲姩鍒拌繎鐐�
+ * 绛夊緟鍫嗗灈鏈烘惉杩�
+ */
+ public void letCarBeReady(WrkCharge wrkCharge, Integer steNo) {
+ // 鑾峰彇绌挎杞︿俊鎭�
+ SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
+ SteProtocol steProtocol = steThread.getSteProtocol();
+ if (steProtocol == null) { return; }
+ if (steProtocol.isIdle()) {
+
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+ SteCommand steCommand = new SteCommand();
+ steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
+ steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙�
+ steCommand.setTaskMode(SteTaskModeType.findOriginByLoc(steProtocol)); // 浠诲姟妯″紡: 鍘昏繎鐐� 绛夊緟鍫嗗灈鏈哄弶鍙�
+
+ steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
+ steCommand.setBay(steProtocol.getBay());
+ steCommand.setLev(steProtocol.getLev());
+
+ if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
+ log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
+ } else {
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞�
+ wrkCharge.setSteNo(steNo);
+ wrkCharge.setModiTime(new Date());
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ }
+ }
+ }
+ }
+
+ /**
* 鍏ュ嚭搴� ===>> 鍫嗗灈鏈烘惉鍏ュ皬杞�
*/
public void carMoveIn(WrkMast wrkMast, Integer steNo, CrnProtocol crnProtocol) {
@@ -1451,6 +1499,20 @@
wrkCharge.setWrkSts(24L);
if (!wrkChargeService.updateById(wrkCharge)) {
log.error("淇敼鍏呯數浠诲姟鐘舵�� 23.鍚婅溅鎼繍 ===>> 24.灏忚溅鍒拌揪 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ } else {
+ // 鍫嗗灈鏈哄浣�
+ crnThread.setResetFlag(true);
+ // 绌挎杞﹂噸鏂板畾浣嶆帓鍒楀眰
+ SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
+ if (!steThread.confirmPos()) {
+ log.error("{}鍙风┛姊溅閲嶆柊瀹氫綅澶辫触锛佷綔涓氬厖鐢典换鍔″彿锛歿}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
+ }
+ }
+ } else if (wrkCharge.getWrkSts() == 34) {
+ // 34.鍚婅溅鎼繍 ===>> 35.灏忚溅灏辩华
+ wrkCharge.setWrkSts(35L);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼鍏呯數浠诲姟鐘舵�� 34.鍚婅溅鎼繍 ===>> 35.灏忚溅灏辩华 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
} else {
// 鍫嗗灈鏈哄浣�
crnThread.setResetFlag(true);
@@ -1774,6 +1836,22 @@
wrkCharge.setWrkSts(26L);
if (!wrkChargeService.updateById(wrkCharge)) {
log.error("淇敼鍏呯數浠诲姟鐘舵�� 25.灏忚溅鍘诲厖鐢� ===>> 26.绛夊緟鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ } else {
+ steThread.setResetFlag(true);
+ }
+ } else if (wrkCharge.getWrkSts() == 32) {
+ // 32.灏忚溅璧拌 ===>> 33.灏忚溅寰呮惉
+ wrkCharge.setWrkSts(33L);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼婕旂ず浠诲姟鐘舵�� 25.灏忚溅鍘诲厖鐢� ===>> 26.绛夊緟鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ } else {
+ steThread.setResetFlag(true);
+ }
+ } else if (wrkCharge.getWrkSts() == 36) {
+ // 36.灏忚溅璧拌 ===>> 37.婕旂ず瀹屾垚
+ wrkCharge.setWrkSts(37L);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼婕旂ず浠诲姟鐘舵�� 36.灏忚溅璧拌 ===>> 37.婕旂ず瀹屾垚 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
} else {
steThread.setResetFlag(true);
}
@@ -2347,6 +2425,7 @@
wrkCharge.setCrnNo(basSte.getCrnNo());
wrkCharge.setIoPri((double) 10);
wrkCharge.setLocNo(idleLoc);
+ wrkCharge.setMemo("charge");
if (!wrkChargeService.insert(wrkCharge)) {
log.error("淇濆瓨{}鍙风┛姊溅鍏呯數浠诲姟澶辫触!!!", ste.getId());
continue;
@@ -2480,7 +2559,7 @@
// filter
if (wrkChargeService.selectCount(new EntityWrapper<WrkCharge>()
- .eq("crn_no", crn.getId()).lt("wrk_sts", 35)) > 0) {
+ .eq("crn_no", crn.getId()).between("wrk_sts", 31, 36)) > 0) {
continue;
}
@@ -2549,9 +2628,9 @@
wrkCharge.setIoPri((double) 10);
wrkCharge.setSourceLocNo(sourceLocNo);
wrkCharge.setLocNo(locNo);
+ wrkCharge.setMemo("demo");
if (!wrkChargeService.insert(wrkCharge)) {
log.error("鐢熸垚婕旂ず浠诲姟澶辫触锛屽爢鍨涙満鍙凤細{}锛屽皬杞︼細{}锛屾簮搴撲綅锛歿}锛岀洰鏍囧簱浣嶏細{}", crn.getId(), steNo, sourceLocNo, locNo);
- continue;
}
}
}
@@ -2559,93 +2638,97 @@
}
/**
- * 鍫嗗灈鏈烘紨绀� ===>> 搴撲綅绉昏浆
+ * 婕旂ず鍙栬揣
*/
- public synchronized void crnDemoOfLocMove(){
- for (CrnSlave crn : slaveProperties.getCrn()) {
- if (!crn.getDemo()) { continue; } // 蹇呴』涓烘紨绀虹姸鎬�
-
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) { continue; }
-
- log.info("{}鍙峰爢鍨涙満姝ｅ湪婕旂ず", crn.getId());
-
- // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
- if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
-// // 鑾峰彇绉诲簱宸ヤ綔妗ｄ俊鎭�
-// WrkMast wrkMast = wrkMastMapper.selectLocMove(crn.getId());
-// if (null != wrkMast) { continue; }
-//
-// LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn.getId());
-// LocMast loc = locMastService.queryDemoLoc(crn.getId());
-// if (null == sourceLoc || null == loc) { continue; }
-//
-// String sourceLocNo = sourceLoc.getLocNo();
-// String locNo = loc.getLocNo();
-//
-// // 鑾峰彇宸ヤ綔鍙�
-// int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
-// // 淇濆瓨宸ヤ綔妗�
-// wrkMast = new WrkMast();
-// wrkMast.setWrkNo(workNo);
-// wrkMast.setIoTime(new Date());
-// wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
-// wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
-// wrkMast.setIoPri(13D);
-// wrkMast.setCrnNo(crn.getId());
-// wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
-// wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
-// wrkMast.setFullPlt("N"); // 婊℃澘锛歒
-// wrkMast.setPicking("N"); // 鎷ｆ枡
-// wrkMast.setExitMk("N"); // 閫�鍑�
-// wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 绌烘澘
-// wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
-// wrkMast.setLinkMis("N");
-// wrkMast.setAppeTime(new Date());
-// wrkMast.setModiTime(new Date());
-// int res = wrkMastMapper.insert(wrkMast);
-// if (res == 0) {
-// throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
-// }
-// // 宸ヤ綔妗ｆ槑缁嗕繚瀛�
-// List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
-// for (LocDetl locDetl : locDetls) {
-// WrkDetl wrkDetl = new WrkDetl();
-// wrkDetl.sync(locDetl);
-// wrkDetl.setWrkNo(workNo);
-// wrkDetl.setIoTime(new Date());
-// wrkDetl.setAnfme(locDetl.getAnfme());
-// wrkDetl.setAppeTime(new Date());
-// wrkDetl.setModiTime(new Date());
-// if (!wrkDetlService.insert(wrkDetl)) {
-// throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
-// }
-// }
-// // 淇敼婧愬簱浣嶇姸鎬�
-// if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) {
-// sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
-// sourceLoc.setModiTime(new Date());
-// if (!locMastService.updateById(sourceLoc)){
-// throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
-// }
-// } else {
-// throw new CoolException("婧愬簱浣嶅嚭搴撳け璐�");
-// }
-// // 淇敼鐩爣搴撲綅鐘舵��
-// if (loc.getLocSts().equals("O")) {
-// loc.setLocSts("S"); // S.鍏ュ簱棰勭害
-// loc.setModiTime(new Date());
-// if (!locMastService.updateById(loc)) {
-// throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
-// }
-// } else {
-// throw new CoolException("绉昏浆澶辫触");
-// }
-
- }
-
+ private void steMoveDemo(CrnSlave slave, CrnProtocol crnProtocol) {
+ // 鑾峰彇宸ヤ綔妗ｄ俊鎭�
+ WrkCharge wrkCharge = wrkChargeService.selectOne(new EntityWrapper<WrkCharge>().eq("crn_no", slave.getId())
+ .in("wrk_sts", 31, 33, 35));
+ if (null == wrkCharge) {
+ return;
}
+ SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
+ SteProtocol steProtocol = steThread.getSteProtocol();
+ if (null == steProtocol) { return; }
+ if (steProtocol.isIdle()) {
+ // 31.鐢熸垚婕旂ずID
+ if (wrkCharge.getWrkSts() == 31L) {
+ this.letCarBeReady(wrkCharge, steProtocol.getSteNo().intValue());
+ wrkCharge.setWrkSts(32L);
+ wrkCharge.setModiTime(new Date());
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼婕旂ず浠诲姟{}宸ヤ綔妗� 31.鐢熸垚婕旂ずID ==>> 32.灏忚溅璧拌 澶辫触!", wrkCharge.getWrkNo());
+ }
+ // 33.灏忚溅寰呮惉
+ } else if (wrkCharge.getWrkSts() == 33L) {
+ LocMast locMast = locMastService.selectById(wrkCharge.getLocNo());
+ // 鍫嗗灈鏈哄懡浠や笅鍙戝尯 --------------------------------------------------------------------------
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue()); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY(steProtocol.getBay()); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ(steProtocol.getLev()); // 婧愬簱浣嶅眰
+ crnCommand.setDestinationPosX(Utils.getGroupRow(locMast.getLocNo()).shortValue()); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞�
+ if (!MessageQueue.offer(SlaveType.Crn, wrkCharge.getCrnNo(), new Task(2, crnCommand))) {
+ log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
+ } else {
+ // 淇敼绌挎杞﹁繍琛屼腑鎺掑垪灞�
+ steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo()), locMast.getBay1(), locMast.getLev1());
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 33.灏忚溅寰呮惉 => 34.鍚婅溅鎼繍
+ Date now = new Date();
+ wrkCharge.setWrkSts(34L);
+ wrkCharge.setCrnStrTime(now);
+ wrkCharge.setModiTime(now);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼婕旂ず浠诲姟{}宸ヤ綔妗� 33.灏忚溅寰呮惉 => 34.鍚婅溅鎼繍 澶辫触!", wrkCharge.getWrkNo());
+ }
+ }
+ // 35.灏忚溅灏辩华
+ } else if (wrkCharge.getWrkSts() == 35L) {
+
+ int steNo = steProtocol.getSteNo().intValue();
+ if (!basSteService.updatePakMk(steNo, "Y")) {
+ log.error("淇敼绌挎杞︿綔涓氱姸鎬� 澶辫触锛侊紒锛岀┛姊溅={}", steNo);
+ return;
+ }
+
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+ SteCommand steCommand = new SteCommand();
+ steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
+ steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙�
+ SteTaskModeType originByLoc = SteTaskModeType.findOriginByLoc(steProtocol.getRow());
+ if (originByLoc.equals(SteTaskModeType.GO_ORIGIN)) {
+ originByLoc = SteTaskModeType.BACK_ORIGIN;
+ } else if (originByLoc.equals(SteTaskModeType.BACK_ORIGIN)) {
+ originByLoc = SteTaskModeType.GO_ORIGIN;
+ } else {
+ return;
+ }
+ steCommand.setTaskMode(originByLoc);
+
+ steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
+ steCommand.setBay(steProtocol.getBay());
+ steCommand.setLev(steProtocol.getLev());
+
+ if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
+ log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
+ } else {
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 35.灏忚溅灏辩华 => 36.灏忚溅璧拌
+ wrkCharge.setWrkSts(36L);
+ wrkCharge.setModiTime(new Date());
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼婕旂ず浠诲姟{}宸ヤ綔妗� 35.灏忚溅灏辩华 => 36.灏忚溅璧拌 澶辫触!", wrkCharge.getWrkNo());
+ }
+ }
+ }
+ }
+
}
+
}
--
Gitblit v1.9.1