From 20c607eaa0d2e8e34ab08306c003da4de4773c2c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 08 六月 2024 12:40:29 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java | 3 ++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 13 +++++++++++++
2 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
index 1b2862f..531991c 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
@@ -43,7 +43,8 @@
"/v2/api-docs",
"/v3/api-docs",
"/swagger-ui/**",
- "/ws/**"
+ "/ws/**",
+ "/openapi/**"
};
@Resource
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
index 4399599..0aab8fc 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
@@ -6,10 +6,12 @@
import com.zy.asrs.wcs.core.domain.param.CreateManualTakeTaskParam;
import com.zy.asrs.wcs.core.domain.param.CreateMoveTaskParam;
import com.zy.asrs.wcs.core.domain.param.CreateOutTaskParam;
+import com.zy.asrs.wcs.core.entity.Loc;
import com.zy.asrs.wcs.core.entity.Task;
import com.zy.asrs.wcs.core.entity.TaskCtg;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
+import com.zy.asrs.wcs.core.service.LocService;
import com.zy.asrs.wcs.core.service.TaskCtgService;
import com.zy.asrs.wcs.core.service.TaskService;
import com.zy.asrs.wcs.core.utils.Utils;
@@ -44,6 +46,8 @@
private TaskService taskService;
@Autowired
private DeviceService deviceService;
+ @Autowired
+ private LocService locService;
//鐢熸垚鍑哄簱浠诲姟
@PostMapping("/createOutTask")
@@ -56,6 +60,15 @@
return R.error("浠诲姟绫诲瀷寮傚父");
}
+ Loc loc = locService.selectByLocNo(param.getOriginLoc());
+ if (loc == null) {
+ return R.error("搴撲綅鍙蜂笉瀛樺湪");
+ }
+
+ if (!loc.getLocStsFlag().equals("F")) {
+ return R.error("搴撲綅鐘舵�佷笉婊¤冻鍑哄簱鏉′欢");
+ }
+
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
--
Gitblit v1.9.1