From 4e31f32d04c9826e2fac777dd679286f6dd5ac95 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 01 十一月 2022 14:41:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WrkChargeService.java | 4 -
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 146 ++++++++++++++++++++++++++++++++++++++++++------
src/main/resources/mapper/WrkChargeMapper.xml | 13 ++++
src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java | 10 ++
src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java | 5 +
5 files changed, 150 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java b/src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java
index db9e854..05ba57f 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java
@@ -3,14 +3,15 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkCharge;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface WrkChargeMapper extends BaseMapper<WrkCharge> {
- WrkCharge selectWorking(Integer steNo);
+ WrkCharge selectWorkingOfCharge(@Param("steNo") Integer steNo);
-
+ WrkCharge selectWorkingOfReset(@Param("steNo") Integer steNo);
}
diff --git a/src/main/java/com/zy/asrs/service/WrkChargeService.java b/src/main/java/com/zy/asrs/service/WrkChargeService.java
index 53209ef..ecad01e 100644
--- a/src/main/java/com/zy/asrs/service/WrkChargeService.java
+++ b/src/main/java/com/zy/asrs/service/WrkChargeService.java
@@ -5,8 +5,6 @@
public interface WrkChargeService extends IService<WrkCharge> {
- WrkCharge selectWorking(Integer steNo);
-
-
+ WrkCharge selectWorking(Integer steNo, String memo);
}
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 2994db2..6ce448c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1665,6 +1665,34 @@
log.error("{}鍙风┛姊溅閲嶆柊瀹氫綅澶辫触锛佷綔涓氬厖鐢典换鍔″彿锛歿}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
}
}
+ } else if (wrkCharge.getWrkSts() == 42) {
+ // 42.鍚婅溅鎼繍 ===>> 43.灏忚溅鍒拌揪
+ wrkCharge.setWrkSts(43L);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼澶嶄綅浠诲姟鐘舵�� 42.鍚婅溅鎼繍 ===>> 43.灏忚溅鍒拌揪 澶辫触锛侊紒锛屽伐浣滃彿={}", 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() == 46) {
+ // 46.鏀捐嚦寰呮満浣� ===>> 47.澶嶄綅鎴愬姛
+ wrkCharge.setWrkSts(47L);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼澶嶄綅浠诲姟鐘舵�� 46.鏀捐嚦寰呮満浣� ===>> 47.澶嶄綅鎴愬姛 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ } else {
+ // 鍫嗗灈鏈哄浣�
+ crnThread.setResetFlag(true);
+ // 绌挎杞﹂噸鏂板畾浣嶆帓鍒楀眰
+ SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
+ if (!steThread.confirmPos()) {
+ log.error("{}鍙风┛姊溅閲嶆柊瀹氫綅澶辫触锛佷綔涓氬浣嶄换鍔″彿锛歿}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
+ }
+ }
}
}
@@ -1906,6 +1934,14 @@
wrkCharge.setWrkSts(37L);
if (!wrkChargeService.updateById(wrkCharge)) {
log.error("淇敼婕旂ず浠诲姟鐘舵�� 36.灏忚溅璧拌 ===>> 37.婕旂ず瀹屾垚 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ } else {
+ steThread.setResetFlag(true);
+ }
+ } else if (wrkCharge.getWrkSts() == 44) {
+ // 44.灏忚溅璧拌 ===>> 45.灏忚溅寰呮惉
+ wrkCharge.setWrkSts(45L);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼婕旂ず浠诲姟鐘舵�� 44.灏忚溅璧拌 ===>> 45.灏忚溅寰呮惉 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
} else {
steThread.setResetFlag(true);
}
@@ -2473,7 +2509,7 @@
if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())) {
continue;
}
- WrkCharge wrkCharge = wrkChargeService.selectWorking(null);
+ WrkCharge wrkCharge = wrkChargeService.selectWorking(null, "charge");
if (wrkCharge == null && steProtocol.getChargeStatus() == 0) {
// 瀵绘壘绌洪棽鍏呯數妗�
@@ -2640,7 +2676,7 @@
crnCommand.setDestinationPosX(chargeLoc.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(chargeLoc.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(chargeLoc.getLev1().shortValue()); // 鐩爣搴撲綅灞�
- if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(2, crnCommand))) {
+ if (!MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(crnCommand));
} else {
// 淇敼绌挎杞﹁繍琛屼腑鎺掑垪灞�
@@ -2683,7 +2719,7 @@
*/
public synchronized void steFromChargeToIdleLoc() {
// 涓庡厖鐢典换鍔′笉鍚屾杩涜
- if (null != wrkChargeService.selectWorking(null)) { return; }
+ if (null != wrkChargeService.selectWorking(null, "charge")) { return; }
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
// 妫�绱㈠厖鐢垫々
for (SteChargeType value : SteChargeType.values()) {
@@ -2719,22 +2755,27 @@
&& steProtocol.getCharge() < Float.parseFloat(basSte.getChargeLine())) {
continue;
}
- // 寮�濮嬬┛姊溅澶嶄綅浠诲姟
- WrkCharge wrkCharge = new WrkCharge();
- wrkCharge.setSteNo(steNo);
- wrkCharge.setWrkNo(commonService.getChargeWorkNo(6));
- wrkCharge.setWrkSts(41L); // 41.灏忚溅鍑嗗澶嶄綅
- wrkCharge.setCrnNo(2); // 鍥哄畾2鍙峰爢鍨涙満
- wrkCharge.setIoPri((double) 10);
- wrkCharge.setSourceLocNo(value.locNo);
- wrkCharge.setLocNo(basSte.getIdleLoc());
- wrkCharge.setMemo("reset");
- if (!wrkChargeService.insert(wrkCharge)) {
- log.error("淇濆瓨{}鍙风┛姊溅澶嶄綅浠诲姟澶辫触!!!", steNo);
- continue;
+
+ WrkCharge wrkCharge = wrkChargeService.selectWorking(null, "reset");
+
+ if (wrkCharge == null) {
+ // 寮�濮嬬┛姊溅澶嶄綅浠诲姟
+ wrkCharge = new WrkCharge();
+ wrkCharge.setSteNo(steNo);
+ wrkCharge.setWrkNo(commonService.getChargeWorkNo(6));
+ wrkCharge.setWrkSts(41L); // 41.灏忚溅鍑嗗澶嶄綅
+ wrkCharge.setCrnNo(2); // 鍥哄畾2鍙峰爢鍨涙満
+ wrkCharge.setIoPri((double) 10);
+ wrkCharge.setSourceLocNo(value.locNo);
+ wrkCharge.setLocNo(basSte.getIdleLoc());
+ wrkCharge.setMemo("reset");
+ if (!wrkChargeService.insert(wrkCharge)) {
+ log.error("淇濆瓨{}鍙风┛姊溅澶嶄綅浠诲姟澶辫触!!!", steNo);
+ continue;
+ }
}
- // 1.鎼繍鑷冲浐瀹氶�氶亾
+ // 鎼繍鑷冲浐瀹氶�氶亾
if (wrkCharge.getWrkSts() == 41L) {
// 鎼皬杞﹁嚦灏忚溅璧板悜閫氶亾
List<String> channel = slaveProperties.getChannel();
@@ -2764,18 +2805,18 @@
crnCommand.setDestinationPosX(Utils.getGroupRow(channelLoc.getLocNo(), false).shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(channelLoc.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(channelLoc.getLev1().shortValue()); // 鐩爣搴撲綅灞�
- if (!MessageQueue.offer(SlaveType.Crn, wrkCharge.getCrnNo(), new Task(2, crnCommand))) {
+ if (!MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
} else {
// 淇敼绌挎杞﹁繍琛屼腑鎺掑垪灞�
- steThread.modifyPos(Utils.getGroupRow(channelLoc.getLocNo(), true), channelLoc.getBay1(), channelLoc.getLev1());
+ steThread.modifyPos(Utils.getGroupRow(channelLoc.getLocNo(), false), channelLoc.getBay1(), channelLoc.getLev1());
// 淇敼宸ヤ綔妗ｇ姸鎬� 41.灏忚溅鍑嗗澶嶄綅 => 42.鍚婅溅鎼繍
Date now = new Date();
wrkCharge.setWrkSts(42L);
wrkCharge.setCrnStrTime(now);
wrkCharge.setModiTime(now);
if (!wrkChargeService.updateById(wrkCharge)) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 41.灏忚溅鍑嗗澶嶄綅 => 42.鍚婅溅鎼繍 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ log.error("淇敼澶嶄綅浠诲姟鐘舵�� 41.灏忚溅鍑嗗澶嶄綅 => 42.鍚婅溅鎼繍 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
}
}
break;
@@ -2783,7 +2824,72 @@
}
}
+ } else if (wrkCharge.getWrkSts() == 43L) {
+ // 灏忚溅琛岄┒閫氶亾
+ if (steProtocol.statusType.equals(SteStatusType.IDLE) && steProtocol.getPakMk().equals("N")) {
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+ SteCommand steCommand = new SteCommand();
+ steCommand.setSteNo(wrkCharge.getSteNo()); // 绌挎杞︾紪鍙�
+ steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙�
+ steCommand.setTaskMode(SteTaskModeType.BACK_ORIGIN); // 鍘诲乏绔�
+ steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue());
+ steCommand.setBay(steProtocol.getBay());
+ steCommand.setLev(steProtocol.getLev());
+ if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
+ log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
+ } else {
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 43.灏忚溅鍒拌揪 ===> 44.灏忚溅璧拌
+ wrkCharge.setWrkSts(44L);
+ Date now = new Date();
+ wrkCharge.setCrnEndTime(now);
+ wrkCharge.setModiTime(now);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼澶嶄綅浠诲姟鐘舵�� 43.灏忚溅鍒拌揪 ===> 44.灏忚溅璧拌 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ }
+ }
+ }
+ } else if (wrkCharge.getWrkSts() == 45L) {
+ LocMast idleLoc = locMastService.selectById(basSte.getIdleLoc());
+
+ Integer otherSte = existOtherSte(idleLoc.getLocNo(), wrkCharge.getSteNo());
+ if (null != otherSte) {
+ log.warn("{}鍙峰皬杞︾Щ鍏}搴撲綅缁勫け璐ワ紝鍘熷洜锛氬瓨鍦▄}鍙风┛姊溅锛�", wrkCharge.getSteNo(), idleLoc.getLocNo(), otherSte);
+ } else {
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkCharge.getCrnNo());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) { continue; }
+ // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
+ if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
+ // 鍫嗗灈鏈哄懡浠や笅鍙戝尯 --------------------------------------------------------------------------
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(wrkCharge.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue()); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY(steProtocol.getBay()); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ(steProtocol.getLev()); // 婧愬簱浣嶅眰
+ crnCommand.setDestinationPosX(Utils.getGroupRow(idleLoc.getLocNo(), true).shortValue()); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY(idleLoc.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ(idleLoc.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(idleLoc.getLocNo(), true), idleLoc.getBay1(), idleLoc.getLev1());
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 45.灏忚溅寰呮惉 => 46.鏀捐嚦寰呮満浣�
+ Date now = new Date();
+ wrkCharge.setWrkSts(46L);
+ wrkCharge.setCrnStrTime(now);
+ wrkCharge.setModiTime(now);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 45.灏忚溅寰呮惉 => 46.鏀捐嚦寰呮満浣� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ }
+ }
+ }
+
+ }
}
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java
index 662469a..5ce66bd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java
@@ -10,7 +10,13 @@
public class WrkChargeServiceImpl extends ServiceImpl<WrkChargeMapper, WrkCharge> implements WrkChargeService {
@Override
- public WrkCharge selectWorking(Integer steNo) {
- return this.baseMapper.selectWorking(steNo);
+ public WrkCharge selectWorking(Integer steNo, String memo) {
+ switch (memo) {
+ case "charge":
+ return this.baseMapper.selectWorkingOfCharge(steNo);
+ case "reset":
+ return this.baseMapper.selectWorkingOfReset(steNo);
+ }
+ return null;
}
}
diff --git a/src/main/resources/mapper/WrkChargeMapper.xml b/src/main/resources/mapper/WrkChargeMapper.xml
index 1063374..def654e 100644
--- a/src/main/resources/mapper/WrkChargeMapper.xml
+++ b/src/main/resources/mapper/WrkChargeMapper.xml
@@ -29,7 +29,7 @@
</resultMap>
- <select id="selectWorking" resultMap="BaseResultMap">
+ <select id="selectWorkingOfCharge" resultMap="BaseResultMap">
select top 1 *
from asr_wrk_charge
where 1=1
@@ -40,4 +40,15 @@
and memo = 'charge'
</select>
+ <select id="selectWorkingOfReset" resultMap="BaseResultMap">
+ select top 1 *
+ from asr_wrk_charge
+ where 1=1
+ <if test="steNo != null">
+ and ste_no = #{steNo}
+ </if>
+ and wrk_sts < 47
+ and memo = 'reset'
+ </select>
+
</mapper>
--
Gitblit v1.9.1