chpark/wace_plm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

엑셀다운로드도 출하일 외 여러건

Browse Source
This commit is contained in:
leeheejin
2025-11-13 17:40:11 +09:00
parent 6432bab110
commit 08f5ba1cdb
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
View File

@@ -102,19 +102,28 @@
// 현재 그리드 데이터 백업
var currentData = _tabulGrid.getData();
console.log("=== 엑셀 다운로드 디버그 ===");
console.log("첫 번째 행 데이터:", currentData[0]);
console.log("SHIPPING_DATE:", currentData[0].SHIPPING_DATE);
console.log("SHIPPING_DATE_WITH_COUNT:", currentData[0].SHIPPING_DATE_WITH_COUNT);
// 엑셀용 데이터 가공: 출하일을 분할출하 정보 포함하여 표시
var excelData = currentData.map(function(row) {
var excelRow = Object.assign({}, row);
// 출하일 가공: SHIPPING_DATE_WITH_COUNT 값을 SHIPPING_DATE에 덮어쓰기
// 예: "2025-10-20외1" 형식
if(excelRow.SHIPPING_DATE_WITH_COUNT) {
// 예: "2025-10-20 외 1건" 형식
if(excelRow.SHIPPING_DATE_WITH_COUNT && excelRow.SHIPPING_DATE_WITH_COUNT.trim() !== '') {
console.log("출하일 변경:", excelRow.SHIPPING_DATE, "→", excelRow.SHIPPING_DATE_WITH_COUNT);
excelRow.SHIPPING_DATE = excelRow.SHIPPING_DATE_WITH_COUNT;
}
return excelRow;
});
console.log("가공된 첫 번째 행:", excelData[0]);
console.log("가공된 SHIPPING_DATE:", excelData[0].SHIPPING_DATE);
// 엑셀용 데이터로 임시 설정
_tabulGrid.setData(excelData);
@@ -243,15 +252,15 @@ var columns = [
{headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '발주일', field : 'ORDER_DATE'},
{headerHozAlign : 'center', hozAlign : 'center', width : '120', title : '발주번호', field : 'PO_NO'},
{headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '요청납기', field : 'REQUEST_DATE'},
{headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '출하일', field : 'SHIPPING_DATE',
{headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '출하일', field : 'SHIPPING_DATE_WITH_COUNT',
formatter: function(cell) {
var data = cell.getRow().getData();
// SHIPPING_DATE_WITH_COUNT가 있으면 사용 (예: "2025-10-20외1")
if(data.SHIPPING_DATE_WITH_COUNT && data.SHIPPING_DATE_WITH_COUNT.trim() !== '') {
return data.SHIPPING_DATE_WITH_COUNT;
var value = cell.getValue();
// SHIPPING_DATE_WITH_COUNT가 비어있으면 SHIPPING_DATE 사용
if(!value || value.trim() === '') {
var data = cell.getRow().getData();
return data.SHIPPING_DATE || '';
}
// 없으면 기본 SHIPPING_DATE 사용
return cell.getValue() || '';
return value;
},
cellClick: function(e, cell) {
var projectNo = cell.getRow().getData().PROJECT_NO;