From 61678d13d96ca99b4586f786ba5408aed378e750 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 08 七月 2025 10:39:35 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 3 ++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java | 7 ++++---
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml | 5 ++++-
construction-data/src/components/datav/index.vue | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java | 2 +-
6 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/construction-data/src/components/datav/index.vue b/construction-data/src/components/datav/index.vue
index c0ab932..ce7e6cf 100644
--- a/construction-data/src/components/datav/index.vue
+++ b/construction-data/src/components/datav/index.vue
@@ -406,7 +406,7 @@
getTaskDetl (data) {
let that = this
// eslint-disable-next-line no-undef
- $ajax.post('wave/task/detl/qutify/', { taskNo: data.taskNo, matnr: data.matnr }).then(response => {
+ $ajax.post('wave/task/detl/qutify/', { taskNo: data.taskNo, matnr: data.matnr, waveNo: data.waveNo }).then(response => {
if (response.code === 200) {
that.taskDetls = []
// this.show = false
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
index d59b241..c56ed38 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
@@ -70,9 +70,10 @@
throw new CoolException("璇锋眰鍙傛暟锛氫换鍔＄紪鐮佷笉鑳戒负绌猴紒锛�");
}
String taskNoStr = (String) param.get("taskNo");
+ String waveNo = param.get("waveNo").toString();
// Long matnr = Long.valueOf(taskNo.get("matnr").toString());
- return waveManagentService.getTaskDetlQutify(taskNoStr);
+ return waveManagentService.getTaskDetlQutify(taskNoStr, waveNo);
}
/**
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
index 68306a7..254e93c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
@@ -21,7 +21,6 @@
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
import java.util.List;
import static com.zy.asrs.wms.utils.HttpUtils.getClientIpAddress;
@@ -94,12 +93,14 @@
/**
* 鑾峰彇闈炴眹鎬绘槑缁嗘暟鎹�
+ *
* @param taskNo
+ * @param waveNo
* @return
*/
@Override
- public R getTaskDetlQutify(String taskNo) {
- List<WaveTaskDetl> taskDetls = taskMapper.getTaskDetlQutify(taskNo);
+ public R getTaskDetlQutify(String taskNo, String waveNo) {
+ List<WaveTaskDetl> taskDetls = taskMapper.getTaskDetlQutify(taskNo, waveNo);
return R.ok(taskDetls);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
index aea114e..f87ab4a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
@@ -17,7 +17,7 @@
R getTaskDetl(String taskNo);
- R getTaskDetlQutify(String taskNo);
+ R getTaskDetlQutify(String taskNo, String waveNo);
R getAllOrders(String waveNo);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java
index 8dbf9ed..3c4d365 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java
@@ -20,7 +20,7 @@
List<WaveTaskDetl> getTaskDetlByTaskNo(@Param("taskNo") String taskNo);
- List<WaveTaskDetl> getTaskDetlQutify(@Param("taskNo") String taskNo);
+ List<WaveTaskDetl> getTaskDetlQutify(@Param("taskNo") String taskNo, @Param("waveNo") String waveNo);
List<LargeScreenTaskDto> getTaskIntegrateByTaskNo(@Param(Constants.WRAPPER) LambdaQueryWrapper<Task> ew);
}
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
index e0581a3..450cdf0 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
@@ -43,7 +43,10 @@
<if test="taskNo != null and taskNo != ''">
AND mt.task_no = #{taskNo}
</if>
- )
+ )
+ <if test="waveNo != null and waveNo != ''">
+ AND mws.wave_no = #{waveNo}
+ </if>
GROUP BY
order_no, matnr
) t
--
Gitblit v1.9.1