From 2816415f539ef54839e331657edae7055c243ad8 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期六, 17 一月 2026 19:27:45 +0800
Subject: [PATCH] agv缓存库位清空和标记功能
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 90 ++++++++++++++++++++++++++++-----------------
1 files changed, 56 insertions(+), 34 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 5076fd4..8ee6f4b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -140,10 +140,9 @@
String sourceSite = param.getSourceSite();
String barcode = param.getBarcode();
int ioType;
+ // 鏌ヨ婧愮珯鐐癸紙搴撲綅锛変俊鎭紝浣嗕笉妫�鏌ユ槸鍚﹀瓨鍦紝鍏佽涓嬪崟鎴愬姛
+ // 绔欑偣涓嶅瓨鍦ㄧ殑妫�鏌ュ皢鍦ㄥ畾鏃朵换鍔★紙AgvHandler.callAgv锛変腑杩涜
LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", sourceSite));
- if (null == locCache) {
- throw new CoolException("绔欑偣涓嶅瓨鍦細" + sourceSite);
- }
switch (type) {
case 1:
// 鍒ゆ柇鏈夋病鏈夌粍鎵�
@@ -151,10 +150,13 @@
if (count == 0) {
throw new CoolException("鏉＄爜鏈粍鎵橈細" + barcode);
}
- ioType = 101;
+ ioType = 1; // AGV瀹瑰櫒鍏ュ簱锛堝疄鎵樺叆搴擄級
- locCache.setLocSts(LocStsType.LOC_STS_TYPE_R.type);
- locCacheService.updateById(locCache);
+ // 濡傛灉搴撲綅瀛樺湪锛屾洿鏂扮姸鎬佷负鍏ュ簱棰勭害锛涗笉瀛樺湪鍒欒烦杩囷紝鐢卞畾鏃朵换鍔″鐞�
+ if (locCache != null) {
+ locCache.setLocSts(LocStsType.LOC_STS_TYPE_S.type); // S.鍏ュ簱棰勭害
+ locCacheService.updateById(locCache);
+ }
break;
case 2:
// 鍒ゆ柇鏄嫞閫夊洖搴撴墭鐩�
@@ -165,10 +167,13 @@
if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107) {
throw new CoolException("鏉＄爜涓嶉渶瑕佸洖搴擄細" + barcode);
}
- ioType = wrkMast.getIoType() - 50;
+ ioType = wrkMast.getIoType() - 50; // 103->53(鎷ｆ枡鍏ュ簱), 107->57(鐩樼偣鍏ュ簱)
- locCache.setLocSts(LocStsType.LOC_STS_TYPE_R.type);
- locCacheService.updateById(locCache);
+ // 濡傛灉搴撲綅瀛樺湪锛屾洿鏂扮姸鎬佷负鍏ュ簱棰勭害锛涗笉瀛樺湪鍒欒烦杩囷紝鐢卞畾鏃朵换鍔″鐞�
+ if (locCache != null) {
+ locCache.setLocSts(LocStsType.LOC_STS_TYPE_S.type); // S.鍏ュ簱棰勭害锛堝鍣ㄥ洖搴撴槸鍏ュ簱鎿嶄綔锛�
+ locCacheService.updateById(locCache);
+ }
break;
case 3:
// 鍒ゆ柇鏄惁涓虹┖鎵樺叆搴擄細妫�鏌ユ潯鐮佸湪wms涓笉瀛樺湪锛岀‘璁や负绌烘墭鐩�
@@ -209,8 +214,9 @@
}
// 鏍规嵁whs_type鍜屽簱浣嶇紪鍙峰墠缂�閫夋嫨绔欑偣鍜屾満鍣ㄤ汉缁�
- Long whsType = locCache.getWhsType();
- String locNo = locCache.getLocNo();
+ // 濡傛灉搴撲綅涓嶅瓨鍦紝浣跨敤榛樿閫昏緫锛堟牴鎹畉ype鍒ゆ柇锛夛紝绔欑偣涓嶅瓨鍦ㄧ殑妫�鏌ュ皢鍦ㄥ畾鏃朵换鍔′腑杩涜
+ Long whsType = locCache != null ? locCache.getWhsType() : null;
+ String locNo = locCache != null ? locCache.getLocNo() : sourceSite;
List<String> targetStations;
String robotGroup;
@@ -237,6 +243,7 @@
agvProperties.getWestDisplayName(), robotGroup);
} else {
// whs_type涓虹┖鎴栧叾浠栧�硷紝鏍规嵁type鍒ゆ柇锛堝吋瀹规棫閫昏緫锛�
+ // 濡傛灉搴撲綅涓嶅瓨鍦紝涔熶娇鐢ㄦ閫昏緫
if (type == 1) {
targetStations = agvProperties.getEastStations();
robotGroup = agvProperties.getRobotGroupEast();
@@ -244,7 +251,11 @@
targetStations = agvProperties.getWestStations();
robotGroup = agvProperties.getRobotGroupWest();
}
- log.warn("搴撲綅whs_type={}鏈厤缃垨涓嶅湪鏄犲皠鑼冨洿鍐咃紝浣跨敤type={}鐨勯粯璁ら�昏緫", whsType, type);
+ if (locCache == null) {
+ log.warn("婧愮珯鐐癸紙搴撲綅锛墈}涓嶅瓨鍦紝浣跨敤type={}鐨勯粯璁ら�昏緫锛岀珯鐐规鏌ュ皢鍦ㄥ畾鏃朵换鍔′腑杩涜", sourceSite, type);
+ } else {
+ log.warn("搴撲綅whs_type={}鏈厤缃垨涓嶅湪鏄犲皠鑼冨洿鍐咃紝浣跨敤type={}鐨勯粯璁ら�昏緫", whsType, type);
+ }
}
// 灏嗙珯鐐瑰瓧绗︿覆鍒楄〃杞崲涓烘暣鏁板垪琛�
@@ -252,31 +263,33 @@
.map(Integer::parseInt)
.collect(Collectors.toList());
- // 鍒ゆ柇鑳藉叆绔欑偣锛坕n_enable="Y"琛ㄧず鑳藉叆锛�
+ // 鍒ゆ柇鑳藉叆绔欑偣锛坕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)
- ).stream().map(BasDevp::getDevNo).collect(Collectors.toList());
-
- if (sites.isEmpty()) {
- throw new CoolException("娌℃湁鑳藉叆绔欑偣,whs_type锛�" + whsType + ",type锛�" + type);
- }
+ .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 = basDevpMapper.getCanInSites(sites);
- if (canInSites.isEmpty()) {
- throw new CoolException("璇风瓑寰呭嚭搴撳畬鎴�,type:" + type);
- }
+ List<Integer> canInSites = sites.isEmpty() ? new ArrayList<>() : basDevpMapper.getCanInSites(sites);
- // 瀵绘壘鍏ュ簱浠诲姟鏈�灏戠殑绔欑偣锛堜笖蹇呴』in_enable="Y"鑳藉叆 鍜� canining="Y"鍙叆锛�
+ // 瀵绘壘鍏ュ簱浠诲姟鏈�灏戠殑绔欑偣锛堜笖蹇呴』in_enable="Y"鑳藉叆 鍜� canining="Y"鍙叆锛夛紝鎺掗櫎dev_no=0鐨勬棤鏁堢珯鐐�
// 娉ㄦ剰锛氫笉鍦ㄦ澶勬鏌ユ湭瀹屾垚鐨凙GV浠诲姟锛屽厑璁窹DA鎸佺画鐢宠涓嬪崟
// 鏈畬鎴愪换鍔＄殑妫�鏌ュ皢鍦ㄥ彂閫丄GV璇锋眰鏃惰繘琛岋紙AgvHandler.callAgv锛�
- List<BasDevp> devList = basDevpMapper.selectList(new EntityWrapper<BasDevp>()
+ 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;
@@ -322,14 +335,20 @@
}
endSite = basDevp.getDevNo();
-
- // 鍏ュ簱鏆傚瓨+1
- basDevpMapper.incrementInQty(endSite);
+
+ // 妫�鏌ョ珯鐐规槸鍚︽湁鏁堬紙涓嶈兘涓�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.warn("{}鍙敤绔欑偣锛坽}锛変腑娌℃湁鍙叆绔欑偣锛坕n_enable='Y'涓攃anining='Y'锛夛紝鏆備笉鍒嗛厤绔欑偣锛屽皢鍦ㄥ畾鏃朵换鍔′腑鍒嗛厤", groupName, canInSites);
}
@@ -347,11 +366,11 @@
.setStaNo(endSite != null ? String.valueOf(endSite) : null) // 濡傛灉鍒嗛厤浜嗙珯鐐瑰垯璁剧疆锛屽惁鍒欎负null锛岀敱瀹氭椂浠诲姟鍒嗛厤
.setSourceStaNo(sourceSite) // 璁剧疆婧愮珯鐐�
.setInvWh(robotGroup) // 鏍规嵁whs_type璁剧疆鏈哄櫒浜虹粍
- .setFullPlt(ioType != 10 ? "N" : "Y")// 婊℃澘锛歒
+ .setFullPlt(ioType == 10 ? "N" : "Y")// 绌烘墭鍏ュ簱(ioType=10)璁剧疆涓篘锛屽叾浠栧叆搴撹缃负Y锛堟弧鏉匡級
.setPicking("N") // 鎷ｆ枡
.setExitMk("N")// 閫�鍑�
- .setSourceLocNo(locCache.getLocNo()) // 璁剧疆婧愬簱浣嶇紪鍙凤紝鐢ㄤ簬AGV fromBin
- .setEmptyMk(ioType == 10 ? "Y" : "N")// 绌烘澘
+ .setSourceLocNo(locCache != null ? locCache.getLocNo() : sourceSite) // 璁剧疆婧愬簱浣嶇紪鍙凤紝鐢ㄤ簬AGV fromBin锛屽鏋滃簱浣嶄笉瀛樺湪鍒欎娇鐢╯ourceSite
+ .setEmptyMk(ioType == 10 ? "Y" : "N")// 绌烘墭鍏ュ簱(ioType=10)璁剧疆涓篩锛屽叾浠栬缃负N
.setBarcode(barcode)// 鎵樼洏鐮�
.setLinkMis("N")
.setAppeTime(now)
@@ -360,8 +379,11 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- // 鏇存柊鏆傚瓨浣嶇姸鎬佷负 R.鍑哄簱棰勭害
- basStationMapper.updateLocStsBatch( Collections.singletonList(String.valueOf(sourceSite)), "R");
+ // 濡傛灉搴撲綅瀛樺湪锛屾牴鎹甶oType鏇存柊鏆傚瓨浣嶇姸鎬侊細鍏ュ簱浠诲姟璁剧疆涓篠锛堝叆搴撻绾︼級锛屽嚭搴撲换鍔¤缃负R锛堝嚭搴撻绾︼級
+ if (locCache != null) {
+ String locSts = (ioType < 100) ? "S" : "R"; // 鍏ュ簱浠诲姟锛坕oType < 100锛夎缃负S锛屽嚭搴撲换鍔¤缃负R
+ basStationMapper.updateLocStsBatch( Collections.singletonList(String.valueOf(sourceSite)), locSts);
+ }
return R.ok("agv浠诲姟鐢熸垚鎴愬姛!");
}
--
Gitblit v1.9.1