From c13370c9e13771b7c987b11a4f8b24ff8c41a9ae Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 04 八月 2025 17:10:21 +0800
Subject: [PATCH] no message
---
zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue | 8 +++++++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java | 1 +
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue b/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
index f7d939f..08aadf7 100644
--- a/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
+++ b/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
@@ -174,6 +174,12 @@
list: tableData.value
};
+ let locs = tableData.value.filter(item => item.locId == null && item.locs.length < 1);
+ if (locs != null && locs.length > 0) {
+ message.error("鐗╂枡搴撳瓨涓嶈冻锛屾棤娉曠敓鎴愬嚭搴撲换鍔� 锛侊紒");
+ return
+ }
+
post('/api/out/orderOut/merge/wave', requestParam).then((resp) => {
let result = resp.data;
if (result.code == 200) {
@@ -353,7 +359,7 @@
<template #bodyCell="{ column, text, record, index }">
<template v-if="column.dataIndex === 'locNo'">
<div v-if="record.locId != null && record.anfme > 0">
-<!-- <a-tag color="green">{{ record.locNo }}</a-tag>-->
+ <!-- <a-tag color="green">{{ record.locNo }}</a-tag>-->
<a-select v-model:value="record.locNo" :options="record.otherLocs"
:fieldNames="{ label: 'locNo', value: 'locId' }"
@change="handleOtherLocChange(index, record)">
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java
index b6d00a4..d1c862f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java
@@ -33,6 +33,7 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<ViewInOut, BaseParam> pageParam = new PageParam<>(baseParam, ViewInOut.class);
QueryWrapper<ViewInOut> queryWrapper = pageParam.buildWrapper(true);
+ queryWrapper.orderByDesc("ymd");
PageParam<ViewInOut, BaseParam> page = viewInOutMapper.selectPage(pageParam, queryWrapper);
return R.ok().add(page);
}
--
Gitblit v1.9.1