diff --git a/WebContent/WEB-INF/view/salesMng/quotationRequestFormPopup.jsp b/WebContent/WEB-INF/view/salesMng/quotationRequestFormPopup.jsp
index 3db9ac7..9ccef93 100644
--- a/WebContent/WEB-INF/view/salesMng/quotationRequestFormPopup.jsp
+++ b/WebContent/WEB-INF/view/salesMng/quotationRequestFormPopup.jsp
@@ -291,6 +291,15 @@ function fn_initGrid() {
field: 'VENDOR_NAME'
});
+ // 환종
+ columns.push({
+ headerHozAlign: 'center',
+ hozAlign: 'center',
+ width: 70,
+ title: '환종',
+ field: 'CURRENCY_NAME'
+ });
+
// 단가 (수정가능 - 클릭 시 전체 선택)
columns.push({
headerHozAlign: 'center',
diff --git a/src/com/pms/controller/PurchaseOrderController.java b/src/com/pms/controller/PurchaseOrderController.java
index 656b763..06bc842 100644
--- a/src/com/pms/controller/PurchaseOrderController.java
+++ b/src/com/pms/controller/PurchaseOrderController.java
@@ -949,8 +949,10 @@ public class PurchaseOrderController {
if("".equals(unit)) unit = CommonUtils.checkNull(partRow.get("unit"));
detailRow.put("UNIT", "".equals(unit) ? "0001400" : unit);
- // 환종: 기본 USD
- detailRow.put("CURRENCY", "USD");
+ // 환종: MBOM에서 넘어온 값 사용, 없으면 달러(0001534)
+ String currency = CommonUtils.checkNull(partRow.get("CURRENCY"));
+ if("".equals(currency)) currency = CommonUtils.checkNull(partRow.get("currency"));
+ detailRow.put("CURRENCY", "".equals(currency) ? "0001534" : currency);
Object priceObj = partRow.get("UNIT_PRICE");
if(priceObj == null) priceObj = partRow.get("unit_price");
@@ -973,6 +975,14 @@ public class PurchaseOrderController {
info = purchaseOrderService.getPurchaseOrderMasterInfo(request, paramMap);
paramMap.put("MULTI_MASTER_OBJID", objId);
detailList = commonService.selectList("purchaseOrder.getPURCHASE_ORDER_PART", request, paramMap);
+ for(int i = 0; i < detailList.size(); i++){
+ Map row = (Map) detailList.get(i);
+ String currency = CommonUtils.checkNull(row.get("CURRENCY"));
+ String fallbackCurrency = CommonUtils.checkNull(row.get("FALLBACK_CURRENCY"));
+ if("".equals(currency) && !"".equals(fallbackCurrency)){
+ row.put("CURRENCY", fallbackCurrency);
+ }
+ }
}
code_map.put("partner_cd", commonService.bizMakeOptionList("", (String)info.get("PARTNER_OBJID"),"common.getClientMngSupplySelect"));
diff --git a/src/com/pms/mapper/purchaseOrder.xml b/src/com/pms/mapper/purchaseOrder.xml
index 439b079..4c1738c 100644
--- a/src/com/pms/mapper/purchaseOrder.xml
+++ b/src/com/pms/mapper/purchaseOrder.xml
@@ -2359,7 +2359,14 @@
@@ -3361,6 +3368,11 @@ SELECT POM.OBJID
FROM PURCHASE_ORDER_PART POP
WHERE POP.PURCHASE_ORDER_MASTER_OBJID = POM.OBJID
) AS PART_NAME
+ ,(SELECT CC.CODE_NAME FROM COMM_CODE CC
+ WHERE CC.CODE_ID = (SELECT POP.CURRENCY FROM PURCHASE_ORDER_PART POP
+ WHERE POP.PURCHASE_ORDER_MASTER_OBJID = POM.OBJID::VARCHAR
+ AND POP.CURRENCY IS NOT NULL AND POP.CURRENCY != '' LIMIT 1)
+ ) AS CURRENCY_NAME
FROM PURCHASE_ORDER_MASTER AS POM
LEFT OUTER JOIN(
SELECT B.OBJID AS ROUTE_OBJID
@@ -4435,6 +4447,11 @@ SELECT POM.OBJID
,(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
,POM.PURCHASE_CLOSE_DATE
+ ,(SELECT CC.CODE_NAME FROM COMM_CODE CC
+ WHERE CC.CODE_ID = (SELECT POP2.CURRENCY FROM PURCHASE_ORDER_PART POP2
+ WHERE POP2.PURCHASE_ORDER_MASTER_OBJID = POM.OBJID::VARCHAR
+ AND POP2.CURRENCY IS NOT NULL AND POP2.CURRENCY != '' LIMIT 1)
+ ) AS CURRENCY_NAME
FROM PURCHASE_ORDER_MASTER AS POM
,(SELECT USER_NAME FROM USER_INFO WHERE USER_ID = POM.WRITER) AS WRITER_NAME
+
+ ,(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
@@ -6539,6 +6560,10 @@ FROM(
,(SELECT USER_NAME FROM USER_INFO WHERE USER_ID = POM.WRITER) AS WRITER_NAME
+
+ ,(SELECT CC.CODE_NAME FROM COMM_CODE CC
+ WHERE CC.CODE_ID = POP.CURRENCY) AS CURRENCY_NAME
+
,AP.RECEIPT_DATE
diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml
index 39616cb..62a854f 100644
--- a/src/com/pms/mapper/salesMng.xml
+++ b/src/com/pms/mapper/salesMng.xml
@@ -4036,6 +4036,7 @@ ORDER BY V.PATH2
COALESCE(MIN(MD.RAW_MATERIAL_SIZE), '') AS SIZE,
MIN(MD.UNIT) AS UNIT,
COALESCE(MIN(MD.USE_YN), 'Y') AS USE_YN,
+ MIN(MD.CURRENCY) AS CURRENCY,
'MBOM' AS DATA_SOURCE,
'MATERIAL' AS PROPOSAL_TYPE
FROM
@@ -4078,6 +4079,7 @@ ORDER BY V.PATH2
SUM(COALESCE(MD.PRODUCTION_QTY, 0)) AS PRODUCTION_QTY,
MIN(MD.UNIT) AS UNIT,
COALESCE(MIN(MD.USE_YN), 'Y') AS USE_YN,
+ MIN(MD.CURRENCY) AS CURRENCY,
'MBOM' AS DATA_SOURCE,
'PROCESSING' AS PROPOSAL_TYPE
FROM
@@ -4349,6 +4351,7 @@ ORDER BY V.PATH2
PRODUCTION_QTY,
USE_YN,
MATERIAL_YN,
+ CURRENCY,
PROPOSAL_DATE,
WRITER,
REGDATE
@@ -4366,6 +4369,7 @@ ORDER BY V.PATH2
#{PRODUCTION_QTY},
#{USE_YN},
#{MATERIAL_YN},
+ #{CURRENCY},
NOW(),
#{WRITER},
NOW()
@@ -4389,6 +4393,7 @@ ORDER BY V.PATH2
PRODUCTION_QTY,
USE_YN,
MATERIAL_YN,
+ CURRENCY,
PROPOSAL_DATE,
WRITER,
REGDATE
@@ -4406,6 +4411,7 @@ ORDER BY V.PATH2
#{PRODUCTION_QTY},
#{USE_YN},
#{MATERIAL_YN},
+ #{CURRENCY},
NOW(),
#{WRITER},
NOW()
@@ -5072,7 +5078,43 @@ ORDER BY V.PATH2
/* 품명: 소재있으면 소재품명(현재 PM), 없으면 부품명(현재 PM) */
PM.PART_NAME AS DISPLAY_PART_NAME,
/* 규격: 품명의 규격 */
- PM.SPEC AS DISPLAY_SPEC
+ PM.SPEC AS DISPLAY_SPEC,
+ /* 환종 코드값: SRP에 저장된 값 우선, 없으면 MBOM에서 조회 */
+ COALESCE(
+ NULLIF(SRP.CURRENCY, ''),
+ CASE WHEN COALESCE(SRP.MATERIAL_YN, 'N') = 'Y' AND SRM.MBOM_HEADER_OBJID IS NOT NULL THEN
+ (SELECT MD.CURRENCY FROM MBOM_DETAIL MD
+ WHERE MD.RAW_MATERIAL_PART_NO = PM.PART_NO
+ AND MD.MBOM_HEADER_OBJID::VARCHAR = SRM.MBOM_HEADER_OBJID::VARCHAR
+ LIMIT 1)
+ WHEN SRM.MBOM_HEADER_OBJID IS NOT NULL THEN
+ (SELECT MD.CURRENCY FROM MBOM_DETAIL MD
+ WHERE MD.PART_OBJID::VARCHAR = SRP.PART_OBJID::VARCHAR
+ AND MD.MBOM_HEADER_OBJID::VARCHAR = SRM.MBOM_HEADER_OBJID::VARCHAR
+ LIMIT 1)
+ ELSE NULL
+ END
+ ) AS CURRENCY,
+ /* 환종명 */
+ COALESCE(
+ (SELECT CC.CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID =
+ COALESCE(
+ NULLIF(SRP.CURRENCY, ''),
+ CASE WHEN COALESCE(SRP.MATERIAL_YN, 'N') = 'Y' AND SRM.MBOM_HEADER_OBJID IS NOT NULL THEN
+ (SELECT MD.CURRENCY FROM MBOM_DETAIL MD
+ WHERE MD.RAW_MATERIAL_PART_NO = PM.PART_NO
+ AND MD.MBOM_HEADER_OBJID::VARCHAR = SRM.MBOM_HEADER_OBJID::VARCHAR
+ LIMIT 1)
+ WHEN SRM.MBOM_HEADER_OBJID IS NOT NULL THEN
+ (SELECT MD.CURRENCY FROM MBOM_DETAIL MD
+ WHERE MD.PART_OBJID::VARCHAR = SRP.PART_OBJID::VARCHAR
+ AND MD.MBOM_HEADER_OBJID::VARCHAR = SRM.MBOM_HEADER_OBJID::VARCHAR
+ LIMIT 1)
+ ELSE NULL
+ END
+ )
+ ), ''
+ ) AS CURRENCY_NAME
FROM
SALES_REQUEST_PART SRP
LEFT JOIN PART_MNG PM ON SRP.PART_OBJID::VARCHAR = PM.OBJID::VARCHAR
@@ -5102,7 +5144,8 @@ ORDER BY V.PATH2
UPDATE SALES_REQUEST_PART SET
DELIVERY_REQUEST_DATE = CASE WHEN #{DELIVERY_REQUEST_DATE} IS NOT NULL AND #{DELIVERY_REQUEST_DATE} != '' THEN #{DELIVERY_REQUEST_DATE} ELSE NULL END,
UNIT = #{UNIT},
- REMARK = #{REMARK}
+ REMARK = #{REMARK},
+ CURRENCY = #{CURRENCY}
WHERE OBJID = #{PART_OBJID}
@@ -5366,9 +5409,20 @@ ORDER BY V.PATH2
-- 마스터 정보
QRM.VENDOR_TYPE,
QRM.VENDOR_OBJID,
- (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = QRM.VENDOR_OBJID) AS VENDOR_NAME
+ (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = QRM.VENDOR_OBJID) AS VENDOR_NAME,
+ /* 환종: MBOM에서 환종 코드명 조회 */
+ COALESCE(
+ (SELECT CC.CODE_NAME FROM MBOM_DETAIL MD
+ JOIN COMM_CODE CC ON CC.CODE_ID = MD.CURRENCY
+ WHERE MD.MBOM_HEADER_OBJID::VARCHAR = SRM.MBOM_HEADER_OBJID::VARCHAR
+ AND (MD.PART_OBJID::VARCHAR = QRD.PART_OBJID::VARCHAR
+ OR MD.RAW_MATERIAL_PART_NO = QRD.PART_NO)
+ AND MD.CURRENCY IS NOT NULL AND MD.CURRENCY != ''
+ LIMIT 1), ''
+ ) AS CURRENCY_NAME
FROM QUOTATION_REQUEST_DETAIL QRD
LEFT JOIN QUOTATION_REQUEST_MASTER QRM ON QRD.QUOTATION_REQUEST_MASTER_OBJID = QRM.OBJID
+ LEFT JOIN SALES_REQUEST_MASTER SRM ON QRM.SALES_REQUEST_MASTER_OBJID::VARCHAR = SRM.OBJID::VARCHAR
WHERE QRD.QUOTATION_REQUEST_MASTER_OBJID = #{QUOTATION_REQUEST_MASTER_OBJID}::NUMERIC
ORDER BY QRD.OBJID
diff --git a/src/com/pms/salesmgmt/controller/SalesMngController.java b/src/com/pms/salesmgmt/controller/SalesMngController.java
index aad912e..3b817f3 100644
--- a/src/com/pms/salesmgmt/controller/SalesMngController.java
+++ b/src/com/pms/salesmgmt/controller/SalesMngController.java
@@ -1430,7 +1430,9 @@ public class SalesMngController {
code_map.put("product_name", commonService.bizMakeOptionList("0000016", (String)resultMap.get("PRODUCT_NAME"), "common.getCodeselect"));
// 단위 코드 목록 (UNIT_CD: 단위)
code_map.put("unit_list", commonService.bizMakeOptionList("0001399", "", "common.getCodeselect"));
-
+ // 환종 코드 목록
+ code_map.put("currency_list", commonService.bizMakeOptionList("0001533", "", "common.getCodeselect"));
+
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/src/com/pms/salesmgmt/service/SalesMngService.java b/src/com/pms/salesmgmt/service/SalesMngService.java
index b46a322..1b642c1 100644
--- a/src/com/pms/salesmgmt/service/SalesMngService.java
+++ b/src/com/pms/salesmgmt/service/SalesMngService.java
@@ -2226,6 +2226,7 @@ public class SalesMngService {
partParam.put("PRODUCTION_QTY", part.get("PRODUCTION_QTY"));
partParam.put("USE_YN", CommonUtils.checkNull(part.get("USE_YN")));
partParam.put("MATERIAL_YN", isMaterial ? "Y" : "N");
+ partParam.put("CURRENCY", CommonUtils.checkNull(part.get("CURRENCY")));
if("PROCESSING".equals(proposalType)) {
sqlSession.insert("salesMng.insertProposalPartFromMBomProcessing", partParam);