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 | 136 +++++++++++++++++++++++++++++----------------
1 files changed, 88 insertions(+), 48 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 8cb66c6..4e573e0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -23,6 +23,7 @@
import com.zy.common.model.DetlDto;
import com.zy.common.model.MesCombParam;
import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.properties.AgvProperties;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -36,6 +37,8 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -122,16 +125,30 @@
@Resource
private BasDevpMapper basDevpMapper;
+ @Resource
+ private AgvProperties agvProperties;
+
+ /**
+ * 绔欑偣杞璁℃暟鍣紝鐢ㄤ簬骞冲潎鍒嗛厤绔欑偣
+ * Key: 绔欑偣缁勬爣璇嗭紙濡� "east" 鎴� "west"锛夛紝Value: 褰撳墠杞绱㈠紩
+ */
+ private final Map<String, AtomicInteger> siteRoundRobinCounters = new ConcurrentHashMap<>();
+
@Override
public R inLocCallAgv(CallAgvParam param,Long userId) {
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:
// 鍒ゆ柇鏈夋病鏈夌粍鎵�
@@ -139,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:
// 鍒ゆ柇鏄嫞閫夊洖搴撴墭鐩�
@@ -153,67 +173,82 @@
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:
- // 鍒ゆ柇鏉＄爜鍦╳ms涓嶅瓨鍦紝鏄┖鎵樼洏
- // 宸茬粍鎵�
+ // 鍒ゆ柇鏄惁涓虹┖鎵樺叆搴擄細妫�鏌ユ潯鐮佸湪wms涓笉瀛樺湪锛岀‘璁や负绌烘墭鐩�
+ log.info("寮�濮嬪垽鏂槸鍚︿负绌烘墭鍏ュ簱锛屾潯鐮侊細{}", barcode);
+
+ // 妫�鏌ユ槸鍚﹀凡缁勬墭
int waitPakInCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
if (waitPakInCount != 0) {
+ log.warn("鏉＄爜缁勬墭妗ｅ凡瀛樺湪锛屼笉鏄┖鎵樼洏锛歿}", barcode);
throw new CoolException("鏉＄爜缁勬墭妗ｅ凡瀛樺湪锛�" + barcode);
}
- // 鏈変换鍔�
+
+ // 妫�鏌ユ槸鍚︽湁浠诲姟
int wrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", barcode));
if (wrkMastCount != 0) {
+ log.warn("鏉＄爜浠诲姟妗ｅ凡瀛樺湪锛屼笉鏄┖鎵樼洏锛歿}", barcode);
throw new CoolException("鏉＄爜浠诲姟妗ｅ凡瀛樺湪锛�" + barcode);
}
- // 鏈夊簱瀛�
+
+ // 妫�鏌ユ槸鍚︽湁搴撳瓨
int locDetlCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", barcode));
if (locDetlCount != 0) {
+ log.warn("鏉＄爜搴撳瓨宸插瓨鍦紝涓嶆槸绌烘墭鐩橈細{}", barcode);
throw new CoolException("鏉＄爜搴撳瓨宸插瓨鍦細" + barcode);
}
+
+ // 閫氳繃鎵�鏈夋鏌ワ紝纭涓虹┖鎵樼洏锛岃缃负绌烘墭鍏ュ簱
ioType = 10;
+ log.info("纭涓虹┖鎵樼洏锛岃缃负绌烘墭鍏ュ簱锛屾潯鐮侊細{}锛宨oType锛歿}", barcode, ioType);
break;
default:
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鎼繍浠诲姟!");
}
- // 鍒ゆ柇鑳藉叆绔欑偣
- List<Integer> sites = basDevpMapper.selectList(
- new EntityWrapper<BasDevp>()
- .eq("canining", "Y")
- .in("dev_no", type == 1 ? Arrays.asList(1003, 1005, 1007) : Arrays.asList(1044, 1046, 1048))
- ).stream().map(BasDevp::getDevNo).collect(Collectors.toList());
-
- if (sites.isEmpty()) {
- throw new CoolException("娌℃湁鑳藉叆绔欑偣,type锛�" + type);
+ // 鏍规嵁whs_type纭畾鏈哄櫒浜虹粍锛堢珯鐐瑰垎閰嶅畬鍏ㄧ敱瀹氭椂浠诲姟澶勭悊锛�
+ // 濡傛灉搴撲綅涓嶅瓨鍦紝浣跨敤榛樿閫昏緫锛堟牴鎹畉ype鍒ゆ柇锛�
+ Long whsType = locCache != null ? locCache.getWhsType() : null;
+ String robotGroup;
+
+ if (whsType != null && whsType.equals(agvProperties.getWhsTypeMapping().getInboundArea())) {
+ // whs_type = 1: 鍏ュ簱鍖猴紝浣跨敤Group-001
+ robotGroup = agvProperties.getRobotGroupEast();
+ log.info("搴撲綅whs_type={}锛屼娇鐢ㄥ叆搴撳尯閰嶇疆锛坽}锛�", whsType, robotGroup);
+ } else if (whsType != null && whsType.equals(agvProperties.getWhsTypeMapping().getCacheArea())) {
+ // whs_type = 2: 缂撳瓨鍖猴紝浣跨敤Group-002
+ robotGroup = agvProperties.getRobotGroupWest();
+ log.info("搴撲綅whs_type={}锛屼娇鐢ㄧ紦瀛樺尯閰嶇疆锛坽}锛�", whsType, robotGroup);
+ } else {
+ // whs_type涓虹┖鎴栧叾浠栧�硷紝鏍规嵁type鍒ゆ柇锛堝吋瀹规棫閫昏緫锛�
+ // 濡傛灉搴撲綅涓嶅瓨鍦紝涔熶娇鐢ㄦ閫昏緫
+ if (type == 1) {
+ robotGroup = agvProperties.getRobotGroupEast();
+ } else {
+ robotGroup = agvProperties.getRobotGroupWest();
+ }
+ if (locCache == null) {
+ log.warn("婧愮珯鐐癸紙搴撲綅锛墈}涓嶅瓨鍦紝浣跨敤type={}鐨勯粯璁ら�昏緫锛屾満鍣ㄤ汉缁勶細{}锛岀珯鐐瑰垎閰嶅皢鍦ㄥ畾鏃朵换鍔′腑杩涜", sourceSite, type, robotGroup);
+ } else {
+ log.warn("搴撲綅whs_type={}鏈厤缃垨涓嶅湪鏄犲皠鑼冨洿鍐咃紝浣跨敤type={}鐨勯粯璁ら�昏緫锛屾満鍣ㄤ汉缁勶細{}", whsType, type, robotGroup);
+ }
}
-
- // 鑾峰彇娌℃湁鍑哄簱浠诲姟鐨勭珯鐐�
- List<Integer> canInSites = basDevpMapper.getCanInSites(sites);
- if (canInSites.isEmpty()) {
- throw new CoolException("璇风瓑寰呭嚭搴撳畬鎴�,type:" + type);
- }
-
- // 瀵绘壘鍏ュ簱浠诲姟鏈�灏戠殑绔欑偣
- List<BasDevp> devList = basDevpMapper.selectList(new EntityWrapper<BasDevp>().in("dev_no", canInSites));
- // 鍏ュ簱浠诲姟鏁版帓搴�
- devList.sort(Comparator.comparing(BasDevp::getInQty));
-
- // 鍙栧叆搴撲换鍔℃渶灏戠珯鐐�
- BasDevp basDevp = devList.get(0);
- int endSite = basDevp.getDevNo();
-
- // 鍏ュ簱鏆傚瓨+1
- basDevpMapper.incrementInQty(endSite);
+
+ // 绔欑偣鍒嗛厤瀹屽叏鐢卞畾鏃朵换鍔″鐞嗭紝姝ゅ涓嶅垎閰嶇珯鐐癸紝鍙垱寤轰换鍔�
+ log.info("鍒涘缓AGV浠诲姟锛岀珯鐐瑰垎閰嶅皢鍦ㄥ畾鏃朵换鍔′腑澶勭悊锛屾満鍣ㄤ汉缁勶細{}", robotGroup);
// 鑾峰彇宸ヤ綔鍙�
@@ -227,12 +262,14 @@
.setIoType(ioType) // 鍏ュ嚭搴撶姸鎬侊細 1.鍏ュ簱
.setTaskType("agv")
.setIoPri(10D)
- .setStaNo(String.valueOf(endSite))
- .setFullPlt(ioType != 10 ? "N" : "Y")// 婊℃澘锛歒
+ .setStaNo(null) // 绔欑偣鍒嗛厤瀹屽叏鐢卞畾鏃朵换鍔″鐞�
+ .setSourceStaNo(sourceSite) // 璁剧疆婧愮珯鐐�
+ .setInvWh(robotGroup) // 鏍规嵁whs_type璁剧疆鏈哄櫒浜虹粍
+ .setFullPlt(ioType == 10 ? "N" : "Y")// 绌烘墭鍏ュ簱(ioType=10)璁剧疆涓篘锛屽叾浠栧叆搴撹缃负Y锛堟弧鏉匡級
.setPicking("N") // 鎷ｆ枡
.setExitMk("N")// 閫�鍑�
- .setSourceLocNo(sourceSite)
- .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)
@@ -241,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