|
@@ -485,7 +485,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
|
|
//queryWrapper.eq("a.is_reference",0);
|
|
//queryWrapper.eq("a.is_reference",0);
|
|
queryWrapper.and(QueryWrapper -> QueryWrapper.eq("a.is_reference", 0).or().eq("a.is_reference", 2));
|
|
queryWrapper.and(QueryWrapper -> QueryWrapper.eq("a.is_reference", 0).or().eq("a.is_reference", 2));
|
|
queryWrapper.eq("a.status",1);
|
|
queryWrapper.eq("a.status",1);
|
|
- queryWrapper.groupBy("a.document_No");
|
|
|
|
|
|
+ queryWrapper.groupBy("a.id");
|
|
queryWrapper.orderByDesc("a.item_number,b.po_no");
|
|
queryWrapper.orderByDesc("a.item_number,b.po_no");
|
|
Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(pageNo, pageSize);
|
|
Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(pageNo, pageSize);
|
|
IPage<SyPreAssembledPackingListVo> pageList = syLetterDepositService.querySyPreAssembledPackingList(page, queryWrapper);
|
|
IPage<SyPreAssembledPackingListVo> pageList = syLetterDepositService.querySyPreAssembledPackingList(page, queryWrapper);
|