From a1f7856f0f450883c7060444a4fc2b721720a051 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 15 四月 2026 11:00:05 +0800
Subject: [PATCH] 1.erp对接新增字段 2.电视机数据
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 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 fd6422b..582ec1d 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -706,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("褰撳墠搴撳尯娌℃湁鍙噸鏂板垎閰嶇殑绌哄簱浣�");
}
@@ -801,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) {
@@ -821,6 +832,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) {
if (area == null || area <= 0) {
return false;
--
Gitblit v1.9.1