From 9611dc686299be640ce5e5f5990c747765161ec7 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期三, 21 一月 2026 10:59:38 +0800
Subject: [PATCH] agv逻辑调整2
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 135 +++++---------------------------------------
1 files changed, 17 insertions(+), 118 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 8ee6f4b..2fdb225 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -139,6 +139,12 @@
int type = param.getType();
String sourceSite = param.getSourceSite();
String barcode = param.getBarcode();
+
+ // 妫�鏌ユ墭鐩樼爜鍜屾殏瀛樹綅缂栫爜鏄惁鐩稿悓
+ if (barcode != null && sourceSite != null && barcode.trim().equals(sourceSite.trim())) {
+ throw new CoolException("鎵樼洏鐮佸拰鏆傚瓨浣嶇紪鐮佷笉鑳界浉鍚�");
+ }
+
int ioType;
// 鏌ヨ婧愮珯鐐癸紙搴撲綅锛変俊鎭紝浣嗕笉妫�鏌ユ槸鍚﹀瓨鍦紝鍏佽涓嬪崟鎴愬姛
// 绔欑偣涓嶅瓨鍦ㄧ殑妫�鏌ュ皢鍦ㄥ畾鏃朵换鍔★紙AgvHandler.callAgv锛変腑杩涜
@@ -213,143 +219,36 @@
throw new CoolException(barcode+ "锛氭潯鐮佸瓨鍦╝gv鎼繍浠诲姟!");
}
- // 鏍规嵁whs_type鍜屽簱浣嶇紪鍙峰墠缂�閫夋嫨绔欑偣鍜屾満鍣ㄤ汉缁�
- // 濡傛灉搴撲綅涓嶅瓨鍦紝浣跨敤榛樿閫昏緫锛堟牴鎹畉ype鍒ゆ柇锛夛紝绔欑偣涓嶅瓨鍦ㄧ殑妫�鏌ュ皢鍦ㄥ畾鏃朵换鍔′腑杩涜
+ // 鏍规嵁whs_type纭畾鏈哄櫒浜虹粍锛堢珯鐐瑰垎閰嶅畬鍏ㄧ敱瀹氭椂浠诲姟澶勭悊锛�
+ // 濡傛灉搴撲綅涓嶅瓨鍦紝浣跨敤榛樿閫昏緫锛堟牴鎹畉ype鍒ゆ柇锛�
Long whsType = locCache != null ? locCache.getWhsType() : null;
- String locNo = locCache != null ? locCache.getLocNo() : sourceSite;
- List<String> targetStations;
String robotGroup;
- // 鍒ゆ柇搴撲綅缂栧彿鍓嶇紑锛欳A寮�澶村彧鍋氬叆搴擄紝WA寮�澶存墠浼氳鍑哄簱鍒嗛厤缂撳瓨鍖猴紙浠庨厤缃鍙栵級
- String inboundOnlyPrefix = agvProperties.getLocationPrefix().getInboundOnly();
- String cacheAreaPrefix = agvProperties.getLocationPrefix().getCacheArea();
- boolean isCA = locNo != null && locNo.startsWith(inboundOnlyPrefix);
- boolean isWA = locNo != null && locNo.startsWith(cacheAreaPrefix);
-
if (whsType != null && whsType.equals(agvProperties.getWhsTypeMapping().getInboundArea())) {
- // whs_type = 1: 鍏ュ簱鍖猴紝浣跨敤涓滀晶绔欑偣鍜孏roup-001
- targetStations = agvProperties.getEastStations();
+ // whs_type = 1: 鍏ュ簱鍖猴紝浣跨敤Group-001
robotGroup = agvProperties.getRobotGroupEast();
- log.info("搴撲綅whs_type={}锛屽簱浣嶇紪鍙�={}锛坽}锛夛紝浣跨敤鍏ュ簱鍖洪厤缃紙{}绔欑偣鍜寋}锛�",
- whsType, locNo, isCA ? "CA" : (isWA ? "WA" : "鍏朵粬"),
- agvProperties.getEastDisplayName(), robotGroup);
+ log.info("搴撲綅whs_type={}锛屼娇鐢ㄥ叆搴撳尯閰嶇疆锛坽}锛�", whsType, robotGroup);
} else if (whsType != null && whsType.equals(agvProperties.getWhsTypeMapping().getCacheArea())) {
- // whs_type = 2: 缂撳瓨鍖猴紝浣跨敤瑗夸晶绔欑偣鍜孏roup-002
- // 娉ㄦ剰锛氬鏋滄湁CA寮�澶寸殑鍏ュ簱锛屼絾鏄爣璁板湪瑗夸晶鐨勶紙whs_type=2锛夛紝涔熶細鍒嗛厤鍒拌タ渚х殑绔欑偣鍏ュ簱
- targetStations = agvProperties.getWestStations();
+ // whs_type = 2: 缂撳瓨鍖猴紝浣跨敤Group-002
robotGroup = agvProperties.getRobotGroupWest();
- log.info("搴撲綅whs_type={}锛屽簱浣嶇紪鍙�={}锛坽}锛夛紝浣跨敤缂撳瓨鍖洪厤缃紙{}绔欑偣鍜寋}锛�",
- whsType, locNo, isCA ? "CA" : (isWA ? "WA" : "鍏朵粬"),
- agvProperties.getWestDisplayName(), robotGroup);
+ log.info("搴撲綅whs_type={}锛屼娇鐢ㄧ紦瀛樺尯閰嶇疆锛坽}锛�", whsType, robotGroup);
} else {
// whs_type涓虹┖鎴栧叾浠栧�硷紝鏍规嵁type鍒ゆ柇锛堝吋瀹规棫閫昏緫锛�
// 濡傛灉搴撲綅涓嶅瓨鍦紝涔熶娇鐢ㄦ閫昏緫
if (type == 1) {
- targetStations = agvProperties.getEastStations();
robotGroup = agvProperties.getRobotGroupEast();
} else {
- targetStations = agvProperties.getWestStations();
robotGroup = agvProperties.getRobotGroupWest();
}
if (locCache == null) {
- log.warn("婧愮珯鐐癸紙搴撲綅锛墈}涓嶅瓨鍦紝浣跨敤type={}鐨勯粯璁ら�昏緫锛岀珯鐐规鏌ュ皢鍦ㄥ畾鏃朵换鍔′腑杩涜", sourceSite, type);
+ log.warn("婧愮珯鐐癸紙搴撲綅锛墈}涓嶅瓨鍦紝浣跨敤type={}鐨勯粯璁ら�昏緫锛屾満鍣ㄤ汉缁勶細{}锛岀珯鐐瑰垎閰嶅皢鍦ㄥ畾鏃朵换鍔′腑杩涜", sourceSite, type, robotGroup);
} else {
- log.warn("搴撲綅whs_type={}鏈厤缃垨涓嶅湪鏄犲皠鑼冨洿鍐咃紝浣跨敤type={}鐨勯粯璁ら�昏緫", whsType, type);
+ log.warn("搴撲綅whs_type={}鏈厤缃垨涓嶅湪鏄犲皠鑼冨洿鍐咃紝浣跨敤type={}鐨勯粯璁ら�昏緫锛屾満鍣ㄤ汉缁勶細{}", whsType, type, robotGroup);
}
}
- // 灏嗙珯鐐瑰瓧绗︿覆鍒楄〃杞崲涓烘暣鏁板垪琛�
- List<Integer> siteIntList = targetStations.stream()
- .map(Integer::parseInt)
- .collect(Collectors.toList());
-
- // 鍒ゆ柇鑳藉叆绔欑偣锛坕n_enable="Y"琛ㄧず鑳藉叆锛夛紝鎺掗櫎dev_no=0鐨勬棤鏁堢珯鐐�
- // 娉ㄦ剰锛氫笉鍦ㄦ澶勬鏌ョ珯鐐规槸鍚﹀瓨鍦ㄦ垨鍙敤锛屽厑璁镐笅鍗曟垚鍔�
- // 绔欑偣妫�鏌ュ拰鍒嗛厤灏嗗湪瀹氭椂浠诲姟锛圓gvHandler.callAgv锛変腑杩涜
- List<Integer> sites = basDevpMapper.selectList(
- new EntityWrapper<BasDevp>()
- .eq("in_enable", "Y") // in_enable鏄兘鍏�
- .in("dev_no", siteIntList)
- .ne("dev_no", 0) // 鎺掗櫎dev_no=0鐨勬棤鏁堢珯鐐�
- ).stream()
- .map(BasDevp::getDevNo)
- .filter(devNo -> devNo != null && devNo != 0) // 鍐嶆杩囨护锛岀‘淇濅笉涓簄ull鎴�0
- .collect(Collectors.toList());
-
- // 鑾峰彇娌℃湁鍑哄簱浠诲姟鐨勭珯鐐�
- List<Integer> canInSites = sites.isEmpty() ? new ArrayList<>() : basDevpMapper.getCanInSites(sites);
-
- // 瀵绘壘鍏ュ簱浠诲姟鏈�灏戠殑绔欑偣锛堜笖蹇呴』in_enable="Y"鑳藉叆 鍜� canining="Y"鍙叆锛夛紝鎺掗櫎dev_no=0鐨勬棤鏁堢珯鐐�
- // 娉ㄦ剰锛氫笉鍦ㄦ澶勬鏌ユ湭瀹屾垚鐨凙GV浠诲姟锛屽厑璁窹DA鎸佺画鐢宠涓嬪崟
- // 鏈畬鎴愪换鍔＄殑妫�鏌ュ皢鍦ㄥ彂閫丄GV璇锋眰鏃惰繘琛岋紙AgvHandler.callAgv锛�
- List<BasDevp> devList = canInSites.isEmpty() ? new ArrayList<>() : basDevpMapper.selectList(new EntityWrapper<BasDevp>()
- .in("dev_no", canInSites)
- .eq("in_enable", "Y") // in_enable鏄兘鍏�
- .eq("canining", "Y") // canining鏄彲鍏�
- .ne("dev_no", 0) // 鎺掗櫎dev_no=0鐨勬棤鏁堢珯鐐�
- ).stream()
- .filter(dev -> dev.getDevNo() != null && dev.getDevNo() != 0) // 鍐嶆杩囨护锛岀‘淇濅笉涓簄ull鎴�0
- .collect(Collectors.toList());
-
- // 閫夋嫨绔欑偣锛堝鏋滃彲鍏ョ珯鐐逛负绌猴紝鍒欎笉鍦ㄥ垱寤轰换鍔℃椂鍒嗛厤绔欑偣锛岀敱瀹氭椂浠诲姟鍒嗛厤锛�
- Integer endSite = null;
- if (!devList.isEmpty()) {
- // 鍏ュ簱浠诲姟鏁版帓搴�
- devList.sort(Comparator.comparing(BasDevp::getInQty));
-
- // 閫夋嫨绔欑偣
- BasDevp basDevp;
-
- // 鑾峰彇鏈�灏戜换鍔℃暟
- int minInQty = devList.get(0).getInQty();
-
- // 绛涢�夊嚭浠诲姟鏁版渶灏戠殑绔欑偣鍒楄〃
- List<BasDevp> minTaskSites = devList.stream()
- .filter(dev -> dev.getInQty() == minInQty)
- .collect(Collectors.toList());
-
- // 鏍规嵁閰嶇疆閫夋嫨鍒嗛厤绛栫暐
- String strategy = agvProperties.getSiteAllocation().getStrategy();
- boolean enableRoundRobin = agvProperties.getSiteAllocation().isEnableRoundRobin();
-
- if (minTaskSites.size() > 1 && enableRoundRobin && "round-robin".equals(strategy)) {
- // 杞鍒嗛厤锛氬綋澶氫釜绔欑偣浠诲姟鏁扮浉鍚屾椂锛屼娇鐢ㄨ疆璇�
- String groupKey = (whsType != null && whsType.equals(agvProperties.getWhsTypeMapping().getInboundArea()))
- ? "east" : "west";
- AtomicInteger counter = siteRoundRobinCounters.computeIfAbsent(groupKey, k -> new AtomicInteger(0));
- int index = counter.getAndIncrement() % minTaskSites.size();
- basDevp = minTaskSites.get(index);
- log.info("浣跨敤杞鍒嗛厤绛栫暐锛岀珯鐐圭粍锛歿}锛岃疆璇㈢储寮曪細{}锛岄�変腑绔欑偣锛歿}", groupKey, index, basDevp.getDevNo());
- } else if (minTaskSites.size() > 1 && enableRoundRobin && "random".equals(strategy)) {
- // 闅忔満鍒嗛厤
- Random random = new Random();
- int index = random.nextInt(minTaskSites.size());
- basDevp = minTaskSites.get(index);
- log.info("浣跨敤闅忔満鍒嗛厤绛栫暐锛岄�変腑绔欑偣锛歿}", basDevp.getDevNo());
- } else {
- // 榛樿锛氶�夋嫨绗竴涓紙浠诲姟鏈�灏戠殑锛�
- basDevp = devList.get(0);
- if (minTaskSites.size() > 1) {
- log.info("澶氫釜绔欑偣浠诲姟鏁扮浉鍚岋紙{}锛夛紝浣嗘湭鍚敤杞锛岄�夋嫨绗竴涓珯鐐癸細{}", minInQty, basDevp.getDevNo());
- }
- }
-
- endSite = basDevp.getDevNo();
-
- // 妫�鏌ョ珯鐐规槸鍚︽湁鏁堬紙涓嶈兘涓�0鎴杗ull锛�
- if (endSite == null || endSite == 0) {
- log.error("鍒嗛厤鐨勭珯鐐规棤鏁堬紙dev_no={}锛夛紝涓嶅垎閰嶇珯鐐癸紝灏嗗湪瀹氭椂浠诲姟涓垎閰�", endSite);
- endSite = null; // 璁剧疆涓簄ull锛岀敱瀹氭椂浠诲姟鍒嗛厤
- } else {
- // 鍏ュ簱鏆傚瓨+1
- basDevpMapper.incrementInQty(endSite);
- }
- } else {
- // 娌℃湁鍙叆绔欑偣锛岃褰曟棩蹇椾絾涓嶉樆姝笅鍗曪紝绔欑偣鍒嗛厤灏嗗湪瀹氭椂浠诲姟涓鐞�
- String groupName = (whsType != null && whsType.equals(agvProperties.getWhsTypeMapping().getInboundArea()))
- ? agvProperties.getEastDisplayName() : agvProperties.getWestDisplayName();
-// log.warn("{}鍙敤绔欑偣锛坽}锛変腑娌℃湁鍙叆绔欑偣锛坕n_enable='Y'涓攃anining='Y'锛夛紝鏆備笉鍒嗛厤绔欑偣锛屽皢鍦ㄥ畾鏃朵换鍔′腑鍒嗛厤", groupName, canInSites);
- }
+ // 绔欑偣鍒嗛厤瀹屽叏鐢卞畾鏃朵换鍔″鐞嗭紝姝ゅ涓嶅垎閰嶇珯鐐癸紝鍙垱寤轰换鍔�
+ log.info("鍒涘缓AGV浠诲姟锛岀珯鐐瑰垎閰嶅皢鍦ㄥ畾鏃朵换鍔′腑澶勭悊锛屾満鍣ㄤ汉缁勶細{}", robotGroup);
// 鑾峰彇宸ヤ綔鍙�
@@ -363,7 +262,7 @@
.setIoType(ioType) // 鍏ュ嚭搴撶姸鎬侊細 1.鍏ュ簱
.setTaskType("agv")
.setIoPri(10D)
- .setStaNo(endSite != null ? String.valueOf(endSite) : null) // 濡傛灉鍒嗛厤浜嗙珯鐐瑰垯璁剧疆锛屽惁鍒欎负null锛岀敱瀹氭椂浠诲姟鍒嗛厤
+ .setStaNo(null) // 绔欑偣鍒嗛厤瀹屽叏鐢卞畾鏃朵换鍔″鐞�
.setSourceStaNo(sourceSite) // 璁剧疆婧愮珯鐐�
.setInvWh(robotGroup) // 鏍规嵁whs_type璁剧疆鏈哄櫒浜虹粍
.setFullPlt(ioType == 10 ? "N" : "Y")// 绌烘墭鍏ュ簱(ioType=10)璁剧疆涓篘锛屽叾浠栧叆搴撹缃负Y锛堟弧鏉匡級
--
Gitblit v1.9.1