From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档，新增了几个字段需要加入到组托档中，不额外加字段 2.针对7.11接口文档，对outOrder方法进行重写，batchSeq在wrkMast表中新增一个字段放，entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档，上报时加上orderId出库单号 4.针对7.9接口文档，wcs会先请求wms，只需要palletId托盘码，errorMsg错误信息；wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档，ERP先按照这个文档发给wms，wms再发给wcs，发给wcs这块先不写
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 395 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 374 insertions(+), 21 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 5d658fb..fd6422b 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.zy.api.controller.params.ReassignLocParams;
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.controller.params.StopOutTaskParams;
import com.zy.api.controller.params.WorkTaskParams;
@@ -18,16 +19,22 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.constant.MesConstant;
+import com.zy.common.model.LocTypeDto;
+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;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -38,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;
@@ -90,6 +103,10 @@
private BasCrnpService basCrnpService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private RowLastnoService rowLastnoService;
+ @Autowired
+ private RedisUtil redisUtil;
/**
@@ -289,7 +306,7 @@
}
/**
- * 鍑哄簱锛氫粎褰撳崟鍙枫�佸簭鍙峰潎鏈夋晥鏃跺仛璺冲彿鏍￠獙锛涘崟鍙风┖鎴栧簭鍙锋棤鏁堜粛涓嬪彂銆傚叆搴�/绉诲簱涓嶅鐞嗐��
+ * 鍑哄簱锛氫粎褰撳崟鍙枫�佹壒娆°�佸簭鍙峰潎鏈夋晥鏃跺仛鎵规鍐呰烦鍙锋牎楠岋紱鏃犳晥鏃朵粛涓嬪彂銆傚叆搴�/绉诲簱涓嶅鐞嗐��
*/
private List<WorkTaskParams> filterOutboundByContiguousPlt(List<WorkTaskParams> accepted, Map<String, WrkMast> wrkMastMap, List<String> skipMsgs) {
Map<String, Integer> reachCache = new HashMap<>();
@@ -301,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;
@@ -350,7 +369,7 @@
}
/**
- * 鍚屽崟涓嬩竴缁勶細浼樺厛 WCS queryTask锛涘け璐ユ垨鏃犳暟鎹垯涓昏〃宸查潪 11 鎴栧凡杩涘巻鍙茶〃銆�
+ * 鍚屽崟鍚屾壒涓嬩竴缁勶細浼樺厛 WCS queryTask锛涘け璐ユ垨鏃犳暟鎹垯涓昏〃宸查潪 11 鎴栧凡杩涘巻鍙茶〃銆�
*/
private boolean sameOrderNextChunkAllowed(List<WorkTaskParams> lastSentChunk) {
if (lastSentChunk == null || lastSentChunk.isEmpty()) {
@@ -413,7 +432,7 @@
}
/**
- * 鍑哄簱姣忕粍涓嬪彂鍓嶏細鏈粍鏈夋湁鏁堟渶灏忓簭鍙蜂笖>1 鏃讹紝鍙牎楠屻�屾渶灏忓簭鍙�-1銆嶄竴妗ｏ紱搴忓彿鍏ㄦ棤鍒欒烦杩囨湰鏉′欢銆�
+ * 鍑哄簱姣忕粍涓嬪彂鍓嶏細鏈粍鏈夋湁鏁堟渶灏忓簭鍙蜂笖>1 鏃讹紝鍙牎楠屻�屽悓鍗曞悓鎵圭殑鏈�灏忓簭鍙�-1銆嶄竴妗ｏ紱搴忓彿鍏ㄦ棤鍒欒烦杩囨湰鏉′欢銆�
*/
private boolean outboundChunkPredecessorPltReady(List<WorkTaskParams> chunk, Map<String, WrkMast> wrkMastMap) {
if (chunk == null || chunk.isEmpty()) {
@@ -425,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;
}
@@ -441,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)) {
@@ -457,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;
}
@@ -489,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));
}
@@ -505,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;
}
/**
@@ -531,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");
@@ -568,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
@@ -607,6 +685,63 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R reassignInboundLoc(ReassignLocParams params) {
+ if (params == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Cools.isEmpty(params.getTaskNo())) {
+ return R.error("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getTaskNo()));
+ String validateMsg = validateReassignInboundTask(wrkMast);
+ if (!Cools.isEmpty(validateMsg)) {
+ return R.error(validateMsg);
+ }
+
+ LocMast currentLoc = locMastService.selectById(wrkMast.getLocNo());
+ if (Cools.isEmpty(currentLoc)) {
+ return R.error("褰撳墠鐩爣搴撲綅涓嶅瓨鍦�");
+ }
+
+ Integer preferredArea = resolveReassignArea(wrkMast, currentLoc);
+ if (preferredArea == null) {
+ return R.error("鏃犳硶纭畾浠诲姟鎵�灞炲簱鍖�");
+ }
+
+ List<Integer> candidateCrnNos = buildReassignCandidateCrnNos(preferredArea, wrkMast.getCrnNo());
+ if (candidateCrnNos.isEmpty()) {
+ return R.error("褰撳墠搴撳尯娌℃湁鍏朵粬鍫嗗灈鏈哄彲渚涢噸鍒嗛厤");
+ }
+
+ 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("褰撳墠搴撳尯娌℃湁鍙噸鏂板垎閰嶇殑绌哄簱浣�");
+ }
+
+ LocMast targetLoc = locMastService.selectById(startupDto.getLocNo());
+ if (Cools.isEmpty(targetLoc)) {
+ throw new CoolException("鏂扮洰鏍囧簱浣嶄笉瀛樺湪");
+ }
+ if (!"O".equals(targetLoc.getLocSts())) {
+ throw new CoolException(targetLoc.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
+ }
+
+ Date now = new Date();
+ 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()));
+ return R.ok("鎿嶄綔鎴愬姛").add(result);
+ }
+
private boolean requiresOutboundErpConfirm(WrkMast wrkMast) {
Integer ioType = wrkMast == null ? null : wrkMast.getIoType();
return ioType != null && (ioType == 101 || ioType == 103 || ioType == 104 || ioType == 107 || ioType == 110);
@@ -641,6 +776,218 @@
}
}
return null;
+ }
+
+ private String validateReassignInboundTask(WrkMast wrkMast) {
+ if (wrkMast == null) {
+ return "浠诲姟涓嶅瓨鍦�";
+ }
+ if (wrkMast.getIoType() == null || (wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10)) {
+ return "褰撳墠浠诲姟涓嶆槸鍏ュ簱浠诲姟";
+ }
+ if (!Objects.equals(wrkMast.getWrkSts(), 2L)) {
+ return "褰撳墠浠诲姟鐘舵�佷笉鍏佽閲嶆柊鍒嗛厤鍏ュ簱浣�";
+ }
+ if (wrkMast.getCrnNo() == null) {
+ return "褰撳墠浠诲姟鏈垎閰嶅爢鍨涙満";
+ }
+ if (Cools.isEmpty(wrkMast.getLocNo())) {
+ return "褰撳墠浠诲姟鏈垎閰嶇洰鏍囧簱浣�";
+ }
+ if (wrkMast.getSourceStaNo() == null) {
+ return "褰撳墠浠诲姟缂哄皯婧愮珯淇℃伅";
+ }
+ return null;
+ }
+
+ private Integer resolveReassignArea(WrkMast wrkMast, LocMast currentLoc) {
+ Integer stationArea = Utils.getStationStorageArea(wrkMast.getSourceStaNo());
+ if (belongsToArea(stationArea, wrkMast.getCrnNo(), currentLoc)) {
+ return stationArea;
+ }
+ Integer fallbackArea = findAreaByCurrentTask(wrkMast.getCrnNo(), currentLoc);
+ if (fallbackArea != null) {
+ return fallbackArea;
+ }
+ return stationArea;
+ }
+
+ private Integer findAreaByCurrentTask(Integer currentCrnNo, LocMast currentLoc) {
+ for (int area = 1; area <= 3; area++) {
+ if (belongsToArea(area, currentCrnNo, currentLoc)) {
+ return area;
+ }
+ }
+ return null;
+ }
+
+ private boolean belongsToArea(Integer area, Integer currentCrnNo, LocMast currentLoc) {
+ if (area == null || area <= 0) {
+ return false;
+ }
+ RowLastno areaRowLastno = rowLastnoService.selectById(area);
+ if (areaRowLastno == null) {
+ return false;
+ }
+ Integer startCrnNo = resolveAreaStartCrnNo(areaRowLastno);
+ Integer endCrnNo = resolveAreaEndCrnNo(areaRowLastno, startCrnNo);
+ if (currentCrnNo != null && currentCrnNo >= startCrnNo && currentCrnNo <= endCrnNo) {
+ return true;
+ }
+ Integer row = currentLoc == null ? null : currentLoc.getRow1();
+ Integer startRow = areaRowLastno.getsRow();
+ Integer endRow = areaRowLastno.geteRow();
+ return row != null && startRow != null && endRow != null && row >= startRow && row <= endRow;
+ }
+
+ private List<Integer> buildReassignCandidateCrnNos(Integer area, Integer currentCrnNo) {
+ RowLastno areaRowLastno = rowLastnoService.selectById(area);
+ if (areaRowLastno == null) {
+ throw new CoolException("鏈壘鍒板簱鍖鸿疆璇㈣鍒�");
+ }
+ int startCrnNo = resolveAreaStartCrnNo(areaRowLastno);
+ int endCrnNo = resolveAreaEndCrnNo(areaRowLastno, startCrnNo);
+ if (currentCrnNo == null || currentCrnNo < startCrnNo || currentCrnNo > endCrnNo) {
+ throw new CoolException("褰撳墠浠诲姟鍫嗗灈鏈轰笉鍦ㄦ墍灞炲簱鍖鸿寖鍥村唴");
+ }
+ List<Integer> candidateCrnNos = new ArrayList<>();
+ for (int crnNo = currentCrnNo - 1; crnNo >= startCrnNo; crnNo--) {
+ addUnlockedReassignCandidate(candidateCrnNos, area, crnNo);
+ }
+ for (int crnNo = endCrnNo; crnNo > currentCrnNo; 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) {
+ if (areaRowLastno.getsCrnNo() != null && areaRowLastno.getsCrnNo() > 0) {
+ return areaRowLastno.getsCrnNo();
+ }
+ return 1;
+ }
+
+ private int resolveAreaEndCrnNo(RowLastno areaRowLastno, int startCrnNo) {
+ if (areaRowLastno.geteCrnNo() != null && areaRowLastno.geteCrnNo() >= startCrnNo) {
+ return areaRowLastno.geteCrnNo();
+ }
+ int crnQty = areaRowLastno.getCrnQty() == null || areaRowLastno.getCrnQty() <= 0 ? 1 : areaRowLastno.getCrnQty();
+ return startCrnNo + crnQty - 1;
+ }
+
+ private LocTypeDto buildReassignLocTypeDto(LocMast currentLoc) {
+ LocTypeDto locTypeDto = new LocTypeDto();
+ if (currentLoc == null) {
+ return locTypeDto;
+ }
+ locTypeDto.setLocType1(normalizeLocType(currentLoc.getLocType1()));
+ locTypeDto.setLocType2(normalizeLocType(currentLoc.getLocType2()));
+ locTypeDto.setLocType3(normalizeLocType(currentLoc.getLocType3()));
+ return locTypeDto;
+ }
+
+ private Short normalizeLocType(Short locType) {
+ return locType == null || locType <= 0 ? null : locType;
+ }
+
+ private void updateReassignTargetLoc(LocMast targetLoc, WrkMast wrkMast, LocMast currentLoc, Date now) {
+ targetLoc.setLocSts("S");
+ targetLoc.setModiUser(WCS_SYNC_USER);
+ targetLoc.setModiTime(now);
+ if (!Cools.isEmpty(wrkMast.getBarcode())) {
+ targetLoc.setBarcode(wrkMast.getBarcode());
+ } else if (!Cools.isEmpty(currentLoc) && !Cools.isEmpty(currentLoc.getBarcode())) {
+ targetLoc.setBarcode(currentLoc.getBarcode());
+ } else {
+ targetLoc.setBarcode("");
+ }
+ if (wrkMast.getScWeight() != null) {
+ targetLoc.setScWeight(wrkMast.getScWeight());
+ } else if (!Cools.isEmpty(currentLoc) && currentLoc.getScWeight() != null) {
+ targetLoc.setScWeight(currentLoc.getScWeight());
+ } else {
+ targetLoc.setScWeight(BigDecimal.ZERO);
+ }
+ if (!locMastService.updateById(targetLoc)) {
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ }
+
+ private void updateReassignWorkMast(WrkMast wrkMast, StartupDto startupDto, Date now) {
+ wrkMast.setLocNo(startupDto.getLocNo());
+ wrkMast.setCrnNo(startupDto.getCrnNo());
+ if (startupDto.getStaNo() != null) {
+ wrkMast.setStaNo(startupDto.getStaNo());
+ }
+ wrkMast.setWrkSts(2L);
+ wrkMast.setModiUser(WCS_SYNC_USER);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("淇敼宸ヤ綔妗ｅけ璐�");
+ }
+ }
+
+ private void releaseOldReservedLocIfNeeded(LocMast currentLoc, String newLocNo, Date now) {
+ if (currentLoc == null || Cools.isEmpty(currentLoc.getLocNo()) || currentLoc.getLocNo().equals(newLocNo)) {
+ return;
+ }
+ if (!"S".equals(currentLoc.getLocSts())) {
+ return;
+ }
+ currentLoc.setLocSts("O");
+ currentLoc.setBarcode("");
+ currentLoc.setScWeight(BigDecimal.ZERO);
+ currentLoc.setModiUser(WCS_SYNC_USER);
+ currentLoc.setModiTime(now);
+ if (!locMastService.updateById(currentLoc)) {
+ throw new CoolException("閲婃斁鍘熺洰鏍囧簱浣嶅け璐�");
+ }
+ }
+
+ 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();
}
/**
@@ -711,21 +1058,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;
}
/**
@@ -766,10 +1115,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;
@@ -913,6 +1264,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