From 53186966cbf02e294358ebe720bdb284305a61b7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 01 八月 2025 15:08:32 +0800
Subject: [PATCH] 平库分页问题
---
zy-asrs-admin/src/views/out/flat/index.vue | 26 ++++++++++++++++++++++----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java | 5 +++--
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-admin/src/views/out/flat/index.vue b/zy-asrs-admin/src/views/out/flat/index.vue
index dc7f0fc..8676f68 100644
--- a/zy-asrs-admin/src/views/out/flat/index.vue
+++ b/zy-asrs-admin/src/views/out/flat/index.vue
@@ -10,9 +10,15 @@
</div>
</div>
- <a-table :columns="columns" :data-source="datasource" bordered :defaultExpandAllRows="false"
+ <!-- <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
+ :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
+ :pagination="{ total: tableData.total, onChange: onPageChange }"
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn"
+ :loading="state.loading"> -->
+ <a-table :columns="columns" :data-source="tableData.records" bordered :defaultExpandAllRows="false"
:row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
- :scroll="{ y: columns.length * 140 }" style="margin: 5px">
+ :pagination="{ total: tableData.total, onChange: onPageChange }" :scroll="{ y: columns.length * 140 }"
+ style="margin: 5px">
<template #bodyCell="{ column, record, index }">
<template v-if="column.key === 'number'">
{{ index + 1 }}
@@ -115,6 +121,9 @@
// {key: 'operate', title: '鎿嶄綔', dataIndex: 'operate'}
],
datasource: [],
+ tableData: {},
+ current: 1,
+ pageSize: 10,
childList: [],
show: false,
isPrint: false,
@@ -178,6 +187,13 @@
});
},
+ onPageChange(page, size) {
+ this.current = page;
+ this.pageSize = size;
+ this.getOutFlatSheet();
+ },
+
+
//鍒犻櫎褰撳墠琛�
removeRow(record) {
let that = this
@@ -200,11 +216,13 @@
},
getOutFlatSheet() {
let that = this
- post('/api/pick/flat/page', { page: { currnt: 1, size: 10 }, params: { pickNo: this.searchParam.pickNo, waveNo: this.searchParam.waveNo } }).then((resp) => {
+ post('/api/pick/flat/page', { page: { current: this.current, size: this.pageSize }, params: { pickNo: this.searchParam.pickNo, waveNo: this.searchParam.waveNo } }).then((resp) => {
let result = resp.data;
if (result.code == 200) {
// message.success(formatMessage('page.add.success', '鎴愬姛'));
- that.datasource = result.data
+ this.tableData = result.data;
+ console.log(result);
+ // that.datasource = result.data
} else {
message.error(result.msg);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java
index beb6d84..cbde3ef 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.PickSheet;
import com.zy.asrs.wms.asrs.entity.PickSheetDetl;
import com.zy.asrs.wms.asrs.entity.param.PageRequest;
import com.zy.asrs.wms.asrs.service.PickSheetService;
@@ -23,8 +24,8 @@
*/
@PostMapping("/pick/flat/page")
public R getOutFlatSheet(@RequestBody PageRequest params) {
- IPage page = pickSheetService.getOutFlatSheet(params);
- return R.ok().add(page.getRecords());
+ IPage<PickSheet> page = pickSheetService.getOutFlatSheet(params);
+ return R.ok().add(page);
}
/**
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java
index ae78fea..cedf153 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java
@@ -32,7 +32,7 @@
@Override
public IPage<PickSheet> getOutFlatSheet(PageRequest params) {
LambdaQueryWrapper<PickSheet> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(PickSheet::getDeleted, 0).eq(PickSheet::getStatus, 1);
+ lambdaQueryWrapper.eq(PickSheet::getDeleted, 0).eq(PickSheet::getStatus, 1).orderByDesc(PickSheet::getCreatedTime);
Map<String, Object> param = params.getParams();
if (!Objects.isNull(param)) {
lambdaQueryWrapper.eq(!StringUtils.isNullOrEmpty(param.get("pickNo").toString()),PickSheet::getPickNo, param.get("pickNo"))
--
Gitblit v1.9.1