purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

进销存列表默认查询全部仓库的数据

Browse Source
This commit is contained in:
季圣华
2017-06-22 23:44:31 +08:00
parent 76017fb1eb
commit 76cdbdfb4e
3 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/jsh/action/materials/DepotHeadAction.java
View File

@@ -415,8 +415,12 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
Map<String,Object> condition = new HashMap<String,Object>();
if(model.getAllocationProjectId()!=null)
{condition.put("AllocationProjectId_n_eq", model.getAllocationProjectId());}
if(model.getProjectId()!=null)
{condition.put("ProjectId_n_eq", model.getProjectId());}
if(model.getProjectId()!=null) {
condition.put("ProjectId_n_eq", model.getProjectId());
}
else {
condition.put("ProjectId_s_in", model.getDepotIds());
}
condition.put("Type_s_eq",model.getType());
condition.put("SubType_s_eq",model.getSubType());
condition.put("Number_s_like",model.getNumber());

9
src/main/java/com/jsh/model/vo/materials/DepotHeadModel.java
View File

@@ -11,6 +11,7 @@ public class DepotHeadModel implements Serializable
private String Type = "";
private String SubType = "";
private Long ProjectId;
private String DepotIds = "";
private String Number = "";
private String OperPersonName = "";
private String OperTime;
@@ -85,6 +86,14 @@ public class DepotHeadModel implements Serializable
ProjectId = projectId;
}
public String getDepotIds() {
return DepotIds;
}
public void setDepotIds(String depotIds) {
DepotIds = depotIds;
}
public String getNumber() {
return Number;
}