';
- // 공급업체 미입력으로 제외된 품목이 있는 경우 알림 추가
- var excludedHtml = '';
- if(excludedParts && excludedParts.length > 0) {
- var excludedListHtml = excludedParts.map(function(part) {
+ // 소재 품의서 대상
+ if(materialParts.length > 0) {
+ var materialListHtml = materialParts.map(function(part) {
return '- ' + fnc_checkNull(part.PART_NO) + ' / ' + fnc_checkNull(part.PART_NAME);
}).join('
');
- excludedHtml = '
' +
- '
⚠️ 공급업체 미입력으로 제외된 품목 (' + excludedParts.length + '건)
' +
- '
' +
- excludedListHtml +
- '
' +
+ confirmHtml += '
' +
+ '
📦 소재 품의서 (' + materialParts.length + '건)
' +
+ '
' + materialListHtml + '
' +
'
';
}
+ // 가공 품의서 대상
+ if(processingParts.length > 0) {
+ var processingListHtml = processingParts.map(function(part) {
+ return '- ' + fnc_checkNull(part.PART_NO) + ' / ' + fnc_checkNull(part.PART_NAME);
+ }).join('
');
+
+ confirmHtml += '
' +
+ '
⚙️ 가공 품의서 (' + processingParts.length + '건)
' +
+ '
' + processingListHtml + '
' +
+ '
';
+ }
+
+ // 제외된 품목 표시
+ confirmHtml += fn_buildExcludedHtml(materialExcluded, processingExcluded);
+ confirmHtml += '
';
+
+ // 생성될 품의서 개수 표시
+ var proposalCount = (materialParts.length > 0 ? 1 : 0) + (processingParts.length > 0 ? 1 : 0);
+
Swal.fire({
title: '품의서 생성',
- html: '
' +
- '
총 ' + partCount + '건의 품목으로 품의서를 생성합니다.
' +
- '
' +
- partListHtml +
- '
' +
- excludedHtml +
- '
',
+ html: '
' + proposalCount + '개의 품의서가 생성됩니다.
' + confirmHtml,
icon: 'question',
showCancelButton: true,
confirmButtonText: '생성',
- cancelButtonText: '취소'
+ cancelButtonText: '취소',
+ width: '600px'
}).then((result) => {
if (result.isConfirmed) {
- fn_executeCreateProposal(salesRequestObjid, targetParts);
+ fn_executeCreateProposal(salesRequestObjid, null);
}
});
} else {
- // 실패 시에도 공급업체 미입력 품목 정보 표시
- var excludedParts = response.excludedParts || [];
- var excludedHtml = '';
-
- if(excludedParts && excludedParts.length > 0) {
- var excludedListHtml = excludedParts.map(function(part) {
- return '- ' + fnc_checkNull(part.PART_NO) + ' / ' + fnc_checkNull(part.PART_NAME);
- }).join('
');
-
- excludedHtml = '
' +
- '
⚠️ 공급업체 미입력 품목 (' + excludedParts.length + '건)
' +
- '
' +
- excludedListHtml +
- '
' +
- '
';
- }
-
Swal.fire({
title: '알림',
- html: (response.message || '품목 조회 중 오류가 발생했습니다.') + excludedHtml,
+ html: response.message || '품목 조회 중 오류가 발생했습니다.',
icon: 'info'
});
}
@@ -608,13 +620,44 @@ function fn_createProposal() {
error: function(xhr, status, error) {
Swal.fire({
title: '오류',
- text: '서버 통신 중 오류가 발생했습니다.22',
+ text: '서버 통신 중 오류가 발생했습니다.',
icon: 'error'
});
}
});
}
+/**
+ * 제외된 품목 HTML 생성
+ */
+function fn_buildExcludedHtml(materialExcluded, processingExcluded) {
+ var html = '';
+
+ if(materialExcluded && materialExcluded.length > 0) {
+ var listHtml = materialExcluded.map(function(part) {
+ return '- ' + fnc_checkNull(part.PART_NO) + ' / ' + fnc_checkNull(part.PART_NAME);
+ }).join('
');
+
+ html += '
' +
+ '
⚠️ 소재 - 공급업체 미입력 (' + materialExcluded.length + '건)
' +
+ '
' + listHtml + '
' +
+ '
';
+ }
+
+ if(processingExcluded && processingExcluded.length > 0) {
+ var listHtml = processingExcluded.map(function(part) {
+ return '- ' + fnc_checkNull(part.PART_NO) + ' / ' + fnc_checkNull(part.PART_NAME);
+ }).join('
');
+
+ html += '
' +
+ '
⚠️ 가공 - 가공업체 미입력 (' + processingExcluded.length + '건)
' +
+ '
' + listHtml + '
' +
+ '
';
+ }
+
+ return html;
+}
+
/**
* 품의서 생성 실행
*/
@@ -623,15 +666,16 @@ function fn_executeCreateProposal(salesRequestObjid, targetParts) {
url: "/salesMng/createProposalFromPurchaseList.do",
type: "POST",
data: {
- SALES_REQUEST_MASTER_OBJID: salesRequestObjid,
- TARGET_PARTS: JSON.stringify(targetParts)
+ SALES_REQUEST_MASTER_OBJID: salesRequestObjid
},
dataType: "json",
success: function(response) {
if(response.resultFlag === "S") {
+ // 서버에서 반환한 메시지 사용 (소재/가공 품의서 번호 포함)
+ var message = response.message || '품의서가 생성되었습니다.';
Swal.fire({
title: '생성 완료',
- text: '품의서가 생성되었습니다.\n품의서 관리에서 확인하세요.',
+ html: message.replace(/\n/g, '
'),
icon: 'success'
}).then(() => {
fn_search(); // 목록 새로고침
@@ -639,12 +683,13 @@ function fn_executeCreateProposal(salesRequestObjid, targetParts) {
} else {
Swal.fire({
title: '오류',
- text: response.message || '품의서 생성 중 오류가 발생했습니다.',
+ html: (response.message || '품의서 생성 중 오류가 발생했습니다.').replace(/\n/g, '
'),
icon: 'error'
});
}
},
error: function(xhr, status, error) {
+ console.error("품의서 생성 오류:", status, error);
Swal.fire({
title: '오류',
text: '서버 통신 중 오류가 발생했습니다.',
diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml
index 6cd0665..9143a35 100644
--- a/src/com/pms/mapper/salesMng.xml
+++ b/src/com/pms/mapper/salesMng.xml
@@ -3114,7 +3114,11 @@ UPDATE SET
COALESCE(SRP.VENDOR_PM, SRP.PARTNER_OBJID) AS VENDOR_PM,
COALESCE(SRP.UNIT_PRICE, NULLIF(SRP.PARTNER_PRICE, '')::numeric, 0) AS UNIT_PRICE,
COALESCE(SRP.TOTAL_PRICE, 0) AS TOTAL_PRICE,
+ COALESCE(SRP.PROCESSING_UNIT_PRICE, 0) AS PROCESSING_UNIT_PRICE,
+ COALESCE(SRP.PROCESSING_TOTAL_PRICE, 0) AS PROCESSING_TOTAL_PRICE,
+ COALESCE(SRP.GRAND_TOTAL_PRICE, 0) AS GRAND_TOTAL_PRICE,
SRP.PROPOSAL_DATE,
+ SRP.PROCESSING_PROPOSAL_DATE,
'SRP' AS DATA_SOURCE -- 데이터 소스 구분용
FROM
SALES_REQUEST_PART SRP
@@ -3173,7 +3177,11 @@ WITH RECURSIVE VIEW_BOM(
USE_YN,
NET_QTY,
PO_QTY,
- PROPOSAL_DATE
+ PROPOSAL_DATE,
+ PROCESSING_PROPOSAL_DATE,
+ PROCESSING_UNIT_PRICE,
+ PROCESSING_TOTAL_PRICE,
+ GRAND_TOTAL_PRICE
) AS (
SELECT
A.MBOM_HEADER_OBJID,
@@ -3221,7 +3229,11 @@ WITH RECURSIVE VIEW_BOM(
COALESCE(A.USE_YN, 'Y'),
COALESCE(A.NET_QTY, 0),
COALESCE(A.PO_QTY, 0),
- A.PROPOSAL_DATE
+ A.PROPOSAL_DATE,
+ A.PROCESSING_PROPOSAL_DATE,
+ COALESCE(A.PROCESSING_UNIT_PRICE, 0),
+ COALESCE(A.PROCESSING_TOTAL_PRICE, 0),
+ COALESCE(A.GRAND_TOTAL_PRICE, 0)
FROM
MBOM_DETAIL A
INNER JOIN MBOM_HEADER MH ON MH.OBJID = A.MBOM_HEADER_OBJID
@@ -3281,7 +3293,11 @@ WITH RECURSIVE VIEW_BOM(
COALESCE(B.USE_YN, 'Y'),
COALESCE(B.NET_QTY, 0),
COALESCE(B.PO_QTY, 0),
- B.PROPOSAL_DATE
+ B.PROPOSAL_DATE,
+ B.PROCESSING_PROPOSAL_DATE,
+ COALESCE(B.PROCESSING_UNIT_PRICE, 0),
+ COALESCE(B.PROCESSING_TOTAL_PRICE, 0),
+ COALESCE(B.GRAND_TOTAL_PRICE, 0)
FROM
MBOM_DETAIL B
JOIN
@@ -3369,6 +3385,10 @@ SELECT
V.NET_QTY,
V.PO_QTY,
V.PROPOSAL_DATE,
+ V.PROCESSING_PROPOSAL_DATE,
+ V.PROCESSING_UNIT_PRICE,
+ V.PROCESSING_TOTAL_PRICE,
+ V.GRAND_TOTAL_PRICE,
'MBOM' AS DATA_SOURCE -- 데이터 소스 구분용
FROM VIEW_BOM V
LEFT JOIN PART_MNG P ON P.OBJID::VARCHAR = V.PART_OBJID::VARCHAR
@@ -3400,6 +3420,9 @@ ORDER BY V.PATH2
PROCESSING_VENDOR = #{PROCESSING_VENDOR},
UNIT_PRICE = COALESCE(NULLIF(TRIM(#{UNIT_PRICE}::TEXT), '')::NUMERIC, 0),
TOTAL_PRICE = COALESCE(NULLIF(TRIM(#{TOTAL_PRICE}::TEXT), '')::NUMERIC, 0),
+ PROCESSING_UNIT_PRICE = COALESCE(NULLIF(TRIM(#{PROCESSING_UNIT_PRICE}::TEXT), '')::NUMERIC, 0),
+ PROCESSING_TOTAL_PRICE = COALESCE(NULLIF(TRIM(#{PROCESSING_TOTAL_PRICE}::TEXT), '')::NUMERIC, 0),
+ GRAND_TOTAL_PRICE = COALESCE(NULLIF(TRIM(#{GRAND_TOTAL_PRICE}::TEXT), '')::NUMERIC, 0),
EDITER = #{EDITER},
EDIT_DATE = NOW()
WHERE OBJID::VARCHAR = #{OBJID}
@@ -3415,6 +3438,9 @@ ORDER BY V.PATH2
PROCESSING_VENDOR = #{PROCESSING_VENDOR},
UNIT_PRICE = COALESCE(NULLIF(TRIM(#{UNIT_PRICE}::TEXT), '')::NUMERIC, 0),
TOTAL_PRICE = COALESCE(NULLIF(TRIM(#{TOTAL_PRICE}::TEXT), '')::NUMERIC, 0),
+ PROCESSING_UNIT_PRICE = COALESCE(NULLIF(TRIM(#{PROCESSING_UNIT_PRICE}::TEXT), '')::NUMERIC, 0),
+ PROCESSING_TOTAL_PRICE = COALESCE(NULLIF(TRIM(#{PROCESSING_TOTAL_PRICE}::TEXT), '')::NUMERIC, 0),
+ GRAND_TOTAL_PRICE = COALESCE(NULLIF(TRIM(#{GRAND_TOTAL_PRICE}::TEXT), '')::NUMERIC, 0),
WRITER = #{EDITER}
WHERE OBJID::VARCHAR = #{OBJID}
@@ -3477,7 +3503,7 @@ ORDER BY V.PATH2
-
+
-
+
+
+
+
-
+
+
+
+
-
+
+
+
+
+
+
+
INSERT INTO SALES_REQUEST_MASTER (
@@ -3628,7 +3780,7 @@ ORDER BY V.PATH2
)
-
+
INSERT INTO SALES_REQUEST_PART (
OBJID,
@@ -3663,7 +3815,42 @@ ORDER BY V.PATH2
WHERE OBJID = #{SOURCE_OBJID}
-
+
+
+ INSERT INTO SALES_REQUEST_PART (
+ OBJID,
+ SALES_REQUEST_MASTER_OBJID,
+ PART_OBJID,
+ QTY,
+ UNIT_PRICE,
+ TOTAL_PRICE,
+ VENDOR_PM,
+ NET_QTY,
+ PO_QTY,
+ USE_YN,
+ PROPOSAL_DATE,
+ WRITER,
+ REGDATE
+ )
+ SELECT
+ #{NEW_OBJID},
+ #{PROPOSAL_MASTER_OBJID},
+ PART_OBJID,
+ PRODUCTION_QTY AS QTY,
+ PROCESSING_UNIT_PRICE AS UNIT_PRICE,
+ PROCESSING_TOTAL_PRICE AS TOTAL_PRICE,
+ PROCESSING_VENDOR AS VENDOR_PM,
+ NET_QTY,
+ PO_QTY,
+ USE_YN,
+ NOW() AS PROPOSAL_DATE,
+ #{WRITER},
+ NOW()
+ FROM MBOM_DETAIL
+ WHERE OBJID = #{SOURCE_OBJID}
+
+
+
INSERT INTO SALES_REQUEST_PART (
OBJID,
@@ -3698,7 +3885,42 @@ ORDER BY V.PATH2
WHERE OBJID = #{SOURCE_OBJID}
-
+
+
+ INSERT INTO SALES_REQUEST_PART (
+ OBJID,
+ SALES_REQUEST_MASTER_OBJID,
+ PART_OBJID,
+ QTY,
+ UNIT_PRICE,
+ TOTAL_PRICE,
+ VENDOR_PM,
+ NET_QTY,
+ PO_QTY,
+ USE_YN,
+ PROPOSAL_DATE,
+ WRITER,
+ REGDATE
+ )
+ SELECT
+ #{NEW_OBJID},
+ #{PROPOSAL_MASTER_OBJID},
+ PART_OBJID,
+ PRODUCTION_QTY AS QTY,
+ PROCESSING_UNIT_PRICE AS UNIT_PRICE,
+ PROCESSING_TOTAL_PRICE AS TOTAL_PRICE,
+ PROCESSING_VENDOR AS VENDOR_PM,
+ NET_QTY,
+ PO_QTY,
+ USE_YN,
+ NOW() AS PROPOSAL_DATE,
+ #{WRITER},
+ NOW()
+ FROM SALES_REQUEST_PART
+ WHERE OBJID = #{SOURCE_OBJID}
+
+
+
UPDATE SALES_REQUEST_PART
SET PROPOSAL_DATE = NOW()
@@ -3708,7 +3930,17 @@ ORDER BY V.PATH2
-
+
+
+ UPDATE SALES_REQUEST_PART
+ SET PROCESSING_PROPOSAL_DATE = NOW()
+ WHERE OBJID IN
+
+ #{objid}
+
+
+
+
UPDATE MBOM_DETAIL
SET PROPOSAL_DATE = NOW()
@@ -3718,6 +3950,16 @@ ORDER BY V.PATH2
+
+
+ UPDATE MBOM_DETAIL
+ SET PROCESSING_PROPOSAL_DATE = NOW()
+ WHERE OBJID IN
+
+ #{objid}
+
+
+