diff --git a/src/com/pms/mapper/purchaseOrder.xml b/src/com/pms/mapper/purchaseOrder.xml
index 6fd3ff4..6abceba 100644
--- a/src/com/pms/mapper/purchaseOrder.xml
+++ b/src/com/pms/mapper/purchaseOrder.xml
@@ -887,7 +887,7 @@
PM.PART_NO,
PM.PART_NAME,
PM.SPEC,
- COALESCE(NULLIF(SRP.UNIT, ''), PM.UNIT) AS UNIT,
+ COALESCE(NULLIF(SRP.UNIT, ''), PM.UNIT_DC) AS UNIT,
PM.MAKER,
(SELECT PJ.PART_NAME FROM PROJECT_MGMT PJ WHERE PJ.OBJID::VARCHAR = SRM.PROJECT_NO) AS PROJECT_PRODUCT_NAME,
CASE WHEN COALESCE(SRP.MATERIAL_YN, 'N') = 'Y' AND SRM.MBOM_HEADER_OBJID IS NOT NULL THEN
@@ -6411,6 +6411,27 @@ FROM(
AND TRIM(UPPER(POP.SPEC)) LIKE '%'||TRIM(UPPER(#{SEARCH_PART_SPEC}))||'%'
+
+ AND TRIM(UPPER(
+ COALESCE(
+ (SELECT
+ CASE WHEN COALESCE(SRP3.MATERIAL_YN, 'N') = 'Y' AND SRM3.MBOM_HEADER_OBJID IS NOT NULL THEN
+ (SELECT MIN(PM3.PART_NO) FROM MBOM_DETAIL MD3
+ JOIN PART_MNG PM3 ON MD3.PART_OBJID::VARCHAR = PM3.OBJID::VARCHAR
+ WHERE MD3.RAW_MATERIAL_PART_NO = POP.PART_NO
+ AND MD3.MBOM_HEADER_OBJID::VARCHAR = SRM3.MBOM_HEADER_OBJID::VARCHAR)
+ ELSE POP.PART_NO
+ END
+ FROM SALES_REQUEST_PART SRP3
+ JOIN SALES_REQUEST_MASTER SRM3 ON SRP3.SALES_REQUEST_MASTER_OBJID = SRM3.OBJID
+ WHERE SRM3.OBJID::VARCHAR = POM.SALES_REQUEST_OBJID
+ AND SRP3.PART_OBJID = POP.PART_OBJID
+ LIMIT 1
+ ),
+ POP.PART_NO
+ )
+ )) LIKE '%'||TRIM(UPPER(#{SEARCH_COMPONENT_PART_NO}))||'%'
+
ORDER BY POM.REGDATE DESC, POP.OBJID
diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml
index 78605ab..df61bee 100644
--- a/src/com/pms/mapper/salesMng.xml
+++ b/src/com/pms/mapper/salesMng.xml
@@ -5007,10 +5007,10 @@ ORDER BY V.PATH2
PM.PART_NAME,
PM.SPEC,
PM.MATERIAL,
- COALESCE(NULLIF(SRP.UNIT, ''), PM.UNIT) AS UNIT,
+ COALESCE(NULLIF(SRP.UNIT, ''), PM.UNIT_DC) AS UNIT,
COALESCE(
(SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = NULLIF(SRP.UNIT, '')),
- (SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = PM.UNIT)
+ (SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = PM.UNIT_DC)
) AS UNIT_TITLE,
SRP.QTY,
COALESCE(SRP.UNIT_PRICE, 0) AS UNIT_PRICE,