From 6fd781e50005f88c29262ec9138677b80795e234 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 13 六月 2024 09:59:27 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 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..31d7579 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) {
@@ -140,6 +149,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) {
@@ -180,6 +198,14 @@
.eq(TaskCtg::getStatus, 1));
if (taskCtg == null) {
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("浠诲姟宸插瓨鍦�");
}
//浼樺厛绾�
@@ -244,6 +270,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) {
@@ -258,8 +291,8 @@
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