From ee1fcbd729e22329594a609919ae26ce8343f421 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 17 五月 2025 20:04:50 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/core/enums/WrkStsType.java | 2
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 95 ++++++++++++++++++++++++++++---
src/main/java/com/zy/asrs/domain/param/CreateInTaskParam.java | 3 +
src/main/java/com/zy/asrs/entity/WrkMast.java | 9 ++
src/main/java/com/zy/common/service/CommonService.java | 1
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 58 +++++++++++++++++++
6 files changed, 155 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/param/CreateInTaskParam.java b/src/main/java/com/zy/asrs/domain/param/CreateInTaskParam.java
index bef55f7..e5fe127 100644
--- a/src/main/java/com/zy/asrs/domain/param/CreateInTaskParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/CreateInTaskParam.java
@@ -8,6 +8,9 @@
//wms浠诲姟鍙�
private String taskNo;
+ //wms浠诲姟鍙�
+ private String taskNo2;
+
//婧愮珯
private Integer sourceStaNo;
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 193887b..adbc709 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -9,7 +9,8 @@
import com.core.common.SpringUtils;
import com.zy.asrs.mapper.BasWrkIotypeMapper;
import com.zy.asrs.mapper.BasWrkStatusMapper;
-import com.zy.asrs.service.*;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.LocMastService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -166,6 +167,12 @@
@ApiModelProperty(value= "WMS浠诲姟鍙�")
@TableField(value = "wms_wrk_no")
private String wmsWrkNo;
+ /**
+ * WMS浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "WMS浠诲姟鍙�2")
+ @TableField(value = "wms_wrk_no2")
+ private String wmsWrkNo2;
/**
* 绯荤粺娑堟伅
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 8ce3dc2..8904c2d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -217,6 +217,17 @@
if (Cools.isEmpty(barcode) || "?".endsWith(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
continue;
}
+
+ //妫�娴嬫槸鍚﹀瓨鍦ㄥ嚭搴撲换鍔�
+ List<WrkMast> wrkMastOutList = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .in("sta_no", 1024, 1013)
+ .eq("io_type", 101));
+ if (!wrkMastOutList.isEmpty()) {
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol.getSiteId()));
+ News.error("绔欑偣瀛樺湪鍑哄簱浠诲姟,绂佹鍏ュ簱,绔欑偣={}", staProtocol.getSiteId());
+ continue;
+ }
+
// 鍒ゆ柇閲嶅宸ヤ綔妗�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_sta_no", inSta.getStaNo()).eq("barcode", barcode));
if (wrkMast != null && wrkMast.getWrkSts() == WrkStsType.NEW_INBOUND.sts) {
@@ -346,6 +357,17 @@
Short workNo = staProtocol.getWorkNo();
if (staProtocol.isAutoing() && staProtocol.isLoading() && isInEnable(devpThread, inSta.getStaNo()) && !staProtocol.isEmptyMk() && (workNo == 0 || (workNo >= 9990 && workNo <= 9999)) && staProtocol.isPakMk()) {
String barcode = staProtocol.getBarcode();
+
+ //妫�娴嬫槸鍚﹀瓨鍦ㄥ嚭搴撲换鍔�
+ List<WrkMast> wrkMastOutList = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .in("sta_no", 1011, 1021)
+ .eq("io_type", 101));
+ if (!wrkMastOutList.isEmpty()) {
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol.getSiteId()));
+ News.error("绔欑偣瀛樺湪鍑哄簱浠诲姟,绂佹鍏ュ簱,绔欑偣={}", staProtocol.getSiteId());
+ continue;
+ }
+
// 鍒ゆ柇閲嶅宸ヤ綔妗�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_sta_no", inSta.getStaNo()).eq("barcode", barcode));
if (wrkMast == null) {
@@ -479,6 +501,26 @@
if (devpThread == null) {
continue;
}
+
+ //妫�娴嬫槸鍚﹀瓨鍦ㄥ叆搴撲换鍔�
+ Integer checkInSourceStaNo = null;
+ if (wrkMast.getStaNo() == 1013) {
+ checkInSourceStaNo = 1014;
+ } else if (wrkMast.getStaNo() == 1024) {
+ checkInSourceStaNo = 1025;
+ } else {
+ continue;
+ }
+ List<WrkMast> wrkMastInList = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("source_sta_no", checkInSourceStaNo)
+ .eq("io_type", 1));
+ if (!wrkMastInList.isEmpty()) {
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(3, wrkMast.getStaNo()));
+ News.error("绔欑偣瀛樺湪鍏ュ簱浠诲姟,绂佹鍑哄簱,绔欑偣={}", wrkMast.getStaNo());
+ continue;
+ }
+
+
Map<Integer, StaProtocol> station = devpThread.getStation();
StaProtocol staProtocol = station.get(wrkMast.getStaNo());
if (staProtocol == null) {
@@ -994,6 +1036,11 @@
if (wrkMast.getSourceStaNo() == 1022) {
led = 3;
} else if (wrkMast.getSourceStaNo() == 1031) {
+ //宸ヤ綔鍙蜂竴鑷村垽鏂�
+ if (!staProtocol.getFinishWorkNo().equals(wrkMast.getWmsWrkNo2())) {
+ News.taskInfo(wrkMast.getWrkNo(), "{}宸ヤ綔鍙�1锛寋}宸ヤ綔鍙�2锛�1135杩囨潵鐨勬墭鐩橈紝涓哄皢宸ヤ綔鍙峰啓鍒拌嚦1031", staProtocol.getFinishWorkNo(), wrkMast.getWmsWrkNo2());
+ return false;
+ }
}
// 灏哄妫�娴嬪紓甯�
boolean back = false;
@@ -1066,6 +1113,12 @@
staNo = 1023;
} else if (wrkMast.getSourceStaNo() == 1031) {
staNo = 1032;
+ //妫�娴�1135璐х墿鏄惁鍒拌揪1031锛屽埌杈炬墠鍏佽璧板埌1032
+ if (!(staProtocol.isAutoing()
+ && staProtocol.isLoading())
+ ) {
+ return false;
+ }
}
staProtocol = staProtocol.clone();
@@ -1286,6 +1339,26 @@
try {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", WrkStsType.NEW_OUTBOUND.sts, WrkStsType.OUTBOUND_SHUTTLE_RUN_COMPLETE.sts).in("sta_no", 1011, 1021, 1031));
for (WrkMast wrkMast : wrkMasts) {
+
+ //妫�娴嬫槸鍚﹀瓨鍦ㄥ叆搴撲换鍔�
+ Integer checkInSourceStaNo = null;
+ if (wrkMast.getStaNo() == 1011) {
+ checkInSourceStaNo = 1012;
+ } else if (wrkMast.getStaNo() == 1021) {
+ checkInSourceStaNo = 1022;
+ }
+
+ if (checkInSourceStaNo != null) {
+ List<WrkMast> wrkMastInList = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("source_sta_no", checkInSourceStaNo)
+ .eq("io_type", 1));
+ if (!wrkMastInList.isEmpty()) {
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(3, wrkMast.getStaNo()));
+ News.error("绔欑偣瀛樺湪鍏ュ簱浠诲姟,绂佹鍑哄簱,绔欑偣={}", wrkMast.getStaNo());
+ continue;
+ }
+ }
+
boolean step1 = this.liftOutExecuteStep1(wrkMast);//瑙﹀彂鎼繍浠诲姟
if (!step1) {
continue;
@@ -1411,8 +1484,6 @@
//鑾峰彇鎻愬崌鏈哄懡浠�
List<LiftCommand> liftCommands = liftThread.getPalletOutCommand(wrkMast.getWrkNo(), sourceLev, wrkMast.getStaNo());
LiftCommand liftCommand = liftCommands.get(0);
- int deviceWrk = commonService.getWorkNo(8);//鐢熸垚鎻愬崌鏈鸿澶囧伐浣滃彿
- liftCommand.setTaskNo(deviceWrk);//鏇存崲闅忔満浠诲姟鍙�
ArrayList<LiftCommand> commands = new ArrayList<>();
commands.add(liftCommand);
@@ -1847,16 +1918,18 @@
} else if (staProtocol.getSiteId() == 1031 && staProtocol.isLoading()) {
wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getFinishWorkNo()).eq("wrk_sts", WrkStsType.OUTBOUND_DEVP_RUN_2.sts));
if (wrkMast != null) {
- staProtocol.setWorkNo(Short.parseShort(String.valueOf(wrkMast.getWrkNo())));
+ staProtocol.setWorkNo(Short.parseShort(String.valueOf(wrkMast.getWmsWrkNo())));
staProtocol.setStaNo(Short.parseShort(String.valueOf(1135)));
- MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
- News.taskInfo(wrkMast.getWrkNo(), "杈撻�佺嚎鍏ュ簱鍛戒护涓嬪彂锛屼换鍔℃暟鎹�={}", JSON.toJSON(wrkMast));
- wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
- wrkMast.setModiTime(new Date());
- if (wrkMastService.updateById(wrkMast)) {
- News.taskInfo(wrkMast.getWrkNo(), "杈撻�佺嚎宸茬‘璁や笖浠诲姟瀹屾垚鐘舵�併�傝緭閫佺嚎鍙�={},瀹岀粨宸ヤ綔鍙�={}", staProtocol.getSiteId(), staProtocol.getFinishWorkNo());
- } else {
- News.error("杈撻�佺嚎宸茬‘璁や笖浠诲姟瀹屾垚鐘舵��,澶嶄綅澶辫触锛屼絾鏈壘鍒板伐浣滄。銆傝緭閫佺嚎鍙�={}锛屽畬缁撳伐浣滃彿={}", staProtocol.getSiteId(), staProtocol.getFinishWorkNo());
+ boolean offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ if (offer) {
+ News.taskInfo(wrkMast.getWrkNo(), "杈撻�佺嚎鍏ュ簱鍛戒护涓嬪彂锛屼换鍔℃暟鎹�={}", JSON.toJSON(wrkMast));
+ wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
+ wrkMast.setModiTime(new Date());
+ if (wrkMastService.updateById(wrkMast)) {
+ News.taskInfo(wrkMast.getWrkNo(), "杈撻�佺嚎宸茬‘璁や笖浠诲姟瀹屾垚鐘舵�併�傝緭閫佺嚎鍙�={},瀹岀粨宸ヤ綔鍙�={}", staProtocol.getSiteId(), staProtocol.getFinishWorkNo());
+ } else {
+ News.error("杈撻�佺嚎宸茬‘璁や笖浠诲姟瀹屾垚鐘舵��,澶嶄綅澶辫触锛屼絾鏈壘鍒板伐浣滄。銆傝緭閫佺嚎鍙�={}锛屽畬缁撳伐浣滃彿={}", staProtocol.getSiteId(), staProtocol.getFinishWorkNo());
+ }
}
}
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 3695334..b1caae1 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -206,6 +206,7 @@
wrkMast.setBarcode(param.getBarcode());
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+ wrkMast.setWmsWrkNo2(param.getTaskNo2());
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
News.error("鍏ュ簱浠诲姟 --- 淇濆瓨宸ヤ綔妗ｅけ璐ワ紒");
diff --git a/src/main/java/com/zy/core/enums/WrkStsType.java b/src/main/java/com/zy/core/enums/WrkStsType.java
index 54a6811..8a371c4 100644
--- a/src/main/java/com/zy/core/enums/WrkStsType.java
+++ b/src/main/java/com/zy/core/enums/WrkStsType.java
@@ -19,7 +19,7 @@
OUTBOUND_LIFT_RUN(104, "鎻愬崌鏈烘惉杩愪腑"),
OUTBOUND_LIFT_RUN_COMPLETE(105, "鎻愬崌鏈烘惉杩愬畬鎴�"),
OUTBOUND_DEVP_RUN(106, "杈撻�佺嚎鎼繍涓�"),
- OUTBOUND_DEVP_RUN_2(107, "杈撻�佺嚎鎼繍涓�"),
+ OUTBOUND_DEVP_RUN_2(107, "璋冩嫧浠诲姟1013->1135"),
COMPLETE_OUTBOUND(109, "鍑哄簱瀹屾垚"),
SETTLE_OUTBOUND(110, "鍑哄簱搴撳瓨鏇存柊"),
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index 64edd4f..c13f926 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -99,6 +99,10 @@
write((StaProtocol) task.getData());
read();
break;
+ // 鎶ヨ
+ case 3:
+ writeError((Integer) task.getData());
+ break;
default:
break;
}
@@ -252,6 +256,60 @@
}
/**
+ * 鎶ヨ
+ */
+ private void writeError(Integer staNo) throws InterruptedException {
+ if (null == staNo) {
+ return;
+ }
+
+ ArrayList<Integer> lift1 = new ArrayList<Integer>() {{
+ add(1011);
+ add(1012);
+ }};
+
+ ArrayList<Integer> lift2 = new ArrayList<Integer>() {{
+ add(1021);
+ add(1022);
+ add(1023);
+ }};
+
+ ArrayList<Integer> devp1 = new ArrayList<Integer>() {{
+ add(1013);
+ add(1014);
+ add(1015);
+ }};
+
+ ArrayList<Integer> devp2 = new ArrayList<Integer>() {{
+ add(1024);
+ add(1025);
+ add(1026);
+ }};
+
+ String dbAddress = "DB82.48";
+ if (lift1.contains(staNo)) {
+ dbAddress = "DB82.48";
+ } else if (lift2.contains(staNo)) {
+ dbAddress = "DB82.178";
+ } else if (devp1.contains(staNo)) {
+ dbAddress = "DB82.100";
+ } else if (devp2.contains(staNo)) {
+ dbAddress = "DB82.256";
+ }else {
+ return;
+ }
+
+ OperateResult write1 = siemensS7Net.Write(dbAddress, (short) 1);
+ if (!write1.IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鎶ヨ鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(true)));
+ log.error("鍐欏叆杈撻�佺嚎绔欑偣鎶ヨ鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(true));
+ return;
+ }
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鎶ヨ鏁版嵁鎴愬姛銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(true)));
+ log.info("鍐欏叆杈撻�佺嚎绔欑偣鎶ヨ鏁版嵁鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(true));
+ }
+
+ /**
* 蹇冭烦
*/
private void heartbeat() {
--
Gitblit v1.9.1