diff --git a/WebContent/WEB-INF/view/contractMgmt/estimateAndOrderRegistFormPopup.jsp b/WebContent/WEB-INF/view/contractMgmt/estimateAndOrderRegistFormPopup.jsp index 2d985cf..bf9a41c 100644 --- a/WebContent/WEB-INF/view/contractMgmt/estimateAndOrderRegistFormPopup.jsp +++ b/WebContent/WEB-INF/view/contractMgmt/estimateAndOrderRegistFormPopup.jsp @@ -41,11 +41,16 @@ section.business_popup_min_width { padding: 0 !important; margin: 0 auto !important; - width: calc(100% - 16px) !important; + max-width: none !important; + width: calc(100% - 8px) !important; + border: none !important; + box-shadow: none !important; } #EntirePopupFormWrap { width: 100% !important; margin: 5px 0 0 0 !important; + padding: 0 5px 10px 5px !important; + box-sizing: border-box; } /* ===== 품목 그리드 컬럼 리사이즈 ===== */ @@ -483,52 +488,52 @@ // S/N html += ''; - html += ''; + html += ''; html += ''; html += ''; // 요청납기 html += ''; - html += ''; + html += ''; html += ''; // 고객요청사항 html += ''; - html += ''; + html += ''; html += ''; // 반납사유 html += ''; - html += ''; + html += ''; html += ''; // 수주수량 (Machine이고 프로젝트가 있으면 readonly) html += ''; if(isMachine && hasProject) { - html += ''; + html += ''; } else { - html += ''; + html += ''; } html += ''; // 수주단가 html += ''; - html += ''; + html += ''; html += ''; // 수주공급가액 (자동계산 + 수정가능) html += ''; - html += ''; + html += ''; html += ''; // 수주부가세 (자동계산 + 수정가능) html += ''; - html += ''; + html += ''; html += ''; // 수주총액 (자동계산 + 수정가능) html += ''; - html += ''; + html += ''; html += ''; // 삭제 버튼 @@ -718,46 +723,39 @@ var returnReason = "<%= CommonUtils.checkNull(item.get("RETURN_REASON")) %>"; var savedProduct = "<%= CommonUtils.checkNull(item.get("PRODUCT")) %>"; - // 제품구분 드롭다운 html += ''; - html += ''; - html += ''; - - html += ''; - html += ''; + html += ''; html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; // 수주 정보 (Machine이고 프로젝트가 있으면 수량 readonly) html += ''; if(isMachine && hasProject) { - html += ''; + html += ''; } else { - html += ''; + html += ''; } html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; @@ -1676,13 +1674,13 @@ - + - + - + diff --git a/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp b/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp index d2d2a86..2b181a0 100644 --- a/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp +++ b/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp @@ -696,13 +696,13 @@ html += ''; html += ''; html += ''; html += ''; html += ''; html += ''; html += ''; html += ''; html += ''; html += '
'; - html += ''; + html += ''; html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; @@ -1499,13 +1499,13 @@ html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; @@ -2244,15 +2244,15 @@
- - + + - - - + + + - - + + diff --git a/src/com/pms/salesmgmt/mapper/contractMgmt.xml b/src/com/pms/salesmgmt/mapper/contractMgmt.xml index 1ff5dc1..15de0b8 100644 --- a/src/com/pms/salesmgmt/mapper/contractMgmt.xml +++ b/src/com/pms/salesmgmt/mapper/contractMgmt.xml @@ -5288,6 +5288,9 @@ WHERE ORDER_SUPPLY_PRICE = #{orderSupplyPrice}, ORDER_VAT = #{orderVat}, ORDER_TOTAL_AMOUNT = #{orderTotalAmount} + + ,PRODUCT = #{product} + WHERE OBJID = #{contractItemObjId} diff --git a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml index e9b12f2..f9138d2 100644 --- a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml +++ b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml @@ -1787,8 +1787,10 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC