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:37:17 +09:00
parent 67f694be65
commit 6432bab110
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
View File

@@ -912,10 +912,10 @@
CASE
WHEN COUNT(DISTINCT shipping_date) = 0 THEN ''
WHEN COUNT(DISTINCT shipping_date) = 1 THEN TO_CHAR(MIN(shipping_date), 'YYYY-MM-DD')
ELSE TO_CHAR(MIN(shipping_date), 'YYYY-MM-DD') || '외' || (COUNT(DISTINCT shipping_date) - 1)::TEXT
ELSE TO_CHAR(MIN(shipping_date), 'YYYY-MM-DD') || ' 외 ' || (COUNT(DISTINCT shipping_date) - 1)::TEXT || '건'
END
FROM shipment_log
WHERE target_objid = T.OBJID::VARCHAR
WHERE target_objid = T.PROJECT_NO
AND shipping_date IS NOT NULL
AND UPPER(COALESCE(shipping_status, '')) != 'CANCELLED'),
COALESCE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), '')

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

@@ -244,6 +244,15 @@ var columns = [
{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',
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;
}
// 없으면 기본 SHIPPING_DATE 사용
return cell.getValue() || '';
},
cellClick: function(e, cell) {
var projectNo = cell.getRow().getData().PROJECT_NO;
if(projectNo) {

4
src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
View File

@@ -912,10 +912,10 @@
CASE
WHEN COUNT(DISTINCT shipping_date) = 0 THEN ''
WHEN COUNT(DISTINCT shipping_date) = 1 THEN TO_CHAR(MIN(shipping_date), 'YYYY-MM-DD')
ELSE TO_CHAR(MIN(shipping_date), 'YYYY-MM-DD') || '외' || (COUNT(DISTINCT shipping_date) - 1)::TEXT
ELSE TO_CHAR(MIN(shipping_date), 'YYYY-MM-DD') || ' 외 ' || (COUNT(DISTINCT shipping_date) - 1)::TEXT || '건'
END
FROM shipment_log
WHERE target_objid = T.OBJID::VARCHAR
WHERE target_objid = T.PROJECT_NO
AND shipping_date IS NOT NULL
AND UPPER(COALESCE(shipping_status, '')) != 'CANCELLED'),
COALESCE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), '')