From 2a7b97eddbe3d24a47389a58dde46fe6175b6971 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 16 六月 2024 10:22:12 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 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 d986ca4..706f0a6 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
@@ -82,6 +82,15 @@
return R.error("搴撲綅鐘舵�佷笉婊¤冻鍏ュ簱鏉′欢");
}
+ Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskCtg, taskCtg.getId())
+ .eq(Task::getOriginSite, param.getOriginSite())
+ .eq(Task::getDestSite, param.getDestSite())
+ .eq(Task::getDestLoc, param.getDestLoc()));
+ if (one != null) {
+ return R.error("浠诲姟宸插瓨鍦�");
+ }
+
//浼樺厛绾�
Integer priority = 10;
if (param.getPriority() != null) {
@@ -91,6 +100,7 @@
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
+ task.setWmsTaskNo(param.getTaskNo());
task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(priority);
@@ -140,6 +150,15 @@
return R.error("搴撲綅鐘舵�佷笉婊¤冻鍑哄簱鏉′欢");
}
+ Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskCtg, taskCtg.getId())
+ .eq(Task::getOriginSite, param.getOriginSite())
+ .eq(Task::getOriginLoc, param.getOriginLoc())
+ .eq(Task::getDestSite, param.getDestSite()));
+ if (one != null) {
+ return R.error("浠诲姟宸插瓨鍦�");
+ }
+
//浼樺厛绾�
Integer priority = 10;
if (param.getPriority() != null) {
@@ -149,6 +168,7 @@
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
+ task.setWmsTaskNo(param.getTaskNo());
task.setTaskSts(TaskStsType.NEW_OUTBOUND.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(priority);
@@ -182,6 +202,14 @@
return R.error("浠诲姟绫诲瀷寮傚父");
}
+ Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskCtg, taskCtg.getId())
+ .eq(Task::getOriginLoc, param.getOriginLoc())
+ .eq(Task::getDestLoc, param.getDestLoc()));
+ if (one != null) {
+ return R.error("浠诲姟宸插瓨鍦�");
+ }
+
//浼樺厛绾�
Integer priority = 10;
if (param.getPriority() != null) {
@@ -191,6 +219,7 @@
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
+ task.setWmsTaskNo(param.getTaskNo());
task.setTaskSts(TaskStsType.NEW_MANUAL.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(priority);
@@ -244,6 +273,13 @@
return R.error("绌挎杞﹀拰鐩爣浣嶇疆涓嶅湪鍚屼竴妤煎眰");
}
+ Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskCtg, taskCtg.getId())
+ .eq(Task::getDestLoc, param.getDestLoc()));
+ if (one != null) {
+ return R.error("浠诲姟宸插瓨鍦�");
+ }
+
//浼樺厛绾�
Integer priority = 10;
if (param.getPriority() != null) {
@@ -253,13 +289,14 @@
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
+ task.setWmsTaskNo(param.getTaskNo());
task.setTaskSts(TaskStsType.NEW_MOVE.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(priority);
task.setOriginSite(null);
task.setOriginLoc(null);
- task.setDestSite(param.getDestLoc());
- task.setDestLoc(null);
+ task.setDestSite(null);
+ task.setDestLoc(param.getDestLoc());
task.setIoTime(new Date());
task.setStartTime(new Date());
task.setStatus(1);
--
Gitblit v1.9.1