|
@ -33,12 +33,9 @@ public class WarehouseInventoryHistoryService extends MybatisBaseService<Warehou |
|
|
@Autowired |
|
|
@Autowired |
|
|
WarehouseInventoryHistoryService warehouseInventoryHistoryService; |
|
|
WarehouseInventoryHistoryService warehouseInventoryHistoryService; |
|
|
public QueryWrapper<WarehouseInventoryHistory> createQueryWrapper(PagerQuery<WarehouseInventoryHistoryQuery> pq) { |
|
|
public QueryWrapper<WarehouseInventoryHistory> createQueryWrapper(PagerQuery<WarehouseInventoryHistoryQuery> pq) { |
|
|
return new QueryWrapper<>(); |
|
|
|
|
|
} |
|
|
|
|
|
public ResultBean<PagerVo<WarehouseInventoryHistoryVo>> listPage(PagerQuery<WarehouseInventoryHistoryQuery> pq) { |
|
|
|
|
|
ResultBean rb =new ResultBean().fail(); |
|
|
|
|
|
WarehouseInventoryHistoryQuery query = pq.getParams(); |
|
|
WarehouseInventoryHistoryQuery query = pq.getParams(); |
|
|
QueryWrapper<WarehouseInventoryHistory> qw = new QueryWrapper<>(); |
|
|
QueryWrapper<WarehouseInventoryHistory> qw = new QueryWrapper<>(); |
|
|
|
|
|
qw.clear(); |
|
|
if (StringUtils.isNotBlank(query.getOrgLevelKey())) { |
|
|
if (StringUtils.isNotBlank(query.getOrgLevelKey())) { |
|
|
//数据权限ID(1全部、2本部门及子部门、3本部门、4个人)
|
|
|
//数据权限ID(1全部、2本部门及子部门、3本部门、4个人)
|
|
|
String orgLevelKey=query.getOrgLevelKey(); |
|
|
String orgLevelKey=query.getOrgLevelKey(); |
|
@ -54,40 +51,58 @@ public class WarehouseInventoryHistoryService extends MybatisBaseService<Warehou |
|
|
orgSidPath = orgSidPath.substring(0, index); |
|
|
orgSidPath = orgSidPath.substring(0, index); |
|
|
qw.apply("s.orgSidPath like('"+orgSidPath+"')"); |
|
|
qw.apply("s.orgSidPath like('"+orgSidPath+"')"); |
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
qw.eq("wab.createBySid", query.getUserSid()); |
|
|
qw.eq("a.createBySid", query.getUserSid()); |
|
|
} else { |
|
|
|
|
|
PagerVo<WarehouseInventoryVo> p = new PagerVo<>(); |
|
|
|
|
|
return rb.success().setData(p); |
|
|
|
|
|
} |
|
|
} |
|
|
} else { |
|
|
|
|
|
PagerVo<WarehouseInventoryVo> p = new PagerVo<>(); |
|
|
|
|
|
return rb.success().setData(p); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseSid())) { |
|
|
|
|
|
qw.like("a.warehouseNameSid", query.getWarehouseSid()); |
|
|
|
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(query.getGoodsSpuSid())) { |
|
|
if (StringUtils.isNotBlank(query.getGoodsSpuSid())) { |
|
|
qw.like("a.goodsSpuSid", query.getGoodsSpuSid()); |
|
|
qw.eq("a.goodsSkuSid", query.getGoodsSpuSid()); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(query.getBrandSid())) { |
|
|
if (StringUtils.isNotBlank(query.getGoodsTypeSid())) { |
|
|
qw.like("a.brandSid", query.getBrandSid()); |
|
|
qw.eq("a.goodsTypeSid", query.getGoodsTypeSid()); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(query.getSpec())) { |
|
|
if (StringUtils.isNotBlank(query.getSpec())) { |
|
|
qw.like("a.goodsSkuOwnSpec", query.getSpec()); |
|
|
qw.like("a.goodsSkuOwnSpec", query.getSpec()); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(query.getGoodsSpuSid())) { |
|
|
// qw.apply(StringUtils.isNotBlank(query.getCountStart()), "a.count >= " + query.getCountStart()).
|
|
|
qw.like("a.goodsSpuSid", query.getGoodsSpuSid()); |
|
|
// apply(StringUtils.isNotBlank(query.getCountEnd()), "a.count <= " + query.getCountEnd()
|
|
|
|
|
|
// );
|
|
|
|
|
|
if (StringUtils.isNotBlank(query.getBarCode())) { |
|
|
|
|
|
qw.eq("a.barCode", query.getBarCode()); |
|
|
} |
|
|
} |
|
|
qw.apply(StringUtils.isNotBlank(query.getCountStart()), "a.count >= " + query.getCountStart()). |
|
|
// qw.apply(org.apache.commons.lang3.StringUtils.isNotBlank(query.getCreateDateEnd()), "a.orderDate = '" + query.getCreateDateEnd()+"'" );
|
|
|
apply(StringUtils.isNotBlank(query.getCountEnd()), "a.count <= " + query.getCountEnd() |
|
|
qw.like("a.orderDate",query.getCreateDateEnd()); |
|
|
); |
|
|
|
|
|
qw.eq("1",1); |
|
|
qw.eq("1",1); |
|
|
qw.groupBy("a.goodsSpuSid"); |
|
|
|
|
|
|
|
|
return qw; |
|
|
|
|
|
} |
|
|
|
|
|
public ResultBean<PagerVo<WarehouseInventoryHistoryVo>> listPage(PagerQuery<WarehouseInventoryHistoryQuery> pq) { |
|
|
|
|
|
ResultBean rb =new ResultBean().fail(); |
|
|
|
|
|
WarehouseInventoryHistoryQuery query = pq.getParams(); |
|
|
|
|
|
QueryWrapper<WarehouseInventoryHistory> qw = createQueryWrapper(pq); |
|
|
IPage<WarehouseInventoryHistory> page = PagerUtil.queryToPage(pq); |
|
|
IPage<WarehouseInventoryHistory> page = PagerUtil.queryToPage(pq); |
|
|
|
|
|
if(StringUtils.isBlank(query.getOrgLevelKey())){ |
|
|
|
|
|
PagerVo<WarehouseInventoryVo> p = new PagerVo<>(); |
|
|
|
|
|
return rb.success().setData(p); |
|
|
|
|
|
}else{ |
|
|
|
|
|
qw = createQueryWrapper(pq); |
|
|
|
|
|
} |
|
|
IPage<WarehouseInventoryHistoryVo> pagging = baseMapper.listPage(page, qw); |
|
|
IPage<WarehouseInventoryHistoryVo> pagging = baseMapper.listPage(page, qw); |
|
|
for (WarehouseInventoryHistoryVo record : pagging.getRecords()) { |
|
|
for (WarehouseInventoryHistoryVo record : pagging.getRecords()) { |
|
|
List<WarehouseInventoryHistoryVo> vos=baseMapper.getListBySpuSid(record.getGoodsSpuSid()); |
|
|
record.setSid(record.getGoodsSpuSid()); |
|
|
record.setList(vos); |
|
|
List<WarehouseInventoryHistoryVo> vos=new ArrayList<>(); |
|
|
|
|
|
if (StringUtils.isBlank(query.getGoodsSpuSid())) { |
|
|
|
|
|
qw=createQueryWrapper(pq); |
|
|
|
|
|
qw.eq("a.goodsSpuSid", record.getGoodsSpuSid()); |
|
|
|
|
|
vos=baseMapper.getListBySpuSid(qw,query.getCountStart(),query.getCountEnd()); |
|
|
|
|
|
}else{ |
|
|
|
|
|
vos=baseMapper.getListBySpuSid(qw,query.getCountStart(),query.getCountEnd()); |
|
|
|
|
|
} |
|
|
|
|
|
for (WarehouseInventoryHistoryVo vo : vos) { |
|
|
|
|
|
record.setCount(record.getCount().add(vo.getCount())); |
|
|
|
|
|
vo.setMainSid(record.getGoodsSpuSid()); |
|
|
|
|
|
vo.setSid(vo.getGoodsSkuSid()); |
|
|
|
|
|
} |
|
|
|
|
|
record.setChildren(vos); |
|
|
} |
|
|
} |
|
|
PagerVo<WarehouseInventoryHistoryVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
PagerVo<WarehouseInventoryHistoryVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
return rb.success().setData(p); |
|
|
return rb.success().setData(p); |
|
|