修改bug
This commit is contained in:
parent
0af8cd78ba
commit
dd86d8d1e6
|
|
@ -564,6 +564,13 @@ public class InvoicingApi {
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
QueryWrapper<MaterialInfoEntity> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<MaterialInfoEntity> queryWrapper = new QueryWrapper<>();
|
||||||
|
if(StringUtils.isBlank(materialInfoEntity.getWlType())){
|
||||||
|
queryWrapper.gt("a.kcsl",0);
|
||||||
|
}else if(StringUtils.equals("1",materialInfoEntity.getWlType())){
|
||||||
|
queryWrapper.eq("a.kcsl",0);
|
||||||
|
}else if(StringUtils.equals("0",materialInfoEntity.getWlType())){
|
||||||
|
queryWrapper.gt("a.kcsl",0);
|
||||||
|
}
|
||||||
queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getSuppliers()),"c.suppliers_id", materialInfoEntity.getSuppliers());
|
queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getSuppliers()),"c.suppliers_id", materialInfoEntity.getSuppliers());
|
||||||
queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getNuId()),"a.nu_id", materialInfoEntity.getNuId());
|
queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getNuId()),"a.nu_id", materialInfoEntity.getNuId());
|
||||||
queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getWlId()),"a.wl_id", materialInfoEntity.getWlId());
|
queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getWlId()),"a.wl_id", materialInfoEntity.getWlId());
|
||||||
|
|
|
||||||
|
|
@ -158,4 +158,5 @@ public class MaterialInfoEntity implements Serializable {
|
||||||
private Double procurementPrice;
|
private Double procurementPrice;
|
||||||
@Dict(dicCode = "pd_type")
|
@Dict(dicCode = "pd_type")
|
||||||
private String pdType;
|
private String pdType;
|
||||||
|
private String wlType;//用于查询出入库类型 0库存大于0 1库存等于0
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue