From e14a4372b6bd4a38e40a3a68bde32350d96071ab Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 15 一月 2026 13:11:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9ca84ee..06626d3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,7 +1,9 @@
package com.zy.asrs.controller;
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;
@@ -24,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;
@@ -88,6 +91,29 @@
return R.ok();
}
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")
@@ -179,18 +205,31 @@
@PostMapping("/getAllLocInformation")
@OpenApiLog(memo = "鑾峰彇鍏ㄩ儴搴撲綅淇℃伅")
- public R getAllLocInformation() {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>());
- if (locMasts.isEmpty()) {
- return R.error("搴撲綅淇℃伅涓嶅瓨鍦�");
+ public R getAllLocInformation(@RequestBody GetAllLocInformationParam param) {
+ List<HashMap<String, Object>> list = new ArrayList<>();
+ EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+
+ if (!Cools.isEmpty(param.getRow())) {
+ wrapper.eq("row1", param.getRow());
}
- ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+ if (!Cools.isEmpty(param.getLev())) {
+ wrapper.eq("lev1", param.getLev());
+ }
+
+ List<LocMast> locMasts = locMastService.selectList(wrapper);
+ if (locMasts.isEmpty()) {
+ return R.ok().add(list);
+ }
+
for (LocMast locMast : locMasts) {
HashMap<String, Object> map = new HashMap<>();
map.put("locNo", locMast.getLocNo());
map.put("locSts", locMast.getLocSts());
map.put("barcode", locMast.getBarcode());
+ map.put("row", locMast.getRow1());
+ map.put("bay", locMast.getBay1());
+ map.put("lev", locMast.getLev1());
list.add(map);
}
@@ -224,7 +263,7 @@
@GetMapping("/getFakeSystemRunStatus")
public R getFakeSystemRunStatus() {
HashMap<String, Object> map = new HashMap<>();
- if(mainProcessPlugin.equals("FakeProcess")) {
+ if(mainProcessPlugin.contains("Fake")) {
map.put("running", false);
map.put("isFake", true);
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "enableFake"));
--
Gitblit v1.9.1