From 11d4e7383093190ee85d59d198f0e3b5ba428c91 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期五, 14 十一月 2025 18:08:22 +0800
Subject: [PATCH] 111
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 321 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 221 insertions(+), 100 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 1ea8950..e351e6a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -18,6 +18,7 @@
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.common.utils.Utils;
import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.R;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.common.domain.TaskDto;
@@ -28,10 +29,12 @@
import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.core.utils.HttpHandler;
+import com.zy.acs.manager.manager.controller.param.LocSiteParams;
import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
+import com.zy.acs.manager.manager.service.impl.LocStsServiceImpl;
import com.zy.acs.manager.manager.service.impl.WebsocketServiceImpl;
import com.zy.acs.manager.manager.utils.ActionSorter;
import com.zy.acs.manager.system.service.ConfigService;
@@ -104,6 +107,8 @@
private TaskReportService taskReportService;
@Autowired
private AgvDurationService agvDurationService;
+ @Autowired
+ private LocStsService locStsService;
@SuppressWarnings("all")
@Transactional
@@ -205,11 +210,11 @@
break;
case STA_TO_LOC:
oriSta = staService.getById(task.getOriSta());
- if (oriSta.getStaTypeIsCheck() != 1) {
- if (locStaStatusCheck && !oriSta.getStaSts().equals(StaStsType.STOCK.val())) {
- throw new BusinessException("oriSta锛�" + task.getOriSta$() + " is not in STOCK status");
- }
- }
+// if (oriSta.getStaTypeIsCheck() != 1) {
+// if (locStaStatusCheck && !oriSta.getStaSts().equals(StaStsType.STOCK.val())) {
+// throw new BusinessException("oriSta锛�" + task.getOriSta$() + " is not in STOCK status");
+// }
+// }
oriSta.setStaSts(StaStsType.READY_TAKE.val());
oriSta.setUpdateTime(now);
if (!staService.updateById(oriSta)) {
@@ -770,7 +775,6 @@
// 闇�瑕佽蛋琛�
if (!lastCode.getData().equals(code.getData())) {
-
// 璧拌璺緞鑺傜偣
// List<String> pathList = mapService.checkoutPath(agv.getUuid(), lastCode, code);
List<String> pathListPart = pathList.subList(pathList.indexOf(lastCode.getData()), pathList.indexOf(code.getData()) + 1);
@@ -788,8 +792,16 @@
// 绗竴姝ワ細濡傛灉涓嬩竴涓柟鍚戞濂芥槸浣滀笟鏂瑰悜鐨勭浉鍙嶆柟鍚戯紝鍒欓噸缃笅涓�涓柟鍚戜负浣滀笟鏂瑰悜锛屾爣璁� reverse = true
boolean reverse = false;
if (nextDirection.equals((workDirection + 180) % 360)) {
- nextDirection = workDirection;
- reverse = true;
+ List<String> list = Arrays.asList("00000050", "00000051", "00000052", "00000053", "00000054");
+ if ((Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType())).equals(TaskPosDto.PosType.ORI_STA)
+ || Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
+ .equals(TaskPosDto.PosType.DEST_STA)) && list.contains(lastCode.getData())) {
+ reverse = false;
+ lastDirection = nextDirection;
+ } else {
+ nextDirection = workDirection;
+ reverse = true;
+ }
}
// 绗簩姝ワ細鍒ゆ柇褰撳墠鑺傜偣鏄惁鍙互鏃嬭浆
@@ -810,7 +822,52 @@
nextDirection = lastDirection;
reverse = true;
} else {
+ if ((Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
+ .equals(TaskPosDto.PosType.ORI_STA) || Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
+ .equals(TaskPosDto.PosType.DEST_STA)) && lastCode.getData().equals("00000050")) {
+ // turn
+ reverse = false;
+ actionList.add(new Action(
+ null, // 缂栧彿s
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.TurnCorner.desc, // 鍚嶇О
+ mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(180), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+ } else {
+ // turn
+ actionList.add(new Action(
+ null, // 缂栧彿s
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.TurnCorner.desc, // 鍚嶇О
+ mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(nextDirection), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+ }
+ lastDirection = nextDirection;
+ }
+ } else {
+ if ((Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
+ .equals(TaskPosDto.PosType.ORI_STA) || Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
+ .equals(TaskPosDto.PosType.DEST_STA)) && lastCode.getData().equals("00000050")) {
// turn
+ reverse = false;
actionList.add(new Action(
null, // 缂栧彿s
task.getBusId(), // 鎬荤嚎
@@ -820,20 +877,18 @@
ActionTypeType.TurnCorner.desc, // 鍚嶇О
mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�у��
lastCode.getData(), // 鍦伴潰鐮�
- String.valueOf(nextDirection), // 鍔ㄤ綔鍙傛暟
+ String.valueOf(180), // 鍔ㄤ綔鍙傛暟
ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
actionPrepareSts, // 鍔ㄤ綔杩涘害
agvId, // AGV
now // 宸ヤ綔鏃堕棿
));
-
- lastDirection = nextDirection;
}
}
}
// 绗竴涓姩浣滀竴瀹氭槸 turn
- if (actionList.isEmpty()) {
+ if (actionList.isEmpty() && lastCode.getCornerBool()) {
// turn
actionList.add(new Action(
null, // 缂栧彿
@@ -879,31 +934,37 @@
lastCode = nextCode;
}
-
}
// 鍒濆鏂瑰悜鍊艰ˉ涓�
if (first) {
if (Cools.isEmpty(actionList) || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
- // turn
- actionList.add(new Action(
- null, // 缂栧彿
- task.getBusId(), // 鎬荤嚎
- task.getId(), // 浠诲姟
- null, // 鍔ㄤ綔鍙�
- null, // 浼樺厛绾�
- ActionTypeType.TurnCorner.desc, // 鍚嶇О
- mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�у��
- lastCode.getData(), // 鍦伴潰鐮�
- String.valueOf(workDirection), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
- actionPrepareSts, // 鍔ㄤ綔杩涘害
- agvId, // AGV
- now // 宸ヤ綔鏃堕棿
- ));
-
- lastDirection = workDirection;
-
+ Double turnDirection = workDirection;
+ List<String> list = Arrays.asList("00000051", "00000052", "00000053", "00000054");
+ if ((Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType())).equals(TaskPosDto.PosType.ORI_STA)
+ || Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
+ .equals(TaskPosDto.PosType.DEST_STA)) && list.contains(lastCode.getData())) {
+ turnDirection = workDirection + 180.0;
+ }
+ if (lastCode.getCornerBool()) {
+ // turn
+ actionList.add(new Action(
+ null, // 缂栧彿
+ task.getBusId(), // 鎬荤嚎
+ task.getId(), // 浠诲姟
+ null, // 鍔ㄤ綔鍙�
+ null, // 浼樺厛绾�
+ ActionTypeType.TurnCorner.desc, // 鍚嶇О
+ mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�у��
+ lastCode.getData(), // 鍦伴潰鐮�
+ String.valueOf(turnDirection), // 鍔ㄤ綔鍙傛暟
+ ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+ actionPrepareSts, // 鍔ㄤ綔杩涘害
+ agvId, // AGV
+ now // 宸ヤ綔鏃堕棿
+ ));
+ lastDirection = workDirection;
+ }
}
first = false;
}
@@ -917,7 +978,8 @@
assert backpackType != null;
// 妫�楠屾柟鍚�
if (!lastDirection.equals(workDirection)) {
- throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
+ lastDirection = workDirection;
+// throw new CoolException(agvNo agvNo+ "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
}
// 璐ф灦鍙栬揣
Loc oriLoc = locService.getById(task.getOriLoc());
@@ -1003,28 +1065,28 @@
Sta oriSta = staService.getById(task.getOriSta());
Double oriStaWorkDirection = mapService.getStaAngle(oriSta, workDirection);
// 妫�楠屾柟鍚�
- if (!lastDirection.equals(oriStaWorkDirection)) {
- if (!lastCode.getCornerBool()) {
- throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
- }
- // turn
- actionList.add(new Action(
- null, // 缂栧彿
- task.getBusId(), // 鎬荤嚎
- task.getId(), // 浠诲姟
- null, // 鍔ㄤ綔鍙�
- null, // 浼樺厛绾�
- ActionTypeType.TurnCorner.desc, // 鍚嶇О
- mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�ш皰
- lastCode.getData(), // 鍦伴潰鐮�
- String.valueOf(oriStaWorkDirection), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
- actionPrepareSts, // 鍔ㄤ綔杩涘害
- agvId, // AGV
- now // 宸ヤ綔鏃堕棿
- ));
- lastDirection = oriStaWorkDirection;
- }
+// if (!lastDirection.equals(oriStaWorkDirection)) {
+// if (!lastCode.getCornerBool()) {
+// throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
+// }
+// // turn
+// actionList.add(new Action(
+// null, // 缂栧彿
+// task.getBusId(), // 鎬荤嚎
+// task.getId(), // 浠诲姟
+// null, // 鍔ㄤ綔鍙�
+// null, // 浼樺厛绾�
+// ActionTypeType.TurnCorner.desc, // 鍚嶇О
+// mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�ш皰
+// lastCode.getData(), // 鍦伴潰鐮�
+// String.valueOf(oriStaWorkDirection), // 鍔ㄤ綔鍙傛暟
+// ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+// actionPrepareSts, // 鍔ㄤ綔杩涘害
+// agvId, // AGV
+// now // 宸ヤ綔鏃堕棿
+// ));
+// lastDirection = oriStaWorkDirection;
+// }
// 璁＄畻璐у弶宸ヤ綔鏂瑰悜
staWorkDirection = mapService.calculateAgvWorkDirectionByStation(oriStaWorkDirection, lastDirection);
actionList.add(new Action(
@@ -1033,11 +1095,11 @@
task.getId(), // 浠诲姟
null, // 鍔ㄤ綔鍙�
null, // 浼樺厛绾�
- ActionTypeType.ReadyTakeFromConveyorSta.desc, // 鍚嶇О
- staWorkDirection, // 灞炴�у��
+ ActionTypeType.ReadyTakeFromShelvesLoc.desc, // 鍚嶇О
+ Double.parseDouble("0"), // 灞炴�у��
lastCode.getData(), // 鍦伴潰鐮�
String.valueOf(oriSta.getOffset()), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.ReadyTakeFromConveyorSta.val(), // 鍔ㄤ綔绫诲瀷
+ ActionTypeType.ReadyTakeFromShelvesLoc.val(), // 鍔ㄤ綔绫诲瀷
actionPrepareSts, // 鍔ㄤ綔杩涘害
agvId, // AGV
now, // 宸ヤ綔鏃堕棿
@@ -1066,29 +1128,47 @@
// 绔欑偣鏀捐揣
Sta destSta = staService.getById(task.getDestSta());
Double destStaWorkDirection = mapService.getStaAngle(destSta, workDirection);
+// CodeGap gap = codeGapService.findByCodeOfBoth(lastCode.getId(), nextCode.getId());
+
// 妫�楠屾柟鍚�
- if (!lastDirection.equals(destStaWorkDirection)) {
- if (!lastCode.getCornerBool()) {
- throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
- }
- // turn
- actionList.add(new Action(
- null, // 缂栧彿
- task.getBusId(), // 鎬荤嚎
- task.getId(), // 浠诲姟
- null, // 鍔ㄤ綔鍙�
- null, // 浼樺厛绾�
- ActionTypeType.TurnCorner.desc, // 鍚嶇О
- mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�ш皰
- lastCode.getData(), // 鍦伴潰鐮�
- String.valueOf(destStaWorkDirection), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
- actionPrepareSts, // 鍔ㄤ綔杩涘害
- agvId, // AGV
- now // 宸ヤ綔鏃堕棿
- ));
- lastDirection = destStaWorkDirection;
- }
+// if (!lastDirection.equals(destStaWorkDirection)) {
+// if (!lastCode.getCornerBool()) {
+// throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
+// }
+//
+// actionList.add(new Action(
+// null, // 缂栧彿
+// task.getBusId(), // 鎬荤嚎
+// task.getId(), // 浠诲姟
+// null, // 鍔ㄤ綔鍙�
+// null, // 浼樺厛绾�
+// actionType.desc, // 鍚嶇О
+// (double) agvSpeedType.val, // 灞炴�у��
+// lastCode.getData(), // 鍦伴潰鐮�
+// String.valueOf(gap.getDistance()), // 鍔ㄤ綔鍙傛暟
+// actionType.val(), // 鍔ㄤ綔绫诲瀷
+// actionPrepareSts, // 鍔ㄤ綔杩涘害
+// agvId, // AGV
+// now // 宸ヤ綔鏃堕棿
+// ));
+// // turn
+// actionList.add(new Action(
+// null, // 缂栧彿
+// task.getBusId(), // 鎬荤嚎
+// task.getId(), // 浠诲姟
+// null, // 鍔ㄤ綔鍙�
+// null, // 浼樺厛绾�
+// ActionTypeType.TurnCorner.desc, // 鍚嶇О
+// mapService.isTurnCorner(lastCode.getData()) ? 1D : 0D, // 灞炴�ш皰
+// lastCode.getData(), // 鍦伴潰鐮�
+// String.valueOf(destStaWorkDirection), // 鍔ㄤ綔鍙傛暟
+// ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
+// actionPrepareSts, // 鍔ㄤ綔杩涘害
+// agvId, // AGV
+// now // 宸ヤ綔鏃堕棿
+// ));
+// lastDirection = destStaWorkDirection;
+// }
// 鏆傚瓨鐐瑰彇璐�
assert backpackType != null;
actionList.add(new Action(
@@ -1115,11 +1195,11 @@
task.getId(), // 浠诲姟
null, // 鍔ㄤ綔鍙�
null, // 浼樺厛绾�
- ActionTypeType.ReadyReleaseToConveyorSta.desc, // 鍚嶇О
- staWorkDirection, // 灞炴�ш皰
+ ActionTypeType.ReadyReleaseToShelvesLoc.desc, // 鍚嶇О
+ Double.parseDouble("0"), // 灞炴�у��
lastCode.getData(), // 鍦伴潰鐮�
String.valueOf(destSta.getOffset()), // 鍔ㄤ綔鍙傛暟
- ActionTypeType.ReadyReleaseToConveyorSta.val(), // 鍔ㄤ綔绫诲瀷
+ ActionTypeType.ReadyReleaseToShelvesLoc.val(), // 鍔ㄤ綔绫诲瀷
actionPrepareSts, // 鍔ㄤ綔杩涘害
agvId, // AGV
now, // 宸ヤ綔鏃堕棿
@@ -1131,7 +1211,7 @@
// 妫�楠屾柟鍚�
FuncSta chargeFuncSta = funcStaService.query(lastCode.getId(), FuncStaType.CHARGE.toString());
Double chargeDirection = Double.parseDouble(chargeFuncSta.getAngle());
- if (!lastDirection.equals(chargeDirection)) {
+ if (!lastDirection.equals(chargeDirection) && lastCode.getCornerBool()) {
actionList.add(new Action(
null, // 缂栧彿
null, // 鎬荤嚎
@@ -1288,7 +1368,6 @@
}
-
/**
* 鏍规嵁鍒嗙墖鐢熸垚鍔ㄤ綔 ( 杞﹁締鍙兘宸茬粡鍋氳繃涓�浜涗换鍔′簡,姝ｅ湪绛夊緟涓嬩竴娈典换鍔� )
*/
@@ -1322,11 +1401,14 @@
throw new CoolException("AGV[" + agvNo + "]瀹氫綅鍋忕Щ...");
}
- String lastCorner = null;
- for (int i = pathList.size(); i <0; i++) {
- Code nextCode = codeService.getCacheByData(pathList.get(i - 1));
- if (nextCode!=null&&nextCode.getCornerBool()){
- lastCorner =pathList.get(i - 1);
+ //String lastCorner = null;
+ Integer index = -1;
+ boolean corner = false;
+ for (int i = pathList.size(); i < 0; i++) {
+ Code nextCode = codeService.getCacheByData(pathList.get(i));
+ if (nextCode != null && nextCode.getCornerBool()) {
+ //lastCorner = pathList.get(i);
+ index = i;
}
}
@@ -1350,19 +1432,21 @@
if (i == 0) {
continue;
}
-
String next = pathListPart.get(i);
-
Code nextCode = codeService.getCacheByData(next);
- Double nextDirection = mapService.calculateDirection(lastCode, nextCode, angleOffsetVal);
+ Double nextDirection;
boolean reverse = false;
- if (lastCorner.equals(lastCode)){
- // DOTO
+ if (index >= i) {
+ // DOTO 娣诲姞杞集
+ Code endCode = codeService.getCacheByData(pathList.get(pathList.size() - 1));
+ nextDirection = mapService.calculateDirection(lastCode, endCode, angleOffsetVal);
+ reverse = true;
+ } else {
+ nextDirection = mapService.calculateDirection(lastCode, nextCode, angleOffsetVal);
- }else {
// 绗竴姝ワ細濡傛灉涓嬩竴涓柟鍚戞濂芥槸浣滀笟鏂瑰悜鐨勭浉鍙嶆柟鍚戯紝鍒欓噸缃笅涓�涓柟鍚戜负浣滀笟鏂瑰悜锛屾爣璁� reverse = true
- if (nextDirection.equals((workDirection + 180) % 360)) {
+ if (!nextDirection.equals((workDirection + 180) % 360)) {
nextDirection = workDirection;
reverse = true;
}
@@ -1708,7 +1792,7 @@
// 妫�楠屾柟鍚�
FuncSta chargeFuncSta = funcStaService.query(lastCode.getId(), FuncStaType.CHARGE.toString());
Double chargeDirection = Double.parseDouble(chargeFuncSta.getAngle());
- if (!lastDirection.equals(chargeDirection)) {
+ if (!lastDirection.equals(chargeDirection) && lastCode.getCornerBool()) {
actionList.add(new Action(
null, // 缂栧彿
null, // 鎬荤嚎
@@ -1851,7 +1935,7 @@
log.info("{}鍙稟gv鍔ㄤ綔缁勮瀹屾垚锛屾寚浠ゆ暟閲忥細{}", agvNo, newActionList.size());
} catch (Exception e) {
- log.error("mainService.generateAction", e);
+ log.error("mainService.generateActionV2", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
if (!Cools.isEmpty(pathList)) {
@@ -1860,7 +1944,7 @@
mapDataDispatcher.clearDynamicMatrixByCodeList(null, codeMatrixIdxList);
}
- throw new RuntimeException("generateAction method caught an exception, rolling back transaction.", e);
+ throw new RuntimeException("generateActionV2 method caught an exception, rolling back transaction.", e);
}
}
@@ -2329,4 +2413,41 @@
}
return false;
}
+
+ /**
+ * @author Ryan
+ * @date 2025/11/10
+ * @description: 淇敼搴撲綅鐘舵��
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public R modifyStatus(LocSiteParams params) {
+ if (Objects.isNull(params.getStatus())) {
+ return R.error("淇敼鐘舵�佷笉鑳戒负绌猴紒锛�");
+ }
+ LocSts locSts = locStsService.getOne(new LambdaQueryWrapper<LocSts>().eq(LocSts::getUuid, params.getStatus()));
+ if (Objects.isNull(locSts)) {
+ return R.error("鏁版嵁閿欒锛屾湭鎵惧埌瀵瑰簲宸ヤ綔鐘舵�侊紒锛�");
+ }
+ if (!params.getType().equals("loc")) {
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, params.getCode()));
+ if (Objects.isNull(loc)) {
+ return R.error("搴撲綅淇℃伅涓嶅瓨鍦紒锛�");
+ }
+ loc.setLocSts(locSts.getId());
+ if (!locService.updateById(loc)) {
+ return R.ok("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ } else {
+ Sta sta = staService.getOne(new LambdaQueryWrapper<Sta>().eq(Sta::getStaNo, params.getCode()));
+ if (Objects.isNull(sta)) {
+ return R.error("绔欑偣淇℃伅涓嶅瓨鍦紒锛�");
+ }
+ sta.setStatus(locSts.getStatus());
+ if (!staService.updateById(sta)) {
+ return R.error("绔欑偣鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.9.1