diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js index 4c14f6e1..eb7d7371 100644 --- a/erp_web/js/pages/materials/in_out.js +++ b/erp_web/js/pages/materials/in_out.js @@ -2676,56 +2676,33 @@ function showDepotHeadDetails(pageNo,pageSize){ var materialParam = $.trim($("#searchMaterial").val()); $.ajax({ - type:"get", - url: "/depotItem/getHeaderIdByMaterial", + type: "get", + url: "/depotHead/list", dataType: "json", data: ({ - materialParam: materialParam, - depotIds: depotString + search: JSON.stringify({ + type: listType, + subType: listSubType, + state: $.trim($("#searchState").val()), + number: $.trim($("#searchNumber").val()), + beginTime: $("#searchBeginTime").val(), + endTime: $("#searchEndTime").val(), + materialParam: materialParam, + depotIds: depotString + }), + currentPage: pageNo, + pageSize: pageSize }), success: function (res) { - if(res && res.code === 200) { - var ids = res.data; - if(ids){ - $.ajax({ - type: "get", - url: "/depotHead/list", - dataType: "json", - data: ({ - search: JSON.stringify({ - type: listType, - subType: listSubType, - state: $.trim($("#searchState").val()), - number: $.trim($("#searchNumber").val()), - beginTime: $("#searchBeginTime").val(), - endTime: $("#searchEndTime").val(), - dhIds: ids - }), - currentPage: pageNo, - pageSize: pageSize - }), - success: function (res) { - if(res && res.code === 200){ - if(res.data && res.data.page) { - $("#tableData").datagrid('loadData', res.data.page); - } - } - }, - //此处添加错误处理 - error: function () { - $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error'); - return; - } - }); - } - else { - $("#tableData").datagrid('loadData', []); + if(res && res.code === 200){ + if(res.data && res.data.page) { + $("#tableData").datagrid('loadData', res.data.page); } } }, //此处添加错误处理 - error:function() { - $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); + error: function () { + $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error'); return; } }); diff --git a/erp_web/login.html b/erp_web/login.html index 6b6a8fb1..f675bd62 100644 --- a/erp_web/login.html +++ b/erp_web/login.html @@ -4,7 +4,6 @@ ERP系统 - diff --git a/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/src/main/java/com/jsh/erp/controller/DepotHeadController.java index c3559e76..2e497446 100644 --- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -438,7 +438,7 @@ public class DepotHeadController { JSONObject result = ExceptionConstants.standardSuccess(); if(("open").equals(mybatisPlusStatus)) { Long billsNumLimit = Long.parseLong(request.getSession().getAttribute("billsNumLimit").toString()); - Long count = depotHeadService.countDepotHead(null,null,null,null,null,null); + Long count = depotHeadService.countDepotHead(null,null,null,null,null,null,null); if(count>= billsNumLimit) { throw new BusinessParamCheckingException(ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_CODE, ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_MSG); diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java index 0b4a11fd..f78f0f86 100644 --- a/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -42,44 +42,6 @@ public class DepotItemController { @Resource private MaterialService materialService; - /** - * 根据材料信息获取 - * @param materialParam 商品参数 - * @param depotIds 拥有的仓库信息 - * @param request - * @return - */ - @GetMapping(value = "/getHeaderIdByMaterial") - public BaseResponseInfo getHeaderIdByMaterial(@RequestParam("materialParam") String materialParam, - @RequestParam("depotIds") String depotIds, - HttpServletRequest request)throws Exception { - BaseResponseInfo res = new BaseResponseInfo(); - try { - List depotItemList = depotItemService.getHeaderIdByMaterial(materialParam, depotIds); - String allReturn = ""; - if (depotItemList != null&&depotItemList.size()>0) { - for (DepotItemVo4HeaderId d : depotItemList) { - Long dl = d.getHeaderid(); //获取对象 - allReturn = allReturn + dl.toString() + ","; - } - /** - * 2019-01-17修复depotItemList集合为空时，程序异常 - * */ - allReturn = allReturn.substring(0, allReturn.length() - 1); - } - if (allReturn.equals("null")) { - allReturn = ""; - } - res.code = 200; - res.data = allReturn; - } catch(Exception e){ - e.printStackTrace(); - res.code = 500; - res.data = "获取数据失败"; - } - return res; - } - /** * 只根据商品id查询单据列表 * @param mId diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4HeaderId.java b/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4HeaderId.java deleted file mode 100644 index 0e6eda79..00000000 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4HeaderId.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.datasource.entities; - -public class DepotItemVo4HeaderId { - - private Long headerid; - - public Long getHeaderid() { - return headerid; - } - - public void setHeaderid(Long headerid) { - this.headerid = headerid; - } - -} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index 1ce76911..6cfecf33 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -24,7 +24,8 @@ public interface DepotHeadMapperEx { @Param("number") String number, @Param("beginTime") String beginTime, @Param("endTime") String endTime, - @Param("dhIds") String dhIds, + @Param("materialParam") String materialParam, + @Param("depotIds") String depotIds, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -34,7 +35,8 @@ public interface DepotHeadMapperEx { @Param("number") String number, @Param("beginTime") String beginTime, @Param("endTime") String endTime, - @Param("dhIds") String dhIds); + @Param("materialParam") String materialParam, + @Param("depotIds") String depotIds); Long getMaxId(); diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java index 34a30d14..9a7723c8 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java @@ -27,10 +27,6 @@ public interface DepotItemMapperEx { @Param("type") Integer type, @Param("remark") String remark); - List getHeaderIdByMaterial( - @Param("materialParam") String materialParam, - @Param("depotIds") String depotIds); - List findDetailByTypeAndMaterialIdList( @Param("mId") Long mId, @Param("offset") Integer offset, diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java index a755bd55..74326b00 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java @@ -35,9 +35,9 @@ public class DepotHeadComponent implements ICommonQuery { String number = StringUtil.getInfo(search, "number"); String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); - String dhIds = StringUtil.getInfo(search, "dhIds"); - String order = QueryUtils.order(map); - return depotHeadService.select(type, subType, number, beginTime, endTime, dhIds, QueryUtils.offset(map), QueryUtils.rows(map)); + String materialParam = StringUtil.getInfo(search, "materialParam"); + String depotIds = StringUtil.getInfo(search, "depotIds"); + return depotHeadService.select(type, subType, number, beginTime, endTime, materialParam, depotIds, QueryUtils.offset(map), QueryUtils.rows(map)); } @Override @@ -48,8 +48,9 @@ public class DepotHeadComponent implements ICommonQuery { String number = StringUtil.getInfo(search, "number"); String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); - String dhIds = StringUtil.getInfo(search, "dhIds"); - return depotHeadService.countDepotHead(type, subType, number, beginTime, endTime, dhIds); + String materialParam = StringUtil.getInfo(search, "materialParam"); + String depotIds = StringUtil.getInfo(search, "depotIds"); + return depotHeadService.countDepotHead(type, subType, number, beginTime, endTime, materialParam, depotIds); } @Override diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 9af976aa..d9bf7380 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -88,11 +88,12 @@ public class DepotHeadService { return list; } - public List select(String type, String subType, String number, String beginTime, String endTime, String dhIds, int offset, int rows)throws Exception { + public List select(String type, String subType, String number, String beginTime, String endTime, + String materialParam, String depotIds, int offset, int rows)throws Exception { List resList = new ArrayList(); List list=null; try{ - list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, number, beginTime, endTime, dhIds, offset, rows); + list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, number, beginTime, endTime, materialParam, depotIds, offset, rows); }catch(Exception e){ logger.error("异常码[{}],异常提示[{}],异常[{}]", ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e); @@ -127,10 +128,11 @@ public class DepotHeadService { - public Long countDepotHead(String type, String subType, String number, String beginTime, String endTime, String dhIds) throws Exception{ + public Long countDepotHead(String type, String subType, String number, String beginTime, String endTime, + String materialParam, String depotIds) throws Exception{ Long result=null; try{ - result=depotHeadMapperEx.countsByDepotHead(type, subType, number, beginTime, endTime, dhIds); + result=depotHeadMapperEx.countsByDepotHead(type, subType, number, beginTime, endTime, materialParam, depotIds); }catch(Exception e){ logger.error("异常码[{}],异常提示[{}],异常[{}]", ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e); diff --git a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index 55b1ee5c..35157466 100644 --- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -188,19 +188,6 @@ public class DepotItemService { return list==null?0:list.size(); } - public List getHeaderIdByMaterial(String materialParam, String depotIds)throws Exception { - List list =null; - try{ - list = depotItemMapperEx.getHeaderIdByMaterial(materialParam, depotIds); - }catch(Exception e){ - logger.error("异常码[{}],异常提示[{}],异常[{}]", - ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e); - throw new BusinessRunTimeException(ExceptionConstants.DATA_READ_FAIL_CODE, - ExceptionConstants.DATA_READ_FAIL_MSG); - } - return list; - } - public List findDetailByTypeAndMaterialIdList(Map map)throws Exception { String mIdStr = map.get("mId"); Long mId = null; diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index ef7d6285..90b8f379 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -49,6 +49,8 @@ left join jsh_person p on dh.HandsPersonId=p.id and ifnull(p.delete_Flag,'0') !='1' left join jsh_account a on dh.AccountId=a.id and ifnull(a.delete_Flag,'0') !='1' left join jsh_depot dd on dh.AllocationProjectId=dd.id and ifnull(dd.delete_Flag,'0') !='1' + inner join jsh_depotitem di on dh.Id = di.HeaderId and ifnull(di.delete_Flag,'0') !='1' + inner join jsh_material m on di.MaterialId = m.Id and ifnull(m.delete_Flag,'0') !='1' where 1=1 and dh.Type='${type}' @@ -59,15 +61,18 @@ and dh.Number like '%${number}%' - - and dh.Id in (${dhIds}) - and dh.OperTime >= '${beginTime}' and dh.OperTime <= '${endTime}' + + and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%') + + + and di.DepotId in (${depotIds}) + and ifnull(dh.delete_Flag,'0') !='1' order by dh.Id desc @@ -76,8 +81,10 @@ -