#

luxiaotao1123

2021-06-21 f6c8a961595ea54f2c9a6b7da589480481cc6283

#

 src/main/java/com/slcf/controller/WaitPakInLogController.java

@@ -5,6 +5,7 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -35,12 +36,12 @@
    SysLogService sysLogService;
    @Autowired
    RoleService roleService;
	

    @RequestMapping("/goWaitPakInLog.action")
    public String goWaitPakInLogPage(HttpServletRequest request){
        try {
            String rid = request.getSession().getAttribute("ROLEID").toString();
            String authCode = roleService.getAuthListByRoleMenu(Integer.parseInt(rid), 
            String authCode = roleService.getAuthListByRoleMenu(Integer.parseInt(rid),
                    AuthorityCode.WaitPakInLogCode);
            request.getSession().setAttribute("AUTHCODE",authCode);
            // 插入日志
@@ -57,7 +58,7 @@
        }
        return "waitPakInLog";
    }
	

    /**
     * 分页查询所有
     * @param pageNumber
@@ -83,7 +84,30 @@
        }catch(Exception e) {
            System.out.println(e.getMessage());
            return null;
        }		
        }
    }
	

    /**
     * 导出所有
     * @param response
     */
    @RequestMapping("/exportWaitPakInLog.action")
    public void ExportExcel(WaitPakInLogCondition waitPakInLogCondition, HttpServletResponse response, HttpServletRequest request){
        try {
            waitPakInLogService.ExportWaitPakInLogList(waitPakInLogCondition,response);

            // 插入日志
            UserBean user = (UserBean) request.getSession().getAttribute("USER");
            SysLogBean sysLog = new SysLogBean();
            sysLog.setLogin_no(user.getUser_account());
            sysLog.setMachine_ip(request.getRemoteAddr());
            sysLog.setForm_no("exportWaitPakInLog.action");
            sysLog.setTts_keyname("导出入库通知历史档到EXCEL");
            sysLog.setModi_user(user.getUser_account());
            sysLogService.insertSysLog(sysLog);
        }catch (Exception e) {
            System.out.println(e.getMessage());
        }
    }

}

 src/main/java/com/slcf/controller/WaitPakOutLogController.java

@@ -5,6 +5,7 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -35,12 +36,12 @@
    SysLogService sysLogService;
    @Autowired
    RoleService roleService;
	

    @RequestMapping("/goWaitPakOutLog.action")
    public String goWaitPakOutLogPage(HttpServletRequest request){
        try {
            String rid = request.getSession().getAttribute("ROLEID").toString();
            String authCode = roleService.getAuthListByRoleMenu(Integer.parseInt(rid), 
            String authCode = roleService.getAuthListByRoleMenu(Integer.parseInt(rid),
                    AuthorityCode.WaitPakOutLogCode);
            request.getSession().setAttribute("AUTHCODE",authCode);
            // 插入日志
@@ -57,7 +58,7 @@
        }
        return "waitPakOutLog";
    }
	

    /**
     * 分页查询所有
     * @param pageNumber
@@ -83,7 +84,30 @@
        }catch(Exception e) {
            System.out.println(e.getMessage());
            return null;
        }		
        }
    }
	

    /**
     * 导出所有
     * @param response
     */
    @RequestMapping("/exportWaitPakOutLog.action")
    public void ExportExcel(WaitPakOutLogCondition waitPakOutLogCondition, HttpServletResponse response, HttpServletRequest request){
        try {
            waitPakOutLogService.ExportWaitPakOutLogList(waitPakOutLogCondition,response);

            // 插入日志
            UserBean user = (UserBean) request.getSession().getAttribute("USER");
            SysLogBean sysLog = new SysLogBean();
            sysLog.setLogin_no(user.getUser_account());
            sysLog.setMachine_ip(request.getRemoteAddr());
            sysLog.setForm_no("exportWaitPakOutLog.action");
            sysLog.setTts_keyname("导出出库通知历史档到EXCEL");
            sysLog.setModi_user(user.getUser_account());
            sysLogService.insertSysLog(sysLog);
        }catch (Exception e) {
            System.out.println(e.getMessage());
        }
    }

}

 src/main/java/com/slcf/dao/WaitPakInLogDao.java

@@ -16,15 +16,21 @@
//    @Select("select top (#{epage}) a.*,b.loc_desc loc_sts_name from cust_wait_pakin a,asr_bas_loc_type b where a.loc_sts=b.loc_sts and loc_no not in "
//            + " (select top (#{spage}) loc_no from cust_wait_pakin order by loc_no asc) order by loc_no asc")
    public List<WaitPakInLogBean> queryWaitPakInLogList(WaitPakInLogCondition waitPakInCon);
	

    //根据过滤条件统计总数量
    public int getWaitPakInLogCount(WaitPakInLogCondition waitPakInCon);
	

    /**
     * 查询所有
     * @return
     */
    @Select("select * from cust_wait_pakin_log order by sheet_no,mat_no desc")
    public List<WaitPakInLogBean> getWaitPakInLogList();
	

    /**
     * 不分页查询所有信息，用于excel导出
     * @return
     */
    public List<WaitPakInLogBean> getWaitPakInLogAll(WaitPakInLogCondition condition);

}

 src/main/java/com/slcf/dao/WaitPakOutLogDao.java

@@ -16,15 +16,21 @@
//    @Select("select top (#{epage}) a.*,b.loc_desc loc_sts_name from cust_wait_pakout_log a,asr_bas_loc_type b where a.loc_sts=b.loc_sts and loc_no not in "
//            + " (select top (#{spage}) loc_no from cust_wait_pakout_log order by loc_no asc) order by loc_no asc")
    public List<WaitPakOutLogBean> queryWaitPakOutLogList(WaitPakOutLogCondition waitPakOutCon);
	

    //根据过滤条件统计总数量
    public int getWaitPakOutLogCount(WaitPakOutLogCondition waitPakOutCon);
	

    /**
     * 查询所有
     * @return
     */
    @Select("select * from cust_wait_pakout_log order by sheet_no,mat_no desc")
    public List<WaitPakOutLogBean> getWaitPakOutLogList();
	

    /**
     * 不分页查询所有信息，用于excel导出
     * @return
     */
    public List<WaitPakOutLogBean> getWaitPakOutLogAll(WaitPakOutLogCondition condition);

}

 src/main/java/com/slcf/service/WaitPakInLogService.java

@@ -6,6 +6,8 @@
import com.slcf.bean.WaitPakInLogCondition;
import com.slcf.pojo.WaitPakInLogBean;

import javax.servlet.http.HttpServletResponse;

/**
 * 入库通知历史档接口
 * @author admin
@@ -16,11 +18,14 @@
    //查询所有
    //public List<WaitPakInBean> queryWaitPakInList(int spage,int epage);
    public Map<String,Object> queryWaitPakInLogList(WaitPakInLogCondition waitPakInLogCon);
	

    /**
     * 查询所有信息
     * @return
     */
    public List<WaitPakInLogBean> getWaitPakInLogList();
	

    //导出excel
    public void ExportWaitPakInLogList(WaitPakInLogCondition condition, HttpServletResponse response);

}

 src/main/java/com/slcf/service/WaitPakOutLogService.java

@@ -6,6 +6,8 @@
import com.slcf.bean.WaitPakOutLogCondition;
import com.slcf.pojo.WaitPakOutLogBean;

import javax.servlet.http.HttpServletResponse;

/**
 * 出库通知历史档接口
 * @author admin
@@ -16,11 +18,14 @@
    //查询所有
    //public List<WaitPakOutBean> queryWaitPakOutList(int spage,int epage);
    public Map<String,Object> queryWaitPakOutLogList(WaitPakOutLogCondition WaitPakOutLogCon);
	

    /**
     * 查询所有信息
     * @return
     */
    public List<WaitPakOutLogBean> getWaitPakOutLogList();
	

    //导出excel
    public void ExportWaitPakOutLogList(WaitPakOutLogCondition condition, HttpServletResponse response);

}

 src/main/java/com/slcf/service/impl/WaitPakInLogServiceImpl.java

@@ -1,9 +1,15 @@
package com.slcf.service.impl;

import java.io.IOException;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.slcf.util.DateTimeUtil;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -11,6 +17,8 @@
import com.slcf.dao.WaitPakInLogDao;
import com.slcf.pojo.WaitPakInLogBean;
import com.slcf.service.WaitPakInLogService;

import javax.servlet.http.HttpServletResponse;

/**
 * 入库通知历史档接口实现
@@ -22,7 +30,7 @@

    @Autowired
    WaitPakInLogDao waitPakInLogDao;
	

    /**
     * 分页查询所有
     */
@@ -52,5 +60,82 @@
            return null;
        }
    }
	
}

    public void ExportWaitPakInLogList(WaitPakInLogCondition condition, HttpServletResponse response) {
        //输出Excel文件
        try {
            //HSSFWorkbook对象(excel的文档对象)
            HSSFWorkbook workBook=new HSSFWorkbook();

            //sheet对象（excel的表单）
            HSSFSheet sheet=workBook.createSheet("入库通知历史档");

            //行数，参数为行索引(excel的行)
//                HSSFRow rowHead=sheet.createRow(0);//第一行  可以是0～65535之间的任何一个

//                //创建excel的单元格，参数为列索引，可以是0～255之间的任何一个
//                HSSFCell cellOne=rowHead.createCell(0);
//                cellOne.setCellValue("用户信息");//表头

            //合并单元格CellRangeAddress构造参数依次表示起始行，截至行，起始列， 截至列
//                sheet.addMergedRegion(new CellRangeAddress(0,0,0,5));

            sheet.setColumnWidth(0, (int)((10 + 0.72) * 256));
            sheet.setColumnWidth(1, (int)((20 + 0.72) * 256));
            sheet.setColumnWidth(2, (int)((15 + 0.72) * 256));
            sheet.setColumnWidth(3, (int)((15 + 0.72) * 256));
            sheet.setColumnWidth(4, (int)((15 + 0.72) * 256));
            sheet.setColumnWidth(5, (int)((25 + 0.72) * 256));
            sheet.setColumnWidth(6, (int)((10 + 0.72) * 256));
            sheet.setColumnWidth(7, (int)((8 + 0.72) * 256));
            sheet.setColumnWidth(8, (int)((10 + 0.72) * 256));
            sheet.setColumnWidth(9, (int)((10 + 0.72) * 256));
            sheet.setColumnWidth(10, (int)((10 + 0.72) * 256));
            sheet.setColumnWidth(11, (int)((25 + 0.72) * 256));

            HSSFRow rows=sheet.createRow(0);//第二行
            //创建单元格并设置单元格内容
            rows.createCell(0).setCellValue("库位号");
            rows.createCell(1).setCellValue("物料");
            rows.createCell(2).setCellValue("物料描述");
            rows.createCell(3).setCellValue("仓库号");
            rows.createCell(4).setCellValue("请求编号");
            rows.createCell(5).setCellValue("物料标签ID");
            rows.createCell(6).setCellValue("工厂");
            rows.createCell(7).setCellValue("数量");
            rows.createCell(8).setCellValue("单位");
            rows.createCell(9).setCellValue("托盘码");
            rows.createCell(10).setCellValue("用户ID");
            rows.createCell(11).setCellValue("异动时间");

            List<WaitPakInLogBean> list=waitPakInLogDao.getWaitPakInLogAll(condition);
            for(int i=0;i<list.size();i++){
                HSSFRow row=sheet.createRow(i+1);//从第三行开始
                //创建单元格并设置单元格内容
                row.createCell(0).setCellValue(list.get(i).getLoc_no());
                row.createCell(1).setCellValue(list.get(i).getMatnr());
                row.createCell(2).setCellValue(list.get(i).getMaktx());
                row.createCell(3).setCellValue(list.get(i).getLgnum());
                row.createCell(4).setCellValue(list.get(i).getTbnum());
                row.createCell(5).setCellValue(list.get(i).getZmatid());
                row.createCell(6).setCellValue(list.get(i).getWerks());
                row.createCell(7).setCellValue(list.get(i).getAnfme());
                row.createCell(8).setCellValue(list.get(i).getAltme());
                row.createCell(9).setCellValue(list.get(i).getZpallet());
                row.createCell(10).setCellValue(list.get(i).getBname());
                row.createCell(11).setCellValue(list.get(i).getModi_time());
            }
//            //输出Excel文件
//            try {
            OutputStream output=response.getOutputStream();
            response.reset();
            response.setHeader("Content-disposition", "attachment; filename=WaitPakInLog"+ DateTimeUtil.getStringDateTime(14)+".xls");
            response.setContentType("application/msexcel");
            workBook.write(output);
            output.close();
        } catch (IOException e) {
            e.printStackTrace();
        }
    }

}

 src/main/java/com/slcf/service/impl/WaitPakOutLogServiceImpl.java

@@ -1,9 +1,15 @@
package com.slcf.service.impl;

import java.io.IOException;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.slcf.util.DateTimeUtil;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -11,6 +17,8 @@
import com.slcf.dao.WaitPakOutLogDao;
import com.slcf.pojo.WaitPakOutLogBean;
import com.slcf.service.WaitPakOutLogService;

import javax.servlet.http.HttpServletResponse;

/**
 * 出库通知历史档接口实现
@@ -22,7 +30,7 @@

    @Autowired
    WaitPakOutLogDao waitPakOutLogDao;
	

    /**
     * 分页查询所有
     */
@@ -52,5 +60,85 @@
            return null;
        }
    }
	
}

    public void ExportWaitPakOutLogList(WaitPakOutLogCondition condition, HttpServletResponse response) {
        //输出Excel文件
        try {
            //HSSFWorkbook对象(excel的文档对象)
            HSSFWorkbook workBook=new HSSFWorkbook();

            //sheet对象（excel的表单）
            HSSFSheet sheet=workBook.createSheet("出库通知历史档");

            //行数，参数为行索引(excel的行)
//                HSSFRow rowHead=sheet.createRow(0);//第一行  可以是0～65535之间的任何一个

//                //创建excel的单元格，参数为列索引，可以是0～255之间的任何一个
//                HSSFCell cellOne=rowHead.createCell(0);
//                cellOne.setCellValue("用户信息");//表头

            //合并单元格CellRangeAddress构造参数依次表示起始行，截至行，起始列， 截至列
//                sheet.addMergedRegion(new CellRangeAddress(0,0,0,5));

            sheet.setColumnWidth(0, (int)((10 + 0.72) * 256));
            sheet.setColumnWidth(1, (int)((20 + 0.72) * 256));
            sheet.setColumnWidth(2, (int)((15 + 0.72) * 256));
            sheet.setColumnWidth(3, (int)((15 + 0.72) * 256));
            sheet.setColumnWidth(4, (int)((15 + 0.72) * 256));
            sheet.setColumnWidth(5, (int)((25 + 0.72) * 256));
            sheet.setColumnWidth(6, (int)((10 + 0.72) * 256));
            sheet.setColumnWidth(7, (int)((8 + 0.72) * 256));
            sheet.setColumnWidth(8, (int)((10 + 0.72) * 256));
            sheet.setColumnWidth(9, (int)((10 + 0.72) * 256));
            sheet.setColumnWidth(10, (int)((10 + 0.72) * 256));
            sheet.setColumnWidth(11, (int)((25 + 0.72) * 256));
            sheet.setColumnWidth(12, (int)((25 + 0.72) * 256));

            HSSFRow rows=sheet.createRow(0);//第二行
            //创建单元格并设置单元格内容
            rows.createCell(0).setCellValue("仓库号");
            rows.createCell(1).setCellValue("转储编号");
            rows.createCell(2).setCellValue("行项目");
            rows.createCell(3).setCellValue("物料");
            rows.createCell(4).setCellValue("物料描述");
            rows.createCell(5).setCellValue("工厂");
            rows.createCell(6).setCellValue("数量");
            rows.createCell(7).setCellValue("单位");
            rows.createCell(8).setCellValue("源发地类型");
            rows.createCell(9).setCellValue("源发地仓位");
            rows.createCell(10).setCellValue("目的地类型");
            rows.createCell(11).setCellValue("目的地仓位");
            rows.createCell(12).setCellValue("用户ID");

            List<WaitPakOutLogBean> list=waitPakOutLogDao.getWaitPakOutLogAll(condition);
            for(int i=0;i<list.size();i++){
                HSSFRow row=sheet.createRow(i+1);//从第三行开始
                //创建单元格并设置单元格内容
                row.createCell(0).setCellValue(list.get(i).getLgnum());
                row.createCell(1).setCellValue(list.get(i).getTanum());
                row.createCell(2).setCellValue(list.get(i).getTapos());
                row.createCell(3).setCellValue(list.get(i).getMatnr());
                row.createCell(4).setCellValue(list.get(i).getMaktx());
                row.createCell(5).setCellValue(list.get(i).getWerks());
                row.createCell(6).setCellValue(list.get(i).getVsolm());
                row.createCell(7).setCellValue(list.get(i).getMeins());
                row.createCell(8).setCellValue(list.get(i).getVltyp());
                row.createCell(9).setCellValue(list.get(i).getVlpla());
                row.createCell(10).setCellValue(list.get(i).getNltyp());
                row.createCell(11).setCellValue(list.get(i).getNlpla());
                row.createCell(12).setCellValue(list.get(i).getBname());
            }
//            //输出Excel文件
//            try {
            OutputStream output=response.getOutputStream();
            response.reset();
            response.setHeader("Content-disposition", "attachment; filename=WaitPakOutLog"+ DateTimeUtil.getStringDateTime(14)+".xls");
            response.setContentType("application/msexcel");
            workBook.write(output);
            output.close();
        } catch (IOException e) {
            e.printStackTrace();
        }
    }

}

 src/main/resources/mapper/WaitPakInLogMapper.xml

@@ -4,7 +4,7 @@
<mapper namespace="com.slcf.dao.WaitPakInLogDao">

<!-- mapper不支持sql语句嵌套时，采用sql片段包含方式，解决xml标签问题 -->
<sql id="WaitPakInLogConditionSql">	
<sql id="WaitPakInLogConditionSql">
        <if test="matnr!=null and matnr!='' ">
            and a.matnr like '%' + #{matnr} + '%'
        </if>
@@ -15,21 +15,21 @@
            or zpallet like '%' + #{maktx} + '%'
            or loc_no like '%' + #{maktx} + '%'
            )
        </if>	
        </if>
        <if test="begin_date!=null and begin_date!='' ">
            <![CDATA[
            and a.modi_time >= #{begin_date} 			
            ]]>			
        </if>	
            and a.modi_time >= #{begin_date}
            ]]>
        </if>
        <if test="end_date!=null and end_date!='' ">
            <![CDATA[
            and a.modi_time <= #{end_date} 			
            ]]>			
            and a.modi_time <= #{end_date}
            ]]>
        </if>
</sql>

<select id="queryWaitPakInLogList" parameterType="com.slcf.bean.WaitPakInLogCondition" resultType="com.slcf.pojo.WaitPakInLogBean">
select * from ( 
select * from (
select *,ROW_NUMBER() OVER(Order by modi_time,lgnum) as rowid
 from cust_wait_pakin_log a
<where>
@@ -54,4 +54,20 @@
<include refid="WaitPakInLogConditionSql"></include>
</where>
</select>
</mapper>


<!-- 不分页查询所有信息，用于excel导出 -->
<select id="getWaitPakInLogAll" parameterType="com.slcf.bean.WaitPakInLogCondition" resultType="com.slcf.pojo.WaitPakInLogBean">
    select a.*
    from cust_wait_pakin_log a
    <where>
        <![CDATA[
1=1
]]>
        <include refid="WaitPakInLogConditionSql"></include>
        <![CDATA[
order by a.appe_time,a.matnr,a.loc_no asc
]]>
    </where>
</select>
</mapper>

 src/main/resources/mapper/WaitPakOutLogMapper.xml

@@ -4,7 +4,7 @@
<mapper namespace="com.slcf.dao.WaitPakOutLogDao">

<!-- mapper不支持sql语句嵌套时，采用sql片段包含方式，解决xml标签问题 -->
<sql id="WaitPakOutLogConditionSql">	
<sql id="WaitPakOutLogConditionSql">
        <if test="matnr!=null and matnr!='' ">
            and a.matnr like '%' + #{matnr} + '%'
        </if>
@@ -21,18 +21,18 @@
        </if>
        <if test="begin_date!=null and begin_date!='' ">
            <![CDATA[
            and a.modi_time >= #{begin_date} 			
            ]]>			
        </if>	
            and a.modi_time >= #{begin_date}
            ]]>
        </if>
        <if test="end_date!=null and end_date!='' ">
            <![CDATA[
            and a.modi_time <= #{end_date} 			
            ]]>			
        </if>	
            and a.modi_time <= #{end_date}
            ]]>
        </if>
</sql>

<select id="queryWaitPakOutLogList" parameterType="com.slcf.bean.WaitPakOutLogCondition" resultType="com.slcf.pojo.WaitPakOutLogBean">
select * from ( 
select * from (
select *,ROW_NUMBER() OVER(Order by appe_time desc) as rowid
 from cust_wait_pakout_log a
<where>
@@ -57,4 +57,20 @@
<include refid="WaitPakOutLogConditionSql"></include>
</where>
</select>
</mapper>


<!-- 不分页查询所有信息，用于excel导出 -->
<select id="getWaitPakOutLogAll" parameterType="com.slcf.bean.WaitPakOutLogCondition" resultType="com.slcf.pojo.WaitPakOutLogBean">
    select a.*
    from cust_wait_pakout_log a
    <where>
        <![CDATA[
1=1
]]>
        <include refid="WaitPakOutLogConditionSql"></include>
        <![CDATA[
order by a.appe_time desc
]]>
    </where>
</select>
</mapper>

 src/main/webapp/WEB-INF/pages/waitPakInLog.jsp

@@ -9,37 +9,37 @@

<script type="text/javascript" src="${path }/jsFiles/waitPakInLog.js"></script>
<style type="text/css">
.modal-dialog { 
    position: absolute; 
    top: 0; 
    bottom: 0; 
    left: 0; 
    right: 0; 
} 
.modal-dialog {
    position: absolute;
    top: 0;
    bottom: 0;
    left: 0;
    right: 0;
}

.modal-content { 
    /*overflow-y: scroll; */ 
    position: absolute; 
    top: 0; 
    bottom: 0; 
.modal-content {
    /*overflow-y: scroll; */
    position: absolute;
    top: 0;
    bottom: 0;
    height :60%;
    width: 100%; 
} 
    width: 100%;
}

.modal-body {
    overflow-y: scroll; 
    position: absolute; 
    top: 55px;     
    bottom: 65px;  
    width: 100%; 
} 
    overflow-y: scroll;
    position: absolute;
    top: 55px;
    bottom: 65px;
    width: 100%;
}

.modal-header .close {margin-right: 15px;} 
.modal-header .close {margin-right: 15px;}

.modal-footer {
    position: absolute; 
    width: 100%; 
    bottom: 0; 
    position: absolute;
    width: 100%;
    bottom: 0;
}
</style>
</head>
@@ -50,10 +50,10 @@
    <div class="panel-body">
        <form id="conForm" class="form-inline">
            <input type="text" class="form-control" style="width:25%" id="search_sheet_no" name="search_sheet_no" placeholder="物料">
            <input type="text" class="form-control" style="width:25%" id="search_mat_no" name="search_mat_no" placeholder="搜索">	
            <input type="text" class="form-control" style="width:25%" id="search_mat_no" name="search_mat_no" placeholder="搜索">
            <input type="text" id="begin_date" style="width:15%" name="begin_date" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" readonly="readonly" class="form-control form-control-static" placeholder="开始时间">
            <input type="text" id="end_date" style="width:15%" name="end_date" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" readonly="readonly" class="form-control form-control-static" placeholder="结束时间">	    
		    
            <input type="text" id="end_date" style="width:15%" name="end_date" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" readonly="readonly" class="form-control form-control-static" placeholder="结束时间">

            <button type="button" onclick="getByCon()" class="btn btn-info ">
           <span class="glyphicon glyphicon-search" aria-hidden="true" >  搜索</span></button>
        </form>
@@ -67,5 +67,13 @@
<table id="test-table" class="table table-hover text-nowrap"></table>
</div>

<!--toolbar  -->
<div id="toolbar" class="btn-toolbar">
    <button onclick="ExportExcel()" type="button" class="btn btn-success">
        <span class="glyphicon glyphicon-paste" aria-hidden="true" >导出</span>
    </button>
</div>


</body>
</html>
</html>

 src/main/webapp/WEB-INF/pages/waitPakOutLog.jsp

@@ -9,37 +9,37 @@

<script type="text/javascript" src="${path }/jsFiles/waitPakOutLog.js"></script>
<style type="text/css">
.modal-dialog { 
    position: absolute; 
    top: 0; 
    bottom: 0; 
    left: 0; 
    right: 0; 
} 
.modal-dialog {
    position: absolute;
    top: 0;
    bottom: 0;
    left: 0;
    right: 0;
}

.modal-content { 
    /*overflow-y: scroll; */ 
    position: absolute; 
    top: 0; 
    bottom: 0; 
.modal-content {
    /*overflow-y: scroll; */
    position: absolute;
    top: 0;
    bottom: 0;
    height :60%;
    width: 100%; 
} 
    width: 100%;
}

.modal-body {
    overflow-y: scroll; 
    position: absolute; 
    top: 55px;     
    bottom: 65px;  
    width: 100%; 
} 
    overflow-y: scroll;
    position: absolute;
    top: 55px;
    bottom: 65px;
    width: 100%;
}

.modal-header .close {margin-right: 15px;} 
.modal-header .close {margin-right: 15px;}

.modal-footer {
    position: absolute; 
    width: 100%; 
    bottom: 0; 
    position: absolute;
    width: 100%;
    bottom: 0;
}
</style>
</head>
@@ -50,10 +50,10 @@
    <div class="panel-body">
        <form id="conForm" class="form-inline">
            <input type="text" class="form-control" style="width:15%" id="search_sheet_no" name="search_sheet_no" placeholder="物料">
            <input type="text" class="form-control" style="width:25%" id="search_mat_no" name="search_mat_no" placeholder="搜索">		    
            <input type="text" class="form-control" style="width:25%" id="search_mat_no" name="search_mat_no" placeholder="搜索">
            <input type="text" id="begin_date" style="width:15%" name="begin_date" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" readonly="readonly" class="form-control form-control-static" placeholder="开始时间">
            <input type="text" id="end_date" style="width:15%" name="end_date" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" readonly="readonly" class="form-control form-control-static" placeholder="结束时间">
		    

            <button type="button" onclick="getByCon()" class="btn btn-info ">
           <span class="glyphicon glyphicon-search" aria-hidden="true" >  搜索</span></button>
        </form>
@@ -65,5 +65,12 @@
<table id="test-table" class="table table-hover text-nowrap"></table>
</div>

<!--toolbar  -->
<div id="toolbar" class="btn-toolbar">
    <button onclick="ExportExcel()" type="button" class="btn btn-success">
        <span class="glyphicon glyphicon-paste" aria-hidden="true" >导出</span>
    </button>
</div>

</body>
</html>
</html>

 src/main/webapp/jsFiles/waitPakInLog.js

@@ -4,7 +4,7 @@
var myColumns=[];
$(function(){
    getColumns();
	

    $('#test-table').bootstrapTable('destroy');
    $('#test-table').bootstrapTable({
        method : 'GET',
@@ -23,8 +23,8 @@
        clickToSelect: true, // 单击行即可以选中
        search : false,//显示搜素表单
        silent : true, //刷新事件必须设置
        sidePagination : "server", //表示服务端请求  
        columns : myColumns,  
        sidePagination : "server", //表示服务端请求
        columns : myColumns,
//        [{
//            checkbox:true
//        },{
@@ -43,7 +43,7 @@
//            field : "mat_name",
//            title : "物料名称",
//            align : "center",
//            valign : "middle",		
//            valign : "middle",
//        }, {
//            field : "str1",
//            title : "单位",
@@ -130,15 +130,15 @@
//        onCheck:function(row){
////            alert(row.menu_name);
//        },onUncheck:function(row){
////          alert('取消选中');       
////          alert('取消选中');
//        },
        onClickRow:function (row,$element) {
            $('.info').removeClass('info');
            $($element).addClass('info');
        }
    });
	
}); 

});

function operateFormatter(value, row, index) {
    return [
@@ -168,10 +168,10 @@
//                    valign : "middle"
//                });
                myColumns.push({
                    title: '序号',  
                    field: '',  
                    formatter: function (value, row, index) {  
                        return index+1;  
                    title: '序号',
                    field: '',
                    formatter: function (value, row, index) {
                        return index+1;
                    }
                });
//                myColumns.push({
@@ -187,7 +187,7 @@
                    align : "left",
                    valign : "middle"
                });
				

//                myColumns.push({
//                    field : "io_status",
//                    title : "状态",
@@ -245,10 +245,24 @@
    $("#addDlg").modal("hide");
    $("#info").text("");
    $("#infos").text("");
	

    $('#myform').data('bootstrapValidator', null);
    $("#addForm").data('bootstrapValidator',null);
    formValidator();
    //$('#mydlg').data('bootstrapValidator').resetForm(true);
    $("input[type=reset]").trigger("click");
}
}

//导出
function ExportExcel(){
    if(confirm("确认导出excel？")){
        var url = "work/exportWaitPakInLog.action?";
        url += "matnr=" + $("#search_sheet_no").val();
        url += "&maktx=" + $("#search_mat_no").val();
        url += "&begin_date=" + $("#begin_date").val();
        url += "&end_date=" + $("#end_date").val();
        location.href=url;
    }else{
        return false;
    }
}

 src/main/webapp/jsFiles/waitPakOutLog.js

@@ -4,7 +4,7 @@
var myColumns=[];
$(function(){
    getColumns();
	

    $('#test-table').bootstrapTable('destroy');
    $('#test-table').bootstrapTable({
        method : 'GET',
@@ -23,8 +23,8 @@
        clickToSelect: true, // 单击行即可以选中
        search : false,//显示搜素表单
        silent : true, //刷新事件必须设置
        sidePagination : "server", //表示服务端请求  
        columns ://myColumns, 
        sidePagination : "server", //表示服务端请求
        columns ://myColumns,
        [{
            field : "lgnum",
            title : "仓库号",
@@ -41,7 +41,7 @@
            field : "tapos",
            title : "行项目",
            align : "center",
            valign : "middle",		
            valign : "middle",
        }, {
            field : "matnr",
            title : "物料",
@@ -153,15 +153,15 @@
//        onCheck:function(row){
////            alert(row.menu_name);
//        },onUncheck:function(row){
////          alert('取消选中');       
////          alert('取消选中');
//        },
        onClickRow:function (row,$element) {
            $('.info').removeClass('info');
            $($element).addClass('info');
        }
    });
	
}); 

});

function operateFormatter(value, row, index) {
    return [
@@ -191,10 +191,10 @@
//                    valign : "middle"
//                });
                myColumns.push({
                    title: '序号',  
                    field: '',  
                    formatter: function (value, row, index) {  
                        return index+1;  
                    title: '序号',
                    field: '',
                    formatter: function (value, row, index) {
                        return index+1;
                    }
                });
//                myColumns.push({
@@ -218,7 +218,7 @@
//                    align : "left",
//                    valign : "middle"
//                });
				

//                myColumns.push({
//                    field : "io_status",
//                    title : "状态",
@@ -276,10 +276,24 @@
    $("#addDlg").modal("hide");
    $("#info").text("");
    $("#infos").text("");
	

    $('#myform').data('bootstrapValidator', null);
    $("#addForm").data('bootstrapValidator',null);
    formValidator();
    //$('#mydlg').data('bootstrapValidator').resetForm(true);
    $("input[type=reset]").trigger("click");
}
}

//导出
function ExportExcel(){
    if(confirm("确认导出excel？")){
        var url = "work/exportWaitPakOutLog.action?";
        url += "matnr=" + $("#search_sheet_no").val();
        url += "&maktx=" + $("#search_mat_no").val();
        url += "&begin_date=" + $("#begin_date").val();
        url += "&end_date=" + $("#end_date").val();
        location.href=url;
    }else{
        return false;
    }
}