From 375f337b2a91e59beb0b41dc89353de1e92aa6a1 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 22 一月 2026 18:54:50 +0800
Subject: [PATCH] agv工作档增加 is_deleted
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 157 +++++++++++++++-------------------------------------
1 files changed, 45 insertions(+), 112 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 173cf0c..4e573e0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -139,11 +139,16 @@
int type = param.getType();
String sourceSite = param.getSourceSite();
String barcode = param.getBarcode();
- int ioType;
- LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", sourceSite));
- if (null == locCache) {
- throw new CoolException("绔欑偣涓嶅瓨鍦細" + sourceSite);
+
+ // 妫�鏌ユ墭鐩樼爜鍜屾殏瀛樹綅缂栫爜鏄惁鐩稿悓
+ if (barcode != null && sourceSite != null && barcode.trim().equals(sourceSite.trim())) {
+ throw new CoolException("鎵樼洏鐮佸拰鏆傚瓨浣嶇紪鐮佷笉鑳界浉鍚�");
}
+
+ int ioType;
+ // 鏌ヨ婧愮珯鐐癸紙搴撲綅锛変俊鎭紝浣嗕笉妫�鏌ユ槸鍚﹀瓨鍦紝鍏佽涓嬪崟鎴愬姛
+ // 绔欑偣涓嶅瓨鍦ㄧ殑妫�鏌ュ皢鍦ㄥ畾鏃朵换鍔★紙AgvHandler.callAgv锛変腑杩涜
+ LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", sourceSite));
switch (type) {
case 1:
// 鍒ゆ柇鏈夋病鏈夌粍鎵�
@@ -151,10 +156,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 +173,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涓笉瀛樺湪锛岀‘璁や负绌烘墭鐩�
@@ -203,122 +214,41 @@
throw new CoolException("鍏ュ簱绫诲瀷閿欒,type锛�" + type);
}
// 鏉＄爜瀛樺湪agv浠诲姟
- int count = taskService.selectCount(new EntityWrapper<Task>().eq("barcode", barcode));
+ int count = taskService.selectCount(new EntityWrapper<Task>().eq("barcode", barcode).eq("is_deleted", 0));
if (count > 0) {
throw new CoolException(barcode+ "锛氭潯鐮佸瓨鍦╝gv鎼繍浠诲姟!");
}
- // 鏍规嵁whs_type閫夋嫨绔欑偣鍜屾満鍣ㄤ汉缁�
- Long whsType = locCache.getWhsType();
- List<String> targetStations;
+ // 鏍规嵁whs_type纭畾鏈哄櫒浜虹粍锛堢珯鐐瑰垎閰嶅畬鍏ㄧ敱瀹氭椂浠诲姟澶勭悊锛�
+ // 濡傛灉搴撲綅涓嶅瓨鍦紝浣跨敤榛樿閫昏緫锛堟牴鎹畉ype鍒ゆ柇锛�
+ Long whsType = locCache != null ? locCache.getWhsType() : null;
String robotGroup;
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={}锛屼娇鐢ㄥ叆搴撳尯閰嶇疆锛堜笢渚х珯鐐瑰拰Group-001锛�", whsType);
+ log.info("搴撲綅whs_type={}锛屼娇鐢ㄥ叆搴撳尯閰嶇疆锛坽}锛�", whsType, robotGroup);
} else if (whsType != null && whsType.equals(agvProperties.getWhsTypeMapping().getCacheArea())) {
- // whs_type = 2: 缂撳瓨鍖猴紝浣跨敤瑗夸晶绔欑偣鍜孏roup-002
- targetStations = agvProperties.getWestStations();
+ // whs_type = 2: 缂撳瓨鍖猴紝浣跨敤Group-002
robotGroup = agvProperties.getRobotGroupWest();
- log.info("搴撲綅whs_type={}锛屼娇鐢ㄧ紦瀛樺尯閰嶇疆锛堣タ渚х珯鐐瑰拰Group-002锛�", whsType);
+ 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();
}
- log.warn("搴撲綅whs_type={}鏈厤缃垨涓嶅湪鏄犲皠鑼冨洿鍐咃紝浣跨敤type={}鐨勯粯璁ら�昏緫", whsType, type);
- }
-
- // 灏嗙珯鐐瑰瓧绗︿覆鍒楄〃杞崲涓烘暣鏁板垪琛�
- List<Integer> siteIntList = targetStations.stream()
- .map(Integer::parseInt)
- .collect(Collectors.toList());
-
- // 鍒ゆ柇鑳藉叆绔欑偣锛坕n_enable="Y"琛ㄧず鑳藉叆锛�
- 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);
- }
-
- // 鑾峰彇娌℃湁鍑哄簱浠诲姟鐨勭珯鐐�
- List<Integer> canInSites = basDevpMapper.getCanInSites(sites);
- if (canInSites.isEmpty()) {
- throw new CoolException("璇风瓑寰呭嚭搴撳畬鎴�,type:" + type);
- }
-
- // 瀵绘壘鍏ュ簱浠诲姟鏈�灏戠殑绔欑偣锛堜笖蹇呴』in_enable="Y"鑳藉叆 鍜� canining="Y"鍙叆锛�
- // 娉ㄦ剰锛氫笉鍦ㄦ澶勬鏌ユ湭瀹屾垚鐨凙GV浠诲姟锛屽厑璁窹DA鎸佺画鐢宠涓嬪崟
- // 鏈畬鎴愪换鍔＄殑妫�鏌ュ皢鍦ㄥ彂閫丄GV璇锋眰鏃惰繘琛岋紙AgvHandler.callAgv锛�
- List<BasDevp> devList = basDevpMapper.selectList(new EntityWrapper<BasDevp>()
- .in("dev_no", canInSites)
- .eq("in_enable", "Y") // in_enable鏄兘鍏�
- .eq("canining", "Y") // canining鏄彲鍏�
- );
-
- // 閫夋嫨绔欑偣锛堝鏋滃彲鍏ョ珯鐐逛负绌猴紝鍒欎笉鍦ㄥ垱寤轰换鍔℃椂鍒嗛厤绔欑偣锛岀敱瀹氭椂浠诲姟鍒嗛厤锛�
- 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());
+ if (locCache == null) {
+ log.warn("婧愮珯鐐癸紙搴撲綅锛墈}涓嶅瓨鍦紝浣跨敤type={}鐨勯粯璁ら�昏緫锛屾満鍣ㄤ汉缁勶細{}锛岀珯鐐瑰垎閰嶅皢鍦ㄥ畾鏃朵换鍔′腑杩涜", sourceSite, type, robotGroup);
} else {
- // 榛樿锛氶�夋嫨绗竴涓紙浠诲姟鏈�灏戠殑锛�
- basDevp = devList.get(0);
- if (minTaskSites.size() > 1) {
- log.info("澶氫釜绔欑偣浠诲姟鏁扮浉鍚岋紙{}锛夛紝浣嗘湭鍚敤杞锛岄�夋嫨绗竴涓珯鐐癸細{}", minInQty, basDevp.getDevNo());
- }
+ log.warn("搴撲綅whs_type={}鏈厤缃垨涓嶅湪鏄犲皠鑼冨洿鍐咃紝浣跨敤type={}鐨勯粯璁ら�昏緫锛屾満鍣ㄤ汉缁勶細{}", whsType, type, robotGroup);
}
-
- endSite = basDevp.getDevNo();
-
- // 鍏ュ簱鏆傚瓨+1
- basDevpMapper.incrementInQty(endSite);
- } else {
- // 娌℃湁鍙叆绔欑偣锛岃褰曟棩蹇椾絾涓嶉樆姝笅鍗曪紝绔欑偣鍒嗛厤灏嗗湪瀹氭椂浠诲姟涓鐞�
- String groupName = (whsType != null && whsType.equals(agvProperties.getWhsTypeMapping().getInboundArea()))
- ? "涓滀晶" : "瑗夸晶";
- log.warn("{}鍙敤绔欑偣锛坽}锛変腑娌℃湁鍙叆绔欑偣锛坕n_enable='Y'涓攃anining='Y'锛夛紝鏆備笉鍒嗛厤绔欑偣锛屽皢鍦ㄥ畾鏃朵换鍔′腑鍒嗛厤", groupName, canInSites);
}
+
+ // 绔欑偣鍒嗛厤瀹屽叏鐢卞畾鏃朵换鍔″鐞嗭紝姝ゅ涓嶅垎閰嶇珯鐐癸紝鍙垱寤轰换鍔�
+ log.info("鍒涘缓AGV浠诲姟锛岀珯鐐瑰垎閰嶅皢鍦ㄥ畾鏃朵换鍔′腑澶勭悊锛屾満鍣ㄤ汉缁勶細{}", robotGroup);
// 鑾峰彇宸ヤ綔鍙�
@@ -332,14 +262,14 @@
.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")// 婊℃澘锛歒
+ .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)
@@ -348,8 +278,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