|
@@ -255,8 +255,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
|
|
|
|
|
|
QueryWrapper<SyPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPackingList, request.getParameterMap());
|
|
|
if(tailoringOrFabric.equals("0")){ //查成衣
|
|
|
- queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1);
|
|
|
- queryWrapper.groupBy("a.document_No");
|
|
|
+ queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1).groupBy("b.group_id");
|
|
|
+ queryWrapper.groupBy("a.document_No");
|
|
|
pageList = syShippingOrderService.queryTailoring(page,queryWrapper);
|
|
|
|
|
|
}else{//查面料
|