diff --git a/src/main/java/com/gaotao/modules/pallet/entity/CatchPallet.java b/src/main/java/com/gaotao/modules/pallet/entity/CatchPallet.java index 3e96ee3..11a440f 100644 --- a/src/main/java/com/gaotao/modules/pallet/entity/CatchPallet.java +++ b/src/main/java/com/gaotao/modules/pallet/entity/CatchPallet.java @@ -24,21 +24,21 @@ public class CatchPallet { @ExcelIgnore private String site; - @ExcelProperty(value = "Pallet Label",index = 1) + @ExcelProperty(value = "Pallet Label",index = 0) private String palletNo; - @ExcelProperty(value = "SN",index = 2) + @ExcelProperty(value = "SN",index = 1) private String sn; - @ExcelProperty(value = "SKU",index = 3) + @ExcelProperty(value = "SKU",index = 2) private String sku; + @ExcelProperty(value = "Part No",index = 3) + private String erpPartNo; + @ExcelProperty(value = "Part Description",index = 4) private String partDesc; - @ExcelIgnore - private String erpPartNo; - @ExcelIgnore private String createBy; diff --git a/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java b/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java index 745ecc6..b899fb3 100644 --- a/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java @@ -1,6 +1,7 @@ package com.gaotao.modules.pallet.service.impl; import cn.idev.excel.FastExcel; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -33,7 +34,9 @@ public class CatchPalletServiceImpl extends ServiceImpl list = list(new QueryWrapper<>(pallet)); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(pallet); + queryWrapper.orderByDesc(CatchPallet::getId); + List list = list(queryWrapper); if (list.isEmpty()) { throw new RuntimeException("not find any Pallet Label"); } @@ -61,7 +64,7 @@ public class CatchPalletServiceImpl extends ServiceImpl