From 6984e2147a254108cf527bafe4080b55bb165c7d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 02 四月 2025 15:41:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 13 +++++++++++--
src/main/java/com/zy/asrs/domain/param/ShuttleGatherParam.java | 12 ++++++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 4 ++--
src/main/webapp/static/js/basShuttle/basShuttle.js | 8 ++++++++
4 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 7c0b8fd..fed6c93 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -357,8 +357,8 @@
@PostMapping("/shuttleGather")
@OpenApiLog(memo = "灏忚溅闆嗗悎")
- public R shuttleGather() {
- List<ShuttleGatherResult> shuttleGather = shuttleDispatchUtils.shuttleGather();
+ public R shuttleGather(@RequestBody ShuttleGatherParam param) {
+ List<ShuttleGatherResult> shuttleGather = shuttleDispatchUtils.shuttleGather(param);
apiLogService.insert(new ApiLog(
null
diff --git a/src/main/java/com/zy/asrs/domain/param/ShuttleGatherParam.java b/src/main/java/com/zy/asrs/domain/param/ShuttleGatherParam.java
new file mode 100644
index 0000000..b737843
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/param/ShuttleGatherParam.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.domain.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ShuttleGatherParam {
+
+ private List<Integer> shuttleNos;
+
+}
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index dd6f4fd..6f10725 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -1,9 +1,11 @@
package com.zy.core.dispatcher;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.ShuttleGatherResult;
+import com.zy.asrs.domain.param.ShuttleGatherParam;
import com.zy.asrs.entity.BasShuttle;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasShuttleService;
@@ -299,8 +301,15 @@
/**
* 灏忚溅闆嗗悎
*/
- public List<ShuttleGatherResult> shuttleGather() {
- List<BasShuttle> basShuttles = basShuttleService.selectList(new EntityWrapper<BasShuttle>().eq("status", 1));
+ public List<ShuttleGatherResult> shuttleGather(ShuttleGatherParam param) {
+ Wrapper<BasShuttle> wrapper = new EntityWrapper<BasShuttle>().eq("status", 1);
+ if (param != null) {
+ if (!param.getShuttleNos().isEmpty()) {
+ wrapper.in("shuttle_no", param.getShuttleNos());
+ }
+ }
+
+ List<BasShuttle> basShuttles = basShuttleService.selectList(wrapper);
List<ShuttleGatherResult> list = new ArrayList<>();
for (BasShuttle basShuttle : basShuttles) {
String idleLoc = basShuttle.getIdleLoc();
diff --git a/src/main/webapp/static/js/basShuttle/basShuttle.js b/src/main/webapp/static/js/basShuttle/basShuttle.js
index 2c6b8f2..081a4a1 100644
--- a/src/main/webapp/static/js/basShuttle/basShuttle.js
+++ b/src/main/webapp/static/js/basShuttle/basShuttle.js
@@ -101,11 +101,19 @@
showUpdateCharge();
break;
case 'shuttleGather':
+ shuttleNos = []
+ checkStatus.map(function (d) {
+ shuttleNos.push(d.shuttleNo)
+ })
+
admin.confirm('纭畾闆嗗悎鍏ㄩ儴灏忚溅鍚楋紵', {shadeClose: true}, function(){
$.ajax({
url: baseUrl+"/openapi/shuttleGather",
headers: {'token': localStorage.getItem('token')},
dataType:'json',
+ data: JSON.stringify({
+ shuttleNos: shuttleNos
+ }),
contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
--
Gitblit v1.9.1