From ebdfec3e9db0977bccca0527be7d2226fbbd0229 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 11:02:16 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 96 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 90 insertions(+), 6 deletions(-)
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..6634dc1 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
@@ -3,13 +3,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.common.SnowflakeIdWorker;
+import com.zy.asrs.wcs.core.domain.param.CreateInTaskParam;
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.TaskCtgType;
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,16 +48,84 @@
private TaskService taskService;
@Autowired
private DeviceService deviceService;
+ @Autowired
+ private LocService locService;
+
+ //鐢熸垚鍏ュ簱浠诲姟
+ @PostMapping("/createInTask")
+ public R createInTask(@RequestBody CreateInTaskParam param) {
+ //鑾峰彇鍏ュ簱浠诲姟绫诲瀷
+ TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.IN))
+ .eq(TaskCtg::getStatus, 1));
+ if (taskCtg == null) {
+ return R.error("浠诲姟绫诲瀷寮傚父");
+ }
+
+ Loc loc = locService.selectByLocNo(param.getDestLoc());
+ if (loc == null) {
+ return R.error("搴撲綅鍙蜂笉瀛樺湪");
+ }
+
+ if (!loc.getLocStsFlag().equals("O")) {
+ return R.error("搴撲綅鐘舵�佷笉婊¤冻鍏ュ簱鏉′欢");
+ }
+
+ //浼樺厛绾�
+ Integer priority = 10;
+ if (param.getPriority() != null) {
+ priority = param.getPriority();
+ }
+
+ Task task = new Task();
+ task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+ task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
+ task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
+ task.setTaskCtg(taskCtg.getId());
+ task.setPriority(priority);
+ task.setOriginSite(param.getOriginSite());
+ task.setOriginLoc(null);
+ task.setDestSite(param.getDestSite());
+ task.setDestLoc(param.getDestLoc());
+ task.setIoTime(new Date());
+ task.setStartTime(new Date());
+ task.setStatus(1);
+ task.setMemo("");
+ task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
+ task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
+ task.setHostId(1L);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+
+ boolean result = taskService.save(task);
+ if (!result) {
+ return R.error("鐢熸垚鍏ュ簱浠诲姟澶辫触锛�");
+ }
+ return R.ok();
+ }
//鐢熸垚鍑哄簱浠诲姟
@PostMapping("/createOutTask")
public R createOutTask(@RequestBody CreateOutTaskParam param) {
//鑾峰彇鍑哄簱浠诲姟绫诲瀷
TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .eq(TaskCtg::getFlag, "OUT")
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.OUT))
.eq(TaskCtg::getStatus, 1));
if (taskCtg == null) {
return R.error("浠诲姟绫诲瀷寮傚父");
+ }
+
+ Loc loc = locService.selectByLocNo(param.getOriginLoc());
+ if (loc == null) {
+ return R.error("搴撲綅鍙蜂笉瀛樺湪");
+ }
+
+ if (!loc.getLocStsFlag().equals("F")) {
+ return R.error("搴撲綅鐘舵�佷笉婊¤冻鍑哄簱鏉′欢");
+ }
+
+ //浼樺厛绾�
+ Integer priority = 10;
+ if (param.getPriority() != null) {
+ priority = param.getPriority();
}
Task task = new Task();
@@ -61,7 +133,7 @@
task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
task.setTaskSts(TaskStsType.NEW_OUTBOUND.sts);
task.setTaskCtg(taskCtg.getId());
- task.setPriority(10);
+ task.setPriority(priority);
task.setOriginSite(param.getOriginSite());
task.setOriginLoc(param.getOriginLoc());
task.setDestSite(param.getDestSite());
@@ -86,10 +158,16 @@
public R createManualTakeTask(@RequestBody CreateManualTakeTaskParam param) {
//鑾峰彇鎵嬪姩浠诲姟绫诲瀷
TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .eq(TaskCtg::getFlag, "MANUAL")
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.MANUAL))
.eq(TaskCtg::getStatus, 1));
if (taskCtg == null) {
return R.error("浠诲姟绫诲瀷寮傚父");
+ }
+
+ //浼樺厛绾�
+ Integer priority = 10;
+ if (param.getPriority() != null) {
+ priority = param.getPriority();
}
Task task = new Task();
@@ -97,7 +175,7 @@
task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
task.setTaskSts(TaskStsType.NEW_MANUAL.sts);
task.setTaskCtg(taskCtg.getId());
- task.setPriority(10);
+ task.setPriority(priority);
task.setOriginSite(null);
task.setOriginLoc(param.getOriginLoc());//婧愬簱浣�
task.setDestSite(null);
@@ -122,7 +200,7 @@
public R createMoveTask(@RequestBody CreateMoveTaskParam param) {
//鑾峰彇鍑哄簱浠诲姟绫诲瀷
TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .eq(TaskCtg::getFlag, "MOVE")
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.MOVE))
.eq(TaskCtg::getStatus, 1));
if (taskCtg == null) {
return R.error("浠诲姟绫诲瀷寮傚父");
@@ -145,12 +223,18 @@
return R.error("绌挎杞﹀拰鐩爣浣嶇疆涓嶅湪鍚屼竴妤煎眰");
}
+ //浼樺厛绾�
+ Integer priority = 10;
+ if (param.getPriority() != null) {
+ priority = param.getPriority();
+ }
+
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
task.setTaskSts(TaskStsType.NEW_MOVE.sts);
task.setTaskCtg(taskCtg.getId());
- task.setPriority(10);
+ task.setPriority(priority);
task.setOriginSite(null);
task.setOriginLoc(null);
task.setDestSite(param.getDestSite());
--
Gitblit v1.9.1