From 466cc943089116f996db0c2f249878a74fb1cc10 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 16:02:15 +0800
Subject: [PATCH] 最后可运行版本
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 67 +++++++++++++++------------------
1 files changed, 30 insertions(+), 37 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 9d4d6d4..6254a79 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -172,7 +172,8 @@
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk()
&& staProtocol.getWorkNo() > 9990
- && (staProtocol.isEmptyOutType() || staProtocol.getSiteId() == 301 || staProtocol.getSiteId() == 304)
+ && staProtocol.getWorkNo() < 9998
+ && (staProtocol.getSiteId() == 307 || staProtocol.getSiteId() == 301 || staProtocol.getSiteId() == 304)
&& staProtocol.isPakMk()) {
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛�");
Short wrkNo = 9981;
@@ -214,12 +215,6 @@
String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
}
- log.error("杈撻�佺嚎寮傚父缁勬墭閫�鍥�={}", errMsg);
- staProtocol.setWorkNo(wrkNo);
-
- staProtocol.setStaNo(bark);
-// devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
continue;
}
} else {
@@ -234,15 +229,8 @@
String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
}
- log.error("杈撻�佺嚎寮傚父缁勬墭閫�鍥�={}", errMsg);
- staProtocol.setWorkNo(wrkNo);
-
- staProtocol.setStaNo(bark);
-// devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
continue;
}
-
// 鍒ゆ柇閲嶅宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
//杩囨护鍒ゆ柇锛岄槻姝㈡嫞鏂欏啀鍏ュ簱璐х墿锛岀粡杩囧叆搴撶珯鍐嶅叆搴撴椂锛岃閫�鍥炲埌閫�搴撶珯
@@ -287,7 +275,17 @@
SearchLocParam param = new SearchLocParam();
param.setBarcode(barcode);
- param.setIoType(1);
+
+ WaitPakin waitPakin = new WaitPakin();
+ List<WaitPakin> waitPakinList = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>()
+ .eq("zpallet", param.getBarcode())
+ );
+ if (waitPakinList.isEmpty()) {
+ param.setIoType(10);
+ } else {
+ param.setIoType(1);
+ }
+
param.setSourceStaNo(inSta.getStaNo());
param.setLocType1(locTypeDto.getLocType1());
String response = new HttpHandler.Builder()
@@ -341,25 +339,19 @@
// }
} else {
News.error("" + mark + " - 5" + " - 璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
-// staProtocol.setWorkNo((short)9992);
-// staProtocol.setStaNo(inSta.getBackSta().shortValue());
-// devpThread.setPakMk(staProtocol.getSiteId(), false);
-// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-// if (!result) {
-// throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
-// }
+ staProtocol.setWorkNo((short)9992);
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ if (!result) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
// led 寮傚父鏄剧ず
if (ledThread != null) {
String errorMsg = jsonObject.getString("msg");
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
}
- log.error("杈撻�佺嚎寮傚父缁勬墭閫�鍥�={}", errMsg);
- staProtocol.setWorkNo(wrkNo);
-
- staProtocol.setStaNo(bark);
-// devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
}
} catch (Exception e) {
@@ -1136,11 +1128,11 @@
} else if (wrkMast.getStaNo() == 402) {
ip = "172.26.4.232";
} else if (wrkMast.getStaNo() == 307) {
- ip = "172.26.1.231";
- } else if (wrkMast.getStaNo() == 303) {
- ip = "172.26.1.232";
+ ip = "172.26.1.182";
+ } else if (wrkMast.getStaNo() == 301) {
+ ip = "172.26.1.180";
} else if (wrkMast.getStaNo() == 304) {
- ip = "172.26.1.233";
+ ip = "172.26.1.181";
}
SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");
String newName = sf.format(new Date()) + "_" + locMast.getLocNo();
@@ -1287,7 +1279,7 @@
if (staProtocol.isEmptyOutType() || staProtocol.getSiteId() == 301 || staProtocol.getSiteId() == 304) {
boo1 = true;
}
- if ((staProtocol.getSiteId() == 301 || staProtocol.getSiteId() == 304) && staProtocol.isOutEnable()) {
+ if (((staProtocol.getSiteId() == 301 || staProtocol.getSiteId() == 304) && staProtocol.isOutEnable()) || staProtocol.getSiteId() == 307) {
boo2 = true;
}
@@ -1297,7 +1289,7 @@
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
//鍒ゆ柇鏄惁鏈夋鍦ㄦ墽琛屼腑鐨凙GV浠诲姟
- List<AgvTask> agvTasks = agvTaskService.selectList(new EntityWrapper<AgvTask>().eq("wrk_sts", 302).eq("source_sta_no", staProtocol.getSiteId()));
+ List<AgvTask> agvTasks = agvTaskService.selectList(new EntityWrapper<AgvTask>().eq("wrk_sts", 302).eq("source_sta_no", String.valueOf(staProtocol.getSiteId())));
if (agvTasks != null && agvTasks.size() > 0) {
continue;
}
@@ -1307,7 +1299,7 @@
break;
}
- // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
+ // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝0娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
@@ -1394,7 +1386,7 @@
wrkMast.setModiTime(now);
wrkMastMapper.updateById(wrkMast);
}
- } else if (staProtocol.getSiteId() == 304 && staProtocol.isAutoing() && staProtocol.isLoading() && !staProtocol.isOutEnable()){
+ } else if (staProtocol.getSiteId() == 304 && staProtocol.isAutoing() && staProtocol.isLoading() && !staProtocol.isOutEnable()) {
StaProtocol staProtocol1 = devpThread.getStation().get(301);
if (staProtocol1 == null) {
break;
@@ -2184,7 +2176,7 @@
// ledCommand.setTitle("骞舵澘鍏ュ簱");
// break;
default:
- News.error("" + mark + " - 1" + " - 浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
+// News.error("" + mark + " - 1" + " - 浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
break;
}
ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
@@ -2427,6 +2419,7 @@
int workNo = commonService.getWorkNo(0);
// 淇濆瓨宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
+ wrkMast.setId(new Date().getTime());
wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
--
Gitblit v1.9.1