diff --git a/WebContent/WEB-INF/view/productionplanning/mBomHeaderPopup.jsp b/WebContent/WEB-INF/view/productionplanning/mBomHeaderPopup.jsp
index 93bccf5..056ea9f 100644
--- a/WebContent/WEB-INF/view/productionplanning/mBomHeaderPopup.jsp
+++ b/WebContent/WEB-INF/view/productionplanning/mBomHeaderPopup.jsp
@@ -162,14 +162,16 @@ $(function(){
fn_closeWindow();
});
+ /* 주석처리: 가공납기/연삭납기 일괄 적용 버튼 이벤트
// 일괄 적용 버튼 클릭
$("#btnApplyBulkDeadline").click(function(){
fn_applyBulkDeadline();
});
+ */
});
-// 가공납기/연삭납기 일괄 적용
+/* 주석처리: 가공납기/연삭납기 일괄 적용 함수
function fn_applyBulkDeadline() {
var processingDeadline = $("#bulk_processing_deadline").val();
var grindingDeadline = $("#bulk_grinding_deadline").val();
@@ -206,6 +208,7 @@ function fn_applyBulkDeadline() {
alert("적용할 데이터가 없습니다.");
}
}
+*/
// M-BOM 템플릿 로드 (Machine 이외 제품)
function fn_loadMbomTemplate() {
@@ -926,7 +929,7 @@ function compareItemFields(before, after) {
-
+
diff --git a/WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp b/WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp
index 8c3fea0..55a0fc6 100644
--- a/WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp
+++ b/WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp
@@ -537,6 +537,7 @@ function fn_initGrid() {
values: ['업체A', '업체B', '업체C'] // TODO: 실제 가공업체 목록으로 교체
}
},
+ /* 주석처리: 가공납기, 연삭납기 컬럼
{
headerHozAlign: 'center',
hozAlign: 'center',
@@ -555,6 +556,7 @@ function fn_initGrid() {
titleFormatter: function() { return ''; },
editor: 'date'
},
+ */
{
headerHozAlign: 'center',
hozAlign: 'left',
@@ -843,7 +845,7 @@ function fn_searchMbom(searchParams) {
});
}
-// 가공납기/연삭납기 일괄 적용
+/* 주석처리: 가공납기/연삭납기 일괄 적용
function applyBulkDeadline(processingDeadline, grindingDeadline) {
if(!_tabulGrid) {
console.error("그리드가 초기화되지 않았습니다.");
@@ -877,6 +879,7 @@ function applyBulkDeadline(processingDeadline, grindingDeadline) {
console.log("업데이트 완료 - 업데이트된 행:", updatedCount);
return updatedCount;
}
+*/
// M-BOM 트리 데이터 수집 (저장용)
function getMbomTreeData() {
diff --git a/src/com/pms/mapper/productionplanning.xml b/src/com/pms/mapper/productionplanning.xml
index 4b0f593..f883803 100644
--- a/src/com/pms/mapper/productionplanning.xml
+++ b/src/com/pms/mapper/productionplanning.xml
@@ -4187,7 +4187,7 @@
V.STOCK_QTY,
V.SHORTAGE_QTY,
V.VENDOR,
- (SELECT SUPPLY_NAME FROM ADMIN_SUPPLY_MNG WHERE OBJID::VARCHAR = V.VENDOR) AS VENDOR_NAME,
+ (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = V.VENDOR) AS VENDOR_NAME,
V.UNIT_PRICE,
V.TOTAL_PRICE,
V.CURRENCY,