From 55b36b1279fd11feafde05a65ec835f55aa89850 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 27 十二月 2021 13:23:25 +0800
Subject: [PATCH] #
---
src/main/java/com/slcf/controller/StockController.java | 10 +-
src/main/java/com/slcf/service/WaitPakOutService.java | 5 +
src/main/java/com/slcf/service/impl/WaitPakOutServiceImpl.java | 133 ++++++++++++++++++++++----
src/main/java/com/slcf/service/impl/WaitCheckServiceImpl.java | 12 ++
version/db/klsasrs20211227.bak | 0
src/main/java/com/slcf/service/WaitCheckService.java | 2
version/db/20210607/klasrs.rar | 0
src/main/resources/jdbc.properties | 18 +-
src/main/java/com/slcf/filter/UpdateThread.java | 2
src/main/webapp/jsFiles/waitPakOut.js | 13 ++
src/main/java/com/slcf/controller/AsrsController.java | 13 +-
version/db/20210626/klasrs.rar | 0
version/wcs/KLS_WCS20211227.rar | 0
src/main/java/com/slcf/controller/WaitPakOutController.java | 25 +++++
src/main/java/com/slcf/dao/WaitCheckDao.java | 8 +
src/main/webapp/WEB-INF/pages/waitPakOut.jsp | 9 +
src/main/java/com/slcf/dao/WaitPakOutDao.java | 8 +
src/main/resources/mapper/WaitPakOutMapper.xml | 16 +++
18 files changed, 231 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/slcf/controller/AsrsController.java b/src/main/java/com/slcf/controller/AsrsController.java
index ee764f2..fec6616 100644
--- a/src/main/java/com/slcf/controller/AsrsController.java
+++ b/src/main/java/com/slcf/controller/AsrsController.java
@@ -16,6 +16,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.slcf.pojo.*;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -26,11 +27,6 @@
import org.springframework.web.bind.annotation.ResponseBody;
import com.slcf.erp.ErpBean;
-import com.slcf.pojo.LocDetailBean;
-import com.slcf.pojo.LocationBean;
-import com.slcf.pojo.WaitCheckBean;
-import com.slcf.pojo.WaitPakInBean;
-import com.slcf.pojo.WaitPakOutBean;
import com.slcf.service.LocDetailService;
import com.slcf.service.LocationService;
import com.slcf.service.WaitCheckService;
@@ -676,7 +672,8 @@
String loc_no=job.get("lgpla").toString();
LocationBean locBean = locationService.queryLocationById(loc_no);
- if(locBean==null || !locBean.getLoc_sts().equals("F")) {
+ WaitCheckBean waitCheckBean = waitCheckService.getWaitCheckByLoc(loc_no);
+ if(locBean==null || (!locBean.getLoc_sts().equals("F") && null == waitCheckBean)) {
jsonRet.put("lgnum", job.get("lgnum").toString());
jsonRet.put("ivnum", job.get("ivnum").toString());
jsonRet.put("ivpos", job.get("ivpos").toString());
@@ -709,7 +706,9 @@
waitCheck.setLgtyp(job.get("lgtyp").toString());
waitCheck.setLgpla(job.get("lgpla").toString());
- int result = waitCheckService.insertWaitCheck(waitCheck);
+// if(null == waitCheckBean) {
+ int result = waitCheckService.insertWaitCheck(waitCheck);
+// }
jsonRet.put("lgnum", job.get("lgnum").toString());
jsonRet.put("ivnum", job.get("ivnum").toString());
diff --git a/src/main/java/com/slcf/controller/StockController.java b/src/main/java/com/slcf/controller/StockController.java
index 02de680..741c1bd 100644
--- a/src/main/java/com/slcf/controller/StockController.java
+++ b/src/main/java/com/slcf/controller/StockController.java
@@ -55,7 +55,7 @@
SysLogService sysLogService;
@Autowired
RoleService roleService;
-
+
Logger logger=Logger.getLogger(StockController.class);
@RequestMapping("/goStock.action")
@@ -82,8 +82,6 @@
/**
* 鍒嗛〉鏌ヨ鎵�鏈�
- * @param pageNumber
- * @param pageSize
* @return
*/
@ResponseBody
@@ -95,8 +93,6 @@
/**
* 鍒嗛〉鏌ヨ鎵�鏈�
- * @param pageNumber
- * @param pageSize
* @return
*/
@ResponseBody
@@ -308,6 +304,10 @@
locDetl.setWerks(werks);
locDetl.setAnfme(gesme);
locDetl.setAltme(altme);
+ if(barcode == null || "".equals(barcode)) {
+ LocationBean locationBean = locationService.queryLocationById(loc_no);
+ barcode = locationBean.getBarcode();
+ }
locDetl.setZpallet(barcode);
locDetl.setBname("");
result = locDetailService.insertLocDetail(locDetl);
diff --git a/src/main/java/com/slcf/controller/WaitPakOutController.java b/src/main/java/com/slcf/controller/WaitPakOutController.java
index d4ded6b..14fec83 100644
--- a/src/main/java/com/slcf/controller/WaitPakOutController.java
+++ b/src/main/java/com/slcf/controller/WaitPakOutController.java
@@ -12,7 +12,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.slcf.bean.WaitPakOutLogCondition;
import com.slcf.controller.param.SetEmsParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -734,4 +736,27 @@
return map;
}
+ /**
+ * 瀵煎嚭鎵�鏈�
+ * @param response
+ */
+ @RequestMapping("/exportWaitPakOut.action")
+ public void ExportExcel(WaitPakOutCondition waitPakOutCondition, HttpServletResponse response, HttpServletRequest request){
+ try {
+ waitPakOutService.ExportWaitPakOutList(waitPakOutCondition,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("exportWaitPakOut.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/WaitCheckDao.java b/src/main/java/com/slcf/dao/WaitCheckDao.java
index 6e4494e..1603a87 100644
--- a/src/main/java/com/slcf/dao/WaitCheckDao.java
+++ b/src/main/java/com/slcf/dao/WaitCheckDao.java
@@ -72,4 +72,12 @@
@Select("select * from cust_wait_check a left join bas_mat_code b on a.mat_no=b.mat_no "
+ "where barcode=#{barcode} order by sheet_no,a.mat_no desc")
public List<WaitCheckBean> getApiWaitCheckList(@Param("barcode")String barcode);
+
+ /**
+ * 鏌ヨ淇℃伅
+ * @param
+ * @return
+ */
+ @Select("select * from cust_wait_check where lgpla=#{locNo}")
+ public WaitCheckBean getWaitCheckByLoc(@Param("locNo")String locNo);
}
diff --git a/src/main/java/com/slcf/dao/WaitPakOutDao.java b/src/main/java/com/slcf/dao/WaitPakOutDao.java
index fedf22f..1904814 100644
--- a/src/main/java/com/slcf/dao/WaitPakOutDao.java
+++ b/src/main/java/com/slcf/dao/WaitPakOutDao.java
@@ -2,6 +2,8 @@
import java.util.List;
+import com.slcf.bean.WaitPakOutLogCondition;
+import com.slcf.pojo.WaitPakOutLogBean;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
@@ -127,4 +129,10 @@
*/
@Select("select top 1 * from cust_wait_pakout where status='Y' and io_status='N' and action=2 and prnstatus=1 order by io_status desc,modi_time asc")
public WaitPakOutBean getWaitPakOutPrint();
+
+ /**
+ * 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ * @return
+ */
+ public List<WaitPakOutBean> getWaitPakOutAll(WaitPakOutCondition condition);
}
diff --git a/src/main/java/com/slcf/filter/UpdateThread.java b/src/main/java/com/slcf/filter/UpdateThread.java
index dc86fc9..246c83f 100644
--- a/src/main/java/com/slcf/filter/UpdateThread.java
+++ b/src/main/java/com/slcf/filter/UpdateThread.java
@@ -79,7 +79,7 @@
// 娓呯┖2澶╁墠鐨勬棩蹇�
sapRequestLogService.clearSapLog();
// updateWaitCheckData();
- Thread.sleep(5000);
+ Thread.sleep(15000);
} catch (InterruptedException e) {
e.printStackTrace();
}
diff --git a/src/main/java/com/slcf/service/WaitCheckService.java b/src/main/java/com/slcf/service/WaitCheckService.java
index 0c664fc..b37960b 100644
--- a/src/main/java/com/slcf/service/WaitCheckService.java
+++ b/src/main/java/com/slcf/service/WaitCheckService.java
@@ -51,4 +51,6 @@
* @return
*/
public List<WaitCheckBean> getApiWaitCheckList(String barcode);
+
+ public WaitCheckBean getWaitCheckByLoc(String locNo);
}
diff --git a/src/main/java/com/slcf/service/WaitPakOutService.java b/src/main/java/com/slcf/service/WaitPakOutService.java
index 26557ae..e179ca7 100644
--- a/src/main/java/com/slcf/service/WaitPakOutService.java
+++ b/src/main/java/com/slcf/service/WaitPakOutService.java
@@ -4,8 +4,11 @@
import java.util.Map;
import com.slcf.bean.WaitPakOutCondition;
+import com.slcf.bean.WaitPakOutLogCondition;
import com.slcf.controller.param.SetEmsParam;
import com.slcf.pojo.WaitPakOutBean;
+
+import javax.servlet.http.HttpServletResponse;
/**
* 鍑洪�氱煡妗ｆ帴鍙�
@@ -65,4 +68,6 @@
public WaitPakOutBean queryWaitPakOutFnh();
public WaitPakOutBean getWaitPakOutPrint();
+
+ public void ExportWaitPakOutList(WaitPakOutCondition condition, HttpServletResponse response);
}
diff --git a/src/main/java/com/slcf/service/impl/WaitCheckServiceImpl.java b/src/main/java/com/slcf/service/impl/WaitCheckServiceImpl.java
index 057b4ff..3777f52 100644
--- a/src/main/java/com/slcf/service/impl/WaitCheckServiceImpl.java
+++ b/src/main/java/com/slcf/service/impl/WaitCheckServiceImpl.java
@@ -148,4 +148,16 @@
return null;
}
}
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ */
+ public WaitCheckBean getWaitCheckByLoc(String locNo) {
+ try {
+ return waitCheckDao.getWaitCheckByLoc(locNo);
+ }catch(Exception e) {
+ System.out.println(e.getMessage());
+ return null;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/slcf/service/impl/WaitPakOutServiceImpl.java b/src/main/java/com/slcf/service/impl/WaitPakOutServiceImpl.java
index b4cce8d..2c7e77b 100644
--- a/src/main/java/com/slcf/service/impl/WaitPakOutServiceImpl.java
+++ b/src/main/java/com/slcf/service/impl/WaitPakOutServiceImpl.java
@@ -1,11 +1,19 @@
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.bean.WaitPakOutLogCondition;
import com.slcf.controller.param.SetEmsParam;
+import com.slcf.pojo.WaitPakOutLogBean;
+import com.slcf.util.DateTimeUtil;
import org.apache.ibatis.annotations.Param;
+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;
import org.springframework.transaction.annotation.Transactional;
@@ -18,6 +26,8 @@
import com.slcf.pojo.WorkMastBean;
import com.slcf.service.WaitPakOutService;
+import javax.servlet.http.HttpServletResponse;
+
/**
* 鍏ュ簱閫氱煡妗ｆ帴鍙ｅ疄鐜�
* @author admin
@@ -27,7 +37,7 @@
public class WaitPakOutServiceImpl implements WaitPakOutService {
@Autowired
- WaitPakOutDao WaitPakOutDao;
+ WaitPakOutDao waitPakOutDao;
@Autowired
WorkFileDao workFileDao;
@@ -37,7 +47,7 @@
public int insertWaitPakOut(WaitPakOutBean waitPakOut) {
int result=0;
try {
- result=WaitPakOutDao.insertWaitPakOut(waitPakOut);
+ result=waitPakOutDao.insertWaitPakOut(waitPakOut);
}catch(Exception e) {
System.out.println(e.getMessage());
}
@@ -63,8 +73,8 @@
public Map<String,Object> queryWaitPakOutList(WaitPakOutCondition waitPakOutCon) {
try {
Map<String,Object> map=new HashMap<String, Object>();
- List<WaitPakOutBean> list=WaitPakOutDao.queryWaitPakOutList(waitPakOutCon);
- int count =WaitPakOutDao.getWaitPakOutCount(waitPakOutCon);
+ List<WaitPakOutBean> list=waitPakOutDao.queryWaitPakOutList(waitPakOutCon);
+ int count =waitPakOutDao.getWaitPakOutCount(waitPakOutCon);
map.put("rows", list);
map.put("total", count);
return map;
@@ -83,15 +93,15 @@
// }
public Integer waitPakOutSetEms(SetEmsParam setEmsParam) {
- return WaitPakOutDao.waitPakOutSetEms(setEmsParam.getLgnum(), setEmsParam.getTanum(), setEmsParam.getTapos());
+ return waitPakOutDao.waitPakOutSetEms(setEmsParam.getLgnum(), setEmsParam.getTanum(), setEmsParam.getTapos());
}
public Integer countEmsNum() {
- return WaitPakOutDao.countEmsNum();
+ return waitPakOutDao.countEmsNum();
}
public List<WaitPakOutBean> queryWaitOutPak(String vlpla, String matnr) {
- return WaitPakOutDao.queryWaitOutPak(vlpla, matnr);
+ return waitPakOutDao.queryWaitOutPak(vlpla, matnr);
}
/**
@@ -99,7 +109,7 @@
*/
public WaitPakOutBean queryWaitPakOutById(String sheet_no,String mat_no) {
try {
- return WaitPakOutDao.getWaitPakOutById(sheet_no,mat_no);
+ return waitPakOutDao.getWaitPakOutById(sheet_no,mat_no);
}catch(Exception e) {
System.out.println(e.getMessage());
return null;
@@ -111,7 +121,7 @@
*/
public WaitPakOutBean queryWaitPakOutByLocNo(String loc_no) {
try {
- return WaitPakOutDao.getWaitPakOutByLocNo(loc_no);
+ return waitPakOutDao.getWaitPakOutByLocNo(loc_no);
}catch(Exception e) {
System.out.println(e.getMessage());
return null;
@@ -123,7 +133,7 @@
*/
public WaitPakOutBean queryWaitPakOutByMatNo(String mat_no) {
try {
- return WaitPakOutDao.getWaitPakOutByMatNo(mat_no);
+ return waitPakOutDao.getWaitPakOutByMatNo(mat_no);
}catch(Exception e) {
System.out.println(e.getMessage());
return null;
@@ -134,7 +144,7 @@
public int upWaitPakOut(WaitPakOutBean WaitPakOut, int type) {
int result=0;
try {
- result=WaitPakOutDao.upWaitPakOut(WaitPakOut);
+ result=waitPakOutDao.upWaitPakOut(WaitPakOut);
// if(type==2) {
// //濡傛灉宸ヤ綔妗ｆ湁鏁版嵁锛岃皟鏁村伐浣滄。浼樺厛绾�
// WorkDetailBean workDetail = workFileDao.getWorkDetlByMatNo(WaitPakOut.getMat_no());
@@ -158,7 +168,7 @@
public int upWaitPakOutByLocNo(WaitPakOutBean WaitPakOut) {
int result=0;
try {
- result=WaitPakOutDao.upWaitPakOutByLocNo(WaitPakOut);
+ result=waitPakOutDao.upWaitPakOutByLocNo(WaitPakOut);
}catch(Exception e) {
System.out.println(e.getMessage());
}
@@ -171,7 +181,7 @@
public int delWaitPakOut(WaitPakOutBean WaitPakOut) {
int result=0;
try {
- result=WaitPakOutDao.delWaitPakOutById(WaitPakOut);
+ result=waitPakOutDao.delWaitPakOutById(WaitPakOut);
}catch(Exception e) {
System.out.println(e.getMessage());
}
@@ -184,7 +194,7 @@
*/
public List<WaitPakOutBean> getWaitPakOutList() {
try {
- return WaitPakOutDao.getWaitPakOutList();
+ return waitPakOutDao.getWaitPakOutList();
}catch(Exception e) {
System.out.println(e.getMessage());
return null;
@@ -199,8 +209,8 @@
public int moveToLog(WaitPakOutBean WaitPakOut) {
int result=0;
try {
- result=WaitPakOutDao.insertLog(WaitPakOut);
- result=WaitPakOutDao.delWaitPakOutById(WaitPakOut);
+ result=waitPakOutDao.insertLog(WaitPakOut);
+ result=waitPakOutDao.delWaitPakOutById(WaitPakOut);
}catch(Exception e) {
System.out.println(e.getMessage());
}
@@ -213,7 +223,7 @@
*/
public List<WaitPakOutBean> getSheetNoList() {
try {
- return WaitPakOutDao.getSheetNoList();
+ return waitPakOutDao.getSheetNoList();
}catch(Exception e) {
System.out.println(e.getMessage());
return null;
@@ -225,7 +235,7 @@
*/
public WaitPakOutBean queryWaitPakOutByNum(WaitPakOutBean waitPakOutBean) {
try {
- return WaitPakOutDao.getWaitPakOutByNum(waitPakOutBean);
+ return waitPakOutDao.getWaitPakOutByNum(waitPakOutBean);
}catch(Exception e) {
System.out.println(e.getMessage());
return null;
@@ -237,7 +247,7 @@
*/
public WaitPakOutBean queryWaitPakOutFnh() {
try {
- return WaitPakOutDao.getWaitPakOutFnh();
+ return waitPakOutDao.getWaitPakOutFnh();
}catch(Exception e) {
System.out.println(e.getMessage());
return null;
@@ -249,10 +259,93 @@
*/
public WaitPakOutBean getWaitPakOutPrint() {
try {
- return WaitPakOutDao.getWaitPakOutPrint();
+ return waitPakOutDao.getWaitPakOutPrint();
}catch(Exception e) {
System.out.println(e.getMessage());
return null;
}
}
+
+ public void ExportWaitPakOutList(WaitPakOutCondition 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));
+ sheet.setColumnWidth(13, (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");
+ rows.createCell(13).setCellValue("淇敼鏃堕棿");
+
+ List<WaitPakOutBean> list=waitPakOutDao.getWaitPakOutAll(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());
+ row.createCell(13).setCellValue(list.get(i).getModi_time());
+ }
+// //杈撳嚭Excel鏂囦欢
+// try {
+ OutputStream output=response.getOutputStream();
+ response.reset();
+ response.setHeader("Content-disposition", "attachment; filename=WaitPakOut"+ DateTimeUtil.getStringDateTime(14)+".xls");
+ response.setContentType("application/msexcel");
+ workBook.write(output);
+ output.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
\ No newline at end of file
diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
index 20070d7..8769157 100644
--- a/src/main/resources/jdbc.properties
+++ b/src/main/resources/jdbc.properties
@@ -1,14 +1,14 @@
##Production Env
-jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-jdbc.url=jdbc:sqlserver://172.20.177.10:1433;databaseName=klsasrs
-jdbc.username=asrs
-jdbc.password=klsasrs@zy
-
-#Local Env
#jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-#jdbc.url=jdbc:sqlserver://127.0.0.1:1433;databaseName=klsasrs
-#jdbc.username=sa
-#jdbc.password=sa@123
+#jdbc.url=jdbc:sqlserver://172.20.177.10:1433;databaseName=klsasrs
+#jdbc.username=asrs
+#jdbc.password=klsasrs@zy
+
+Local Env
+jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
+jdbc.url=jdbc:sqlserver://127.0.0.1:1433;databaseName=klsasrs
+jdbc.username=sa
+jdbc.password=sa@123
##Develop Env
#jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
diff --git a/src/main/resources/mapper/WaitPakOutMapper.xml b/src/main/resources/mapper/WaitPakOutMapper.xml
index af471a0..7868cc3 100644
--- a/src/main/resources/mapper/WaitPakOutMapper.xml
+++ b/src/main/resources/mapper/WaitPakOutMapper.xml
@@ -59,4 +59,20 @@
<include refid="WaitPakOutConditionSql"></include>
</where>
</select>
+
+ <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+ <select id="getWaitPakOutAll" parameterType="com.slcf.bean.WaitPakOutCondition" resultType="com.slcf.pojo.WaitPakOutBean">
+ select a.*
+ from cust_wait_pakout a
+ <where>
+ <![CDATA[
+1=1
+]]>
+ <include refid="WaitPakOutConditionSql"></include>
+ <![CDATA[
+order by a.appe_time desc
+]]>
+ </where>
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/pages/waitPakOut.jsp b/src/main/webapp/WEB-INF/pages/waitPakOut.jsp
index ff0c936..dcb25cb 100644
--- a/src/main/webapp/WEB-INF/pages/waitPakOut.jsp
+++ b/src/main/webapp/WEB-INF/pages/waitPakOut.jsp
@@ -64,12 +64,19 @@
<div class="table-responsive">
<!-- <div style="overflow:scroll;"> -->
<!-- <table id="test-table" class="table table-hover table-striped table-condensed table-bordered"></table> -->
- <button type="button" onclick="emsBtn()" class="btn btn-danger">绱ф��</button>
+<%-- <button type="button" onclick="emsBtn()" class="btn btn-danger">绱ф��</button>--%>
+
<table id="test-table" class="table table-hover text-nowrap"></table>
</div>
<!--toolbar -->
<div id="toolbar" class="btn-toolbar">
+ <button onclick="emsBtn()" type="button" class="btn btn-danger">
+ <span class="glyphicon glyphicon-paste" aria-hidden="true" >绱ф��</span>
+ </button>
+ <button onclick="ExportExcel()" type="button" class="btn btn-success">
+ <span class="glyphicon glyphicon-paste" aria-hidden="true" >瀵煎嚭</span>
+ </button>
<!-- <button id="addButton" onclick="addWaitPakOut()" type="button" class="btn btn-success"> -->
<!-- <span class="glyphicon glyphicon-pencil" aria-hidden="true">娣诲姞</span> -->
<!-- </button> -->
diff --git a/src/main/webapp/jsFiles/waitPakOut.js b/src/main/webapp/jsFiles/waitPakOut.js
index 49ef901..3fb798e 100644
--- a/src/main/webapp/jsFiles/waitPakOut.js
+++ b/src/main/webapp/jsFiles/waitPakOut.js
@@ -785,4 +785,17 @@
}
});
}
+}
+
+//瀵煎嚭
+function ExportExcel(){
+ if(confirm("纭瀵煎嚭excel锛�")){
+ var url = "work/exportWaitPakOut.action?";
+ url += "matnr=" + $("#search_sheet_no").val();
+ url += "&maktx=" + $("#search_mat_no").val();
+ url += "&loc_no=" + $("#loc_no").val();
+ location.href=url;
+ }else{
+ return false;
+ }
}
\ No newline at end of file
diff --git a/version/sql/20210607/klasrs.rar b/version/db/20210607/klasrs.rar
similarity index 100%
rename from version/sql/20210607/klasrs.rar
rename to version/db/20210607/klasrs.rar
Binary files differ
diff --git a/version/sql/20210626/klasrs.rar b/version/db/20210626/klasrs.rar
similarity index 100%
rename from version/sql/20210626/klasrs.rar
rename to version/db/20210626/klasrs.rar
Binary files differ
diff --git a/version/db/klsasrs20211227.bak b/version/db/klsasrs20211227.bak
new file mode 100644
index 0000000..3c2558b
--- /dev/null
+++ b/version/db/klsasrs20211227.bak
Binary files differ
diff --git a/version/wcs/KLS_WCS20211227.rar b/version/wcs/KLS_WCS20211227.rar
new file mode 100644
index 0000000..7039485
--- /dev/null
+++ b/version/wcs/KLS_WCS20211227.rar
Binary files differ
--
Gitblit v1.9.1