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 1915d210..d33ed9b7 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 @@ -148,79 +148,6 @@ public class DepotHeadController { 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数组 - 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