From f6c8a961595ea54f2c9a6b7da589480481cc6283 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 21 六月 2021 14:28:08 +0800
Subject: [PATCH] #
---
src/main/java/com/slcf/dao/WaitPakInLogDao.java | 12
src/main/java/com/slcf/service/impl/WaitPakInLogServiceImpl.java | 91 ++++++++
src/main/webapp/jsFiles/waitPakInLog.js | 42 ++-
src/main/java/com/slcf/service/WaitPakOutLogService.java | 9
src/main/webapp/WEB-INF/pages/waitPakInLog.jsp | 64 +++--
src/main/webapp/WEB-INF/pages/waitPakOutLog.jsp | 61 +++--
src/main/java/com/slcf/controller/WaitPakInLogController.java | 34 ++
src/main/java/com/slcf/dao/WaitPakOutLogDao.java | 12
src/main/webapp/jsFiles/waitPakOutLog.js | 42 ++-
src/main/java/com/slcf/service/WaitPakInLogService.java | 9
src/main/resources/mapper/WaitPakOutLogMapper.xml | 34 ++
src/main/java/com/slcf/controller/WaitPakOutLogController.java | 34 ++
src/main/resources/mapper/WaitPakInLogMapper.xml | 34 ++
src/main/java/com/slcf/service/impl/WaitPakOutLogServiceImpl.java | 94 +++++++++
14 files changed, 445 insertions(+), 127 deletions(-)
diff --git a/src/main/java/com/slcf/controller/WaitPakInLogController.java b/src/main/java/com/slcf/controller/WaitPakInLogController.java
index 7bf6e4b..caa5b3c 100644
--- a/src/main/java/com/slcf/controller/WaitPakInLogController.java
+++ b/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());
+ }
+ }
+
}
diff --git a/src/main/java/com/slcf/controller/WaitPakOutLogController.java b/src/main/java/com/slcf/controller/WaitPakOutLogController.java
index cf2b5d4..f9b4ff1 100644
--- a/src/main/java/com/slcf/controller/WaitPakOutLogController.java
+++ b/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());
+ }
+ }
+
}
diff --git a/src/main/java/com/slcf/dao/WaitPakInLogDao.java b/src/main/java/com/slcf/dao/WaitPakInLogDao.java
index 1b9e259..e6a3eb0 100644
--- a/src/main/java/com/slcf/dao/WaitPakInLogDao.java
+++ b/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);
+
}
diff --git a/src/main/java/com/slcf/dao/WaitPakOutLogDao.java b/src/main/java/com/slcf/dao/WaitPakOutLogDao.java
index 89671b2..1acf606 100644
--- a/src/main/java/com/slcf/dao/WaitPakOutLogDao.java
+++ b/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);
+
}
diff --git a/src/main/java/com/slcf/service/WaitPakInLogService.java b/src/main/java/com/slcf/service/WaitPakInLogService.java
index 8e55f99..26855c6 100644
--- a/src/main/java/com/slcf/service/WaitPakInLogService.java
+++ b/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);
+
}
diff --git a/src/main/java/com/slcf/service/WaitPakOutLogService.java b/src/main/java/com/slcf/service/WaitPakOutLogService.java
index 2850907..edd5a29 100644
--- a/src/main/java/com/slcf/service/WaitPakOutLogService.java
+++ b/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);
+
}
diff --git a/src/main/java/com/slcf/service/impl/WaitPakInLogServiceImpl.java b/src/main/java/com/slcf/service/impl/WaitPakInLogServiceImpl.java
index 63e07ca..ea5773a 100644
--- a/src/main/java/com/slcf/service/impl/WaitPakInLogServiceImpl.java
+++ b/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;
}
}
-
-}
\ No newline at end of file
+
+ public void ExportWaitPakInLogList(WaitPakInLogCondition condition, HttpServletResponse response) {
+ //杈撳嚭Excel鏂囦欢
+ try {
+ //HSSFWorkbook瀵硅薄(excel鐨勬枃妗ｅ璞�)
+ HSSFWorkbook workBook=new HSSFWorkbook();
+
+ //sheet瀵硅薄锛坋xcel鐨勮〃鍗曪級
+ HSSFSheet sheet=workBook.createSheet("鍏ュ簱閫氱煡鍘嗗彶妗�");
+
+ //琛屾暟锛屽弬鏁颁负琛岀储寮�(excel鐨勮)
+// HSSFRow rowHead=sheet.createRow(0);//绗竴琛� 鍙互鏄�0锝�65535涔嬮棿鐨勪换浣曚竴涓�
+
+// //鍒涘缓excel鐨勫崟鍏冩牸锛屽弬鏁颁负鍒楃储寮曪紝鍙互鏄�0锝�255涔嬮棿鐨勪换浣曚竴涓�
+// HSSFCell cellOne=rowHead.createCell(0);
+// cellOne.setCellValue("鐢ㄦ埛淇℃伅");//琛ㄥご
+
+ //鍚堝苟鍗曞厓鏍糃ellRangeAddress鏋勯�犲弬鏁颁緷娆¤〃绀鸿捣濮嬭锛屾埅鑷宠锛岃捣濮嬪垪锛� 鎴嚦鍒�
+// 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();
+ }
+ }
+
+}
diff --git a/src/main/java/com/slcf/service/impl/WaitPakOutLogServiceImpl.java b/src/main/java/com/slcf/service/impl/WaitPakOutLogServiceImpl.java
index 891049d..04e840e 100644
--- a/src/main/java/com/slcf/service/impl/WaitPakOutLogServiceImpl.java
+++ b/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;
}
}
-
-}
\ No newline at end of file
+
+ public void ExportWaitPakOutLogList(WaitPakOutLogCondition condition, HttpServletResponse response) {
+ //杈撳嚭Excel鏂囦欢
+ try {
+ //HSSFWorkbook瀵硅薄(excel鐨勬枃妗ｅ璞�)
+ HSSFWorkbook workBook=new HSSFWorkbook();
+
+ //sheet瀵硅薄锛坋xcel鐨勮〃鍗曪級
+ HSSFSheet sheet=workBook.createSheet("鍑哄簱閫氱煡鍘嗗彶妗�");
+
+ //琛屾暟锛屽弬鏁颁负琛岀储寮�(excel鐨勮)
+// HSSFRow rowHead=sheet.createRow(0);//绗竴琛� 鍙互鏄�0锝�65535涔嬮棿鐨勪换浣曚竴涓�
+
+// //鍒涘缓excel鐨勫崟鍏冩牸锛屽弬鏁颁负鍒楃储寮曪紝鍙互鏄�0锝�255涔嬮棿鐨勪换浣曚竴涓�
+// HSSFCell cellOne=rowHead.createCell(0);
+// cellOne.setCellValue("鐢ㄦ埛淇℃伅");//琛ㄥご
+
+ //鍚堝苟鍗曞厓鏍糃ellRangeAddress鏋勯�犲弬鏁颁緷娆¤〃绀鸿捣濮嬭锛屾埅鑷宠锛岃捣濮嬪垪锛� 鎴嚦鍒�
+// 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();
+ }
+ }
+
+}
diff --git a/src/main/resources/mapper/WaitPakInLogMapper.xml b/src/main/resources/mapper/WaitPakInLogMapper.xml
index cd4a81f..96efd25 100644
--- a/src/main/resources/mapper/WaitPakInLogMapper.xml
+++ b/src/main/resources/mapper/WaitPakInLogMapper.xml
@@ -4,7 +4,7 @@
<mapper namespace="com.slcf.dao.WaitPakInLogDao">
<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
-<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>
\ No newline at end of file
+
+
+<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬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>
diff --git a/src/main/resources/mapper/WaitPakOutLogMapper.xml b/src/main/resources/mapper/WaitPakOutLogMapper.xml
index c68bc3a..16ac81d 100644
--- a/src/main/resources/mapper/WaitPakOutLogMapper.xml
+++ b/src/main/resources/mapper/WaitPakOutLogMapper.xml
@@ -4,7 +4,7 @@
<mapper namespace="com.slcf.dao.WaitPakOutLogDao">
<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
-<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>
\ No newline at end of file
+
+
+<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬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>
diff --git a/src/main/webapp/WEB-INF/pages/waitPakInLog.jsp b/src/main/webapp/WEB-INF/pages/waitPakInLog.jsp
index 1a4331b..4dece11 100644
--- a/src/main/webapp/WEB-INF/pages/waitPakInLog.jsp
+++ b/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>
\ No newline at end of file
+</html>
diff --git a/src/main/webapp/WEB-INF/pages/waitPakOutLog.jsp b/src/main/webapp/WEB-INF/pages/waitPakOutLog.jsp
index 8d6c421..39e4ad8 100644
--- a/src/main/webapp/WEB-INF/pages/waitPakOutLog.jsp
+++ b/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>
\ No newline at end of file
+</html>
diff --git a/src/main/webapp/jsFiles/waitPakInLog.js b/src/main/webapp/jsFiles/waitPakInLog.js
index 63f7970..00ee311 100644
--- a/src/main/webapp/jsFiles/waitPakInLog.js
+++ b/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");
-}
\ No newline at end of file
+}
+
+//瀵煎嚭
+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;
+ }
+}
diff --git a/src/main/webapp/jsFiles/waitPakOutLog.js b/src/main/webapp/jsFiles/waitPakOutLog.js
index ca33f05..1e91af7 100644
--- a/src/main/webapp/jsFiles/waitPakOutLog.js
+++ b/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");
-}
\ No newline at end of file
+}
+
+//瀵煎嚭
+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;
+ }
+}
--
Gitblit v1.9.1