From c0b871d491731e4b32f3c9249770c1d4aee4f7f5 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 10:47:37 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
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/asrs/entity/ViewLocDetl.java | 3 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java | 9 ++++
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-admin/src/views/loc/locDetl/index.vue | 7 ++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java | 2
zy-asrs-admin/src/components/order/order/order.vue | 20 +++++++---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java | 1
11 files changed, 43 insertions(+), 18 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-admin/src/components/order/order/order.vue b/zy-asrs-admin/src/components/order/order/order.vue
index 8b26812..e97fd03 100644
--- a/zy-asrs-admin/src/components/order/order/order.vue
+++ b/zy-asrs-admin/src/components/order/order/order.vue
@@ -32,6 +32,7 @@
const state = reactive({
selectedRowKeys: [],
loading: false,
+ orderSettle: 1,
});
let tableData = ref([]);
@@ -160,13 +161,13 @@
pageSize: pageSize,
condition: searchInput.value,
orderType: orderType.value,
+ orderSettle: state.orderSettle,
+
}).then((resp) => {
let result = resp.data;
if (result.code == 200) {
- console.log('--------->')
let data = result.data;
tableData.value = data;
-
state.loading = false;
} else if (result.code === 401) {
message.error(result.msg);
@@ -292,9 +293,17 @@
<EditView ref="editChild" @tableReload="handleTableReload"
:ioModel="ioModel == 'in' ? 1 : ioModel == 'out' ? 2 : null" />
<div class="table-header">
- <div style="margin-left : 10px;">
- <a-select v-model:value="orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍗曟嵁绫诲瀷')" :options="[
- { label: '鎵嬪姩鍏ュ簱鍗�', value: 1 }, { label: '鎵嬪姩鍑哄簱鍗�', value: 2 }, ]" style="width: 160px;margin-right: 10px;">
+ <div style="margin-left : 10px;">
+ <a-select v-model:value="orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍗曟嵁绫诲瀷')"
+ :options="[
+ { label: '鍏ㄩ儴', value: null },{ label: '鎵嬪姩鍏ュ簱鍗�', value: 1 }, { label: '鎵嬪姩鍑哄簱鍗�', value: 2 },]" style="width: 160px;margin-right: 10px;">
+ </a-select>
+ <a-select v-model:value="state.orderSettle" :placeholder="formatMessage('page.locDetl.orderNo.input', '璁㈠崟鐘舵��')"
+ :options="[
+ { label: '鍏ㄩ儴', value: null },
+ { label: '鍒濆鍖�', value: 1 }, { label: '寰呭鐞�', value: 2 },{ label: '鐢熸垚娉㈡', value: 3 }, { label: '浣滀笟涓�', value: 4 },
+ { label: '宸插彇娑�', value: 5 }, { label: '宸插畬鎴�', value: 6 },{ label: '鍑嗗鍙栨秷', value: 7 }, { label: '涓婃姤瀹屾垚', value: 8 },
+ ]" style="width: 160px;margin-right: 10px;">
</a-select>
<a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
style="width: 200px;" @search="onSearch" />
@@ -312,7 +321,6 @@
{{ formatMessage('page.order.import', '鍗曟嵁瀵煎叆') }}
</a-upload>
</a-menu-item>
-
<a-menu-item key="export">
<DownloadOutlined />
{{ formatMessage('page.order.export.template', '瀵煎嚭妯℃澘') }}
diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 3cd21c5..713a7b5 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -8,7 +8,6 @@
import { formatMessage } from '@/utils/localeUtils.js';
import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
-
const router = useRouter();
const TABLE_KEY = 'table-locDetl';
@@ -21,9 +20,9 @@
orderNo: null,
batch: null,
tagId: null,
+ orderType: null,
})
const editChild = ref(null)
-
const state = reactive({
selectedRowKeys: [],
loading: false,
@@ -372,6 +371,10 @@
style="width: 140px;margin-right: 10px;" />
<a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.locDetl.batch.input', '璇疯緭鍏ユ壒鍙�')"
style="width: 140px;margin-right: 10px;" />
+ <a-select v-model:value="searchParam.orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '浠撳簱绫诲瀷')"
+ :options="[
+ { label: '鍏ㄩ儴', value: null }, { label: '绔嬪簱', value: 1 }, { label: '骞冲簱', value: 2 }]" style="width: 140px;margin-right: 10px;">
+ </a-select>
<a-select v-model:value="searchParam.tagId" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍝佺被')"
:options="[
{ label: '榛樿鍒嗙被', value: 10 }, { label: '鏈烘补', value: 11 }, { label: '鍙橀�熺娌�', value: 17 }, { label: '鐏姳濉�', value: 18 },
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/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
index 7c05460..6c98627 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
@@ -22,6 +22,7 @@
import com.zy.asrs.wms.asrs.service.LocDetlService;
import com.zy.asrs.wms.system.controller.BaseController;
import com.zy.asrs.wms.utils.ExcelUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -46,10 +47,16 @@
@PostMapping("/locDetl/page")
@CacheData(tableName = {"man_loc_detl"})
public R page(@RequestBody Map<String, Object> map) {
+// String orderType = null;
+// if (Objects.isNull(map.get("orderType"))) {
+// orderType = map.get("orderType").toString();
+// map.remove("orderType");
+// }
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<ViewLocDetl, BaseParam> pageParam = new PageParam<>(baseParam, ViewLocDetl.class);
PageParam<ViewLocDetl, BaseParam> data = locDetlService.getPage(pageParam, pageParam.buildWrapper(true));
- return R.ok().add(data);
+
+ return R.ok(data);
}
@PreAuthorize("hasAuthority('asrs:locDetl:list')")
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
index d468ece..097c529 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
@@ -56,6 +56,9 @@
@ApiModelProperty(value= "鍟嗗搧")
private Long matId;
+ @ApiModelProperty("浠撳簱绫诲瀷")
+ private Integer orderType;
+
/**
* 鍟嗗搧缂栧彿
*/
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/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
index 179df20..bb8fb09 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
@@ -42,7 +42,6 @@
@Override
public PageParam<ViewLocDetl, BaseParam> getPage(PageParam<ViewLocDetl, BaseParam> pageParam, QueryWrapper<ViewLocDetl> buildWrapper) {
PageParam<ViewLocDetl, BaseParam> result = viewLocDetlMapper.selectPage(pageParam, buildWrapper);
-
//瑙ｆ瀽鍔ㄦ�佸瓧娈�
// JSONObject data = JSON.parseObject(JSON.toJSONString(result));
// List<ViewLocDetl> records = result.getRecords();
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