chpark/wace_plm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '소재 품의서 구분 추가' (#145) from V20260210 into main

Browse Source 
Reviewed-on: #145
This commit was merged in pull request #145.
This commit is contained in:
hjjeong
2026-02-23 09:33:59 +00:00
parent 1f7d35ef01 ea0dde8501
commit a6dad1ed53
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/pms/mapper/salesMng.xml
View File

@@ -3908,6 +3908,14 @@ ORDER BY V.PATH2
MIN(MD.OBJID) AS OBJID,
STRING_AGG(MD.OBJID::VARCHAR, ',' ORDER BY MD.OBJID) AS ORIGINAL_OBJIDS,
MD.PART_OBJID,
/* 소재 있으면 소재 PART_OBJID, 없으면 부품 PART_OBJID */
CASE WHEN COALESCE(MIN(MD.RAW_MATERIAL_PART_NO), '') != ''
THEN COALESCE(
(SELECT PM2.OBJID::VARCHAR FROM PART_MNG PM2 WHERE PM2.PART_NO = MIN(MD.RAW_MATERIAL_PART_NO) LIMIT 1),
MD.PART_OBJID::VARCHAR
)
ELSE MD.PART_OBJID::VARCHAR
END AS PROPOSAL_PART_OBJID,
MIN(PM.PART_NO) AS PART_NO,
MIN(PM.PART_NAME) AS PART_NAME,
CASE WHEN COALESCE(MIN(MD.RAW_MATERIAL_PART_NO), '') != ''
@@ -4239,7 +4247,9 @@ ORDER BY V.PATH2
VENDOR_PM,
NET_QTY,
PO_QTY,
PRODUCTION_QTY,
USE_YN,
MATERIAL_YN,
PROPOSAL_DATE,
WRITER,
REGDATE
@@ -4254,7 +4264,9 @@ ORDER BY V.PATH2
#{VENDOR_PM},
#{NET_QTY},
#{PO_QTY},
#{PRODUCTION_QTY},
#{USE_YN},
#{MATERIAL_YN},
NOW(),
#{WRITER},
NOW()
@@ -4275,7 +4287,9 @@ ORDER BY V.PATH2
VENDOR_PM,
NET_QTY,
PO_QTY,
PRODUCTION_QTY,
USE_YN,
MATERIAL_YN,
PROPOSAL_DATE,
WRITER,
REGDATE
@@ -4290,7 +4304,9 @@ ORDER BY V.PATH2
#{VENDOR_PM},
#{NET_QTY},
#{PO_QTY},
#{PRODUCTION_QTY},
#{USE_YN},
#{MATERIAL_YN},
NOW(),
#{WRITER},
NOW()