diff --git a/WebContent/WEB-INF/view/part/tempPartList.jsp b/WebContent/WEB-INF/view/part/tempPartList.jsp
index f4a419f..2ec148b 100644
--- a/WebContent/WEB-INF/view/part/tempPartList.jsp
+++ b/WebContent/WEB-INF/view/part/tempPartList.jsp
@@ -470,11 +470,12 @@ $(function(){
-
+
+
-
+
@@ -489,7 +490,8 @@ $(function(){
| 원소재사이즈 |
도금 |
중량 |
- 등록일 |
+ 작성자 |
+ 등록일 |
상태 |
@@ -505,7 +507,7 @@ $(function(){
- | 조회된 데이터가 없습니다. |
+ 조회된 데이터가 없습니다. |
@@ -545,9 +547,10 @@ $(function(){
${item.THICKNESS} |
${item.PLATED} |
${item.WEIGHT} |
- ${item.SPRUE} |
+ ${item.SPRUE} |
+ ${item.WRITER_NAME} |
${item.REGDATE} |
- ${item.STATUS_STR} |
+ ${item.STATUS_STR} |
diff --git a/WebContent/WEB-INF/view/productionplanning/mBomMgmtList.jsp b/WebContent/WEB-INF/view/productionplanning/mBomMgmtList.jsp
index d5c64e2..a33e776 100644
--- a/WebContent/WEB-INF/view/productionplanning/mBomMgmtList.jsp
+++ b/WebContent/WEB-INF/view/productionplanning/mBomMgmtList.jsp
@@ -154,13 +154,22 @@ var columns = [
// 6. 접수일
{
- headerHozAlign: 'center',
+ headerHozAlign: 'center',
hozAlign: 'center',
width: 100,
title: '접수일',
field: 'RECEIPT_DATE'
},
-
+
+ // 6-1. 작성자
+ {
+ headerHozAlign: 'center',
+ hozAlign: 'center',
+ width: 90,
+ title: '작성자',
+ field: 'WRITER_NAME'
+ },
+
// 7. 고객사
{
headerHozAlign: 'center',
diff --git a/WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp b/WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp
index 84a853f..7636bda 100644
--- a/WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp
+++ b/WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp
@@ -100,9 +100,9 @@ var columns = [
columns:[
{headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '주문유형', field : 'CATEGORY_NAME', sorter:"string" },
{headerHozAlign : 'center', hozAlign : 'left', width : '90', title : '제품구분', field : 'PRODUCT_NAME', sorter:"string" },
- {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '국내/해외', field : 'AREA_NAME', sorter:"string" },
- {headerHozAlign : 'center', hozAlign : 'center', width : '90', title : '접수일', field : 'REG_DATE', sorter:"string" },
- {headerHozAlign : 'center', hozAlign : 'left', width : '120', title : '고객사', field : 'CUSTOMER_NAME', sorter:"string" },
+ {headerHozAlign : 'center', hozAlign : 'center', width : '90', title : '국내/해외', field : 'AREA_NAME', sorter:"string" },
+ {headerHozAlign : 'center', hozAlign : 'center', width : '90', title : '접수일', field : 'REG_DATE', sorter:"string" },
+ {headerHozAlign : 'center', hozAlign : 'left', width : '120', title : '고객사', field : 'CUSTOMER_NAME', sorter:"string" },
{headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '유/무상', field : 'FREE_OF_CHARGE', sorter:"string"},
{headerHozAlign : 'center', hozAlign : 'left', width : '150', title : '품번', field : 'PRODUCT_ITEM_CODE', sorter:"string" },
{headerHozAlign : 'center', hozAlign : 'left', width : '150', title : '품명', field : 'PRODUCT_ITEM_NAME', sorter:"string" },
diff --git a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp
index ebcc627..09f2a2e 100644
--- a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp
@@ -112,7 +112,9 @@ var columns = [
{headerHozAlign : 'center', hozAlign : 'left', minWidth : 180, widthGrow : 3, title : '품명', field : 'PART_NAME' },
{headerHozAlign : 'center', hozAlign : 'left', minWidth : 150, widthGrow : 2, title : '공급업체', field : 'PARTNER_NAME' },
{headerHozAlign : 'center', hozAlign : 'center', minWidth : 60, widthGrow : 0.6, title : '환종', field : 'CURRENCY_NAME' },
- {headerHozAlign : 'center', hozAlign : 'center', minWidth : 90, widthGrow : 1, title : '구매담당자', field : 'WRITER_NAME' },
+ {headerHozAlign : 'center', hozAlign : 'center', minWidth : 90, widthGrow : 1, title : '구매담당자', field : 'WRITER_NAME' },
+ {headerHozAlign : 'center', hozAlign : 'center', minWidth : 90, widthGrow : 1, title : '입고등록자', field : 'DELIVERY_WRITER_NAME' },
+ {headerHozAlign : 'center', hozAlign : 'center', minWidth : 90, widthGrow : 1, title : '입고등록일', field : 'DELIVERY_REGDATE' },
{headerHozAlign : 'center', hozAlign : 'right', minWidth : 90, widthGrow : 1, title : '발주수량', field : 'TOTAL_PO_QTY',
formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false }
},
diff --git a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptancePartList.jsp b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptancePartList.jsp
index 672842d..b84c292 100644
--- a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptancePartList.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptancePartList.jsp
@@ -130,7 +130,9 @@ var columns = [
{headerHozAlign:'center', hozAlign:'left', minWidth:120, widthGrow:1.2, title:'공급업체', field:'PARTNER_NAME'},
{headerHozAlign:'center', hozAlign:'center', minWidth:60, widthGrow:0.6, title:'환종', field:'CURRENCY_NAME'},
{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:0.8, title:'입고요청일', field:'DELIVERY_REQUEST_DATE'},
- {headerHozAlign : 'center', hozAlign : 'center', minWidth : 90, widthGrow : 1, title : '구매담당자', field : 'WRITER_NAME' },
+ {headerHozAlign : 'center', hozAlign : 'center', minWidth : 90, widthGrow : 1, title : '구매담당자', field : 'WRITER_NAME' },
+ {headerHozAlign:'center', hozAlign:'center', minWidth:90, widthGrow:1, title:'입고등록자', field:'DELIVERY_WRITER_NAME'},
+ {headerHozAlign:'center', hozAlign:'center', minWidth:90, widthGrow:1, title:'입고등록일', field:'DELIVERY_REGDATE'},
{headerHozAlign:'center', hozAlign:'right', minWidth:80, widthGrow:0.8, title:'발주수량', field:'ORDER_QTY',
formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false}
},
diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseCloseList.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseCloseList.jsp
index 2b661b1..4b4b809 100644
--- a/WebContent/WEB-INF/view/purchaseOrder/purchaseCloseList.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseCloseList.jsp
@@ -296,6 +296,7 @@ var columns = [
{headerHozAlign:'center', hozAlign:'center', minWidth:90, widthGrow:0.7, title:'입고일', field:'RECEIPT_DATE'},
//{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:0.8, title:'입고요청일', field:'DELIVERY_REQUEST_DATE'},
{headerHozAlign:'center', hozAlign:'center', minWidth:90, widthGrow:1, title:'구매담당자', field:'WRITER_NAME'},
+ {headerHozAlign:'center', hozAlign:'center', minWidth:90, widthGrow:1, title:'입고등록자', field:'DELIVERY_WRITER_NAME'},
// {headerHozAlign:'center', hozAlign:'right', minWidth:80, widthGrow:0.8, title:'발주수량', field:'ORDER_QTY',
// formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false}
// },
diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
index 8519201..050dd92 100644
--- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
@@ -381,7 +381,8 @@ var columns = [
}
},
{headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'발주일', field:'MAIL_SEND_DATE'},
- {headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'구매담당자', field:'WRITER_NAME'}
+ {headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'구매담당자', field:'WRITER_NAME'},
+ {headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'작성일', field:'REGDATE'}
];
function editCheck (cell) {
diff --git a/src/com/pms/mapper/part.xml b/src/com/pms/mapper/part.xml
index e6bdfea..3717e71 100644
--- a/src/com/pms/mapper/part.xml
+++ b/src/com/pms/mapper/part.xml
@@ -1265,8 +1265,9 @@
(SELECT OBJID FROM ATTACH_FILE_INFO WHERE UPPER(DOC_TYPE) = 'PART_CONVERT_2D' AND TARGET_OBJID = PART.OBJID AND UPPER(STATUS) = 'ACTIVE') AS CONVERT_2D_OBJID,
(SELECT OBJID FROM ATTACH_FILE_INFO WHERE UPPER(DOC_TYPE) = 'PART_CONVERT_3D' AND TARGET_OBJID = PART.OBJID AND UPPER(STATUS) = 'ACTIVE') AS CONVERT_3D_OBJID,
(SELECT REPLACE(FILE_PATH, '\', '\\') FILE_PATH FROM ATTACH_FILE_INFO WHERE TARGET_OBJID = PART.OBJID AND DOC_TYPE = 'PART_SHAPE' AND UPPER(STATUS) = 'ACTIVE') AS FILE_PATH,
- PART.IS_LAST,
+ PART.IS_LAST,
PART.WRITER,
+ (SELECT USER_NAME FROM USER_INFO WHERE USER_ID = PART.WRITER) AS WRITER_NAME,
PART.CAVITY,
PART.REMARKS,
PART.MOLD_CLASSIFICATION,
diff --git a/src/com/pms/mapper/productionplanning.xml b/src/com/pms/mapper/productionplanning.xml
index 49e9a2a..b5a1744 100644
--- a/src/com/pms/mapper/productionplanning.xml
+++ b/src/com/pms/mapper/productionplanning.xml
@@ -2893,6 +2893,12 @@
''
) AS AREA_NAME,
TO_CHAR(PM.REGDATE, 'YYYY-MM-DD') AS RECEIPT_DATE,
+ (SELECT user_name(MH.WRITER)
+ FROM MBOM_HEADER MH
+ WHERE MH.PROJECT_OBJID = PM.OBJID::VARCHAR
+ AND MH.STATUS = 'Y'
+ ORDER BY MH.REGDATE DESC
+ LIMIT 1) AS WRITER_NAME,
CM.CUSTOMER_OBJID,
COALESCE(
CASE WHEN CM.CUSTOMER_OBJID LIKE 'C_%' THEN (SELECT CLIENT_NM FROM CLIENT_MNG AS C WHERE 'C_' || C.OBJID::VARCHAR = CM.CUSTOMER_OBJID LIMIT 1) ELSE (SELECT SUPPLY_NAME FROM SUPPLY_MNG WHERE OBJID::VARCHAR = CM.CUSTOMER_OBJID::VARCHAR LIMIT 1) END,
diff --git a/src/com/pms/mapper/purchaseOrder.xml b/src/com/pms/mapper/purchaseOrder.xml
index 31aa039..5efdd6a 100644
--- a/src/com/pms/mapper/purchaseOrder.xml
+++ b/src/com/pms/mapper/purchaseOrder.xml
@@ -4460,6 +4460,8 @@ SELECT POM.OBJID
,POM.ORDER_TYPE_CD
,(SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = POM.ORDER_TYPE_CD) AS ORDER_TYPE_CD_NAME
,(SELECT user_name(RECEIVER_ID) FROM ARRIVAL_PLAN AP WHERE AP.parent_objid = POM.OBJID ORDER BY AP.RECEIPT_DATE desc LIMIT 1) AS CUR_RECEIVER_NAME
+ ,(SELECT user_name(WRITER) FROM ARRIVAL_PLAN AP WHERE AP.parent_objid = POM.OBJID AND AP.RECEIPT_QTY IS NOT NULL AND AP.RECEIPT_QTY::NUMERIC ]]> 0 ORDER BY AP.RECEIPT_DATE DESC LIMIT 1) AS DELIVERY_WRITER_NAME
+ ,(SELECT AP.RECEIPT_DATE FROM ARRIVAL_PLAN AP WHERE AP.parent_objid = POM.OBJID AND AP.RECEIPT_QTY IS NOT NULL AND AP.RECEIPT_QTY::NUMERIC ]]> 0 ORDER BY AP.RECEIPT_DATE DESC LIMIT 1) AS DELIVERY_REGDATE
,(SELECT COUNT(1) FROM ATTACH_FILE_INFO AF WHERE AF.TARGET_OBJID = POM.OBJID AND AF.DOC_TYPE = 'INSPECTION_FILE' AND UPPER(AF.STATUS) = 'ACTIVE') AS INSPECTION_FILE_CNT
,POM.PURCHASE_CLOSE_DATE
,(SELECT CC.CODE_NAME FROM COMM_CODE CC
@@ -6349,11 +6351,27 @@ FROM(
,(SELECT USER_NAME FROM USER_INFO WHERE USER_ID = POM.WRITER) AS WRITER_NAME
-
+
+
+ ,(SELECT user_name(AP.WRITER)
+ FROM ARRIVAL_PLAN AP
+ WHERE AP.PARENT_OBJID = POM.OBJID
+ AND AP.PART_OBJID = POP.PART_OBJID
+ AND AP.RECEIPT_QTY IS NOT NULL AND AP.RECEIPT_QTY::NUMERIC ]]> 0
+ ORDER BY AP.RECEIPT_DATE DESC LIMIT 1) AS DELIVERY_WRITER_NAME
+
+
+ ,(SELECT AP.RECEIPT_DATE
+ FROM ARRIVAL_PLAN AP
+ WHERE AP.PARENT_OBJID = POM.OBJID
+ AND AP.PART_OBJID = POP.PART_OBJID
+ AND AP.RECEIPT_QTY IS NOT NULL AND AP.RECEIPT_QTY::NUMERIC ]]> 0
+ ORDER BY AP.RECEIPT_DATE DESC LIMIT 1) AS DELIVERY_REGDATE
+
,(SELECT CC.CODE_NAME FROM COMM_CODE CC
WHERE CC.CODE_ID = POP.CURRENCY) AS CURRENCY_NAME
-
+
,COALESCE(POP.ORDER_QTY::NUMERIC, 0) AS ORDER_QTY
@@ -6575,6 +6593,9 @@ FROM(
,(SELECT USER_NAME FROM USER_INFO WHERE USER_ID = POM.WRITER) AS WRITER_NAME
+
+ ,user_name(AP.WRITER) AS DELIVERY_WRITER_NAME
+
,(SELECT CC.CODE_NAME FROM COMM_CODE CC
WHERE CC.CODE_ID = POP.CURRENCY) AS CURRENCY_NAME