将查询单据信息的两个接口合并为一个

erp_web/js/pages/materials/in_out.js

@@ -2676,56 +2676,33 @@
 	function showDepotHeadDetails(pageNo,pageSize){
 		var materialParam = $.trim($("#searchMaterial").val());
 		$.ajax({
-			type:"get",
+			type: "get",
-			url: "/depotItem/getHeaderIdByMaterial",
+			url: "/depotHead/list",
 			dataType: "json",
 			data: ({
-				materialParam: materialParam,
+				search: JSON.stringify({
-				depotIds: depotString
+					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) {
+				if(res && res.code === 200){
-					var ids = res.data;
+					if(res.data && res.data.page) {
-					if(ids){
+						$("#tableData").datagrid('loadData', res.data.page);
-						$.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', []);
 					}
 				}
 			},
 			//此处添加错误处理
-			error:function() {
+			error: function () {
-				$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+				$.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
 				return;
 			}
 		});

erp_web/login.html

@@ -4,7 +4,6 @@
     <title>ERP系统</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=8" >
-    <meta name="referrer" content="Webkit">
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
     <link type="text/css" rel="stylesheet" href="/css/css.css"/>
     <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>

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);

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<DepotItemVo4HeaderId> 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

src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4HeaderId.java

@@ -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;
-    }
-
-}

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();
 

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<DepotItemVo4HeaderId> getHeaderIdByMaterial(
-            @Param("materialParam") String materialParam,
-            @Param("depotIds") String depotIds);
-
     List<DepotItemVo4DetailByTypeAndMId> findDetailByTypeAndMaterialIdList(
             @Param("mId") Long mId,
             @Param("offset") Integer offset,

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 materialParam = StringUtil.getInfo(search, "materialParam");
-        String order = QueryUtils.order(map);
+        String depotIds = StringUtil.getInfo(search, "depotIds");
-        return depotHeadService.select(type, subType, number, beginTime, endTime, dhIds, QueryUtils.offset(map), QueryUtils.rows(map));
+        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");
+        String materialParam = StringUtil.getInfo(search, "materialParam");
-        return depotHeadService.countDepotHead(type, subType, number, beginTime, endTime, dhIds);
+        String depotIds = StringUtil.getInfo(search, "depotIds");
+        return depotHeadService.countDepotHead(type, subType, number, beginTime, endTime, materialParam, depotIds);
     }
 
     @Override

src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java

@@ -88,11 +88,12 @@ public class DepotHeadService {
         return list;
     }
 
-    public List<DepotHeadVo4List> select(String type, String subType, String number, String beginTime, String endTime, String dhIds, int offset, int rows)throws Exception {
+    public List<DepotHeadVo4List> select(String type, String subType, String number, String beginTime, String endTime,
+                                         String materialParam, String depotIds, int offset, int rows)throws Exception {
         List<DepotHeadVo4List> resList = new ArrayList<DepotHeadVo4List>();
         List<DepotHeadVo4List> 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);

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<DepotItemVo4HeaderId> getHeaderIdByMaterial(String materialParam, String depotIds)throws Exception {
-        List<DepotItemVo4HeaderId> 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<DepotItemVo4DetailByTypeAndMId> findDetailByTypeAndMaterialIdList(Map<String, String> map)throws Exception {
         String mIdStr = map.get("mId");
         Long mId = null;

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
         <if test="type != null">
             and dh.Type='${type}'
@@ -59,15 +61,18 @@
         <if test="number != null">
             and dh.Number like '%${number}%'
         </if>
-        <if test="dhIds != null">
-            and dh.Id in (${dhIds})
-        </if>
         <if test="beginTime != null">
             and dh.OperTime >= '${beginTime}'
         </if>
         <if test="endTime != null">
             and dh.OperTime &lt;= '${endTime}'
         </if>
+        <if test="materialParam != null">
+            and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
+        </if>
+        <if test="depotIds != null">
+            and di.DepotId in (${depotIds})
+        </if>
         and ifnull(dh.delete_Flag,'0') !='1'
         order by dh.Id desc
         <if test="offset != null and rows != null">
@@ -76,8 +81,10 @@
     </select>
     <select id="countsByDepotHead" resultType="java.lang.Long">
         SELECT
-        COUNT(id)
+        COUNT(jsh_depothead.id)
         FROM jsh_depothead
+        inner join jsh_depotitem di on jsh_depothead.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
         <if test="type != null">
             and Type='${type}'
@@ -88,16 +95,19 @@
         <if test="number != null">
             and Number like '%${number}%'
         </if>
-        <if test="dhIds != null">
-            and Id in (${dhIds})
-        </if>
         <if test="beginTime != null">
             and OperTime >= '${beginTime}'
         </if>
         <if test="endTime != null">
             and OperTime &lt;= '${endTime}'
         </if>
-        and ifnull(delete_Flag,'0') !='1'
+        <if test="materialParam != null">
+            and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
+        </if>
+        <if test="depotIds != null">
+            and di.DepotId in (${depotIds})
+        </if>
+        and ifnull(jsh_depothead.delete_Flag,'0') !='1'
     </select>
 
     <select id="getMaxId" resultType="java.lang.Long">

src/main/resources/mapper_xml/DepotItemMapperEx.xml

@@ -2,10 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper  namespace="com.jsh.erp.datasource.mappers.DepotItemMapperEx">
 
-    <resultMap id="HeaderIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4HeaderId">
-        <result column="HeaderId" jdbcType="BIGINT" property="headerid" />
-    </resultMap>
-
     <resultMap id="DetailByTypeAndMIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4DetailByTypeAndMId">
         <result column="Number" jdbcType="VARCHAR" property="number" />
         <result column="newType" jdbcType="VARCHAR" property="newtype" />
@@ -88,15 +84,6 @@
         </if>
         and ifnull(delete_Flag,'0') !='1'
     </select>
-    <select id="getHeaderIdByMaterial" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="HeaderIdResultMap">
-        select dt.HeaderId from jsh_depotitem dt
-        INNER JOIN jsh_material m on dt.MaterialId = m.Id and ifnull(m.delete_Flag,'0') !='1'
-        where (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
-        <if test="depotIds != null">
-            and dt.DepotId in (${depotIds})
-        </if>
-        and ifnull(dt.delete_Flag,'0') !='1'
-    </select>
 
     <select id="findDetailByTypeAndMaterialIdList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="DetailByTypeAndMIdResultMap">
         select dh.Number,concat(dh.SubType,dh.Type) as newType,