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 2aa803b..6585a87 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 @@ -63,6 +63,8 @@ public class CatchPalletServiceImpl extends ServiceImpl list = palletService.lambdaQuery() .eq(Pallet::getPalletNo, pallet.getPalletNo().trim()) + .orderByAsc(Pallet::getSku) + .orderByAsc(Pallet::getSn) .list(); if (list.isEmpty()){ throw new RuntimeException("no Pallet Label found \""+pallet.getPalletNo().trim()+"\""); diff --git a/src/main/java/com/gaotao/modules/pallet/service/impl/PalletServiceImpl.java b/src/main/java/com/gaotao/modules/pallet/service/impl/PalletServiceImpl.java index 98b835d..5fdabe6 100644 --- a/src/main/java/com/gaotao/modules/pallet/service/impl/PalletServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pallet/service/impl/PalletServiceImpl.java @@ -23,6 +23,14 @@ public class PalletServiceImpl extends ServiceImpl impleme lambdaUpdate() .in(Pallet::getPalletNo,list) .remove(); - int i = baseMapper.saveBatch(pallets); + // 分批次处理 + // 每次新增50条 + int batchSize = 50; + int total = 0; + for (int i = 0; i < pallets.size(); i += batchSize) { + int end = Math.min(i + batchSize, pallets.size()); + List subList = pallets.subList(i, end); + total += baseMapper.saveBatch(subList); + } } }