From b176072388747abb438990157bfa305b215b4b90 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 14 四月 2026 21:59:39 +0800
Subject: [PATCH] 我们现在讨论一下系统找库位方案， 如何实现，对现有找库位规则进行整改，数据库也要整改 1、要能方便的填写单伸堆垛机或双伸堆垛机的深浅库位配置 2、根据设备状态分配库位，离线设备不分配 3、库位分配要均衡到每一个设备 4、库位高度需要匹配到对应库位信息，低库位能向上兼容 5、空托盘优先放在locType2库位=1的库位，没有这种库位了，允许放到其他库位 6、给入库站点设置有限去那些堆垛机，其次去那些堆垛机，弄成页面可以配置入库站点 7、在系统配置新增优先放前几列的配置，当入库的货物是高频货物时放在前几列 8、组托中会标识该托盘是高频还是低频，如果是高频则从前往后找库位，如果是低频则从后往前找库位 9、找库位时locMast中whsType字段无用
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 227 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 191 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 6f6c65f..582ec1d 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -23,12 +23,15 @@
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
+import com.zy.common.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronizationAdapter;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
import java.io.IOException;
import java.math.BigDecimal;
@@ -42,12 +45,18 @@
private static final Long WCS_SYNC_USER = 9999L;
private static final String YES = "Y";
private static final String NO = "N";
+ private static final long OUT_LOCK_REPORT_PENDING_WRK_STS = 13L;
+ private static final long OUT_LOCK_REPORT_SUCCESS_WRK_STS = 21L;
+ private static final long OUT_LOCK_REPORT_FAIL_WRK_STS = 22L;
+ private static final String OUT_LOCK_REPORT_PENDING_FLAG = "P";
/** 鍚屼竴 WCS 璺緞銆佸悓涓�鍗曞彿涓嬩竴缁勪笅鍙戠殑浠诲姟鏉℃暟涓婇檺 */
private static final int WCS_PUB_BATCH_SIZE = 20;
/** 涓夋柟鎺ュ彛缁熻锛氭湰绯荤粺璋冪敤 WCS 鐨� namespace 绾﹀畾 */
private static final String NS_WMS_TO_WCS = "鏈郴缁熻姹俉CS";
+ private static final String REASSIGN_CRN_LOCK_KEY_PREFIX = "wcs:reassign:inbound:crn:";
+ private static final long REASSIGN_CRN_LOCK_SECONDS = 180L;
@Autowired
private LocMastService locMastService;
@@ -96,6 +105,8 @@
private ApiLogService apiLogService;
@Autowired
private RowLastnoService rowLastnoService;
+ @Autowired
+ private RedisUtil redisUtil;
/**
@@ -295,7 +306,7 @@
}
/**
- * 鍑哄簱锛氫粎褰撳崟鍙枫�佸簭鍙峰潎鏈夋晥鏃跺仛璺冲彿鏍￠獙锛涘崟鍙风┖鎴栧簭鍙锋棤鏁堜粛涓嬪彂銆傚叆搴�/绉诲簱涓嶅鐞嗐��
+ * 鍑哄簱锛氫粎褰撳崟鍙枫�佹壒娆°�佸簭鍙峰潎鏈夋晥鏃跺仛鎵规鍐呰烦鍙锋牎楠岋紱鏃犳晥鏃朵粛涓嬪彂銆傚叆搴�/绉诲簱涓嶅鐞嗐��
*/
private List<WorkTaskParams> filterOutboundByContiguousPlt(List<WorkTaskParams> accepted, Map<String, WrkMast> wrkMastMap, List<String> skipMsgs) {
Map<String, Integer> reachCache = new HashMap<>();
@@ -307,12 +318,14 @@
}
WrkMast w = wrkMastMap.get(p.getTaskNo());
String userNo = sortUserNoForPub(p, w);
+ String batchGroup = sortBatchGroupForPub(p, w);
Integer plt = sortPltForPub(p, w);
if (Cools.isEmpty(userNo) || plt == null || plt <= 0) {
kept.add(p);
continue;
}
- int maxReach = reachCache.computeIfAbsent(userNo, wrkMastService::outboundSeqMaxContiguousPlt);
+ String cacheKey = buildOutboundBatchCacheKey(userNo, batchGroup);
+ int maxReach = reachCache.computeIfAbsent(cacheKey, key -> wrkMastService.outboundSeqMaxContiguousPlt(userNo, batchGroup));
if (plt > maxReach) {
skipMsgs.add(buildTaskMsg(p, "鍑哄簱搴忓彿璺冲彿锛岃烦杩�"));
continue;
@@ -356,7 +369,7 @@
}
/**
- * 鍚屽崟涓嬩竴缁勶細浼樺厛 WCS queryTask锛涘け璐ユ垨鏃犳暟鎹垯涓昏〃宸查潪 11 鎴栧凡杩涘巻鍙茶〃銆�
+ * 鍚屽崟鍚屾壒涓嬩竴缁勶細浼樺厛 WCS queryTask锛涘け璐ユ垨鏃犳暟鎹垯涓昏〃宸查潪 11 鎴栧凡杩涘巻鍙茶〃銆�
*/
private boolean sameOrderNextChunkAllowed(List<WorkTaskParams> lastSentChunk) {
if (lastSentChunk == null || lastSentChunk.isEmpty()) {
@@ -419,7 +432,7 @@
}
/**
- * 鍑哄簱姣忕粍涓嬪彂鍓嶏細鏈粍鏈夋湁鏁堟渶灏忓簭鍙蜂笖>1 鏃讹紝鍙牎楠屻�屾渶灏忓簭鍙�-1銆嶄竴妗ｏ紱搴忓彿鍏ㄦ棤鍒欒烦杩囨湰鏉′欢銆�
+ * 鍑哄簱姣忕粍涓嬪彂鍓嶏細鏈粍鏈夋湁鏁堟渶灏忓簭鍙蜂笖>1 鏃讹紝鍙牎楠屻�屽悓鍗曞悓鎵圭殑鏈�灏忓簭鍙�-1銆嶄竴妗ｏ紱搴忓彿鍏ㄦ棤鍒欒烦杩囨湰鏉′欢銆�
*/
private boolean outboundChunkPredecessorPltReady(List<WorkTaskParams> chunk, Map<String, WrkMast> wrkMastMap) {
if (chunk == null || chunk.isEmpty()) {
@@ -431,6 +444,7 @@
}
WrkMast headMast = wrkMastMap.get(head.getTaskNo());
String userNo = sortUserNoForPub(head, headMast);
+ String batchGroup = sortBatchGroupForPub(head, headMast);
if (Cools.isEmpty(userNo)) {
return true;
}
@@ -447,14 +461,20 @@
if (minPlt == Integer.MAX_VALUE || minPlt <= 1) {
return true;
}
- return outboundPltSlotReleasedInWms(userNo, minPlt - 1);
+ return outboundPltSlotReleasedInWms(userNo, batchGroup, minPlt - 1);
}
- private boolean outboundPltSlotReleasedInWms(String userNo, int pltType) {
- List<WrkMast> rows = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("user_no", userNo)
- .eq("io_type", 101)
- .eq("plt_type", pltType));
+ private boolean outboundPltSlotReleasedInWms(String userNo, String batchSeq, int pltType) {
+ EntityWrapper<WrkMast> mastWrapper = new EntityWrapper<>();
+ mastWrapper.eq("user_no", userNo);
+ mastWrapper.eq("io_type", 101);
+ mastWrapper.eq("plt_type", pltType);
+ if (batchSeq == null) {
+ mastWrapper.isNull("batch_seq");
+ } else {
+ mastWrapper.eq("batch_seq", batchSeq);
+ }
+ List<WrkMast> rows = wrkMastService.selectList(mastWrapper);
if (rows != null && !rows.isEmpty()) {
for (WrkMast m : rows) {
if (m != null && m.getWrkSts() != null && Objects.equals(m.getWrkSts(), 11L)) {
@@ -463,10 +483,16 @@
}
return true;
}
- int logCnt = wrkMastLogService.selectCount(new EntityWrapper<WrkMastLog>()
- .eq("user_no", userNo)
- .eq("io_type", 101)
- .eq("plt_type", pltType));
+ EntityWrapper<WrkMastLog> logWrapper = new EntityWrapper<>();
+ logWrapper.eq("user_no", userNo);
+ logWrapper.eq("io_type", 101);
+ logWrapper.eq("plt_type", pltType);
+ if (batchSeq == null) {
+ logWrapper.isNull("batch_seq");
+ } else {
+ logWrapper.eq("batch_seq", batchSeq);
+ }
+ int logCnt = wrkMastLogService.selectCount(logWrapper);
return logCnt > 0;
}
@@ -495,6 +521,7 @@
return Comparator
.comparing((WorkTaskParams p) -> Optional.ofNullable(p.getType()).orElse(""), String.CASE_INSENSITIVE_ORDER)
.thenComparing(p -> sortUserNoForPub(p, wrkMastMap.get(p.getTaskNo())), Comparator.nullsLast(String::compareTo))
+ .thenComparing(p -> sortBatchGroupForPub(p, wrkMastMap.get(p.getTaskNo())), Comparator.nullsLast(String::compareTo))
.thenComparing(p -> sortPltForPub(p, wrkMastMap.get(p.getTaskNo())), Comparator.nullsLast(Integer::compareTo));
}
@@ -511,6 +538,19 @@
return wrkMast.getPltType();
}
return p.getBatchSeq();
+ }
+
+ private static String sortBatchGroupForPub(WorkTaskParams p, WrkMast wrkMast) {
+ if (wrkMast != null) {
+ return wrkMast.getBatchSeq();
+ }
+ return null;
+ }
+
+ private static String buildOutboundBatchCacheKey(String userNo, String batchSeq) {
+ String safeUserNo = Cools.isEmpty(userNo) ? "_NO_USER_" : userNo;
+ String safeBatchSeq = Cools.isEmpty(batchSeq) ? "_NO_BATCH_" : batchSeq;
+ return safeUserNo + "#" + safeBatchSeq;
}
/**
@@ -537,13 +577,26 @@
}
- if (params.getNotifyType().equals("task")) {
+ if (isOutboundCrnTaskRun(params)) {
+ // WCS鍑哄簱浠诲姟寮�濮嬶細鍫嗗灈鏈哄紑濮嬫墽琛屽嚭搴撲换鍔★紝宸ヤ綔鐘舵�� 12 -> 13銆�
+ if (isOutboundTask(mast) && Objects.equals(mast.getWrkSts(), 12L)) {
+ mast.setWrkSts(OUT_LOCK_REPORT_PENDING_WRK_STS);
+ mast.setExpTime(0D);
+ mast.setLogMk(OUT_LOCK_REPORT_PENDING_FLAG);
+ mast.setLogErrMemo(null);
+ mast.setLogErrTime(null);
+ mast.setModiTime(new Date());
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ } else if (params.getNotifyType().equals("task")) {
//浠诲姟
if (params.getMsgType().equals("task_complete")) {
if (mast.getIoType() == 1 || mast.getIoType() == 2 ||mast.getIoType() == 10) {
mast.setWrkSts(4L);
- } else if ((mast.getIoType() == 101||mast.getIoType()==110) && mast.getWrkSts()<14) {
+ } else if (isOutboundTask(mast) && canMarkOutboundTaskComplete(mast)) {
mast.setWrkSts(14L);
if(Cools.isEmpty(mast.getStaNo())){
mast.setOveMk("Y");
@@ -574,6 +627,25 @@
}
return R.ok();
+ }
+
+ private boolean isOutboundCrnTaskRun(ReceviceTaskParams params) {
+ return params != null
+ && "Crn".equalsIgnoreCase(params.getNotifyType())
+ && "crn_out_task_run".equalsIgnoreCase(params.getMsgType());
+ }
+
+ private boolean isOutboundTask(WrkMast mast) {
+ return mast != null && mast.getIoType() != null && (mast.getIoType() == 101 || mast.getIoType() == 110);
+ }
+
+ private boolean canMarkOutboundTaskComplete(WrkMast mast) {
+ if (mast == null || mast.getWrkSts() == null) {
+ return false;
+ }
+ return mast.getWrkSts() < 14
+ || mast.getWrkSts().equals(OUT_LOCK_REPORT_SUCCESS_WRK_STS)
+ || mast.getWrkSts().equals(OUT_LOCK_REPORT_FAIL_WRK_STS);
}
@Override
@@ -634,19 +706,26 @@
return R.error("褰撳墠鐩爣搴撲綅涓嶅瓨鍦�");
}
- Integer preferredArea = resolveReassignArea(wrkMast, currentLoc);
- if (preferredArea == null) {
+ LocTypeDto locTypeDto = buildReassignLocTypeDto(currentLoc);
+ List<Integer> areaOrder = buildReassignAreaOrder(wrkMast, currentLoc);
+ if (Cools.isEmpty(areaOrder)) {
return R.error("鏃犳硶纭畾浠诲姟鎵�灞炲簱鍖�");
}
- List<Integer> candidateCrnNos = buildReassignCandidateCrnNos(preferredArea, wrkMast.getCrnNo());
- if (candidateCrnNos.isEmpty()) {
- return R.error("褰撳墠搴撳尯娌℃湁鍏朵粬鍫嗗灈鏈哄彲渚涢噸鍒嗛厤");
+ StartupDto startupDto = null;
+ Integer preferredArea = null;
+ for (Integer area : areaOrder) {
+ List<Integer> candidateCrnNos = buildReassignCandidateCrnNos(area, wrkMast.getCrnNo());
+ if (candidateCrnNos.isEmpty()) {
+ continue;
+ }
+ startupDto = commonService.findRun2InboundLocByCandidateCrnNos(
+ wrkMast.getSourceStaNo(), wrkMast.getIoType(), area, candidateCrnNos, locTypeDto);
+ if (startupDto != null && !Cools.isEmpty(startupDto.getLocNo())) {
+ preferredArea = area;
+ break;
+ }
}
-
- LocTypeDto locTypeDto = buildReassignLocTypeDto(currentLoc);
- StartupDto startupDto = commonService.findRun2InboundLocByCandidateCrnNos(
- wrkMast.getSourceStaNo(), wrkMast.getIoType(), preferredArea, candidateCrnNos, locTypeDto);
if (startupDto == null || Cools.isEmpty(startupDto.getLocNo())) {
return R.error("褰撳墠搴撳尯娌℃湁鍙噸鏂板垎閰嶇殑绌哄簱浣�");
}
@@ -663,6 +742,7 @@
updateReassignTargetLoc(targetLoc, wrkMast, currentLoc, now);
updateReassignWorkMast(wrkMast, startupDto, now);
releaseOldReservedLocIfNeeded(currentLoc, targetLoc.getLocNo(), now);
+ lockReassignedCrnAfterCommit(preferredArea, targetLoc.getCrnNo(), wrkMast.getWrkNo());
Map<String, Object> result = new LinkedHashMap<>();
result.put("locNo", Utils.WMSLocToWCSLoc(targetLoc.getLocNo()));
@@ -728,15 +808,19 @@
}
private Integer resolveReassignArea(WrkMast wrkMast, LocMast currentLoc) {
- Integer stationArea = Utils.getStationStorageArea(wrkMast.getSourceStaNo());
- if (belongsToArea(stationArea, wrkMast.getCrnNo(), currentLoc)) {
- return stationArea;
+ List<Integer> stationAreas = Utils.getStationStorageAreas(wrkMast.getSourceStaNo());
+ if (!Cools.isEmpty(stationAreas)) {
+ for (Integer area : stationAreas) {
+ if (belongsToArea(area, wrkMast.getCrnNo(), currentLoc)) {
+ return area;
+ }
+ }
}
Integer fallbackArea = findAreaByCurrentTask(wrkMast.getCrnNo(), currentLoc);
if (fallbackArea != null) {
return fallbackArea;
}
- return stationArea;
+ return Utils.getStationStorageArea(wrkMast.getSourceStaNo());
}
private Integer findAreaByCurrentTask(Integer currentCrnNo, LocMast currentLoc) {
@@ -746,6 +830,25 @@
}
}
return null;
+ }
+
+ private List<Integer> buildReassignAreaOrder(WrkMast wrkMast, LocMast currentLoc) {
+ LinkedHashSet<Integer> areaOrder = new LinkedHashSet<>();
+ List<Integer> stationAreas = Utils.getStationStorageAreas(wrkMast.getSourceStaNo());
+ if (!Cools.isEmpty(stationAreas)) {
+ areaOrder.addAll(stationAreas);
+ }
+ Integer currentArea = findAreaByCurrentTask(wrkMast.getCrnNo(), currentLoc);
+ if (currentArea != null) {
+ areaOrder.add(currentArea);
+ }
+ if (areaOrder.isEmpty()) {
+ Integer resolvedArea = resolveReassignArea(wrkMast, currentLoc);
+ if (resolvedArea != null) {
+ areaOrder.add(resolvedArea);
+ }
+ }
+ return new ArrayList<>(areaOrder);
}
private boolean belongsToArea(Integer area, Integer currentCrnNo, LocMast currentLoc) {
@@ -779,12 +882,21 @@
}
List<Integer> candidateCrnNos = new ArrayList<>();
for (int crnNo = currentCrnNo - 1; crnNo >= startCrnNo; crnNo--) {
- candidateCrnNos.add(crnNo);
+ addUnlockedReassignCandidate(candidateCrnNos, area, crnNo);
}
for (int crnNo = endCrnNo; crnNo > currentCrnNo; crnNo--) {
- candidateCrnNos.add(crnNo);
+ addUnlockedReassignCandidate(candidateCrnNos, area, crnNo);
}
return candidateCrnNos;
+ }
+
+ private void addUnlockedReassignCandidate(List<Integer> candidateCrnNos, Integer area, int crnNo) {
+ if (isReassignCrnLocked(area, crnNo)) {
+ log.info("skip locked reassign crane. area={}, crnNo={}, ttl={}s",
+ area, crnNo, redisUtil.getExpire(buildReassignCrnLockKey(area, crnNo)));
+ return;
+ }
+ candidateCrnNos.add(crnNo);
}
private int resolveAreaStartCrnNo(RowLastno areaRowLastno) {
@@ -871,6 +983,43 @@
}
}
+ private boolean isReassignCrnLocked(Integer area, Integer crnNo) {
+ if (area == null || crnNo == null) {
+ return false;
+ }
+ return redisUtil.hasKey(buildReassignCrnLockKey(area, crnNo));
+ }
+
+ private String buildReassignCrnLockKey(Integer area, Integer crnNo) {
+ return REASSIGN_CRN_LOCK_KEY_PREFIX + area + ":" + crnNo;
+ }
+
+ private void lockReassignedCrnAfterCommit(Integer area, Integer crnNo, Integer wrkNo) {
+ if (area == null || crnNo == null) {
+ return;
+ }
+ Runnable action = () -> {
+ String key = buildReassignCrnLockKey(area, crnNo);
+ boolean locked = redisUtil.set(key, String.valueOf(wrkNo), REASSIGN_CRN_LOCK_SECONDS);
+ if (!locked) {
+ log.warn("failed to lock reassigned crane in redis. area={}, crnNo={}, wrkNo={}", area, crnNo, wrkNo);
+ return;
+ }
+ log.info("locked reassigned crane in redis. area={}, crnNo={}, wrkNo={}, ttl={}s",
+ area, crnNo, wrkNo, REASSIGN_CRN_LOCK_SECONDS);
+ };
+ if (TransactionSynchronizationManager.isActualTransactionActive()) {
+ TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+ @Override
+ public void afterCommit() {
+ action.run();
+ }
+ });
+ return;
+ }
+ action.run();
+ }
+
/**
* 鎸変换鍔＄被鍨嬮�夋嫨 WCS 鎺ュ彛鍦板潃銆�
* in -> 鍏ュ簱鎺ュ彛
@@ -939,21 +1088,23 @@
* <p>
* 鍒嗙粍瑙勫垯锛�
* 1. 鍏堟寜鎺ュ彛璺緞鍖哄垎锛岄伩鍏嶄笉鍚屼换鍔＄被鍨嬫贩鐢ㄥ悓涓�涓� WCS 鎺ュ彛锛�
- * 2. 鍐嶆寜 userNo 鍖哄垎锛岀‘淇濈浉鍚� userNo 鐨勪换鍔′竴璧蜂笂鎶ャ��
+ * 2. 鍐嶆寜 userNo + batchSeq 鍖哄垎锛岀‘淇濈浉鍚岃鍗曞悓鎵规鐨勪换鍔′竴璧蜂笂鎶ャ��
* <p>
* 姝ｅ父鎯呭喌涓� userNo 鍙栬嚜 work_mast.user_no锛�
- * 濡傛灉褰撳墠娌℃煡鍒板伐浣滄。锛屽垯鍥為��鍒拌姹傞噷鐨� batch 瀛楁锛屼繚璇佸吋瀹瑰凡鏈夎皟鐢ㄣ��
+ * batchSeq 鍙栬嚜 work_mast.batch_seq锛涘鏋滃綋鍓嶆病鏌ュ埌宸ヤ綔妗ｏ紝鍒欏彧鎸� userNo 鍥為��鍏煎宸叉湁璋冪敤銆�
*/
private String buildBatchGroupKey(WorkTaskParams params, WrkMast wrkMast) {
String path = resolveTaskPath(params);
String userNo = wrkMast == null ? null : wrkMast.getUserNo();
+ String batchGroup = wrkMast == null ? null : wrkMast.getBatchSeq();
if (Cools.isEmpty(userNo)) {
userNo = params.getBatch();
}
if (Cools.isEmpty(userNo)) {
userNo = "_NO_USER_";
}
- return path + "#" + userNo;
+ String batchKey = Cools.isEmpty(batchGroup) ? "_NO_BATCH_" : batchGroup;
+ return path + "#" + userNo + "#" + batchKey;
}
/**
@@ -994,10 +1145,12 @@
if (!Cools.isEmpty(params.getStaNo())) {
task.put("staNo", params.getStaNo());
}
- if (!Cools.isEmpty(params.getBatch())) {
+ boolean includeOutBatch = !"out".equalsIgnoreCase(params.getType())
+ || (params.getBatchSeq() != null && params.getBatchSeq() > 0);
+ if (includeOutBatch && !Cools.isEmpty(params.getBatch())) {
task.put("batch", params.getBatch());
}
- if (!Objects.isNull(params.getBatchSeq())) {
+ if (includeOutBatch && !Objects.isNull(params.getBatchSeq())) {
task.put("batchSeq", params.getBatchSeq());
}
return task;
@@ -1141,6 +1294,8 @@
// crn_sts 鏈湴琛ㄥ瓨鐨勬槸鈥滃爢鍨涙満妯″紡(鎵嬪姩/鑷姩/鐢佃剳)鈥濓紝鍥犳蹇呴』鍐� mode锛屼笉鑳藉啓 status銆�
basCrnp.setCrnSts(defaultZero(crnProtocol.getMode()));
basCrnp.setWrkNo(defaultZero(crnProtocol.getTaskNo()));
+ basCrnp.setBay(crnProtocol.getBay());
+ basCrnp.setLevel(crnProtocol.getLevel());
basCrnp.setCrnErr(crnProtocol.getAlarm() == null ? 0L : Long.valueOf(crnProtocol.getAlarm()));
basCrnp.setModiUser(WCS_SYNC_USER);
basCrnp.setModiTime(now);
--
Gitblit v1.9.1