From 4ba71d310ea632e16e89b659e423ffeeb228cd25 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 14 一月 2026 14:04:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/config/AspectConfig.java | 5 ++++-
src/main/java/com/zy/asrs/controller/OpenController.java | 25 +++++++++++++++++++++++++
src/main/java/com/zy/asrs/domain/param/CreateOutTaskParam.java | 6 ++++++
src/main/resources/docs/WCS外部HTTP API接口V1.5.docx | 0
src/main/java/com/zy/asrs/domain/param/CreateOutTaskBatchParam.java | 12 ++++++++++++
5 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cef5ae6..06626d3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.exception.CoolException;
import com.zy.asrs.domain.param.*;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.entity.LocMast;
@@ -25,6 +26,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -91,6 +93,29 @@
return R.error("鐢熸垚鍑哄簱浠诲姟澶辫触");
}
+ //鎵归噺鍑哄簱浠诲姟
+ @PostMapping("/createOutTaskBatch")
+ @OpenApiLog(memo = "鎵归噺鍑哄簱浠诲姟")
+ @Transactional
+ public R createOutTaskBatch(@RequestBody CreateOutTaskBatchParam param) {
+ if (param == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ List<CreateOutTaskParam> taskList = param.getTaskList();
+ if (taskList == null || taskList.size() == 0) {
+ return R.error("浠诲姟鍒楄〃涓嶈兘涓虹┖");
+ }
+
+ for (CreateOutTaskParam createOutTaskParam : taskList) {
+ if (createOutTaskParam == null) {
+ throw new CoolException("浠诲姟鍙傛暟涓嶈兘涓虹┖");
+ }
+ commonService.createOutTask(createOutTaskParam);
+ }
+ return R.ok();
+ }
+
@PostMapping("/completeTask")
@OpenApiLog(memo = "浠诲姟瀹屾垚")
public R completeTask(@RequestBody CompleteTaskParam param) {
diff --git a/src/main/java/com/zy/asrs/domain/param/CreateOutTaskBatchParam.java b/src/main/java/com/zy/asrs/domain/param/CreateOutTaskBatchParam.java
new file mode 100644
index 0000000..a557d3c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/param/CreateOutTaskBatchParam.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.domain.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CreateOutTaskBatchParam {
+
+ private List<CreateOutTaskParam> taskList;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/param/CreateOutTaskParam.java b/src/main/java/com/zy/asrs/domain/param/CreateOutTaskParam.java
index a7ad9d5..2ddcf09 100644
--- a/src/main/java/com/zy/asrs/domain/param/CreateOutTaskParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/CreateOutTaskParam.java
@@ -20,4 +20,10 @@
//鍑哄簱鍖哄煙
private String outArea;
+ //鍑哄簱鎵规鍙�
+ private String batch;
+
+ //鍑哄簱椤哄簭鍙�
+ private Integer batchSeq;
+
}
diff --git a/src/main/java/com/zy/common/config/AspectConfig.java b/src/main/java/com/zy/common/config/AspectConfig.java
index 07f14cc..c0ba743 100644
--- a/src/main/java/com/zy/common/config/AspectConfig.java
+++ b/src/main/java/com/zy/common/config/AspectConfig.java
@@ -73,7 +73,10 @@
if (annotation != null && !Cools.isEmpty(annotation.memo())) {
saveErrLog(joinPoint, request, errorResponse, ex, annotation.memo());
}
- return errorResponse;
+ if (ex instanceof Exception) {
+ throw (Exception) ex;
+ }
+ throw new RuntimeException(ex);
} finally {
long end = System.currentTimeMillis();
// log.info("璇锋眰鏃ュ織鐨勬墦鍗�");
diff --git "a/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.5.docx" "b/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.5.docx"
new file mode 100644
index 0000000..5ca7d55
--- /dev/null
+++ "b/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.5.docx"
Binary files differ
--
Gitblit v1.9.1