From 70556cd35e613d6a45b1de0b09d5d330c202075e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 22 Nov 2017 23:30:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E7=94=A8=E6=88=B7=E5=8F=AA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=87=AA=E5=B7=B1=E6=8B=A5=E6=9C=89=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsh/action/materials/DepotHeadAction.java | 3 ++- src/main/java/com/jsh/dao/materials/DepotHeadDAO.java | 9 ++++++--- src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java | 2 +- .../com/jsh/service/materials/DepotHeadIService.java | 2 +- .../java/com/jsh/service/materials/DepotHeadService.java | 4 ++-- src/main/webapp/js/pages/materials/in_out.js | 5 +++-- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/jsh/action/materials/DepotHeadAction.java b/src/main/java/com/jsh/action/materials/DepotHeadAction.java index 0f2b13d1b..478ea43f9 100644 --- a/src/main/java/com/jsh/action/materials/DepotHeadAction.java +++ b/src/main/java/com/jsh/action/materials/DepotHeadAction.java @@ -385,10 +385,11 @@ public class DepotHeadAction extends BaseAction public void getHeaderIdByMaterial(){ try { String materialParam = model.getMaterialParam(); //商品参数 + String depotIds = model.getDepotIds(); //拥有的仓库信息 PageUtil pageUtil = new PageUtil(); pageUtil.setPageSize(0); pageUtil.setCurPage(0); - depotHeadService.getHeaderIdByMaterial(pageUtil, materialParam); + depotHeadService.getHeaderIdByMaterial(pageUtil, materialParam, depotIds); JSONObject outer = new JSONObject(); String allReturn = ""; List dataList = pageUtil.getPageList(); diff --git a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java index fc742bfe8..3043a1e40 100644 --- a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java @@ -159,10 +159,13 @@ public class DepotHeadDAO extends BaseDAO implements DepotHeadIDAO { } @SuppressWarnings("unchecked") - public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam) throws JshException { + public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam,String depotIds) throws JshException { StringBuffer queryString = new StringBuffer(); - queryString.append("select dt.HeaderId from jsh_depotitem dt INNER JOIN jsh_material m on dt.MaterialId = m.Id where m.`Name` "+ - " like '%" + materialParam + "%' or m.Model like '%" + materialParam + "%'"); + queryString.append("select dt.HeaderId from jsh_depotitem dt INNER JOIN jsh_material m on dt.MaterialId = m.Id where ( m.`Name` "+ + " like '%" + materialParam + "%' or m.Model like '%" + materialParam + "%') "); + if(!depotIds.equals("")){ + queryString.append(" and dt.DepotId in (" + depotIds + ") "); + } Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); pageUtil.setPageList(query.list()); } diff --git a/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java b/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java index 80bedc9db..b4ffd3dbb 100644 --- a/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotHeadIDAO.java @@ -25,6 +25,6 @@ public interface DepotHeadIDAO extends BaseIDAO public void findStatementAccount(PageUtil pageUtil,String beginTime,String endTime,Long organId, String supType) throws JshException; - public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam) throws JshException; + public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam,String depotIds) throws JshException; } diff --git a/src/main/java/com/jsh/service/materials/DepotHeadIService.java b/src/main/java/com/jsh/service/materials/DepotHeadIService.java index 18c496d47..addcda8f4 100644 --- a/src/main/java/com/jsh/service/materials/DepotHeadIService.java +++ b/src/main/java/com/jsh/service/materials/DepotHeadIService.java @@ -25,5 +25,5 @@ public interface DepotHeadIService extends BaseIService public void findStatementAccount(PageUtil pageUtil,String beginTime,String endTime, Long organId, String supType)throws JshException; - public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam)throws JshException; + public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam,String depotIds)throws JshException; } diff --git a/src/main/java/com/jsh/service/materials/DepotHeadService.java b/src/main/java/com/jsh/service/materials/DepotHeadService.java index 5f13d86d6..004883274 100644 --- a/src/main/java/com/jsh/service/materials/DepotHeadService.java +++ b/src/main/java/com/jsh/service/materials/DepotHeadService.java @@ -54,7 +54,7 @@ public class DepotHeadService extends BaseService implements DepotHea depotHeadDao.findStatementAccount(pageUtil, beginTime, endTime, organId, supType); } - public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam) throws JshException { - depotHeadDao.getHeaderIdByMaterial(pageUtil, materialParam); + public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam,String depotIds) throws JshException { + depotHeadDao.getHeaderIdByMaterial(pageUtil, materialParam, depotIds); } } diff --git a/src/main/webapp/js/pages/materials/in_out.js b/src/main/webapp/js/pages/materials/in_out.js index 0a7c40f20..38aec04a5 100644 --- a/src/main/webapp/js/pages/materials/in_out.js +++ b/src/main/webapp/js/pages/materials/in_out.js @@ -21,7 +21,7 @@ var payTypeTitle = "";//付款 收款 var organUrl = ""; //组织数据接口地址 var amountNum = ""; //单据编号开头字符 - var depotString = ""; //店铺列表 + var depotString = ""; //店铺id列表 var orgDefaultId = 0; //单位默认编号 var orgDefaultList; //存储查询出来的会员列表 var accountList; //账户列表 @@ -2583,7 +2583,8 @@ url: path + "/depotHead/getHeaderIdByMaterial.action", dataType: "json", data: ({ - MaterialParam: materialParam + MaterialParam: materialParam, + DepotIds: depotString }), success: function (res) { if(res) {