diff --git a/WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp b/WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp
index d0a86e4..b8ceb9e 100644
--- a/WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp
+++ b/WebContent/WEB-INF/view/partMng/structurePopupLeft.jsp
@@ -17,6 +17,13 @@
#structureTableWrap1 {
top: 56px;
width: 99%;
+ height: calc(100vh - 80px);
+ display: flex;
+ flex-direction: column;
+}
+#structureGrid {
+ flex: 1;
+ min-height: 200px;
}
#structureName {
margin-bottom: 10px;
@@ -292,7 +299,7 @@ function fn_initGrid() {
_tabulGrid = new Tabulator("#structureGrid", {
layout: "fitColumns",
- height: "650px",
+ height: "100%",
pagination: false,
headerSort: false, // 정렬 비활성화
columns: columns,
diff --git a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp
index d7e2004..823e697 100644
--- a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp
@@ -105,17 +105,11 @@ var columns = [
{headerHozAlign : 'center', hozAlign : 'right', minWidth : 90, widthGrow : 1, title : '미입고수량', field : 'NON_DELIVERY_QTY',
formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false }
},
- {headerHozAlign : 'center', hozAlign : 'center', minWidth : 100, widthGrow : 1, title : '검사성적서', field : 'INSPECTION_FILE',
- formatter: function(cell, formatterParams, onRendered){
- var fileYn = fnc_checkNull(cell.getValue());
- if(fileYn === 'Y'){
- return '';
- }
- return '';
- },
- cellClick:function(e, cell){
- var objId = fnc_checkNull(cell.getData().OBJID);
- fn_openInspectionFilePopUp(objId);
+ {headerHozAlign : 'center', hozAlign : 'center', minWidth : 100, widthGrow : 1, title : '검사성적서', field : 'INSPECTION_FILE_CNT',
+ formatter:fnc_subInfoValueFormatter,
+ cellClick:function(e, cell){
+ var objid = fnc_checkNull(cell.getData().OBJID);
+ fn_FileRegist(objid,"INSPECTION_FILE","검사성적서");
}
},
{headerHozAlign : 'center', hozAlign : 'center', minWidth : 90, widthGrow : 1, title : '입고결과', field : 'DELIVERY_STATUS',
@@ -295,12 +289,18 @@ function fn_openProposalPopUp(proposalObjId){
window.open(url, "proposalFormPopUp", "width="+popup_width+",height="+popup_height+",scrollbars=yes,resizable=yes");
}
-// 검사성적서 파일 팝업
-function fn_openInspectionFilePopUp(objId){
- var popup_width = 700;
- var popup_height = 500;
- var url = "/common/FileRegistPopup.do?docType=INSPECTION_FILE&targetObjId=" + objId + "&docTypeName=검사성적서";
- window.open(url, "inspectionFilePopUp", "width="+popup_width+",height="+popup_height+",scrollbars=yes,resizable=yes");
+// 첨부파일 팝업
+function fn_FileRegist(objId, docType, docTypeName){
+ var popup_width = 800;
+ var popup_height = 300;
+
+ var objId = objId;
+ var docType = docType;
+ var docTypeName = docTypeName;
+ var params = "?targetObjId="+objId+"&docType="+docType+"&docTypeName="+docTypeName;
+ var url = "/projectConcept/FileRegistPopup.do"+params;
+
+ fn_centerPopup(popup_width, popup_height, url);
}
diff --git a/src/com/pms/common/utils/CommonUtils.java b/src/com/pms/common/utils/CommonUtils.java
index 0bb7cc4..de016f5 100644
--- a/src/com/pms/common/utils/CommonUtils.java
+++ b/src/com/pms/common/utils/CommonUtils.java
@@ -1751,7 +1751,8 @@ public class CommonUtils {
zos = new ZipOutputStream(new FileOutputStream(zipFile));
for(HashMap hm_f : fileList){
- String filePath = CommonUtils.checkNull(hm_f.get(Constants.Db.COL_FILE_PATH)) +"\\"+ CommonUtils.checkNull(hm_f.get(Constants.Db.COL_FILE_SAVED_NAME));
+ // OS에 맞는 경로 구분자 사용
+ String filePath = CommonUtils.checkNull(hm_f.get(Constants.Db.COL_FILE_PATH)) + File.separator + CommonUtils.checkNull(hm_f.get(Constants.Db.COL_FILE_SAVED_NAME));
String fileName = CommonUtils.checkNull(hm_f.get(Constants.Db.COL_FILE_REAL_NAME));
File _f = new File(filePath);
diff --git a/src/com/pms/mapper/purchaseOrder.xml b/src/com/pms/mapper/purchaseOrder.xml
index 1a8f21f..ad07671 100644
--- a/src/com/pms/mapper/purchaseOrder.xml
+++ b/src/com/pms/mapper/purchaseOrder.xml
@@ -3688,7 +3688,7 @@ SELECT OBJID
, FILE_SIZE
, FILE_EXT
, UPPER(FILE_EXT) UPPER_FILE_EXT
- , REPLACE(FILE_PATH, '\', '\\') AS FILE_PATH
+ , REPLACE(FILE_PATH, '\', '/') AS FILE_PATH
, WRITER
, (SELECT USER_NAME FROM USER_INFO USER_INFO_T WHERE USER_INFO_T.USER_ID = WRITER) AS USER_NAME
, (SELECT DEPT_NAME FROM USER_INFO USER_INFO_T WHERE USER_INFO_T.USER_ID = WRITER) AS DEPT_NAME
@@ -4298,6 +4298,7 @@ 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 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
FROM PURCHASE_ORDER_MASTER AS POM