Skip to content
GitLab
Commit 5e05f53a authored by 季圣华's avatar 季圣华
Browse files

更新后端代码

parent b9bc613c
Hide whitespace changes
Inline Side-by-side
src/main/java/com/jsh/action/basic/DepotAction.java
View file @ 5e05f53a
...@@ -25,251 +25,260 @@ import com.jsh.util.PageUtil; ...@@ -25,251 +25,260 @@ import com.jsh.util.PageUtil;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class DepotAction extends BaseAction<DepotModel> public class DepotAction extends BaseAction<DepotModel>
{ {
private DepotIService depotService; private DepotIService depotService;
private UserBusinessIService userBusinessService; private UserBusinessIService userBusinessService;
private DepotModel model = new DepotModel(); private DepotModel model = new DepotModel();
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
public String getBasicData() public String getBasicData()
{ {
Map<String,List> mapData = model.getShowModel().getMap(); Map<String,List> mapData = model.getShowModel().getMap();
PageUtil pageUtil = new PageUtil(); PageUtil pageUtil = new PageUtil();
pageUtil.setPageSize(0); pageUtil.setPageSize(0);
pageUtil.setCurPage(0); pageUtil.setCurPage(0);
try try
{ {
Map<String,Object> condition = pageUtil.getAdvSearch(); Map<String,Object> condition = pageUtil.getAdvSearch();
condition.put("sort_s_order", "asc"); condition.put("sort_s_order", "asc");
depotService.find(pageUtil); depotService.find(pageUtil);
mapData.put("depotList", pageUtil.getPageList()); mapData.put("depotList", pageUtil.getPageList());
} }
catch (Exception e) catch (Exception e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e); Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
model.getShowModel().setMsgTip("exceptoin"); model.getShowModel().setMsgTip("exceptoin");
} }
return SUCCESS; return SUCCESS;
} }
/** /**
* 增加仓库 * 增加仓库
* @return * @return
*/ */
public void create() public void create()
{ {
Log.infoFileSync("==================开始调用增加仓库信息方法create()==================="); Log.infoFileSync("==================开始调用增加仓库信息方法create()===================");
Boolean flag = false; Boolean flag = false;
try try
{ {
Depot depot = new Depot(); Depot depot = new Depot();
depot.setName(model.getName()); depot.setName(model.getName());
depot.setAddress(model.getAddress());
depot.setWarehousing(model.getWarehousing());
depot.setTruckage(model.getTruckage());
depot.setType(model.getType()); depot.setType(model.getType());
depot.setSort(model.getSort()); depot.setSort(model.getSort());
depot.setRemark(model.getRemark()); depot.setRemark(model.getRemark());
depotService.create(depot); depotService.create(depot);
//========标识位=========== //========标识位===========
flag = true; flag = true;
//记录操作日志使用 //记录操作日志使用
tipMsg = "成功"; tipMsg = "成功";
tipType = 0; tipType = 0;
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加仓库信息异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加仓库信息异常", e);
flag = false; flag = false;
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
finally finally
{ {
try try
{ {
toClient(flag.toString()); toClient(flag.toString());
} }
catch (IOException e) catch (IOException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>增加仓库信息回写客户端结果异常", e); Log.errorFileSync(">>>>>>>>>>>>增加仓库信息回写客户端结果异常", e);
} }
} }
logService.create(new Logdetails(getUser(), "增加仓库", model.getClientIp(), logService.create(new Logdetails(getUser(), "增加仓库", model.getClientIp(),
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "增加仓库名称为 "+ model.getName() + " " + tipMsg + "！", "增加仓库" + tipMsg)); , tipType, "增加仓库名称为 "+ model.getName() + " " + tipMsg + "！", "增加仓库" + tipMsg));
Log.infoFileSync("==================结束调用增加仓库方法create()==================="); Log.infoFileSync("==================结束调用增加仓库方法create()===================");
} }
/** /**
* 删除仓库 * 删除仓库
* @return * @return
*/ */
public String delete() public String delete()
{ {
Log.infoFileSync("====================开始调用删除仓库信息方法delete()================"); Log.infoFileSync("====================开始调用删除仓库信息方法delete()================");
try try
{ {
depotService.delete(model.getDepotID()); depotService.delete(model.getDepotID());
tipMsg = "成功"; tipMsg = "成功";
tipType = 0; tipType = 0;
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getDepotID() + " 的仓库异常", e); Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getDepotID() + " 的仓库异常", e);
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
model.getShowModel().setMsgTip(tipMsg); model.getShowModel().setMsgTip(tipMsg);
logService.create(new Logdetails(getUser(), "删除仓库", model.getClientIp(), logService.create(new Logdetails(getUser(), "删除仓库", model.getClientIp(),
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "删除仓库ID为 "+ model.getDepotID() + " " + tipMsg + "！", "删除仓库" + tipMsg)); , tipType, "删除仓库ID为 "+ model.getDepotID() + " " + tipMsg + "！", "删除仓库" + tipMsg));
Log.infoFileSync("====================结束调用删除仓库信息方法delete()================"); Log.infoFileSync("====================结束调用删除仓库信息方法delete()================");
return SUCCESS; return SUCCESS;
} }
/** /**
* 更新仓库 * 更新仓库
* @return * @return
*/ */
public void update() public void update()
{ {
Boolean flag = false; Boolean flag = false;
try try
{ {
Depot depot = depotService.get(model.getDepotID()); Depot depot = depotService.get(model.getDepotID());
depot.setName(model.getName()); depot.setName(model.getName());
depot.setAddress(model.getAddress());
depot.setWarehousing(model.getWarehousing());
depot.setTruckage(model.getTruckage());
depot.setType(model.getType()); depot.setType(model.getType());
depot.setSort(model.getSort()); depot.setSort(model.getSort());
depot.setRemark(model.getRemark()); depot.setRemark(model.getRemark());
depotService.update(depot); depotService.update(depot);
flag = true; flag = true;
tipMsg = "成功"; tipMsg = "成功";
tipType = 0; tipType = 0;
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>修改仓库ID为 ： " + model.getDepotID() + "信息失败", e); Log.errorFileSync(">>>>>>>>>>>>>修改仓库ID为 ： " + model.getDepotID() + "信息失败", e);
flag = false; flag = false;
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
finally finally
{ {
try try
{ {
toClient(flag.toString()); toClient(flag.toString());
} }
catch (IOException e) catch (IOException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>修改仓库回写客户端结果异常", e); Log.errorFileSync(">>>>>>>>>>>>修改仓库回写客户端结果异常", e);
} }
} }
logService.create(new Logdetails(getUser(), "更新仓库", model.getClientIp(), logService.create(new Logdetails(getUser(), "更新仓库", model.getClientIp(),
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "更新仓库ID为 "+ model.getDepotID() + " " + tipMsg + "！", "更新仓库" + tipMsg)); , tipType, "更新仓库ID为 "+ model.getDepotID() + " " + tipMsg + "！", "更新仓库" + tipMsg));
} }
/** /**
* 批量删除指定ID仓库 * 批量删除指定ID仓库
* @return * @return
*/ */
public String batchDelete() public String batchDelete()
{ {
try try
{ {
depotService.batchDelete(model.getDepotIDs()); depotService.batchDelete(model.getDepotIDs());
model.getShowModel().setMsgTip("成功"); model.getShowModel().setMsgTip("成功");
//记录操作日志使用 //记录操作日志使用
tipMsg = "成功"; tipMsg = "成功";
tipType = 0; tipType = 0;
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>批量删除仓库ID为：" + model.getDepotIDs() + "信息异常", e); Log.errorFileSync(">>>>>>>>>>>批量删除仓库ID为：" + model.getDepotIDs() + "信息异常", e);
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
logService.create(new Logdetails(getUser(), "批量删除仓库", model.getClientIp(), logService.create(new Logdetails(getUser(), "批量删除仓库", model.getClientIp(),
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "批量删除仓库ID为 "+ model.getDepotIDs() + " " + tipMsg + "！", "批量删除仓库" + tipMsg)); , tipType, "批量删除仓库ID为 "+ model.getDepotIDs() + " " + tipMsg + "！", "批量删除仓库" + tipMsg));
return SUCCESS; return SUCCESS;
} }
/** /**
* 检查输入名称是否存在 * 检查输入名称是否存在
*/ */
public void checkIsNameExist() public void checkIsNameExist()
{ {
Boolean flag = false; Boolean flag = false;
try try
{ {
flag = depotService.checkIsNameExist("name",model.getName(),"id", model.getDepotID()); flag = depotService.checkIsNameExist("name",model.getName(),"id", model.getDepotID());
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查仓库名称为：" + model.getName() + " ID为： " + model.getDepotID() + " 是否存在异常！"); Log.errorFileSync(">>>>>>>>>>>>>>>>>检查仓库名称为：" + model.getName() + " ID为： " + model.getDepotID() + " 是否存在异常！");
} }
finally finally
{ {
try try
{ {
toClient(flag.toString()); toClient(flag.toString());
} }
catch (IOException e) catch (IOException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>回写检查仓库名称为：" + model.getName() + " ID为： " + model.getDepotID() + " 是否存在异常！",e); Log.errorFileSync(">>>>>>>>>>>>回写检查仓库名称为：" + model.getName() + " ID为： " + model.getDepotID() + " 是否存在异常！",e);
} }
} }
} }
/** /**
* 查找仓库信息 * 查找仓库信息
* @return * @return
*/ */
public void findBy() public void findBy()
{ {
try try
{ {
PageUtil<Depot> pageUtil = new PageUtil<Depot>(); PageUtil<Depot> pageUtil = new PageUtil<Depot>();
pageUtil.setPageSize(model.getPageSize()); pageUtil.setPageSize(model.getPageSize());
pageUtil.setCurPage(model.getPageNo()); pageUtil.setCurPage(model.getPageNo());
pageUtil.setAdvSearch(getCondition()); pageUtil.setAdvSearch(getCondition());
depotService.find(pageUtil); depotService.find(pageUtil);
List<Depot> dataList = pageUtil.getPageList(); List<Depot> dataList = pageUtil.getPageList();
JSONObject outer = new JSONObject(); JSONObject outer = new JSONObject();
outer.put("total", pageUtil.getTotalCount()); outer.put("total", pageUtil.getTotalCount());
//存放数据json数组 //存放数据json数组
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
if(null != dataList) if(null != dataList)
{ {
for(Depot depot:dataList) for(Depot depot:dataList)
{ {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
item.put("id", depot.getId()); item.put("id", depot.getId());
//供应商名称 //供应商名称
item.put("name", depot.getName()); item.put("name", depot.getName());
item.put("address", depot.getAddress());
item.put("warehousing", depot.getWarehousing());
item.put("truckage", depot.getTruckage());
item.put("type", depot.getType()); item.put("type", depot.getType());
item.put("sort", depot.getSort()); item.put("sort", depot.getSort());
item.put("remark", depot.getRemark()); item.put("remark", depot.getRemark());
item.put("op", 1); item.put("op", 1);
dataArray.add(item); dataArray.add(item);
} }
} }
outer.put("rows", dataArray); outer.put("rows", dataArray);
//回写查询结果 //回写查询结果
toClient(outer.toString()); toClient(outer.toString());
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库信息异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库信息异常", e);
} }
catch (IOException e) catch (IOException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库信息结果异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库信息结果异常", e);
} }
} }
/** /**
...@@ -311,82 +320,132 @@ public class DepotAction extends BaseAction<DepotModel> ...@@ -311,82 +320,132 @@ public class DepotAction extends BaseAction<DepotModel>
Log.errorFileSync(">>>>>>>>>回写查询仓库信息结果异常", e); Log.errorFileSync(">>>>>>>>>回写查询仓库信息结果异常", e);
} }
} }
/** /**
* 用户对应仓库显示 * 用户对应仓库显示
* @return * @return
*/ */
public void findUserDepot() public void findUserDepot()
{ {
try try
{ {
PageUtil<Depot> pageUtil = new PageUtil<Depot>(); PageUtil<Depot> pageUtil = new PageUtil<Depot>();
pageUtil.setPageSize(100); pageUtil.setPageSize(100);
//pageUtil.setCurPage(model.getPageNo()); //pageUtil.setCurPage(model.getPageNo());
pageUtil.setAdvSearch(getCondition_UserDepot());
depotService.find(pageUtil);
List<Depot> dataList = pageUtil.getPageList();
//开始拼接json数据
JSONObject outer = new JSONObject();
outer.put("id", 1);
outer.put("text", "仓库列表");
outer.put("state", "open");
//存放数据json数组
JSONArray dataArray = new JSONArray();
if(null != dataList)
{
for(Depot depot:dataList)
{
JSONObject item = new JSONObject();
item.put("id", depot.getId());
item.put("text", depot.getName());
//勾选判断1
Boolean flag = false;
try
{
flag = userBusinessService.checkIsUserBusinessExist("Type",model.getUBType(),"KeyId",model.getUBKeyId(),"Value","["+depot.getId().toString()+"]");
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的仓库：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！");
}
if (flag==true){item.put("checked", true);}
//结束
dataArray.add(item);
}
}
outer.put("children", dataArray);
//回写查询结果
toClient("["+outer.toString()+"]");
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库异常", e);
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库结果异常", e);
}
}
/**
* 根据用户查找对应仓库列表-仅显示有权限的
* @return
*/
public void findDepotByUserId(){
try{
PageUtil<Depot> pageUtil = new PageUtil<Depot>();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
pageUtil.setAdvSearch(getCondition_UserDepot());
depotService.find(pageUtil);
List<Depot> dataList = pageUtil.getPageList();
pageUtil.setAdvSearch(getCondition_UserDepot()); //存放数据json数组
depotService.find(pageUtil); JSONArray dataArray = new JSONArray();
List<Depot> dataList = pageUtil.getPageList(); if(null != dataList)
{
//开始拼接json数据 for(Depot depot:dataList)
JSONObject outer = new JSONObject(); {
outer.put("id", 1); JSONObject item = new JSONObject();
outer.put("text", "仓库列表"); //勾选判断1
outer.put("state", "open"); Boolean flag = false;
//存放数据json数组 try
JSONArray dataArray = new JSONArray(); {
if(null != dataList) flag = userBusinessService.checkIsUserBusinessExist("Type",model.getUBType(),"KeyId",model.getUBKeyId(),"Value","["+depot.getId().toString()+"]");
{ }
for(Depot depot:dataList) catch (DataAccessException e)
{ {
JSONObject item = new JSONObject(); Log.errorFileSync(">>>>>>>>>>>>>>>>>查询用户对应的仓库：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！");
item.put("id", depot.getId()); }
item.put("text", depot.getName()); if (flag==true){
//勾选判断1 item.put("id", depot.getId());
Boolean flag = false; item.put("depotName", depot.getName());
try dataArray.add(item);
{ }
flag = userBusinessService.checkIsUserBusinessExist("Type",model.getUBType(),"KeyId",model.getUBKeyId(),"Value","["+depot.getId().toString()+"]"); }
} }
catch (DataAccessException e) //回写查询结果
{ toClient(dataArray.toString());
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的仓库：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！"); }
} catch (DataAccessException e)
if (flag==true){item.put("checked", true);} {
//结束 Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库异常", e);
dataArray.add(item); }
} catch (IOException e)
} {
outer.put("children", dataArray); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库结果异常", e);
//回写查询结果 }
toClient("["+outer.toString()+"]");
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库异常", e);
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库结果异常", e);
}
} }
/** /**
* 拼接搜索条件 * 拼接搜索条件
* @return * @return
*/ */
private Map<String,Object> getCondition() private Map<String,Object> getCondition()
{ {
/** /**
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("name_s_like", model.getName()); condition.put("name_s_like", model.getName());
condition.put("remark_s_like", model.getRemark()); condition.put("remark_s_like", model.getRemark());
condition.put("type_n_eq", model.getType()); //0-仓库，1-礼品卡 condition.put("type_n_eq", model.getType()); //0-仓库，1-礼品卡
condition.put("sort_s_order", "asc"); condition.put("sort_s_order", "asc");
return condition; return condition;
} }
/** /**
* 拼接搜索条件 * 拼接搜索条件
...@@ -402,22 +461,22 @@ public class DepotAction extends BaseAction<DepotModel> ...@@ -402,22 +461,22 @@ public class DepotAction extends BaseAction<DepotModel>
condition.put("sort_s_order", "asc"); condition.put("sort_s_order", "asc");
return condition; return condition;
} }
/** /**
* 拼接搜索条件-用户对应部门 * 拼接搜索条件-用户对应仓库
* @return * @return
*/ */
private Map<String,Object> getCondition_UserDepot() private Map<String,Object> getCondition_UserDepot()
{ {
/** /**
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("type_n_eq", 0); condition.put("type_n_eq", 0);
condition.put("sort_s_order", "asc"); condition.put("sort_s_order", "asc");
return condition; return condition;
} }
//=============以下spring注入以及Model驱动公共方法，与Action处理无关================== //=============以下spring注入以及Model驱动公共方法，与Action处理无关==================
@Override @Override
public DepotModel getModel() public DepotModel getModel()
...@@ -425,12 +484,12 @@ public class DepotAction extends BaseAction<DepotModel> ...@@ -425,12 +484,12 @@ public class DepotAction extends BaseAction<DepotModel>
return model; return model;
} }
public void setDepotService(DepotIService depotService) public void setDepotService(DepotIService depotService)
{ {
this.depotService = depotService; this.depotService = depotService;
} }
public void setUserBusinessService(UserBusinessIService userBusinessService) { public void setUserBusinessService(UserBusinessIService userBusinessService) {
this.userBusinessService = userBusinessService; this.userBusinessService = userBusinessService;
} }
} }
src/main/java/com/jsh/action/basic/FunctionsAction.java
View file @ 5e05f53a
...@@ -47,7 +47,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel> ...@@ -47,7 +47,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
functions.setSort(model.getSort()); functions.setSort(model.getSort());
functions.setEnabled(model.getEnabled()); functions.setEnabled(model.getEnabled());
functions.setType(model.getType()); functions.setType(model.getType());
functions.setPushBtn(model.getPushBtn());
functionsService.create(functions); functionsService.create(functions);
//========标识位=========== //========标识位===========
...@@ -126,6 +126,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel> ...@@ -126,6 +126,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
functions.setSort(model.getSort()); functions.setSort(model.getSort());
functions.setEnabled(model.getEnabled()); functions.setEnabled(model.getEnabled());
functions.setType(model.getType()); functions.setType(model.getType());
functions.setPushBtn(model.getPushBtn());
functionsService.update(functions); functionsService.update(functions);
flag = true; flag = true;
...@@ -246,6 +247,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel> ...@@ -246,6 +247,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
item.put("Sort", functions.getSort()); item.put("Sort", functions.getSort());
item.put("Enabled", functions.getEnabled()); item.put("Enabled", functions.getEnabled());
item.put("Type", functions.getType()); item.put("Type", functions.getType());
item.put("PushBtn", functions.getPushBtn());
item.put("op", 1); item.put("op", 1);
dataArray.add(item); dataArray.add(item);
} }
...@@ -263,6 +265,49 @@ public class FunctionsAction extends BaseAction<FunctionsModel> ...@@ -263,6 +265,49 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询功能信息结果异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询功能信息结果异常", e);
} }
} }
/**
* 根据id列表查找功能信息
* @return
*/
public void findByIds()
{
try {
PageUtil<Functions> pageUtil = new PageUtil<Functions>();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
pageUtil.setAdvSearch(getConditionByIds());
functionsService.find(pageUtil);
List<Functions> dataList = pageUtil.getPageList();
JSONObject outer = new JSONObject();
outer.put("total", pageUtil.getTotalCount());
//存放数据json数组
JSONArray dataArray = new JSONArray();
if(null != dataList)
{
for(Functions functions:dataList)
{
JSONObject item = new JSONObject();
item.put("Id", functions.getId());
item.put("Name", functions.getName());
item.put("PushBtn", functions.getPushBtn());
item.put("op", 1);
dataArray.add(item);
}
}
outer.put("rows", dataArray);
//回写查询结果
toClient(outer.toString());
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找功能信息异常", e);
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询功能信息结果异常", e);
}
}
/** /**
...@@ -497,7 +542,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel> ...@@ -497,7 +542,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
else else
{ {
//不是目录，有链接 //不是目录，有链接
item2.put("text", "<a onclick=\"NewTab('"+functions2.getName()+"','"+functions2.getURL()+"')\">"+functions2.getName()+"</a>"); item2.put("text", "<a onclick=\"NewTab('"+functions2.getName()+"','"+functions2.getURL()+"','"+functions2.getId()+"')\">"+functions2.getName()+"</a>");
} }
dataArray2.add(item2); dataArray2.add(item2);
...@@ -508,7 +553,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel> ...@@ -508,7 +553,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
else else
{ {
//不是目录，有链接 //不是目录，有链接
item1.put("text", "<a onclick=\"NewTab('"+functions1.getName()+"','"+functions1.getURL()+"')\">"+functions1.getName()+"</a>"); item1.put("text", "<a onclick=\"NewTab('"+functions1.getName()+"','"+functions1.getURL()+"','"+functions1.getId()+"')\">"+functions1.getName()+"</a>");
} }
dataArray1.add(item1); dataArray1.add(item1);
...@@ -519,7 +564,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel> ...@@ -519,7 +564,7 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
else else
{ {
//不是目录，有链接 //不是目录，有链接
item.put("text", "<a onclick=\"NewTab('"+functions.getName()+"','"+functions.getURL()+"')\">"+functions.getName()+"</a>"); item.put("text", "<a onclick=\"NewTab('"+functions.getName()+"','"+functions.getURL()+"','"+functions.getId()+"')\">"+functions.getName()+"</a>");
} }
dataArray.add(item); dataArray.add(item);
...@@ -569,6 +614,18 @@ public class FunctionsAction extends BaseAction<FunctionsModel> ...@@ -569,6 +614,18 @@ public class FunctionsAction extends BaseAction<FunctionsModel>
condition.put("Sort_s_order", "asc"); condition.put("Sort_s_order", "asc");
return condition; return condition;
} }
/**
* 拼接搜索条件-角色对应功能
* @return
*/
private Map<String,Object> getConditionByIds() {
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("Enabled_n_eq", 1);
condition.put("Id_s_in", model.getFunctionsIDs());
condition.put("Sort_s_order", "asc");
return condition;
}
//=============以下spring注入以及Model驱动公共方法，与Action处理无关================== //=============以下spring注入以及Model驱动公共方法，与Action处理无关==================
@Override @Override
......
src/main/java/com/jsh/action/basic/SupplierAction.java
View file @ 5e05f53a
package com.jsh.action.basic; package com.jsh.action.basic;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.dao.DataAccessException;
import com.jsh.base.BaseAction; import com.jsh.base.BaseAction;
import com.jsh.base.Log; import com.jsh.base.Log;
import com.jsh.model.po.Logdetails; import com.jsh.model.po.Logdetails;
import com.jsh.model.po.Supplier; import com.jsh.model.po.Supplier;
import com.jsh.model.vo.basic.SupplierModel; import com.jsh.model.vo.basic.SupplierModel;
import com.jsh.service.basic.SupplierIService; import com.jsh.service.basic.SupplierIService;
import com.jsh.service.basic.UserBusinessIService;
import com.jsh.util.JshException; import com.jsh.util.JshException;
import com.jsh.util.PageUtil; import com.jsh.util.PageUtil;
import com.jsh.util.SupplierConstants;
import com.jsh.util.Tools;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.dao.DataAccessException;
import java.io.IOException;
import java.io.InputStream;
import java.sql.Timestamp;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/* /*
* 单位管理 * 单位管理
* @author jishenghua qq:752718920 * @author ji-sheng-hua qq:7 5 2 7 1 8 9 2 0
*/ */
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class SupplierAction extends BaseAction<SupplierModel> public class SupplierAction extends BaseAction<SupplierModel>
{ {
private SupplierIService supplierService; private SupplierIService supplierService;
private UserBusinessIService userBusinessService;
private SupplierModel model = new SupplierModel(); private SupplierModel model = new SupplierModel();
private final static Integer ISYSTEM = 1; private final static Integer ISYSTEM = 1;
public static final String EXCEL = "excel"; //action返回excel结果
/** /**
* 增加供应商 * 增加供应商
* @return * @return
...@@ -48,9 +54,18 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -48,9 +54,18 @@ public class SupplierAction extends BaseAction<SupplierModel>
supplier.setBeginNeedGet(model.getBeginNeedGet()); supplier.setBeginNeedGet(model.getBeginNeedGet());
supplier.setBeginNeedPay(model.getBeginNeedPay()); supplier.setBeginNeedPay(model.getBeginNeedPay());
supplier.setIsystem((short)1); supplier.setIsystem((short)1);
supplier.setEnabled(true);
supplier.setPhonenum(model.getPhonenum()); supplier.setPhonenum(model.getPhonenum());
supplier.setSupplier(model.getSupplier()); supplier.setSupplier(model.getSupplier());
supplier.setEnabled(model.getEnabled());
supplier.setFax(model.getFax());
supplier.setTelephone(model.getTelephone());
supplier.setAddress(model.getAddress());
supplier.setTaxNum(model.getTaxNum());
supplier.setBankName(model.getBankName());
supplier.setAccountNumber(model.getAccountNumber());
supplier.setTaxRate(model.getTaxRate());
supplierService.create(supplier); supplierService.create(supplier);
//========标识位=========== //========标识位===========
...@@ -131,7 +146,16 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -131,7 +146,16 @@ public class SupplierAction extends BaseAction<SupplierModel>
supplier.setIsystem((short)1); supplier.setIsystem((short)1);
supplier.setPhonenum(model.getPhonenum()); supplier.setPhonenum(model.getPhonenum());
supplier.setSupplier(model.getSupplier()); supplier.setSupplier(model.getSupplier());
supplier.setEnabled(model.getEnabled());
supplier.setFax(model.getFax());
supplier.setTelephone(model.getTelephone());
supplier.setAddress(model.getAddress());
supplier.setTaxNum(model.getTaxNum());
supplier.setBankName(model.getBankName());
supplier.setAccountNumber(model.getAccountNumber());
supplier.setTaxRate(model.getTaxRate());
supplier.setEnabled(supplier.getEnabled());
supplierService.update(supplier); supplierService.update(supplier);
flag = true; flag = true;
...@@ -181,6 +205,15 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -181,6 +205,15 @@ public class SupplierAction extends BaseAction<SupplierModel>
supplier.setIsystem((short)1); supplier.setIsystem((short)1);
supplier.setPhonenum(supplier.getPhonenum()); supplier.setPhonenum(supplier.getPhonenum());
supplier.setSupplier(supplier.getSupplier()); supplier.setSupplier(supplier.getSupplier());
supplier.setFax(supplier.getFax());
supplier.setTelephone(supplier.getTelephone());
supplier.setAddress(supplier.getAddress());
supplier.setTaxNum(supplier.getTaxNum());
supplier.setBankName(supplier.getBankName());
supplier.setAccountNumber(supplier.getAccountNumber());
supplier.setTaxRate(supplier.getTaxRate());
supplier.setEnabled(supplier.getEnabled()); supplier.setEnabled(supplier.getEnabled());
supplierService.update(supplier); supplierService.update(supplier);
...@@ -237,6 +270,33 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -237,6 +270,33 @@ public class SupplierAction extends BaseAction<SupplierModel>
, tipType, "批量删除供应商ID为 "+ model.getSupplierIDs() + " " + tipMsg + "！", "批量删除供应商" + tipMsg)); , tipType, "批量删除供应商ID为 "+ model.getSupplierIDs() + " " + tipMsg + "！", "批量删除供应商" + tipMsg));
return SUCCESS; return SUCCESS;
} }
/**
* 批量设置状态-启用或者禁用
* @return
*/
public String batchSetEnable()
{
try
{
supplierService.batchSetEnable(model.getEnabled(),model.getSupplierIDs());
model.getShowModel().setMsgTip("成功");
//记录操作日志使用
tipMsg = "成功";
tipType = 0;
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>批量修改状态，单位ID为：" + model.getSupplierIDs() + "信息异常", e);
tipMsg = "失败";
tipType = 1;
}
logService.create(new Logdetails(getUser(), "批量修改单位状态", model.getClientIp(),
new Timestamp(System.currentTimeMillis())
, tipType, "批量修改状态，单位ID为 "+ model.getSupplierIDs() + " " + tipMsg + "！", "批量修改单位状态" + tipMsg));
return SUCCESS;
}
/** /**
* 检查输入名称是否存在 * 检查输入名称是否存在
...@@ -278,6 +338,17 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -278,6 +338,17 @@ public class SupplierAction extends BaseAction<SupplierModel>
pageUtil.setCurPage(model.getPageNo()); pageUtil.setCurPage(model.getPageNo());
pageUtil.setAdvSearch(getCondition()); pageUtil.setAdvSearch(getCondition());
supplierService.find(pageUtil); supplierService.find(pageUtil);
String sName = "";
if((model.getType()).equals("供应商")){
sName = "pageUtilVendor";
}
else if((model.getType()).equals("客户")){
sName = "pageUtilCustomer";
}
else if((model.getType()).equals("会员")){
sName = "pageUtilMember";
}
getSession().put(sName, pageUtil);
List<Supplier> dataList = pageUtil.getPageList(); List<Supplier> dataList = pageUtil.getPageList();
JSONObject outer = new JSONObject(); JSONObject outer = new JSONObject();
...@@ -301,6 +372,15 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -301,6 +372,15 @@ public class SupplierAction extends BaseAction<SupplierModel>
item.put("BeginNeedPay",supplier.getBeginNeedPay()); item.put("BeginNeedPay",supplier.getBeginNeedPay());
item.put("isystem", supplier.getIsystem() == (short)0?"是":"否"); item.put("isystem", supplier.getIsystem() == (short)0?"是":"否");
item.put("description", supplier.getDescription()); item.put("description", supplier.getDescription());
item.put("fax", supplier.getFax());
item.put("telephone", supplier.getTelephone());
item.put("address", supplier.getAddress());
item.put("taxNum", supplier.getTaxNum());
item.put("bankName", supplier.getBankName());
item.put("accountNumber", supplier.getAccountNumber());
item.put("taxRate", supplier.getTaxRate());
item.put("enabled", supplier.getEnabled()); item.put("enabled", supplier.getEnabled());
item.put("op", supplier.getIsystem()); item.put("op", supplier.getIsystem());
dataArray.add(item); dataArray.add(item);
...@@ -319,6 +399,65 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -319,6 +399,65 @@ public class SupplierAction extends BaseAction<SupplierModel>
Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e);
} }
} }
/**
* 根据id查找信息
* @return
*/
public void findById() {
try {
PageUtil<Supplier> pageUtil = new PageUtil<Supplier>();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
pageUtil.setAdvSearch(getConditionById());
supplierService.find(pageUtil);
List<Supplier> dataList = pageUtil.getPageList();
JSONObject outer = new JSONObject();
outer.put("total", pageUtil.getTotalCount());
//存放数据json数组
JSONArray dataArray = new JSONArray();
if(null != dataList)
{
for(Supplier supplier:dataList)
{
JSONObject item = new JSONObject();
item.put("id", supplier.getId());
//名称
item.put("supplier", supplier.getSupplier());
item.put("type", supplier.getType());
item.put("contacts",supplier.getContacts());
item.put("phonenum", supplier.getPhonenum());
item.put("email", supplier.getEmail());
item.put("AdvanceIn",supplier.getAdvanceIn());
item.put("BeginNeedGet",supplier.getBeginNeedGet());
item.put("BeginNeedPay",supplier.getBeginNeedPay());
item.put("isystem", supplier.getIsystem() == (short)0?"是":"否");
item.put("description", supplier.getDescription());
item.put("fax", supplier.getFax());
item.put("telephone", supplier.getTelephone());
item.put("address", supplier.getAddress());
item.put("taxNum", supplier.getTaxNum());
item.put("bankName", supplier.getBankName());
item.put("accountNumber", supplier.getAccountNumber());
item.put("taxRate", supplier.getTaxRate());
item.put("enabled", supplier.getEnabled());
item.put("op", supplier.getIsystem());
dataArray.add(item);
}
}
outer.put("rows", dataArray);
//回写查询结果
toClient(outer.toString());
}
catch (DataAccessException e) {
Log.errorFileSync(">>>>>>>>>查找信息异常", e);
}
catch (IOException e) {
Log.errorFileSync(">>>>>>>>>回写查询信息结果异常", e);
}
}
/** /**
* 查找供应商信息-下拉框 * 查找供应商信息-下拉框
...@@ -363,10 +502,8 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -363,10 +502,8 @@ public class SupplierAction extends BaseAction<SupplierModel>
* 查找客户信息-下拉框 * 查找客户信息-下拉框
* @return * @return
*/ */
public void findBySelect_cus() public void findBySelect_cus() {
{ try {
try
{
PageUtil<Supplier> pageUtil = new PageUtil<Supplier>(); PageUtil<Supplier> pageUtil = new PageUtil<Supplier>();
pageUtil.setPageSize(0); pageUtil.setPageSize(0);
pageUtil.setCurPage(0); pageUtil.setCurPage(0);
...@@ -375,32 +512,37 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -375,32 +512,37 @@ public class SupplierAction extends BaseAction<SupplierModel>
List<Supplier> dataList = pageUtil.getPageList(); List<Supplier> dataList = pageUtil.getPageList();
//存放数据json数组 //存放数据json数组
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
if(null != dataList) if(null != dataList) {
{ for(Supplier supplier:dataList) {
for(Supplier supplier:dataList)
{
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
item.put("id", supplier.getId()); //勾选判断1
//客户名称 Boolean flag = false;
item.put("supplier", supplier.getSupplier()); try{
dataArray.add(item); flag = userBusinessService.checkIsUserBusinessExist("Type",model.getUBType(),"KeyId",model.getUBKeyId(),"Value","["+supplier.getId().toString()+"]");
}
catch (DataAccessException e){
Log.errorFileSync(">>>>>>>>>>>>>>>>>查询用户对应的客户：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！");
}
if (flag==true){
item.put("id", supplier.getId());
item.put("supplier", supplier.getSupplier()); //客户名称
dataArray.add(item);
}
} }
} }
//回写查询结果 //回写查询结果
toClient(dataArray.toString()); toClient(dataArray.toString());
} }
catch (DataAccessException e) catch (DataAccessException e) {
{
Log.errorFileSync(">>>>>>>>>查找客户信息异常", e); Log.errorFileSync(">>>>>>>>>查找客户信息异常", e);
} }
catch (IOException e) catch (IOException e) {
{
Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e); Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e);
} }
} }
/** /**
* 查找散户信息-下拉框 * 查找会员信息-下拉框
* @return * @return
*/ */
public void findBySelect_retail() public void findBySelect_retail()
...@@ -479,27 +621,176 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -479,27 +621,176 @@ public class SupplierAction extends BaseAction<SupplierModel>
Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e); Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e);
} }
} }
/**
* 用户对应客户显示
* @return
*/
public void findUserCustomer() {
try {
PageUtil<Supplier> pageUtil = new PageUtil<Supplier>();
pageUtil.setPageSize(500);
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("type_s_eq", "客户");
condition.put("id_s_order", "desc");
pageUtil.setAdvSearch(condition);
supplierService.find(pageUtil);
List<Supplier> dataList = pageUtil.getPageList();
//开始拼接json数据
JSONObject outer = new JSONObject();
outer.put("id", 1);
outer.put("text", "客户列表");
outer.put("state", "open");
//存放数据json数组
JSONArray dataArray = new JSONArray();
if(null != dataList){
for(Supplier supplier:dataList){
JSONObject item = new JSONObject();
item.put("id", supplier.getId());
item.put("text", supplier.getSupplier());
//勾选判断1
Boolean flag = false;
try{
flag = userBusinessService.checkIsUserBusinessExist("Type",model.getUBType(),"KeyId",model.getUBKeyId(),"Value","["+supplier.getId().toString()+"]");
}
catch (DataAccessException e){
Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的客户：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！");
}
if (flag==true){item.put("checked", true);}
//结束
dataArray.add(item);
}
}
outer.put("children", dataArray);
//回写查询结果
toClient("["+outer.toString()+"]");
}
catch (DataAccessException e){
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找客户异常", e);
}
catch (IOException e){
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询客户结果异常", e);
}
}
public String importFun(){
//excel表格file
Boolean result = false;
String returnStr = "";
try {
InputStream in = supplierService.importExcel(model.getSupplierFile());
if(null != in)
{
model.setFileName(Tools.getRandomChar() + Tools.getNow2(Calendar.getInstance().getTime()) + "_wrong.xls");
model.setExcelStream(in);
returnStr = SupplierConstants.BusinessForExcel.EXCEL;
}
else {
result = true;
try {
toClient(result.toString());
} catch (IOException e) {
Log.errorFileSync(">>>>>>>>>回写导入信息结果异常", e);
}
//导入数据成功
returnStr = SUCCESS;
}
}
catch (JshException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>导入excel表格信息异常", e);
}
return returnStr;
}
/**
* 导入excel表格-供应商
* @return
*/
@SuppressWarnings("unchecked")
public String importExcelVendor() {
return importFun();
}
/**
* 导入excel表格-客户
* @return
*/
@SuppressWarnings("unchecked")
public String importExcelCustomer() {
return importFun();
}
/**
* 导入excel表格-会员
* @return
*/
@SuppressWarnings("unchecked")
public String importExcelMember() {
return importFun();
}
/**
* 导出excel表格
* @return
*/
@SuppressWarnings("unchecked")
public String exportExcel() {
Log.infoFileSync("===================调用导出信息action方法exportExcel开始=======================");
try {
String sName = "pageUtil" + model.getType();
PageUtil<Supplier> pageUtil = (PageUtil<Supplier>)getSession().get(sName);
pageUtil.setPageSize(model.getPageSize());
pageUtil.setCurPage(model.getPageNo());
String isCurrentPage = "allPage";
model.setFileName(Tools.changeUnicode("report" + System.currentTimeMillis() + ".xls",model.getBrowserType()));
model.setExcelStream(supplierService.exmportExcel(isCurrentPage,pageUtil));
}
catch (Exception e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出信息action方法exportExcel异常",e);
model.getShowModel().setMsgTip("export excel exception");
}
Log.infoFileSync("===================调用导出信息action方法exportExcel结束==================");
return EXCEL;
}
/** /**
* 拼接搜索条件 * 拼接搜索条件
* @return * @return
*/ */
private Map<String,Object> getCondition() private Map<String,Object> getCondition() {
{
/** /**
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("supplier_s_like", model.getSupplier()); condition.put("supplier_s_like", model.getSupplier());
condition.put("type_s_like", model.getType()); condition.put("type_s_like", model.getType());
condition.put("contacts_s_like", model.getContacts()); condition.put("phonenum_s_like",model.getPhonenum());
condition.put("phonenum_s_like", model.getPhonenum()); condition.put("telephone_s_like", model.getTelephone());
condition.put("email_s_like", model.getEmail());
condition.put("description_s_like", model.getDescription()); condition.put("description_s_like", model.getDescription());
condition.put("isystem_n_eq", ISYSTEM); condition.put("isystem_n_eq", ISYSTEM);
condition.put("id_s_order", "desc"); condition.put("id_s_order", "desc");
return condition; return condition;
} }
/**
*搜索条件
*/
private Map<String,Object> getConditionById() {
/**
* 拼接搜索条件
*/
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("Id_n_eq", model.getSupplierID());
return condition;
}
/** /**
* 拼接搜索条件-下拉框-供应商 * 拼接搜索条件-下拉框-供应商
...@@ -512,6 +803,7 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -512,6 +803,7 @@ public class SupplierAction extends BaseAction<SupplierModel>
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("type_s_like", "供应商"); condition.put("type_s_like", "供应商");
condition.put("enabled_s_eq",1);
condition.put("id_s_order", "desc"); condition.put("id_s_order", "desc");
return condition; return condition;
} }
...@@ -527,12 +819,13 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -527,12 +819,13 @@ public class SupplierAction extends BaseAction<SupplierModel>
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("type_s_like", "客户"); condition.put("type_s_like", "客户");
condition.put("enabled_s_eq",1);
condition.put("id_s_order", "desc"); condition.put("id_s_order", "desc");
return condition; return condition;
} }
/** /**
* 拼接搜索条件-下拉框-散户 * 拼接搜索条件-下拉框-会员
* @return * @return
*/ */
private Map<String,Object> getCondition_Select_retail() private Map<String,Object> getCondition_Select_retail()
...@@ -541,7 +834,8 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -541,7 +834,8 @@ public class SupplierAction extends BaseAction<SupplierModel>
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("type_s_like", "散户"); condition.put("type_s_like", "会员");
condition.put("enabled_s_eq",1);
condition.put("id_s_order", "desc"); condition.put("id_s_order", "desc");
return condition; return condition;
} }
...@@ -556,7 +850,7 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -556,7 +850,7 @@ public class SupplierAction extends BaseAction<SupplierModel>
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("type_s_like", "散户"); condition.put("type_s_like", "会员");
condition.put("isystem_n_eq", 0); condition.put("isystem_n_eq", 0);
condition.put("id_s_order", "desc"); condition.put("id_s_order", "desc");
return condition; return condition;
...@@ -572,4 +866,8 @@ public class SupplierAction extends BaseAction<SupplierModel> ...@@ -572,4 +866,8 @@ public class SupplierAction extends BaseAction<SupplierModel>
{ {
this.supplierService = supplierService; this.supplierService = supplierService;
} }
public void setUserBusinessService(UserBusinessIService userBusinessService) {
this.userBusinessService = userBusinessService;
}
} }
src/main/java/com/jsh/action/basic/UnitAction.java 0 → 100644
View file @ 5e05f53a
package com.jsh.action.basic;
import com.jsh.base.BaseAction;
import com.jsh.base.Log;
import com.jsh.model.po.Unit;
import com.jsh.model.po.Logdetails;
import com.jsh.model.vo.basic.UnitModel;
import com.jsh.service.basic.UnitIService;
import com.jsh.util.PageUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.dao.DataAccessException;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 计量单位
* @author ji shenghua qq:752 718 920
*/
@SuppressWarnings("serial")
public class UnitAction extends BaseAction<UnitModel>
{
private UnitIService unitService;
private UnitModel model = new UnitModel();
/**
* 增加计量单位
* @return
*/
public void create()
{
Log.infoFileSync("==================开始调用增加计量单位方法create()===================");
Boolean flag = false;
try
{
Unit unit = new Unit();
unit.setUName(model.getUName());
unitService.create(unit);
//========标识位===========
flag = true;
//记录操作日志使用
tipMsg = "成功";
tipType = 0;
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加计量单位异常", e);
flag = false;
tipMsg = "失败";
tipType = 1;
}
finally
{
try
{
toClient(flag.toString());
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>>>>增加计量单位回写客户端结果异常", e);
}
}
logService.create(new Logdetails(getUser(), "增加计量单位", model.getClientIp(),
new Timestamp(System.currentTimeMillis())
, tipType, "增加计量单位名称为 "+ model.getUName() + " " + tipMsg + "！", "增加计量单位" + tipMsg));
Log.infoFileSync("==================结束调用增加计量单位方法create()===================");
}
/**
* 删除计量单位
* @return
*/
public String delete() {
Log.infoFileSync("====================开始调用删除计量单位方法delete()================");
try {
unitService.delete(model.getUnitID());
tipMsg = "成功";
tipType = 0;
}
catch (DataAccessException e) {
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getUnitID() + " 的计量单位异常", e);
tipMsg = "失败";
tipType = 1;
}
model.getShowModel().setMsgTip(tipMsg);
logService.create(new Logdetails(getUser(), "删除计量单位", model.getClientIp(),
new Timestamp(System.currentTimeMillis())
, tipType, "删除计量单位ID为 "+ model.getUnitID() + " " + tipMsg + "！", "删除计量单位" + tipMsg));
Log.infoFileSync("====================结束调用删除计量单位方法delete()================");
return SUCCESS;
}
/**
* 更新计量单位
* @return
*/
public void update() {
Boolean flag = false;
try {
Unit unit = unitService.get(model.getUnitID());
unit.setUName(model.getUName());
unitService.update(unit);
flag = true;
tipMsg = "成功";
tipType = 0;
}
catch (DataAccessException e) {
Log.errorFileSync(">>>>>>>>>>>>>修改计量单位ID为 ： " + model.getUnitID() + "信息失败", e);
flag = false;
tipMsg = "失败";
tipType = 1;
}
finally {
try {
toClient(flag.toString());
}
catch (IOException e) {
Log.errorFileSync(">>>>>>>>>>>>修改计量单位回写客户端结果异常", e);
}
}
logService.create(new Logdetails(getUser(), "更新计量单位", model.getClientIp(),
new Timestamp(System.currentTimeMillis())
, tipType, "更新计量单位ID为 "+ model.getUnitID() + " " + tipMsg + "！", "更新计量单位" + tipMsg));
}
/**
* 批量删除指定ID计量单位
* @return
*/
public String batchDelete()
{
try
{
unitService.batchDelete(model.getUnitIDs());
model.getShowModel().setMsgTip("成功");
//记录操作日志使用
tipMsg = "成功";
tipType = 0;
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>批量删除计量单位ID为：" + model.getUnitIDs() + "信息异常", e);
tipMsg = "失败";
tipType = 1;
}
logService.create(new Logdetails(getUser(), "批量删除计量单位", model.getClientIp(),
new Timestamp(System.currentTimeMillis())
, tipType, "批量删除计量单位ID为 "+ model.getUnitIDs() + " " + tipMsg + "！", "批量删除计量单位" + tipMsg));
return SUCCESS;
}
/**
* 检查输入名称是否存在
*/
public void checkIsNameExist()
{
Boolean flag = false;
try
{
flag = unitService.checkIsNameExist("UName",model.getUName(),"id", model.getUnitID());
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查计量单位名称为：" + model.getUName() + " ID为： " + model.getUnitID() + " 是否存在异常！");
}
finally
{
try
{
toClient(flag.toString());
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>>>>回写检查计量单位名称为：" + model.getUName() + " ID为： " + model.getUnitID() + " 是否存在异常！",e);
}
}
}
/**
* 查找计量单位信息
* @return
*/
public void findBy()
{
try
{
PageUtil<Unit> pageUtil = new PageUtil<Unit>();
pageUtil.setPageSize(model.getPageSize());
pageUtil.setCurPage(model.getPageNo());
pageUtil.setAdvSearch(getCondition());
unitService.find(pageUtil);
List<Unit> dataList = pageUtil.getPageList();
JSONObject outer = new JSONObject();
outer.put("total", pageUtil.getTotalCount());
//存放数据json数组
JSONArray dataArray = new JSONArray();
if(null != dataList)
{
for(Unit unit:dataList)
{
JSONObject item = new JSONObject();
item.put("id", unit.getId());
//名称
item.put("UName", unit.getUName());
item.put("op", 1);
dataArray.add(item);
}
}
outer.put("rows", dataArray);
//回写查询结果
toClient(outer.toString());
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找计量单位异常", e);
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询计量单位结果异常", e);
}
}
/**
* 查找计量单位信息-下拉框
* @return
*/
public void findUnitDownList() {
try {
PageUtil<Unit> pageUtil = new PageUtil<Unit>();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
pageUtil.setAdvSearch(getCondition());
unitService.find(pageUtil);
List<Unit> dataList = pageUtil.getPageList();
//存放数据json数组
JSONArray dataArray = new JSONArray();
if(null != dataList) {
for(Unit unit:dataList) {
JSONObject item = new JSONObject();
item.put("id", unit.getId());
//名称
item.put("UName", unit.getUName());
dataArray.add(item);
}
}
//回写查询结果
toClient(dataArray.toString());
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找计量单位异常", e);
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询计量单位结果异常", e);
}
}
/**
* 拼接搜索条件
* @return
*/
private Map<String,Object> getCondition()
{
/**
* 拼接搜索条件
*/
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("UName_s_like", model.getUName());
condition.put("id_s_order", "asc");
return condition;
}
//=============以下spring注入以及Model驱动公共方法，与Action处理无关==================
@Override
public UnitModel getModel()
{
return model;
}
public void setUnitService(UnitIService unitService) {
this.unitService = unitService;
}
}
src/main/java/com/jsh/action/basic/UserAction.java
View file @ 5e05f53a
...@@ -325,7 +325,40 @@ public class UserAction extends BaseAction<UserModel> ...@@ -325,7 +325,40 @@ public class UserAction extends BaseAction<UserModel>
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "更新用户ID为 "+ model.getUserID() + "密码信息 " + tipMsg + "！", "更新用户" + tipMsg)); , tipType, "更新用户ID为 "+ model.getUserID() + "密码信息 " + tipMsg + "！", "更新用户" + tipMsg));
} }
/**
* 重置用户的密码
*/
public void resetPwd() {
Integer flag = 0;
try {
Basicuser user = userService.get(model.getUserID());
String password = "123456";
String md5Pwd = Tools.md5Encryp(password);
user.setPassword(md5Pwd);
userService.update(user);
flag = 1;
tipMsg = "成功";
tipType = 0;
}
catch (Exception e) {
Log.errorFileSync(">>>>>>>>>>>>>修改用户ID为 ： " + model.getUserID() + "密码信息失败", e);
flag = 0;
tipMsg = "失败";
tipType = 1;
}
finally {
try {
toClient(flag.toString());
}
catch (IOException e) {
Log.errorFileSync(">>>>>>>>>>>>修改用户密码回写客户端结果异常", e);
}
}
logService.create(new Logdetails(getUser(), "重置用户密码", model.getClientIp(),
new Timestamp(System.currentTimeMillis()), tipType, "重置用户ID为 "+ model.getUserID() + "密码信息 " + tipMsg + "！", "重置用户密码" + tipMsg));
}
/** /**
* 批量删除指定ID用户 * 批量删除指定ID用户
* @return * @return
......
src/main/java/com/jsh/action/basic/UserBusinessAction.java
View file @ 5e05f53a
...@@ -5,6 +5,8 @@ import java.sql.Timestamp; ...@@ -5,6 +5,8 @@ import java.sql.Timestamp;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.jsh.model.po.Functions;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import com.jsh.base.BaseAction; import com.jsh.base.BaseAction;
import com.jsh.base.Log; import com.jsh.base.Log;
...@@ -173,6 +175,42 @@ public class UserBusinessAction extends BaseAction<UserBusinessModel> ...@@ -173,6 +175,42 @@ public class UserBusinessAction extends BaseAction<UserBusinessModel>
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "更新UserBusiness的ID为 "+ id + " " + tipMsg + "！", "更新UserBusiness" + tipMsg)); , tipType, "更新UserBusiness的ID为 "+ id + " " + tipMsg + "！", "更新UserBusiness" + tipMsg));
} }
/**
* 更新角色的按钮权限
* @return
*/
public void updateBtnStr() {
Boolean flag = false;
try {
UserBusiness userBusiness = userBusinessService.get(model.getUserBusinessID());
userBusiness.setType(userBusiness.getType());
userBusiness.setKeyId(userBusiness.getKeyId());
userBusiness.setValue(userBusiness.getValue());
userBusiness.setBtnStr(model.getBtnStr());
userBusinessService.update(userBusiness);
flag = true;
tipMsg = "成功";
tipType = 0;
}
catch (DataAccessException e) {
Log.errorFileSync(">>>>>>>>>>>>>修改角色按钮权限的ID为 ： " + model.getUserBusinessID() + "信息失败", e);
flag = false;
tipMsg = "失败";
tipType = 1;
}
finally {
try {
toClient(flag.toString());
}
catch (IOException e) {
Log.errorFileSync(">>>>>>>>>>>>修改功能回写客户端结果异常", e);
}
}
logService.create(new Logdetails(getUser(), "更新角色按钮权限", model.getClientIp(),
new Timestamp(System.currentTimeMillis()), tipType,
"角色按钮权限的ID为 "+ model.getUserBusinessID() + " " + tipMsg + "！", "更新角色按钮权限" + tipMsg));
}
/** /**
* 拼接搜索条件-RoleAPP * 拼接搜索条件-RoleAPP
......
src/main/java/com/jsh/action/materials/DepotHeadAction.java
View file @ 5e05f53a
...@@ -62,37 +62,62 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel> ...@@ -62,37 +62,62 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
} }
/** /**
* 增加仓管通 * 增加单据
* @return * @return
*/ */
public void create() public void create(){
{ Log.infoFileSync("==================开始调用增加单据信息信息方法create()===================");
Log.infoFileSync("==================开始调用增加仓管通信息信息方法create()===================");
Boolean flag = false; Boolean flag = false;
try try
{ {
DepotHead depotHead = new DepotHead(); DepotHead depotHead = new DepotHead();
depotHead.setType(model.getType()); depotHead.setType(model.getType());
depotHead.setSubType(model.getSubType()); depotHead.setSubType(model.getSubType());
depotHead.setProjectId(new Depot(model.getProjectId())); if(model.getProjectId()!=null){depotHead.setProjectId(new Depot(model.getProjectId()));}
depotHead.setNumber(model.getNumber()); //构造新的编号
String number = model.getNumber();
String allNewNumber = "";
if(number.equals(model.getDefaultNumber())){ //两个编号一致说明没有修改过
number = number.substring(0,12); //截取前缀
String beginTime = Tools.getNow() + " 00:00:00";
String endTime = Tools.getNow() + " 23:59:59";
String newNumber = buildNumberFun(model.getType(), model.getSubType(), beginTime, endTime); //从数据库查询最新的编号+1,这样能防止重复
allNewNumber = number + newNumber;
depotHead.setNumber(allNewNumber);
}
else { //修改过的编号
depotHead.setNumber(model.getNumber());
}
depotHead.setDefaultNumber(allNewNumber); //初始编号，一直都从后台取值
depotHead.setOperPersonName(getUser().getUsername()); depotHead.setOperPersonName(getUser().getUsername());
depotHead.setCreateTime(new Timestamp(new Date().getTime())); depotHead.setCreateTime(new Timestamp(new Date().getTime()));
try try{
{ depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd").getTime()));
} }
catch (ParseException e) catch (ParseException e){
{
Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
} }
if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));} if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));}
if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));} if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
if(model.getSalesman()!=null){
depotHead.setSalesman(model.getSalesman().toString());
}
if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));} if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));}
depotHead.setChangeAmount(model.getChangeAmount()); depotHead.setChangeAmount(model.getChangeAmount());
depotHead.setAccountIdList(model.getAccountIdList());
depotHead.setAccountMoneyList(model.getAccountMoneyList());
depotHead.setDiscount(model.getDiscount());
depotHead.setDiscountMoney(model.getDiscountMoney());
depotHead.setDiscountLastMoney(model.getDiscountLastMoney());
depotHead.setOtherMoney(model.getOtherMoney());
depotHead.setOtherMoneyList(model.getOtherMoneyList());
depotHead.setOtherMoneyItem(model.getOtherMoneyItem());
depotHead.setAccountDay(model.getAccountDay());
if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));} if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));}
depotHead.setTotalPrice(model.getTotalPrice()); depotHead.setTotalPrice(model.getTotalPrice());
depotHead.setPayType(model.getPayType()); depotHead.setPayType(model.getPayType());
depotHead.setStatus(false);
depotHead.setRemark(model.getRemark()); depotHead.setRemark(model.getRemark());
depotHeadService.create(depotHead); depotHeadService.create(depotHead);
...@@ -102,88 +127,88 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel> ...@@ -102,88 +127,88 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
tipMsg = "成功"; tipMsg = "成功";
tipType = 0; tipType = 0;
} }
catch (DataAccessException e) catch (DataAccessException e) {
{ Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加单据信息异常", e);
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加仓管通信息异常", e);
flag = false; flag = false;
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
finally finally {
{ try {
try
{
toClient(flag.toString()); toClient(flag.toString());
} }
catch (IOException e) catch (IOException e) {
{ Log.errorFileSync(">>>>>>>>>>>>增加单据信息回写客户端结果异常", e);
Log.errorFileSync(">>>>>>>>>>>>增加仓管通信息回写客户端结果异常", e);
} }
} }
logService.create(new Logdetails(getUser(), "增加仓管通", model.getClientIp(), logService.create(new Logdetails(getUser(), "增加单据", model.getClientIp(),
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "增加仓管通编号为 "+ model.getNumber() + " " + tipMsg + "！", "增加仓管通" + tipMsg)); , tipType, "增加单据编号为 "+ model.getNumber() + " " + tipMsg + "！", "增加单据" + tipMsg));
Log.infoFileSync("==================结束调用增加仓管通方法create()==================="); Log.infoFileSync("==================结束调用增加单据方法create()===================");
} }
/** /**
* 删除仓管通 * 删除单据
* @return * @return
*/ */
public String delete() public String delete() {
{ Log.infoFileSync("====================开始调用删除单据信息方法delete()================");
Log.infoFileSync("====================开始调用删除仓管通信息方法delete()================"); try {
try
{
depotHeadService.delete(model.getDepotHeadID()); depotHeadService.delete(model.getDepotHeadID());
tipMsg = "成功"; tipMsg = "成功";
tipType = 0; tipType = 0;
} }
catch (DataAccessException e) catch (DataAccessException e) {
{ Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getDepotHeadID() + " 的单据异常", e);
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getDepotHeadID() + " 的仓管通异常", e);
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
model.getShowModel().setMsgTip(tipMsg); model.getShowModel().setMsgTip(tipMsg);
logService.create(new Logdetails(getUser(), "删除仓管通", model.getClientIp(), logService.create(new Logdetails(getUser(), "删除单据", model.getClientIp(),
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "删除仓管通ID为 "+ model.getDepotHeadID() + " " + tipMsg + "！", "删除仓管通" + tipMsg)); , tipType, "删除单据ID为 "+ model.getDepotHeadID() + " " + tipMsg + "！", "删除单据" + tipMsg));
Log.infoFileSync("====================结束调用删除仓管通信息方法delete()================"); Log.infoFileSync("====================结束调用删除单据信息方法delete()================");
return SUCCESS; return SUCCESS;
} }
/** /**
* 更新仓管通 * 更新单据
* @return * @return
*/ */
public void update() public void update() {
{
Boolean flag = false; Boolean flag = false;
try try {
{
DepotHead depotHead = depotHeadService.get(model.getDepotHeadID()); DepotHead depotHead = depotHeadService.get(model.getDepotHeadID());
depotHead.setType(model.getType()); depotHead.setType(model.getType());
depotHead.setSubType(model.getSubType()); depotHead.setSubType(model.getSubType());
depotHead.setProjectId(new Depot(model.getProjectId())); if(model.getProjectId()!=null){depotHead.setProjectId(new Depot(model.getProjectId()));}
depotHead.setNumber(model.getNumber()); depotHead.setNumber(model.getNumber());
depotHead.setOperPersonName(getUser().getUsername()); depotHead.setOperPersonName(getUser().getUsername());
try try{
{ depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd").getTime()));
} }
catch (ParseException e) catch (ParseException e) {
{
Log.errorFileSync(">>>>>>>>>>>>>>>解析入库时间格式异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>解析入库时间格式异常", e);
} }
if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));} if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));}
if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));} if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
depotHead.setSalesman(model.getSalesman());
if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));} if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));}
depotHead.setChangeAmount(model.getChangeAmount()); depotHead.setChangeAmount(model.getChangeAmount());
depotHead.setAccountIdList(model.getAccountIdList());
depotHead.setAccountMoneyList(model.getAccountMoneyList());
depotHead.setDiscount(model.getDiscount());
depotHead.setDiscountMoney(model.getDiscountMoney());
depotHead.setDiscountLastMoney(model.getDiscountLastMoney());
depotHead.setOtherMoney(model.getOtherMoney());
depotHead.setOtherMoneyList(model.getOtherMoneyList());
depotHead.setOtherMoneyItem(model.getOtherMoneyItem());
depotHead.setAccountDay(model.getAccountDay());
if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));} if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));}
depotHead.setTotalPrice(model.getTotalPrice()); depotHead.setTotalPrice(model.getTotalPrice());
depotHead.setPayType(model.getPayType()); depotHead.setPayType(model.getPayType());
depotHead.setStatus(false);
depotHead.setRemark(model.getRemark()); depotHead.setRemark(model.getRemark());
depotHeadService.update(depotHead); depotHeadService.update(depotHead);
...@@ -191,31 +216,27 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel> ...@@ -191,31 +216,27 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
tipMsg = "成功"; tipMsg = "成功";
tipType = 0; tipType = 0;
} }
catch (DataAccessException e) catch (DataAccessException e) {
{ Log.errorFileSync(">>>>>>>>>>>>>修改单据ID为 ： " + model.getDepotHeadID() + "信息失败", e);
Log.errorFileSync(">>>>>>>>>>>>>修改仓管通ID为 ： " + model.getDepotHeadID() + "信息失败", e);
flag = false; flag = false;
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
finally finally {
{ try {
try
{
toClient(flag.toString()); toClient(flag.toString());
} }
catch (IOException e) catch (IOException e) {
{ Log.errorFileSync(">>>>>>>>>>>>修改单据回写客户端结果异常", e);
Log.errorFileSync(">>>>>>>>>>>>修改仓管通回写客户端结果异常", e);
} }
} }
logService.create(new Logdetails(getUser(), "更新仓管通", model.getClientIp(), logService.create(new Logdetails(getUser(), "更新单据", model.getClientIp(),
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "更新仓管通ID为 "+ model.getDepotHeadID() + " " + tipMsg + "！", "更新仓管通" + tipMsg)); , tipType, "更新单据ID为 "+ model.getDepotHeadID() + " " + tipMsg + "！", "更新单据" + tipMsg));
} }
/** /**
* 批量删除指定ID仓管通 * 批量删除指定ID单据
* @return * @return
*/ */
public String batchDelete() public String batchDelete()
...@@ -230,19 +251,130 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel> ...@@ -230,19 +251,130 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>批量删除仓管通ID为：" + model.getDepotHeadIDs() + "信息异常", e); Log.errorFileSync(">>>>>>>>>>>批量删除单据ID为：" + model.getDepotHeadIDs() + "信息异常", e);
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
logService.create(new Logdetails(getUser(), "批量删除仓管通", model.getClientIp(), logService.create(new Logdetails(getUser(), "批量删除单据", model.getClientIp(),
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "批量删除仓管通ID为 "+ model.getDepotHeadIDs() + " " + tipMsg + "！", "批量删除仓管通" + tipMsg)); , tipType, "批量删除单据ID为 "+ model.getDepotHeadIDs() + " " + tipMsg + "！", "批量删除单据" + tipMsg));
return SUCCESS; return SUCCESS;
} }
/**
* 批量设置状态-审核或者反审核
* @return
*/
public String batchSetStatus() {
try {
depotHeadService.batchSetStatus(model.getStatus(), model.getDepotHeadIDs());
model.getShowModel().setMsgTip("成功");
//记录操作日志使用
tipMsg = "成功";
tipType = 0;
}
catch (DataAccessException e) {
Log.errorFileSync(">>>>>>>>>>>批量修改状态，单据ID为：" + model.getDepotHeadIDs() + "信息异常", e);
tipMsg = "失败";
tipType = 1;
}
logService.create(new Logdetails(getUser(), "批量修改单据状态", model.getClientIp(),
new Timestamp(System.currentTimeMillis())
, tipType, "批量修改状态，单据ID为 "+ model.getDepotHeadIDs() + " " + tipMsg + "！", "批量修改单据状态" + tipMsg));
return SUCCESS;
}
/**
* 检查单据编号是否存在
*/
public void checkIsNumberExist() {
Boolean flag = false;
try {
flag = depotHeadService.checkIsNameExist("Number", model.getNumber(), "Id", model.getDepotHeadID());
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查单据编号为：" + model.getNumber() + " ID为： " + model.getDepotHeadID() + " 是否存在出现异常！");
}
finally
{
try
{
toClient(flag.toString());
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>>>>回写检查单据编号为：" + model.getNumber() + " ID为： " + model.getDepotHeadID() + " 是否存在出现异常！",e);
}
}
}
/**
* 单据编号生成接口，规则：查找当前类型单据下的当天最大的单据号，并加1
*/
public void buildNumber(){
try {
String beginTime = model.getBeginTime();
String endTime = model.getEndTime();
String newNumber = buildNumberFun(model.getType(), model.getSubType(), beginTime, endTime);
JSONObject outer = new JSONObject();
outer.put("DefaultNumber", newNumber);
//回写查询结果
toClient(outer.toString());
}
catch (DataAccessException e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>单据编号生成异常", e);
}
catch (IOException e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写单据编号生成接口异常", e);
}
}
/**
* 查找单据编号
* @return
*/
public String buildNumberFun(String type,String subType,String beginTime,String endTime){
String newNumber = "0001"; //新编号
try {
PageUtil<DepotHead> pageUtil = new PageUtil<DepotHead>();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
pageUtil.setAdvSearch(buildNumberCondition(type, subType, beginTime, endTime));
depotHeadService.find(pageUtil);
List<DepotHead> dataList = pageUtil.getPageList();
//存放数据json数组
if (null != dataList && dataList.size() > 0) {
DepotHead depotHead = dataList.get(0);
if (depotHead != null) {
String number = depotHead.getDefaultNumber(); //最大的单据编号
if (number != null) {
Integer lastNumber = Integer.parseInt(number.substring(12, 16)); //末四尾
lastNumber = lastNumber + 1;
Integer nLen = lastNumber.toString().length();
if (nLen == 1) {
newNumber = "000" + lastNumber.toString();
} else if (nLen == 2) {
newNumber = "00" + lastNumber.toString();
} else if (nLen == 3) {
newNumber = "0" + lastNumber.toString();
} else if (nLen == 4) {
newNumber = lastNumber.toString();
}
}
}
}
}
catch (DataAccessException e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>单据编号生成异常", e);
}
return newNumber;
}
/** /**
* 查找仓管通信息 * 查找单据信息
* @return * @return
*/ */
public void findBy() public void findBy()
...@@ -270,19 +402,30 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel> ...@@ -270,19 +402,30 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
item.put("ProjectName", depotHead.getProjectId()==null?"":depotHead.getProjectId().getName()); item.put("ProjectName", depotHead.getProjectId()==null?"":depotHead.getProjectId().getName());
item.put("Number", depotHead.getNumber()); item.put("Number", depotHead.getNumber());
item.put("OperPersonName", depotHead.getOperPersonName()); item.put("OperPersonName", depotHead.getOperPersonName());
item.put("CreateTime", Tools.getCurrentMonth(depotHead.getCreateTime())); item.put("CreateTime", Tools.getCenternTime(depotHead.getCreateTime()));
item.put("OperTime", Tools.getCurrentMonth(depotHead.getOperTime())); item.put("OperTime", Tools.getCenternTime(depotHead.getOperTime()));
item.put("OrganId", depotHead.getOrganId()==null?"":depotHead.getOrganId().getId()); item.put("OrganId", depotHead.getOrganId()==null?"":depotHead.getOrganId().getId());
item.put("OrganName", depotHead.getOrganId()==null?"":depotHead.getOrganId().getSupplier()); item.put("OrganName", depotHead.getOrganId()==null?"":depotHead.getOrganId().getSupplier());
item.put("HandsPersonId", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getId()); item.put("HandsPersonId", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getId());
item.put("Salesman", depotHead.getSalesman().toString());
item.put("HandsPersonName", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getName()); item.put("HandsPersonName", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getName());
item.put("AccountId", depotHead.getAccountId()==null?"":depotHead.getAccountId().getId()); item.put("AccountId", depotHead.getAccountId()==null?"":depotHead.getAccountId().getId());
item.put("AccountName", depotHead.getAccountId()==null?"":depotHead.getAccountId().getName()); item.put("AccountName", depotHead.getAccountId()==null?"":depotHead.getAccountId().getName());
item.put("ChangeAmount", depotHead.getChangeAmount()==null?"":Math.abs(depotHead.getChangeAmount())); item.put("ChangeAmount", depotHead.getChangeAmount()==null?"":Math.abs(depotHead.getChangeAmount()));
item.put("AccountIdList", depotHead.getAccountIdList());
item.put("AccountMoneyList", depotHead.getAccountMoneyList());
item.put("Discount", depotHead.getDiscount());
item.put("DiscountMoney", depotHead.getDiscountMoney());
item.put("DiscountLastMoney", depotHead.getDiscountLastMoney());
item.put("OtherMoney", depotHead.getOtherMoney());
item.put("OtherMoneyList", depotHead.getOtherMoneyList()); //id列表
item.put("OtherMoneyItem", depotHead.getOtherMoneyItem()); //money列表
item.put("AccountDay", depotHead.getAccountDay()); //结算天数
item.put("AllocationProjectId", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getId()); item.put("AllocationProjectId", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getId());
item.put("AllocationProjectName", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getName()); item.put("AllocationProjectName", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getName());
item.put("TotalPrice", depotHead.getTotalPrice()==null?"":Math.abs(depotHead.getTotalPrice())); item.put("TotalPrice", depotHead.getTotalPrice()==null?"":Math.abs(depotHead.getTotalPrice()));
item.put("payType", depotHead.getPayType()==null?"":depotHead.getPayType()); item.put("payType", depotHead.getPayType()==null?"":depotHead.getPayType());
item.put("Status", depotHead.getStatus());
item.put("Remark", depotHead.getRemark()); item.put("Remark", depotHead.getRemark());
item.put("op", 1); item.put("op", 1);
dataArray.add(item); dataArray.add(item);
...@@ -294,16 +437,16 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel> ...@@ -294,16 +437,16 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
} }
catch (IOException e) catch (IOException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
} }
} }
/** /**
* 查找进销存_根据月份(报表) * 查找单据_根据月份(报表)
* @return * @return
*/ */
public void findByMonth() { public void findByMonth() {
...@@ -332,11 +475,11 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel> ...@@ -332,11 +475,11 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
} }
catch (IOException e) catch (IOException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
} }
} }
...@@ -377,10 +520,10 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel> ...@@ -377,10 +520,10 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
toClient(outer.toString()); toClient(outer.toString());
} }
catch (DataAccessException e) { catch (DataAccessException e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
} }
catch (IOException e) { catch (IOException e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
} }
} }
...@@ -449,98 +592,6 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel> ...@@ -449,98 +592,6 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
} }
return allMoney; return allMoney;
} }
/**
*入库出库明细接口
*/
public void findInDetail(){
PageUtil pageUtil = new PageUtil();
pageUtil.setPageSize(model.getPageSize());
pageUtil.setCurPage(model.getPageNo());
Long pid =model.getProjectId();
String dids =model.getDepotIds();
String beginTime = model.getBeginTime();
String endTime = model.getEndTime();
String type = model.getType();
try{
depotHeadService.findInDetail(pageUtil,beginTime,endTime,type,pid,dids);
List dataList = pageUtil.getPageList();
JSONObject outer = new JSONObject();
outer.put("total", pageUtil.getTotalCount());
//存放数据json数组
JSONArray dataArray = new JSONArray();
if(dataList!=null){
for(Integer i=0; i<dataList.size(); i++){
JSONObject item = new JSONObject();
Object dl = dataList.get(i); //获取对象
Object[] arr = (Object[]) dl; //转为数组
item.put("number", arr[0]); //单据编号
item.put("materialName", arr[1]); //商品名称
item.put("materialModel", arr[2]); //商品型号
item.put("unitPrice", arr[3]); //单价
item.put("operNumber", arr[4]); //入库出库数量
item.put("allPrice", arr[5]); //金额
item.put("supplierName", arr[6]); //供应商
item.put("depotName", arr[7]); //仓库
item.put("operTime", arr[8]); //入库出库日期
dataArray.add(item);
}
}
outer.put("rows", dataArray);
//回写查询结果
toClient(outer.toString());
}
catch (JshException e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
}
catch (IOException e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
}
}
/**
*入库出库统计接口
*/
public void findInOutMaterialCount(){
PageUtil pageUtil = new PageUtil();
pageUtil.setPageSize(model.getPageSize());
pageUtil.setCurPage(model.getPageNo());
Long pid =model.getProjectId();
String dids =model.getDepotIds();
String beginTime = model.getBeginTime();
String endTime = model.getEndTime();
String type = model.getType();
try{
depotHeadService.findInOutMaterialCount(pageUtil, beginTime, endTime, type, pid, dids);
List dataList = pageUtil.getPageList();
JSONObject outer = new JSONObject();
outer.put("total", pageUtil.getTotalCount());
//存放数据json数组
JSONArray dataArray = new JSONArray();
if(dataList!=null){
for(Integer i=0; i<dataList.size(); i++){
JSONObject item = new JSONObject();
Object dl = dataList.get(i); //获取对象
Object[] arr = (Object[]) dl; //转为数组
item.put("MaterialId", arr[0]); //商品Id
item.put("mName", arr[1]); //商品名称
item.put("Model", arr[2]); //商品型号
item.put("categoryName", arr[3]); //商品类型
item.put("priceSum", arr[4]); //金额
dataArray.add(item);
}
}
outer.put("rows", dataArray);
//回写查询结果
toClient(outer.toString());
}
catch (JshException e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
}
catch (IOException e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
}
}
/** /**
* 拼接搜索条件 * 拼接搜索条件
...@@ -552,14 +603,6 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel> ...@@ -552,14 +603,6 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); 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());
}
else {
condition.put("ProjectId_s_in", model.getDepotIds());
}
condition.put("Type_s_eq",model.getType()); condition.put("Type_s_eq",model.getType());
condition.put("SubType_s_eq",model.getSubType()); condition.put("SubType_s_eq",model.getSubType());
condition.put("Number_s_like",model.getNumber()); condition.put("Number_s_like",model.getNumber());
...@@ -568,13 +611,20 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel> ...@@ -568,13 +611,20 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
condition.put("Id_s_order","desc"); condition.put("Id_s_order","desc");
return condition; return condition;
} }
private Map<String,Object> buildNumberCondition(String type,String subType,String beginTime,String endTime) {
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("Type_s_eq", type);
condition.put("SubType_s_eq", subType);
condition.put("OperTime_s_gteq",beginTime);
condition.put("OperTime_s_lteq",endTime);
condition.put("Id_s_order","desc");
return condition;
}
private Map<String,Object> getConditionHead() private Map<String,Object> getConditionHead()
{ {
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
if(model.getProjectId()!=null) {
condition.put("ProjectId_n_eq", model.getProjectId());
}
condition.put("OperTime_s_lteq",model.getMonthTime() + "-31 00:00:00"); condition.put("OperTime_s_lteq",model.getMonthTime() + "-31 00:00:00");
return condition; return condition;
} }
......
src/main/java/com/jsh/action/materials/DepotItemAction.java
View file @ 5e05f53a
package com.jsh.action.materials; package com.jsh.action.materials;
import java.io.File;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.dao.DataAccessException;
import com.jsh.base.BaseAction; import com.jsh.base.BaseAction;
import com.jsh.base.Log; import com.jsh.base.Log;
import com.jsh.util.AssetConstants; import com.jsh.model.po.*;
import com.jsh.util.JshException;
import com.jsh.model.po.Asset;
import com.jsh.model.po.DepotHead;
import com.jsh.model.po.DepotItem;
import com.jsh.model.po.Logdetails;
import com.jsh.model.po.Material;
import com.jsh.model.vo.materials.DepotItemModel; import com.jsh.model.vo.materials.DepotItemModel;
import com.jsh.service.materials.DepotHeadIService;
import com.jsh.service.materials.DepotItemIService; import com.jsh.service.materials.DepotItemIService;
import com.jsh.service.materials.MaterialIService;
import com.jsh.util.JshException;
import com.jsh.util.PageUtil; import com.jsh.util.PageUtil;
import com.jsh.util.Tools; import com.jsh.util.Tools;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.springframework.dao.DataAccessException;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/* /*
* 单据明细管理 * 单据明细管理
* @author jishenghua qq:752718920 * @author jishenghua qq:752718920
...@@ -31,6 +26,7 @@ import com.jsh.util.Tools; ...@@ -31,6 +26,7 @@ import com.jsh.util.Tools;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class DepotItemAction extends BaseAction<DepotItemModel> public class DepotItemAction extends BaseAction<DepotItemModel>
{ {
private MaterialIService materialService;
private DepotItemIService depotItemService; private DepotItemIService depotItemService;
private DepotItemModel model = new DepotItemModel(); private DepotItemModel model = new DepotItemModel();
/** /**
...@@ -42,12 +38,10 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -42,12 +38,10 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
* 保存明细 * 保存明细
* @return * @return
*/ */
public void saveDetials() public void saveDetials() {
{
Log.infoFileSync("==================开始调用保存仓管通明细信息方法saveDetials()==================="); Log.infoFileSync("==================开始调用保存仓管通明细信息方法saveDetials()===================");
Boolean flag = false; Boolean flag = false;
try try {
{
Long headerId=model.getHeaderId(); Long headerId=model.getHeaderId();
String inserted=model.getInserted(); String inserted=model.getInserted();
String deleted=model.getDeleted(); String deleted=model.getDeleted();
...@@ -56,40 +50,146 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -56,40 +50,146 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
JSONArray insertedJson = JSONArray.fromObject(inserted); JSONArray insertedJson = JSONArray.fromObject(inserted);
JSONArray deletedJson = JSONArray.fromObject(deleted); JSONArray deletedJson = JSONArray.fromObject(deleted);
JSONArray updatedJson = JSONArray.fromObject(updated); JSONArray updatedJson = JSONArray.fromObject(updated);
if(null != insertedJson) if(null != insertedJson) {
{ for(int i = 0;i < insertedJson.size(); i++) {
for(int i = 0;i < insertedJson.size(); i++)
{
DepotItem depotItem = new DepotItem(); DepotItem depotItem = new DepotItem();
JSONObject tempInsertedJson = JSONObject.fromObject(insertedJson.get(i)); JSONObject tempInsertedJson = JSONObject.fromObject(insertedJson.get(i));
depotItem.setHeaderId(new DepotHead(headerId)); depotItem.setHeaderId(new DepotHead(headerId));
depotItem.setMaterialId(new Material(tempInsertedJson.getLong("MaterialId"))); depotItem.setMaterialId(new Material(tempInsertedJson.getLong("MaterialId")));
depotItem.setOperNumber(tempInsertedJson.getDouble("OperNumber")); depotItem.setMUnit(tempInsertedJson.getString("Unit"));
if(tempInsertedJson.get("UnitPrice")!=null){depotItem.setUnitPrice(tempInsertedJson.getDouble("UnitPrice"));} if(!StringUtils.isEmpty(tempInsertedJson.get("OperNumber").toString())){
if(tempInsertedJson.get("AllPrice")!=null){depotItem.setAllPrice(tempInsertedJson.getDouble("AllPrice"));} depotItem.setOperNumber(tempInsertedJson.getDouble("OperNumber"));
try {
String Unit = tempInsertedJson.get("Unit").toString();
Double oNumber = tempInsertedJson.getDouble("OperNumber");
Long mId = Long.parseLong(tempInsertedJson.get("MaterialId").toString());
//以下进行单位换算
String UnitName = findUnitName(mId); //查询计量单位名称
if(!UnitName.equals("")) {
String UnitList = UnitName.substring(0, UnitName.indexOf("("));
String RatioList = UnitName.substring(UnitName.indexOf("("));
String basicUnit = UnitList.substring(0, UnitList.indexOf(",")); //基本单位
String otherUnit = UnitList.substring(UnitList.indexOf(",")+1); //副单位
Integer ratio = Integer.parseInt(RatioList.substring(RatioList.indexOf(":") + 1).replace(")","")); //比例
if(Unit.equals(basicUnit)){ //如果等于基础单位
depotItem.setBasicNumber(oNumber); //数量一致
}
else if(Unit.equals(otherUnit)){ //如果等于副单位
depotItem.setBasicNumber(oNumber*ratio); //数量乘以比例
}
}
else {
depotItem.setBasicNumber(oNumber); //其他情况
}
}
catch(Exception e){
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
}
}
if(!StringUtils.isEmpty(tempInsertedJson.get("UnitPrice").toString())){
depotItem.setUnitPrice(tempInsertedJson.getDouble("UnitPrice"));
}
if(!StringUtils.isEmpty(tempInsertedJson.get("TaxUnitPrice").toString())){
depotItem.setTaxUnitPrice(tempInsertedJson.getDouble("TaxUnitPrice"));
}
if(!StringUtils.isEmpty(tempInsertedJson.get("AllPrice").toString())){
depotItem.setAllPrice(tempInsertedJson.getDouble("AllPrice"));
}
depotItem.setRemark(tempInsertedJson.getString("Remark")); depotItem.setRemark(tempInsertedJson.getString("Remark"));
if(tempInsertedJson.get("DepotId")!=null && !StringUtils.isEmpty(tempInsertedJson.get("DepotId").toString())){
depotItem.setDepotId(new Depot(tempInsertedJson.getLong("DepotId")));
}
if(tempInsertedJson.get("AnotherDepotId")!=null && !StringUtils.isEmpty(tempInsertedJson.get("AnotherDepotId").toString())){
depotItem.setAnotherDepotId(new Depot(tempInsertedJson.getLong("AnotherDepotId")));
}
if(!StringUtils.isEmpty(tempInsertedJson.get("TaxRate").toString())){
depotItem.setTaxRate(tempInsertedJson.getDouble("TaxRate"));
}
if(!StringUtils.isEmpty(tempInsertedJson.get("TaxMoney").toString())){
depotItem.setTaxMoney(tempInsertedJson.getDouble("TaxMoney"));
}
if(!StringUtils.isEmpty(tempInsertedJson.get("TaxLastMoney").toString())){
depotItem.setTaxLastMoney(tempInsertedJson.getDouble("TaxLastMoney"));
}
if(tempInsertedJson.get("OtherField1")!=null){depotItem.setOtherField1(tempInsertedJson.getString("OtherField1"));}
if(tempInsertedJson.get("OtherField2")!=null){depotItem.setOtherField2(tempInsertedJson.getString("OtherField2"));}
if(tempInsertedJson.get("OtherField3")!=null){depotItem.setOtherField3(tempInsertedJson.getString("OtherField3"));}
if(tempInsertedJson.get("OtherField4")!=null){depotItem.setOtherField4(tempInsertedJson.getString("OtherField4"));}
if(tempInsertedJson.get("OtherField5")!=null){depotItem.setOtherField5(tempInsertedJson.getString("OtherField5"));}
depotItemService.create(depotItem); depotItemService.create(depotItem);
} }
} }
if(null != deletedJson) if(null != deletedJson) {
{ for(int i = 0;i < deletedJson.size(); i++) {
for(int i = 0;i < deletedJson.size(); i++)
{
JSONObject tempDeletedJson = JSONObject.fromObject(deletedJson.get(i)); JSONObject tempDeletedJson = JSONObject.fromObject(deletedJson.get(i));
depotItemService.delete(tempDeletedJson.getLong("Id")); depotItemService.delete(tempDeletedJson.getLong("Id"));
} }
} }
if(null != updatedJson) if(null != updatedJson) {
{ for(int i = 0;i < updatedJson.size(); i++) {
for(int i = 0;i < updatedJson.size(); i++)
{
JSONObject tempUpdatedJson = JSONObject.fromObject(updatedJson.get(i)); JSONObject tempUpdatedJson = JSONObject.fromObject(updatedJson.get(i));
DepotItem depotItem = depotItemService.get(tempUpdatedJson.getLong("Id")); DepotItem depotItem = depotItemService.get(tempUpdatedJson.getLong("Id"));
depotItem.setMaterialId(new Material(tempUpdatedJson.getLong("MaterialId"))); depotItem.setMaterialId(new Material(tempUpdatedJson.getLong("MaterialId")));
depotItem.setOperNumber(tempUpdatedJson.getDouble("OperNumber")); depotItem.setMUnit(tempUpdatedJson.getString("Unit"));
if(tempUpdatedJson.get("UnitPrice")!=null){depotItem.setUnitPrice(tempUpdatedJson.getDouble("UnitPrice"));} if(!StringUtils.isEmpty(tempUpdatedJson.get("OperNumber").toString())){
if(tempUpdatedJson.get("AllPrice")!=null){depotItem.setAllPrice(tempUpdatedJson.getDouble("AllPrice"));} depotItem.setOperNumber(tempUpdatedJson.getDouble("OperNumber"));
try {
String Unit = tempUpdatedJson.get("Unit").toString();
Double oNumber = tempUpdatedJson.getDouble("OperNumber");
Long mId = Long.parseLong(tempUpdatedJson.get("MaterialId").toString());
//以下进行单位换算
String UnitName = findUnitName(mId); //查询计量单位名称
if(!UnitName.equals("")) {
String UnitList = UnitName.substring(0, UnitName.indexOf("("));
String RatioList = UnitName.substring(UnitName.indexOf("("));
String basicUnit = UnitList.substring(0, UnitList.indexOf(",")); //基本单位
String otherUnit = UnitList.substring(UnitList.indexOf(",")+1); //副单位
Integer ratio = Integer.parseInt(RatioList.substring(RatioList.indexOf(":") + 1).replace(")","")); //比例
if(Unit.equals(basicUnit)){ //如果等于基础单位
depotItem.setBasicNumber(oNumber); //数量一致
}
else if(Unit.equals(otherUnit)){ //如果等于副单位
depotItem.setBasicNumber(oNumber*ratio); //数量乘以比例
}
}
else {
depotItem.setBasicNumber(oNumber); //其他情况
}
}
catch(Exception e){
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
}
}
if(!StringUtils.isEmpty(tempUpdatedJson.get("UnitPrice").toString())){
depotItem.setUnitPrice(tempUpdatedJson.getDouble("UnitPrice"));
}
if(!StringUtils.isEmpty(tempUpdatedJson.get("TaxUnitPrice").toString())){
depotItem.setTaxUnitPrice(tempUpdatedJson.getDouble("TaxUnitPrice"));
}
if(!StringUtils.isEmpty(tempUpdatedJson.get("AllPrice").toString())){
depotItem.setAllPrice(tempUpdatedJson.getDouble("AllPrice"));
}
depotItem.setRemark(tempUpdatedJson.getString("Remark")); depotItem.setRemark(tempUpdatedJson.getString("Remark"));
if(tempUpdatedJson.get("DepotId")!=null && !StringUtils.isEmpty(tempUpdatedJson.get("DepotId").toString())){
depotItem.setDepotId(new Depot(tempUpdatedJson.getLong("DepotId")));
}
if(tempUpdatedJson.get("AnotherDepotId")!=null && !StringUtils.isEmpty(tempUpdatedJson.get("AnotherDepotId").toString())){
depotItem.setAnotherDepotId(new Depot(tempUpdatedJson.getLong("AnotherDepotId")));
}
if(!StringUtils.isEmpty(tempUpdatedJson.get("TaxRate").toString())){
depotItem.setTaxRate(tempUpdatedJson.getDouble("TaxRate"));
}
if(!StringUtils.isEmpty(tempUpdatedJson.get("TaxMoney").toString())){
depotItem.setTaxMoney(tempUpdatedJson.getDouble("TaxMoney"));
}
if(!StringUtils.isEmpty(tempUpdatedJson.get("TaxLastMoney").toString())){
depotItem.setTaxLastMoney(tempUpdatedJson.getDouble("TaxLastMoney"));
}
depotItem.setOtherField1(tempUpdatedJson.getString("OtherField1"));
depotItem.setOtherField2(tempUpdatedJson.getString("OtherField2"));
depotItem.setOtherField3(tempUpdatedJson.getString("OtherField3"));
depotItem.setOtherField4(tempUpdatedJson.getString("OtherField4"));
depotItem.setOtherField5(tempUpdatedJson.getString("OtherField5"));
depotItemService.create(depotItem); depotItemService.create(depotItem);
} }
} }
...@@ -100,21 +200,17 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -100,21 +200,17 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
tipMsg = "成功"; tipMsg = "成功";
tipType = 0; tipType = 0;
} }
catch (DataAccessException e) catch (DataAccessException e) {
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>保存仓管通明细信息异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>保存仓管通明细信息异常", e);
flag = false; flag = false;
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
finally finally {
{ try {
try
{
toClient(flag.toString()); toClient(flag.toString());
} }
catch (IOException e) catch (IOException e) {
{
Log.errorFileSync(">>>>>>>>>>>>保存仓管通明细信息回写客户端结果异常", e); Log.errorFileSync(">>>>>>>>>>>>保存仓管通明细信息回写客户端结果异常", e);
} }
} }
...@@ -125,15 +221,39 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -125,15 +221,39 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
Log.infoFileSync("==================结束调用保存仓管通明细方法saveDetials()==================="); Log.infoFileSync("==================结束调用保存仓管通明细方法saveDetials()===================");
} }
/**
* 查询计量单位信息
* @return
*/
public String findUnitName(Long mId){
String unitName ="";
PageUtil pageUtil = new PageUtil();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
try {
materialService.findUnitName(pageUtil, mId);
unitName = pageUtil.getPageList().toString();
if(unitName!=null){
unitName = unitName.substring(1,unitName.length()-1);
if(unitName.equals("null")){
unitName = "";
}
}
}
catch (JshException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return unitName;
}
/** /**
* 查找仓管通信息 * 查找明细信息
* @return * @return
*/ */
public void findBy() public void findBy() {
{ try {
try
{
PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>(); PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>();
pageUtil.setPageSize(model.getPageSize()); pageUtil.setPageSize(model.getPageSize());
pageUtil.setCurPage(model.getPageNo()); pageUtil.setCurPage(model.getPageNo());
...@@ -145,23 +265,44 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -145,23 +265,44 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
outer.put("total", pageUtil.getTotalCount()); outer.put("total", pageUtil.getTotalCount());
//存放数据json数组 //存放数据json数组
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
if(null != dataList) if(null != dataList) {
{ for(DepotItem depotItem:dataList) {
for(DepotItem depotItem:dataList)
{
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
item.put("Id", depotItem.getId()); item.put("Id", depotItem.getId());
item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId()); item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId());
String MaterialName = ((depotItem.getMaterialId().getModel() == null||depotItem.getMaterialId().getModel().equals(""))?"":depotItem.getMaterialId().getModel()+" ") + depotItem.getMaterialId().getName() String ratio; //比例
+((depotItem.getMaterialId().getStandard() == null||depotItem.getMaterialId().getStandard().equals(""))?"":"("+depotItem.getMaterialId().getStandard() + ")") if(depotItem.getMaterialId().getUnitId() == null || depotItem.getMaterialId().getUnitId().equals("")){
+((depotItem.getMaterialId().getColor() == null||depotItem.getMaterialId().getColor().equals(""))?"":"("+depotItem.getMaterialId().getColor() + ")") ratio = "";
+((depotItem.getMaterialId().getUnit() == null||depotItem.getMaterialId().getUnit().equals(""))?"":"("+depotItem.getMaterialId().getUnit() + ")"); }
else {
ratio = depotItem.getMaterialId().getUnitId().getUName();
ratio = ratio.substring(ratio.indexOf("("));
}
//品名/型号/制造商/包装
String MaterialName = depotItem.getMaterialId().getName() + ((depotItem.getMaterialId().getModel() == null||depotItem.getMaterialId().getModel().equals(""))?"":"("+depotItem.getMaterialId().getModel()+ ")")
+((depotItem.getMaterialId().getMfrs() == null||depotItem.getMaterialId().getMfrs().equals(""))?"":"("+depotItem.getMaterialId().getMfrs() + ")")
+ ratio;
item.put("MaterialName", MaterialName); item.put("MaterialName", MaterialName);
item.put("Unit", depotItem.getMUnit());
item.put("OperNumber", depotItem.getOperNumber()); item.put("OperNumber", depotItem.getOperNumber());
item.put("BasicNumber", depotItem.getBasicNumber());
item.put("UnitPrice", depotItem.getUnitPrice()); item.put("UnitPrice", depotItem.getUnitPrice());
item.put("TaxUnitPrice", depotItem.getTaxUnitPrice());
item.put("AllPrice", depotItem.getAllPrice()); item.put("AllPrice", depotItem.getAllPrice());
item.put("Remark", depotItem.getRemark()); item.put("Remark", depotItem.getRemark());
item.put("Img", depotItem.getImg()); item.put("Img", depotItem.getImg());
item.put("DepotId", depotItem.getDepotId()==null?"":depotItem.getDepotId().getId());
item.put("DepotName", depotItem.getDepotId()==null?"":depotItem.getDepotId().getName());
item.put("AnotherDepotId", depotItem.getAnotherDepotId()==null?"":depotItem.getAnotherDepotId().getId());
item.put("AnotherDepotName", depotItem.getAnotherDepotId()==null?"":depotItem.getAnotherDepotId().getName());
item.put("TaxRate", depotItem.getTaxRate());
item.put("TaxMoney", depotItem.getTaxMoney());
item.put("TaxLastMoney", depotItem.getTaxLastMoney());
item.put("OtherField1", depotItem.getOtherField1());
item.put("OtherField2", depotItem.getOtherField2());
item.put("OtherField3", depotItem.getOtherField3());
item.put("OtherField4", depotItem.getOtherField4());
item.put("OtherField5", depotItem.getOtherField5());
item.put("op", 1); item.put("op", 1);
dataArray.add(item); dataArray.add(item);
} }
...@@ -170,24 +311,20 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -170,24 +311,20 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
//回写查询结果 //回写查询结果
toClient(outer.toString()); toClient(outer.toString());
} }
catch (DataAccessException e) catch (DataAccessException e) {
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e);
} }
catch (IOException e) catch (IOException e) {
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e);
} }
} }
/** /**
* 查找进销存 * 查找所有的明细
* @return * @return
*/ */
public void findByAll() public void findByAll() {
{ try {
try
{
PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>(); PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>();
pageUtil.setPageSize(model.getPageSize()); pageUtil.setPageSize(model.getPageSize());
pageUtil.setCurPage(model.getPageNo()); pageUtil.setCurPage(model.getPageNo());
...@@ -200,10 +337,8 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -200,10 +337,8 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
//存放数据json数组 //存放数据json数组
Integer pid = model.getProjectId(); Integer pid = model.getProjectId();
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
if(null != dataList) if(null != dataList) {
{ for(DepotItem depotItem:dataList) {
for(DepotItem depotItem:dataList)
{
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
Integer prevSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumNumber("出库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true); Integer prevSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumNumber("出库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true);
Integer InSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false); Integer InSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false);
...@@ -218,7 +353,11 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -218,7 +353,11 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
item.put("MaterialStandard", depotItem.getMaterialId().getStandard()); item.put("MaterialStandard", depotItem.getMaterialId().getStandard());
item.put("MaterialColor", depotItem.getMaterialId().getColor()); item.put("MaterialColor", depotItem.getMaterialId().getColor());
item.put("MaterialUnit", depotItem.getMaterialId().getUnit()); item.put("MaterialUnit", depotItem.getMaterialId().getUnit());
item.put("UnitPrice", (prevPrice + InPrice - OutPrice)/(prevSum + InSum - OutSum)); Double unitPrice = 0.0;
if(prevSum + InSum - OutSum != 0.0){
unitPrice = (prevPrice + InPrice - OutPrice)/(prevSum + InSum - OutSum);
}
item.put("UnitPrice", unitPrice);
item.put("prevSum", prevSum); item.put("prevSum", prevSum);
item.put("InSum", InSum); item.put("InSum", InSum);
item.put("OutSum", OutSum); item.put("OutSum", OutSum);
...@@ -241,6 +380,50 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -241,6 +380,50 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
} }
} }
/**
* 根据商品id和仓库id查询库存数量
* @return
*/
public void findStockNumById() {
try {
PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>();
pageUtil.setPageSize(model.getPageSize());
pageUtil.setCurPage(model.getPageNo());
pageUtil.setAdvSearch(getConditionById());
depotItemService.find(pageUtil);
List<DepotItem> dataList = pageUtil.getPageList();
JSONObject outer = new JSONObject();
outer.put("total", pageUtil.getTotalCount());
//存放数据json数组
Integer pid = model.getProjectId();
JSONArray dataArray = new JSONArray();
if(null != dataList) {
for(DepotItem depotItem:dataList) {
JSONObject item = new JSONObject();
Integer prevSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumNumber("出库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true);
Integer InSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Integer OutSum = sumNumber("出库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false);
item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId());
item.put("MaterialName", depotItem.getMaterialId().getName());
item.put("MaterialModel", depotItem.getMaterialId().getModel());
item.put("thisSum", prevSum + InSum - OutSum);
dataArray.add(item);
}
}
outer.put("rows", dataArray);
//回写查询结果
toClient(outer.toString());
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
}
}
/** /**
* 查找礼品卡信息 * 查找礼品卡信息
* @return * @return
...@@ -448,11 +631,9 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -448,11 +631,9 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
* @return * @return
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public String exportExcel() public String exportExcel() {
{
Log.infoFileSync("===================调用导出信息action方法exportExcel开始======================="); Log.infoFileSync("===================调用导出信息action方法exportExcel开始=======================");
try try {
{
PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>(); PageUtil<DepotItem> pageUtil = new PageUtil<DepotItem>();
pageUtil.setPageSize(model.getPageSize()); pageUtil.setPageSize(model.getPageSize());
pageUtil.setCurPage(model.getPageNo()); pageUtil.setCurPage(model.getPageNo());
...@@ -463,10 +644,8 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -463,10 +644,8 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
//存放数据json数组 //存放数据json数组
Integer pid = model.getProjectId(); Integer pid = model.getProjectId();
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
if(null != dataList) if(null != dataList) {
{ for(DepotItem depotItem:dataList) {
for(DepotItem depotItem:dataList)
{
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
Integer prevSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumNumber("出库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true); Integer prevSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumNumber("出库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true);
Integer InSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false); Integer InSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false);
...@@ -494,8 +673,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -494,8 +673,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
model.setFileName(Tools.changeUnicode("report.xls",model.getBrowserType())); model.setFileName(Tools.changeUnicode("report.xls",model.getBrowserType()));
model.setExcelStream(depotItemService.exmportExcel(isCurrentPage,dataArray)); model.setExcelStream(depotItemService.exmportExcel(isCurrentPage,dataArray));
} }
catch (Exception e) catch (Exception e) {
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出信息action方法exportExcel异常",e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出信息action方法exportExcel异常",e);
model.getShowModel().setMsgTip("export excel exception"); model.getShowModel().setMsgTip("export excel exception");
} }
...@@ -668,6 +846,15 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -668,6 +846,15 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
condition.put("MaterialId_s_gb","aaa"); condition.put("MaterialId_s_gb","aaa");
return condition; return condition;
} }
private Map<String,Object> getConditionById() {
/**
* 拼接搜索条件
*/
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("MaterialId_n_eq", model.getMaterialId());
return condition;
}
//=============以下spring注入以及Model驱动公共方法，与Action处理无关================== //=============以下spring注入以及Model驱动公共方法，与Action处理无关==================
@Override @Override
...@@ -679,4 +866,8 @@ public class DepotItemAction extends BaseAction<DepotItemModel> ...@@ -679,4 +866,8 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
{ {
this.depotItemService = depotItemService; this.depotItemService = depotItemService;
} }
public void setMaterialService(MaterialIService materialService) {
this.materialService = materialService;
}
} }
src/main/java/com/jsh/action/materials/MaterialAction.java
View file @ 5e05f53a
package com.jsh.action.materials; package com.jsh.action.materials;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.jsh.model.po.*;
import com.jsh.util.JshException;
import com.jsh.util.MaterialConstants;
import com.jsh.util.Tools;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import com.jsh.base.BaseAction; import com.jsh.base.BaseAction;
import com.jsh.base.Log; import com.jsh.base.Log;
import com.jsh.model.po.DepotHead;
import com.jsh.model.po.Material;
import com.jsh.model.po.Logdetails;
import com.jsh.model.po.MaterialCategory;
import com.jsh.model.po.Supplier;
import com.jsh.model.vo.materials.MaterialModel; import com.jsh.model.vo.materials.MaterialModel;
import com.jsh.service.materials.MaterialIService; import com.jsh.service.materials.MaterialIService;
import com.jsh.util.PageUtil; import com.jsh.util.PageUtil;
...@@ -27,6 +29,7 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -27,6 +29,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
{ {
private MaterialIService materialService; private MaterialIService materialService;
private MaterialModel model = new MaterialModel(); private MaterialModel model = new MaterialModel();
public static final String EXCEL = "excel"; //action返回excel结果
/** /**
* 增加商品 * 增加商品
...@@ -42,6 +45,9 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -42,6 +45,9 @@ public class MaterialAction extends BaseAction<MaterialModel>
material.setMaterialCategory(new MaterialCategory(model.getCategoryId())); material.setMaterialCategory(new MaterialCategory(model.getCategoryId()));
material.setName(model.getName()); material.setName(model.getName());
material.setMfrs(model.getMfrs());
material.setPacking(model.getPacking());
material.setSafetyStock(model.getSafetyStock());
material.setModel(model.getModel()); material.setModel(model.getModel());
material.setStandard(model.getStandard()); material.setStandard(model.getStandard());
material.setColor(model.getColor()); material.setColor(model.getColor());
...@@ -50,7 +56,17 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -50,7 +56,17 @@ public class MaterialAction extends BaseAction<MaterialModel>
material.setLowPrice(model.getLowPrice()); material.setLowPrice(model.getLowPrice());
material.setPresetPriceOne(model.getPresetPriceOne()); material.setPresetPriceOne(model.getPresetPriceOne());
material.setPresetPriceTwo(model.getPresetPriceTwo()); material.setPresetPriceTwo(model.getPresetPriceTwo());
if(model.getUnitId()!=null){
material.setUnitId(new Unit(model.getUnitId()));
}
else {
material.setUnitId(null);
}
material.setFirstOutUnit(model.getFirstOutUnit());
material.setFirstInUnit(model.getFirstInUnit());
material.setPriceStrategy(model.getPriceStrategy());
material.setRemark(model.getRemark()); material.setRemark(model.getRemark());
material.setEnabled(model.getEnabled());
materialService.create(material); materialService.create(material);
//========标识位=========== //========标识位===========
...@@ -124,6 +140,9 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -124,6 +140,9 @@ public class MaterialAction extends BaseAction<MaterialModel>
material.setMaterialCategory(new MaterialCategory(model.getCategoryId())); material.setMaterialCategory(new MaterialCategory(model.getCategoryId()));
material.setName(model.getName()); material.setName(model.getName());
material.setMfrs(model.getMfrs());
material.setPacking(model.getPacking());
material.setSafetyStock(model.getSafetyStock());
material.setModel(model.getModel()); material.setModel(model.getModel());
material.setStandard(model.getStandard()); material.setStandard(model.getStandard());
material.setColor(model.getColor()); material.setColor(model.getColor());
...@@ -132,8 +151,16 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -132,8 +151,16 @@ public class MaterialAction extends BaseAction<MaterialModel>
material.setLowPrice(model.getLowPrice()); material.setLowPrice(model.getLowPrice());
material.setPresetPriceOne(model.getPresetPriceOne()); material.setPresetPriceOne(model.getPresetPriceOne());
material.setPresetPriceTwo(model.getPresetPriceTwo()); material.setPresetPriceTwo(model.getPresetPriceTwo());
if(model.getUnitId()!=null){
material.setUnitId(new Unit(model.getUnitId()));
}
else {
material.setUnitId(null);
}
material.setFirstOutUnit(model.getFirstOutUnit());
material.setFirstInUnit(model.getFirstInUnit());
material.setPriceStrategy(model.getPriceStrategy());
material.setRemark(model.getRemark()); material.setRemark(model.getRemark());
material.setName(model.getName());
materialService.update(material); materialService.update(material);
flag = true; flag = true;
...@@ -189,6 +216,63 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -189,6 +216,63 @@ public class MaterialAction extends BaseAction<MaterialModel>
, tipType, "批量删除商品ID为 "+ model.getMaterialIDs() + " " + tipMsg + "！", "批量删除商品" + tipMsg)); , tipType, "批量删除商品ID为 "+ model.getMaterialIDs() + " " + tipMsg + "！", "批量删除商品" + tipMsg));
return SUCCESS; return SUCCESS;
} }
/**
* 批量设置状态-启用或者禁用
* @return
*/
public String batchSetEnable()
{
try
{
materialService.batchSetEnable(model.getEnabled(),model.getMaterialIDs());
model.getShowModel().setMsgTip("成功");
//记录操作日志使用
tipMsg = "成功";
tipType = 0;
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>批量修改状态，商品ID为：" + model.getMaterialIDs() + "信息异常", e);
tipMsg = "失败";
tipType = 1;
}
logService.create(new Logdetails(getUser(), "批量修改商品状态", model.getClientIp(),
new Timestamp(System.currentTimeMillis())
, tipType, "批量修改状态，商品ID为 "+ model.getMaterialIDs() + " " + tipMsg + "！", "批量修改商品状态" + tipMsg));
return SUCCESS;
}
/**
* 查找该商品是否存在
* @return
*/
public void checkIsExist() {
try {
Boolean flag = false;
PageUtil<Material> pageUtil = new PageUtil<Material>();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
pageUtil.setAdvSearch(getConditionCheckIsExist());
materialService.find(pageUtil);
List<Material> dataList = pageUtil.getPageList();
if(null != dataList && dataList.size() > 0){
flag = true;
}
else{
flag = false;
}
//回写查询结果
toClient(flag.toString());
}
catch (DataAccessException e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品信息异常", e);
}
catch (IOException e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品信息结果异常", e);
}
}
/** /**
* 查找商品信息 * 查找商品信息
...@@ -211,6 +295,7 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -211,6 +295,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
pageUtil.setAdvSearch(getCondition()); pageUtil.setAdvSearch(getCondition());
} }
materialService.find(pageUtil); materialService.find(pageUtil);
getSession().put("pageUtilMaterial", pageUtil);
List<Material> dataList = pageUtil.getPageList(); List<Material> dataList = pageUtil.getPageList();
JSONObject outer = new JSONObject(); JSONObject outer = new JSONObject();
...@@ -224,6 +309,11 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -224,6 +309,11 @@ public class MaterialAction extends BaseAction<MaterialModel>
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
item.put("Id", material.getId()); item.put("Id", material.getId());
item.put("Name", material.getName()); item.put("Name", material.getName());
item.put("CategoryId", material.getMaterialCategory().getId()); //类型Id
item.put("CategoryName", material.getMaterialCategory().getName()); //类型名称
item.put("Mfrs", material.getMfrs()==null?"" : material.getMfrs());
item.put("Packing", material.getPacking()==null?"" : material.getPacking());
item.put("SafetyStock", material.getSafetyStock()==null?"" : material.getSafetyStock());
item.put("Model", material.getModel()==null?"" : material.getModel()); item.put("Model", material.getModel()==null?"" : material.getModel());
item.put("Standard", material.getStandard()==null?"": material.getStandard()); item.put("Standard", material.getStandard()==null?"": material.getStandard());
item.put("Color", material.getColor()==null?"": material.getColor()); item.put("Color", material.getColor()==null?"": material.getColor());
...@@ -232,6 +322,12 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -232,6 +322,12 @@ public class MaterialAction extends BaseAction<MaterialModel>
item.put("LowPrice", material.getLowPrice()); item.put("LowPrice", material.getLowPrice());
item.put("PresetPriceOne", material.getPresetPriceOne()==null? "":material.getPresetPriceOne()); item.put("PresetPriceOne", material.getPresetPriceOne()==null? "":material.getPresetPriceOne());
item.put("PresetPriceTwo", material.getPresetPriceTwo()==null? "":material.getPresetPriceTwo()); item.put("PresetPriceTwo", material.getPresetPriceTwo()==null? "":material.getPresetPriceTwo());
item.put("UnitId",material.getUnitId()==null? "": material.getUnitId().getId()); //计量单位Id
item.put("UnitName", material.getUnitId()==null? "": material.getUnitId().getUName()); //计量单位名称
item.put("FirstOutUnit", material.getFirstOutUnit());
item.put("FirstInUnit", material.getFirstInUnit());
item.put("PriceStrategy", material.getPriceStrategy());
item.put("Enabled", material.getEnabled());
item.put("Remark", material.getRemark()); item.put("Remark", material.getRemark());
item.put("op", 1); item.put("op", 1);
dataArray.add(item); dataArray.add(item);
...@@ -273,6 +369,9 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -273,6 +369,9 @@ public class MaterialAction extends BaseAction<MaterialModel>
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
item.put("Id", material.getId()); item.put("Id", material.getId());
item.put("Name", material.getName()); item.put("Name", material.getName());
item.put("Mfrs", material.getMfrs()==null?"" : material.getMfrs());
item.put("Packing", material.getPacking()==null?"" : material.getPacking());
item.put("SafetyStock", material.getSafetyStock()==null?"" : material.getSafetyStock());
item.put("Model", material.getModel()); item.put("Model", material.getModel());
item.put("Standard", material.getStandard()); item.put("Standard", material.getStandard());
item.put("Color", material.getColor()); item.put("Color", material.getColor());
...@@ -281,6 +380,11 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -281,6 +380,11 @@ public class MaterialAction extends BaseAction<MaterialModel>
item.put("LowPrice", material.getLowPrice()); item.put("LowPrice", material.getLowPrice());
item.put("PresetPriceOne", material.getPresetPriceOne()); item.put("PresetPriceOne", material.getPresetPriceOne());
item.put("PresetPriceTwo", material.getPresetPriceTwo()); item.put("PresetPriceTwo", material.getPresetPriceTwo());
item.put("UnitId",material.getUnitId()==null? "": material.getUnitId().getId()); //计量单位Id
item.put("UnitName", material.getUnitId()==null? "": material.getUnitId().getUName()); //计量单位名称
item.put("FirstOutUnit", material.getFirstOutUnit());
item.put("FirstInUnit", material.getFirstInUnit());
item.put("PriceStrategy", material.getPriceStrategy());
item.put("Remark", material.getRemark()); item.put("Remark", material.getRemark());
item.put("op", 1); item.put("op", 1);
dataArray.add(item); dataArray.add(item);
...@@ -304,10 +408,8 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -304,10 +408,8 @@ public class MaterialAction extends BaseAction<MaterialModel>
* 查找商品信息-下拉框 * 查找商品信息-下拉框
* @return * @return
*/ */
public void findBySelect() public void findBySelect() {
{ try {
try
{
PageUtil<Material> pageUtil = new PageUtil<Material>(); PageUtil<Material> pageUtil = new PageUtil<Material>();
pageUtil.setPageSize(0); pageUtil.setPageSize(0);
pageUtil.setCurPage(0); pageUtil.setCurPage(0);
...@@ -316,17 +418,22 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -316,17 +418,22 @@ public class MaterialAction extends BaseAction<MaterialModel>
List<Material> dataList = pageUtil.getPageList(); List<Material> dataList = pageUtil.getPageList();
//存放数据json数组 //存放数据json数组
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
if(null != dataList) if(null != dataList) {
{ for(Material material:dataList) {
for(Material material:dataList)
{
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
item.put("Id", material.getId()); item.put("Id", material.getId());
//名称 String ratio; //比例
String MaterialName = ((material.getModel() == null || material.getModel().equals(""))?"":material.getModel() +" ") + material.getName() if(material.getUnitId() == null || material.getUnitId().equals("")){
+ ((material.getStandard() == null || material.getStandard().equals(""))?"":"("+material.getStandard() + ")") ratio = "";
+ ((material.getColor() == null || material.getColor().equals(""))?"":"("+material.getColor() + ")") }
+ ((material.getUnit() == null || material.getUnit().equals(""))?"":"("+material.getUnit() + ")"); else {
ratio = material.getUnitId().getUName();
ratio = ratio.substring(ratio.indexOf("("));
}
//品名/型号/制造商/包装
String MaterialName = material.getName() + ((material.getModel() == null || material.getModel().equals(""))?"":"("+material.getModel() + ")")
+ ((material.getMfrs() == null || material.getMfrs().equals(""))?"":"("+material.getMfrs() + ")")
+ ratio;
item.put("MaterialName", MaterialName); item.put("MaterialName", MaterialName);
dataArray.add(item); dataArray.add(item);
} }
...@@ -334,12 +441,10 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -334,12 +441,10 @@ public class MaterialAction extends BaseAction<MaterialModel>
//回写查询结果 //回写查询结果
toClient(dataArray.toString()); toClient(dataArray.toString());
} }
catch (DataAccessException e) catch (DataAccessException e) {
{
Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e);
} }
catch (IOException e) catch (IOException e) {
{
Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e);
} }
} }
...@@ -384,6 +489,67 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -384,6 +489,67 @@ public class MaterialAction extends BaseAction<MaterialModel>
Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e);
} }
} }
/**
* 导入excel表格-供应商
* @return
*/
@SuppressWarnings("unchecked")
public String importExcel() {
//excel表格file
Boolean result = false;
String returnStr = "";
try {
InputStream in = materialService.importExcel(model.getMaterialFile());
if(null != in)
{
model.setFileName(Tools.getRandomChar() + Tools.getNow2(Calendar.getInstance().getTime()) + "_wrong.xls");
model.setExcelStream(in);
returnStr = MaterialConstants.BusinessForExcel.EXCEL;
}
else {
result = true;
try {
toClient(result.toString());
} catch (IOException e) {
Log.errorFileSync(">>>>>>>>>回写导入信息结果异常", e);
}
//导入数据成功
returnStr = SUCCESS;
}
}
catch (JshException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>导入excel表格信息异常", e);
}
return returnStr;
}
/**
* 导出excel表格
* @return
*/
@SuppressWarnings("unchecked")
public String exportExcel() {
Log.infoFileSync("===================调用导出信息action方法exportExcel开始=======================");
try {
String sName = "pageUtilMaterial";
PageUtil<Material> pageUtil = (PageUtil<Material>)getSession().get(sName);
pageUtil.setPageSize(model.getPageSize());
pageUtil.setCurPage(model.getPageNo());
String isCurrentPage = "allPage";
model.setFileName(Tools.changeUnicode("goods" + System.currentTimeMillis() + ".xls", model.getBrowserType()));
model.setExcelStream(materialService.exmportExcel(isCurrentPage,pageUtil));
}
catch (Exception e) {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出信息action方法exportExcel异常",e);
model.getShowModel().setMsgTip("export excel exception");
}
Log.infoFileSync("===================调用导出信息action方法exportExcel结束==================");
return EXCEL;
}
/** /**
* 拼接搜索条件(查全部) * 拼接搜索条件(查全部)
...@@ -395,6 +561,9 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -395,6 +561,9 @@ public class MaterialAction extends BaseAction<MaterialModel>
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("Name_s_like", model.getName());
condition.put("Model_s_like", model.getModel());
condition.put("Mfrs_s_like", model.getMfrs());
condition.put("Id_s_order", "asc"); condition.put("Id_s_order", "asc");
return condition; return condition;
} }
...@@ -403,17 +572,36 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -403,17 +572,36 @@ public class MaterialAction extends BaseAction<MaterialModel>
* 拼接搜索条件 * 拼接搜索条件
* @return * @return
*/ */
private Map<String,Object> getCondition() private Map<String,Object> getCondition() {
{
/** /**
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("Name_s_like", model.getName());
condition.put("Model_s_like", model.getModel());
condition.put("Mfrs_s_like", model.getMfrs());
condition.put("CategoryId_s_in", model.getCategoryIds()); condition.put("CategoryId_s_in", model.getCategoryIds());
condition.put("Id_s_order", "asc"); condition.put("Id_s_order", "asc");
return condition; return condition;
} }
private Map<String,Object> getConditionCheckIsExist() {
Map<String,Object> condition = new HashMap<String,Object>();
if(model.getMaterialID()>0){
condition.put("ID_n_neq", model.getMaterialID());
}
condition.put("Name_s_eq", model.getName());
condition.put("Model_s_eq", model.getModel());
condition.put("Mfrs_s_eq", model.getMfrs());
if(model.getUnit()!=null){
condition.put("Unit_s_eq", model.getUnit());
}
if(model.getUnitId()!=null){
condition.put("UnitId_n_eq", model.getUnitId());
}
return condition;
}
/** /**
* 拼接搜索条件 * 拼接搜索条件
* @return * @return
...@@ -438,6 +626,7 @@ public class MaterialAction extends BaseAction<MaterialModel> ...@@ -438,6 +626,7 @@ public class MaterialAction extends BaseAction<MaterialModel>
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("enabled_s_eq",1);
condition.put("Id_s_order", "asc"); condition.put("Id_s_order", "asc");
return condition; return condition;
} }
......
src/main/java/com/jsh/action/materials/MaterialCategoryAction.java
View file @ 5e05f53a
...@@ -245,6 +245,36 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel> ...@@ -245,6 +245,36 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品类别信息结果异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品类别信息结果异常", e);
} }
} }
/**
* 根据id来查询商品名称
* @return
*/
public void findById() {
try {
PageUtil<MaterialCategory> pageUtil = new PageUtil<MaterialCategory>();
pageUtil.setAdvSearch(getConditionById());
materialCategoryService.find(pageUtil);
List<MaterialCategory> dataList = pageUtil.getPageList();
JSONObject outer = new JSONObject();
if(null != dataList) {
for(MaterialCategory materialCategory : dataList) {
outer.put("name", materialCategory.getName());
outer.put("parentId", materialCategory.getMaterialCategory().getId());
}
}
//回写查询结果
toClient(outer.toString());
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品类别信息异常", e);
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品类别信息结果异常", e);
}
}
/** /**
* 拼接搜索条件 * 拼接搜索条件
...@@ -256,11 +286,25 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel> ...@@ -256,11 +286,25 @@ public class MaterialCategoryAction extends BaseAction<MaterialCategoryModel>
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("Name_s_like", model.getName());
condition.put("ParentId_n_eq", model.getParentId()); condition.put("ParentId_n_eq", model.getParentId());
condition.put("Id_n_neq", 1); condition.put("Id_n_neq", 1);
condition.put("Id_s_order", "asc"); condition.put("Id_s_order", "asc");
return condition; return condition;
} }
/**
* 拼接搜索条件
* @return
*/
private Map<String,Object> getConditionById(){
/**
* 拼接搜索条件
*/
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("Id_n_eq", model.getMaterialCategoryID());
return condition;
}
//=============以下spring注入以及Model驱动公共方法，与Action处理无关================== //=============以下spring注入以及Model驱动公共方法，与Action处理无关==================
@Override @Override
......
src/main/java/com/jsh/action/materials/PersonAction.java
View file @ 5e05f53a
...@@ -70,6 +70,81 @@ public class PersonAction extends BaseAction<PersonModel> ...@@ -70,6 +70,81 @@ public class PersonAction extends BaseAction<PersonModel>
} }
return SUCCESS; return SUCCESS;
} }
/**
* 根据类型获取经手人信息 1-业务员，2-仓管员，3-财务员
* @return
*/
public void getPersonByNumType() {
try {
PageUtil<Person> pageUtil = new PageUtil<Person>();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
Map<String,Object> condition = pageUtil.getAdvSearch();
String type = "";
if(model.getType().equals("1")){
type = "业务员";
}
else if(model.getType().equals("2")){
type = "仓管员";
}
else if(model.getType().equals("3")){
type = "财务员";
}
condition.put("Type_s_eq",type);
condition.put("Id_s_order", "asc");
personService.find(pageUtil);
List<Person> dataList = pageUtil.getPageList();
JSONArray dataArray = new JSONArray();
if(null != dataList) {
for(Person person:dataList){
JSONObject item = new JSONObject();
item.put("id", person.getId());
item.put("name", person.getName());
dataArray.add(item);
}
}
//回写查询结果
toClient(dataArray.toString());
}
catch (DataAccessException e) {
Log.errorFileSync(">>>>>>>>>查找信息异常", e);
}
catch (IOException e) {
Log.errorFileSync(">>>>>>>>>回写查询信息结果异常", e);
}
}
/**
* 根据Id获取经手人信息
* @return
*/
public void getPersonByIds() {
try {
PageUtil<Person> pageUtil = new PageUtil<Person>();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
Map<String,Object> condition = pageUtil.getAdvSearch();
condition.put("Id_s_in", model.getPersonIDs());
condition.put("Id_s_order", "asc");
personService.find(pageUtil);
List<Person> dataList = pageUtil.getPageList();
StringBuffer sb = new StringBuffer();
if(null != dataList) {
for(Person person:dataList){
sb.append(person.getName() + " ");
}
}
//回写查询结果
toClient(sb.toString());
}
catch (DataAccessException e) {
Log.errorFileSync(">>>>>>>>>查找信息异常", e);
}
catch (IOException e) {
Log.errorFileSync(">>>>>>>>>回写查询信息结果异常", e);
}
}
/** /**
* 增加经手人 * 增加经手人
......
src/main/java/com/jsh/dao/basic/SupplierDAO.java
View file @ 5e05f53a
...@@ -2,7 +2,7 @@ package com.jsh.dao.basic; ...@@ -2,7 +2,7 @@ package com.jsh.dao.basic;
import com.jsh.base.BaseDAO; import com.jsh.base.BaseDAO;
import com.jsh.model.po.Supplier; import com.jsh.model.po.Supplier;
import com.jsh.util.PageUtil; import com.jsh.util.JshException;
import com.jsh.util.SearchConditionUtil; import com.jsh.util.SearchConditionUtil;
import org.hibernate.Query; import org.hibernate.Query;
...@@ -18,4 +18,11 @@ public class SupplierDAO extends BaseDAO<Supplier> implements SupplierIDAO ...@@ -18,4 +18,11 @@ public class SupplierDAO extends BaseDAO<Supplier> implements SupplierIDAO
return Supplier.class; return Supplier.class;
} }
@SuppressWarnings("unchecked")
@Override
public void batchSetEnable(Boolean enable,String supplierIDs) {
String sql="update jsh_supplier s set s.enabled=" + enable + " where s.id in (" + supplierIDs + ")";
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(sql);
query.executeUpdate();
}
} }
src/main/java/com/jsh/dao/basic/SupplierIDAO.java
View file @ 5e05f53a
...@@ -5,4 +5,5 @@ import com.jsh.model.po.Supplier; ...@@ -5,4 +5,5 @@ import com.jsh.model.po.Supplier;
public interface SupplierIDAO extends BaseIDAO<Supplier> public interface SupplierIDAO extends BaseIDAO<Supplier>
{ {
public void batchSetEnable(Boolean enable,String supplierIDs);
} }
src/main/java/com/jsh/dao/basic/UnitDAO.java 0 → 100644
View file @ 5e05f53a
package com.jsh.dao.basic;
import com.jsh.base.BaseDAO;
import com.jsh.model.po.Unit;
public class UnitDAO extends BaseDAO<Unit> implements UnitIDAO
{
/**
* 设置dao映射基类
* @return
*/
@Override
public Class<Unit> getEntityClass()
{
return Unit.class;
}
}
src/main/java/com/jsh/dao/basic/UnitIDAO.java 0 → 100644
View file @ 5e05f53a
package com.jsh.dao.basic;
import com.jsh.base.BaseIDAO;
import com.jsh.model.po.Unit;
public interface UnitIDAO extends BaseIDAO<Unit>
{
}
src/main/java/com/jsh/dao/materials/DepotHeadDAO.java
View file @ 5e05f53a
...@@ -5,12 +5,10 @@ import org.hibernate.Query; ...@@ -5,12 +5,10 @@ import org.hibernate.Query;
import com.jsh.base.BaseDAO; import com.jsh.base.BaseDAO;
import com.jsh.util.JshException; import com.jsh.util.JshException;
import com.jsh.model.po.DepotHead; import com.jsh.model.po.DepotHead;
import com.jsh.model.po.UserBusiness;
import com.jsh.util.PageUtil; import com.jsh.util.PageUtil;
import com.jsh.util.SearchConditionUtil; import com.jsh.util.SearchConditionUtil;
public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
{
/** /**
* 设置dao映射基类 * 设置dao映射基类
* @return * @return
...@@ -46,67 +44,10 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO ...@@ -46,67 +44,10 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void findInDetail(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids) throws JshException { @Override
StringBuffer queryString = new StringBuffer(); public void batchSetStatus(Boolean status,String depotHeadIDs) {
queryString.append("select dh.Number,m.`name`,m.Model,di.UnitPrice,di.OperNumber,di.AllPrice,s.supplier,d.dName,date_format(dh.OperTime, '%Y-%m-%d') " + String sql="update jsh_depothead d set d.Status=" + status + " where d.id in (" + depotHeadIDs + ")";
"from jsh_depothead dh inner join jsh_depotitem di on di.HeaderId=dh.id " + Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(sql);
"inner join jsh_material m on m.id=di.MaterialId " + query.executeUpdate();
"inner join jsh_supplier s on s.id=dh.OrganId " +
"inner join (select id,name as dName from jsh_depot) d on d.id=dh.ProjectId " +
"where dh.Type='"+ type +"' and dh.OperTime >='"+ beginTime +"' and dh.OperTime <='"+ endTime +"' ");
if(pid!=null){
queryString.append(" and dh.ProjectId=" + pid );
}
else {
queryString.append(" and dh.ProjectId in (" + dids + ")" );
}
queryString.append(" ORDER BY OperTime DESC,Number desc");
Query query;
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
pageUtil.setTotalCount(query.list().size());
// 分页查询
int pageNo = pageUtil.getCurPage();
int pageSize = pageUtil.getPageSize();
if (0 != pageNo && 0 != pageSize) {
query.setFirstResult((pageNo - 1) * pageSize);
query.setMaxResults(pageSize);
}
pageUtil.setPageList(query.list());
}
@SuppressWarnings("unchecked")
public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids) throws JshException {
StringBuffer queryString = new StringBuffer();
queryString.append("select di.MaterialId, m.mName,m.Model,m.categoryName, "+
" (select sum(jsh_depotitem.AllPrice) priceSum from jsh_depothead INNER JOIN jsh_depotitem " +
"on jsh_depothead.id=jsh_depotitem.HeaderId where jsh_depotitem.MaterialId=di.MaterialId " +
" and jsh_depothead.type='"+ type +"' and dh.OperTime >='"+ beginTime +"' and dh.OperTime <='"+ endTime +"'");
if(pid!=null){
queryString.append(" and dh.ProjectId=" + pid );
}
else {
queryString.append(" and dh.ProjectId in (" + dids + ")" );
}
queryString.append(" ) priceSum from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId " +
" INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_materialcategory.`Name` categoryName from jsh_material INNER JOIN jsh_materialcategory on jsh_material.CategoryId=jsh_materialcategory.Id) m " +
" on m.Id=di.MaterialId where dh.type='"+ type +"' and dh.OperTime >='"+ beginTime +"' and dh.OperTime <='"+ endTime +"' ");
if(pid!=null){
queryString.append(" and dh.ProjectId=" + pid );
}
else {
queryString.append(" and dh.ProjectId in (" + dids + ")" );
}
queryString.append(" GROUP BY di.MaterialId,m.mName,m.Model,m.categoryName ");
Query query;
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
pageUtil.setTotalCount(query.list().size());
// 分页查询
int pageNo = pageUtil.getCurPage();
int pageSize = pageUtil.getPageSize();
if (0 != pageNo && 0 != pageSize) {
query.setFirstResult((pageNo - 1) * pageSize);
query.setMaxResults(pageSize);
}
pageUtil.setPageList(query.list());
} }
} }
src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java
View file @ 5e05f53a
...@@ -15,8 +15,6 @@ public interface DepotHeadIDAO extends BaseIDAO<DepotHead> ...@@ -15,8 +15,6 @@ public interface DepotHeadIDAO extends BaseIDAO<DepotHead>
void findAllMoney(PageUtil<DepotHead> pageUtil, Integer supplierId, String type, String subType, String mode) throws JshException; void findAllMoney(PageUtil<DepotHead> pageUtil, Integer supplierId, String type, String subType, String mode) throws JshException;
public void findInDetail(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids) throws JshException; public void batchSetStatus(Boolean status,String depotHeadIDs);
public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids) throws JshException;
} }
src/main/java/com/jsh/dao/materials/DepotItemDAO.java
View file @ 5e05f53a
...@@ -20,7 +20,7 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO ...@@ -20,7 +20,7 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
{ {
return DepotItem.class; return DepotItem.class;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public void findByType(PageUtil<DepotItem> pageUtil,String type,Integer ProjectId,Long MId,String MonthTime,Boolean isPrev) throws JshException public void findByType(PageUtil<DepotItem> pageUtil,String type,Integer ProjectId,Long MId,String MonthTime,Boolean isPrev) throws JshException
...@@ -29,19 +29,19 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO ...@@ -29,19 +29,19 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
Query query; Query query;
StringBuffer queryString = new StringBuffer(); StringBuffer queryString = new StringBuffer();
if(isPrev) { if(isPrev) {
queryString.append("select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"'"); queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"'");
if(ProjectId!=null) { if(ProjectId!=null) {
queryString.append(" and ProjectId='" + ProjectId +"'"); queryString.append(" and DepotId='" + ProjectId +"'");
} }
queryString.append(" and MaterialId ="+ MId + " and jsh_depothead.OperTime <'"+ MonthTime +"-01 00:00:00' "); queryString.append(" and MaterialId ="+ MId + " and jsh_depothead.OperTime <'"+ MonthTime +"-01 00:00:00' ");
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
} }
else { else {
queryString.append("select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"'"); queryString.append("select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"'");
if(ProjectId!=null) { if(ProjectId!=null) {
queryString.append(" and ProjectId='" + ProjectId +"'"); queryString.append(" and DepotId='" + ProjectId +"'");
} }
queryString.append(" and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 00:00:00' "); queryString.append(" and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 59:59:59' ");
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
} }
pageUtil.setTotalCount(query.list().size()); pageUtil.setTotalCount(query.list().size());
...@@ -58,16 +58,16 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO ...@@ -58,16 +58,16 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
if (isPrev) { if (isPrev) {
queryString.append("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type + "'"); queryString.append("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type + "'");
if (ProjectId != null) { if (ProjectId != null) {
queryString.append(" and ProjectId='" + ProjectId + "'"); queryString.append(" and DepotId='" + ProjectId + "'");
} }
queryString.append(" and MaterialId =" + MId + " and jsh_depothead.OperTime <'" + MonthTime + "-01 00:00:00' "); queryString.append(" and MaterialId =" + MId + " and jsh_depothead.OperTime <'" + MonthTime + "-01 00:00:00' ");
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
} else { } else {
queryString.append("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type + "'"); queryString.append("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type + "'");
if (ProjectId != null) { if (ProjectId != null) {
queryString.append(" and ProjectId='" + ProjectId + "'"); queryString.append(" and DepotId='" + ProjectId + "'");
} }
queryString.append(" and MaterialId =" + MId + " and jsh_depothead.OperTime >='" + MonthTime + "-01 00:00:00' and jsh_depothead.OperTime <='" + MonthTime + "-31 00:00:00' "); queryString.append(" and MaterialId =" + MId + " and jsh_depothead.OperTime >='" + MonthTime + "-01 00:00:00' and jsh_depothead.OperTime <='" + MonthTime + "-31 59:59:59' ");
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
} }
pageUtil.setTotalCount(query.list().size()); pageUtil.setTotalCount(query.list().size());
...@@ -81,10 +81,10 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO ...@@ -81,10 +81,10 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
//多表联查,多表连查，此处用到了createSQLQuery，可以随便写sql语句，很方便 //多表联查,多表连查，此处用到了createSQLQuery，可以随便写sql语句，很方便
Query query; Query query;
if(sumType.equals("Number")) { if(sumType.equals("Number")) {
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"' and subType='" + subType +"' and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 00:00:00' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"' and subType='" + subType +"' and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 59:59:59' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
} }
else { else {
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"' and subType='" + subType +"' and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 00:00:00' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"' and subType='" + subType +"' and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 59:59:59' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
} }
pageUtil.setTotalCount(query.list().size()); pageUtil.setTotalCount(query.list().size());
pageUtil.setPageList(query.list()); pageUtil.setPageList(query.list());
...@@ -103,7 +103,7 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO ...@@ -103,7 +103,7 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
queryString.append(" and AllocationProjectId='" + ProjectId +"'"); //礼品充值时 queryString.append(" and AllocationProjectId='" + ProjectId +"'"); //礼品充值时
} }
else if(type.equals("out")){ else if(type.equals("out")){
queryString.append(" and ProjectId='" + ProjectId +"'"); queryString.append(" and DepotId='" + ProjectId +"'");
} }
} }
queryString.append(" and MaterialId ="+ MId); queryString.append(" and MaterialId ="+ MId);
......
src/main/java/com/jsh/dao/materials/MaterialDAO.java
View file @ 5e05f53a
...@@ -2,6 +2,10 @@ package com.jsh.dao.materials; ...@@ -2,6 +2,10 @@ package com.jsh.dao.materials;
import com.jsh.base.BaseDAO; import com.jsh.base.BaseDAO;
import com.jsh.model.po.Material; import com.jsh.model.po.Material;
import com.jsh.util.JshException;
import com.jsh.util.PageUtil;
import com.jsh.util.SearchConditionUtil;
import org.hibernate.Query;
public class MaterialDAO extends BaseDAO<Material> implements MaterialIDAO public class MaterialDAO extends BaseDAO<Material> implements MaterialIDAO
{ {
...@@ -14,4 +18,25 @@ public class MaterialDAO extends BaseDAO<Material> implements MaterialIDAO ...@@ -14,4 +18,25 @@ public class MaterialDAO extends BaseDAO<Material> implements MaterialIDAO
{ {
return Material.class; return Material.class;
} }
@SuppressWarnings("unchecked")
@Override
public void batchSetEnable(Boolean enable,String supplierIDs) {
String sql="update jsh_material m set m.enabled=" + enable + " where m.id in (" + supplierIDs + ")";
Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(sql);
query.executeUpdate();
}
@SuppressWarnings("unchecked")
@Override
public void findUnitName(PageUtil<Material> pageUtil,Long mId) throws JshException {
//多表联查,多表连查，此处用到了createSQLQuery，可以随便写sql语句，很方便,
StringBuffer queryString = new StringBuffer();
queryString.append("select jsh_unit.UName from jsh_unit inner join jsh_material on UnitId=jsh_unit.id where jsh_material.id="+mId);
Query query;
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
pageUtil.setTotalCount(query.list().size());
pageUtil.setPageList(query.list());
}
} }
src/main/java/com/jsh/dao/materials/MaterialIDAO.java
View file @ 5e05f53a
...@@ -2,8 +2,12 @@ package com.jsh.dao.materials; ...@@ -2,8 +2,12 @@ package com.jsh.dao.materials;
import com.jsh.base.BaseIDAO; import com.jsh.base.BaseIDAO;
import com.jsh.model.po.Material; import com.jsh.model.po.Material;
import com.jsh.util.JshException;
import com.jsh.util.PageUtil;
public interface MaterialIDAO extends BaseIDAO<Material> public interface MaterialIDAO extends BaseIDAO<Material>
{ {
public void batchSetEnable(Boolean enable,String supplierIDs);
public void findUnitName(PageUtil<Material> pageUtil,Long mId) throws JshException;
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment