skyouc
2025-08-01 53186966cbf02e294358ebe720bdb284305a61b7
平库分页问题
3个文件已修改
33 ■■■■ 已修改文件
zy-asrs-admin/src/views/out/flat/index.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
                }
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);
    }
    /**
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"))