diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java index fad57489..1915d210 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -92,9 +92,9 @@ public class DepotHeadController { * @param request * @return */ - @GetMapping(value = "/findInDetail") + @GetMapping(value = "/findInOutDetail") @ApiOperation(value = "入库出库明细接口") - public BaseResponseInfo findInDetail(@RequestParam("currentPage") Integer currentPage, + public BaseResponseInfo findInOutDetail(@RequestParam("currentPage") Integer currentPage, @RequestParam("pageSize") Integer pageSize, @RequestParam(value = "organId", required = false) Integer oId, @RequestParam("number") String number, @@ -126,9 +126,82 @@ public class DepotHeadController { String [] organArray = depotHeadService.getOrganArray(subType, ""); beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = depotHeadService.findInDetail(beginTime, endTime, type, creatorArray, organArray, + List list = depotHeadService.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark, (currentPage-1)*pageSize, pageSize); - int total = depotHeadService.findInDetailCount(beginTime, endTime, type, creatorArray, organArray, + int total = depotHeadService.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, + StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark); + map.put("total", total); + //存放数据json数组 + if (null != list) { + for (DepotHeadVo4InDetail dhd : list) { + resList.add(dhd); + } + } + map.put("rows", resList); + res.code = 200; + res.data = map; + } catch(Exception e){ + e.printStackTrace(); + res.code = 500; + res.data = "获取数据失败"; + } + return res; + } + + /** + * 改接口准备停用 + * @param currentPage + * @param pageSize + * @param oId + * @param number + * @param materialParam + * @param depotId + * @param beginTime + * @param endTime + * @param roleType + * @param type + * @param remark + * @param request + * @return + * @throws Exception + */ + @GetMapping(value = "/findInDetail") + @ApiOperation(value = "入库出库明细接口") + public BaseResponseInfo findInDetail(@RequestParam("currentPage") Integer currentPage, + @RequestParam("pageSize") Integer pageSize, + @RequestParam(value = "organId", required = false) Integer oId, + @RequestParam("number") String number, + @RequestParam("materialParam") String materialParam, + @RequestParam(value = "depotId", required = false) Long depotId, + @RequestParam("beginTime") String beginTime, + @RequestParam("endTime") String endTime, + @RequestParam(value = "roleType", required = false) String roleType, + @RequestParam("type") String type, + @RequestParam("remark") String remark, + HttpServletRequest request)throws Exception { + BaseResponseInfo res = new BaseResponseInfo(); + Map map = new HashMap(); + try { + List depotList = new ArrayList<>(); + if(depotId != null) { + depotList.add(depotId); + } else { + //未选择仓库时默认为当前用户有权限的仓库 + JSONArray depotArr = depotService.findDepotByCurrentUser(); + for(Object obj: depotArr) { + JSONObject object = JSONObject.parseObject(obj.toString()); + depotList.add(object.getLong("id")); + } + } + List resList = new ArrayList(); + String [] creatorArray = depotHeadService.getCreatorArray(roleType); + String subType = "出库".equals(type)? "销售" : ""; + String [] organArray = depotHeadService.getOrganArray(subType, ""); + beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); + endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); + List list = depotHeadService.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, + StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark, (currentPage-1)*pageSize, pageSize); + int total = depotHeadService.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark); map.put("total", total); //存放数据json数组 diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index 070a5d5a..cccaaca2 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -61,7 +61,7 @@ public interface DepotHeadMapperEx { String findMaterialsListByHeaderId( @Param("id") Long id); - List findInDetail( + List findInOutDetail( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("type") String type, @@ -75,7 +75,7 @@ public interface DepotHeadMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int findInDetailCount( + int findInOutDetailCount( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("type") String type, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index c108abe0..5c1ba682 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -486,24 +486,24 @@ public class DepotHeadService { return result; } - public List findInDetail(String beginTime, String endTime, String type, String [] creatorArray, + public List findInOutDetail(String beginTime, String endTime, String type, String [] creatorArray, String [] organArray, String materialParam, List depotList, Integer oId, String number, String remark, Integer offset, Integer rows) throws Exception{ List list = null; try{ - list =depotHeadMapperEx.findInDetail(beginTime, endTime, type, creatorArray, organArray, materialParam, depotList, oId, number, remark, offset, rows); + list =depotHeadMapperEx.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, materialParam, depotList, oId, number, remark, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public int findInDetailCount(String beginTime, String endTime, String type, String [] creatorArray, + public int findInOutDetailCount(String beginTime, String endTime, String type, String [] creatorArray, String [] organArray, String materialParam, List depotList, Integer oId, String number, String remark) throws Exception{ int result = 0; try{ - result =depotHeadMapperEx.findInDetailCount(beginTime, endTime, type, creatorArray, organArray, materialParam, depotList, oId, number, remark); + result =depotHeadMapperEx.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, materialParam, depotList, oId, number, remark); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 5f3cccfc..51a56880 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -239,7 +239,7 @@ and ifnull(jsh_depot_item.delete_flag,'0') !='1' - select dh.number,me.bar_code, m.`name` MName,m.model,m.standard,di.unit_price,di.material_unit as mUnit, di.oper_number,di.all_price, ifnull(di.tax_rate,0) tax_rate, ifnull(di.tax_money,0) tax_money, ifnull(di.tax_last_money,0) tax_last_money, s.supplier SName,d.dName DName, date_format(dh.oper_time, '%Y-%m-%d') OperTime, concat(dh.sub_type,dh.type) as NewType, @@ -271,11 +271,11 @@ ) - and dh.organ_id in ( + and (dh.organ_id in ( #{organId} - ) + ) or dh.sub_type='采购退货' or dh.sub_type='零售') @@ -297,7 +297,7 @@ - select count(1) from jsh_depot_head dh left join jsh_depot_item di on di.header_id=dh.id and ifnull(di.delete_flag,'0') !='1' @@ -326,11 +326,11 @@ ) - and dh.organ_id in ( + and (dh.organ_id in ( #{organId} - ) + ) or dh.sub_type='采购退货' or dh.sub_type='零售') @@ -372,11 +372,11 @@ ) - and dh.organ_id in ( + and (dh.organ_id in ( #{organId} - ) + ) or dh.sub_type='采购退货' or dh.sub_type='零售') @@ -429,11 +429,11 @@ ) - and dh.organ_id in ( + and (dh.organ_id in ( #{organId} - ) + ) or dh.sub_type='采购退货' or dh.sub_type='零售')