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

Merge pull request 'V20260210' (#140) from V20260210 into main

Browse Source 
Reviewed-on: #140
This commit was merged in pull request #140.
This commit is contained in:
hjjeong
2026-02-19 12:18:22 +00:00
parent 159bde686a 0a8d3154f6
commit 9b7e8f1c2d
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp
View File

@@ -459,7 +459,7 @@ function fn_initGrid() {
hozAlign: 'left',
width: 150,
title: '메이커',
field: 'VENDOR'
field: 'MAKER'
},
// 15. 범주 이름
{

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

@@ -3161,7 +3161,8 @@ UPDATE SET
COALESCE(PM.HEAT_TREATMENT_HARDNESS, '') AS HEAT_TREATMENT_HARDNESS,
COALESCE(PM.HEAT_TREATMENT_METHOD, '') AS HEAT_TREATMENT_METHOD,
COALESCE(PM.SURFACE_TREATMENT, '') AS SURFACE_TREATMENT,
COALESCE(PM.MAKER, '') AS VENDOR,
COALESCE(PM.MAKER, '') AS MAKER,
'' AS VENDOR,
(SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = PM.PART_TYPE) AS PART_TYPE_TITLE,
'' AS SUPPLY_TYPE,
'' AS RAW_MATERIAL,
@@ -3492,6 +3493,7 @@ SELECT
P.WEIGHT,
P.PART_TYPE,
P.REVISION,
COALESCE(P.MAKER, '') AS MAKER,
G.VENDOR AS VENDOR,
P.THICKNESS,
P.WIDTH,
@@ -3757,7 +3759,8 @@ SELECT
P.WEIGHT,
P.PART_TYPE,
P.REVISION,
COALESCE(P.MAKER, V.VENDOR) AS VENDOR,
COALESCE(P.MAKER, '') AS MAKER,
V.VENDOR AS VENDOR,
P.THICKNESS,
P.WIDTH,
P.HEIGHT,

16
src/com/pms/salesmgmt/service/SalesMngService.java
View File

@@ -2389,14 +2389,26 @@ public class SalesMngService {
detailParam.put("RAW_MATERIAL", "");
detailParam.put("SIZE", "");
detailParam.put("QTY", partInfo.get("PRODUCTION_QTY"));
} else {
// 공급업체: 소재품번, 소재재질, 규격, 발주수량
} else {
// 공급업체: 소재품번 유무에 따라 분기
String rawMaterialNo = CommonUtils.checkNull(partInfo.get("RAW_MATERIAL_NO"));
if(!rawMaterialNo.isEmpty()) {
// 소재품번이 있는 경우: 소재품번, 소재재질, 규격, 발주수량
detailParam.put("PART_NO", partInfo.get("RAW_MATERIAL_NO"));
detailParam.put("PART_NAME", partInfo.get("RAW_MATERIAL"));
detailParam.put("RAW_MATERIAL", partInfo.get("RAW_MATERIAL"));
detailParam.put("SIZE", partInfo.get("SIZE"));
detailParam.put("QTY", partInfo.get("PO_QTY"));
} else {
// 소재품번이 없는 경우: 부품품번, 부품명, 제작수량
detailParam.put("PART_NO", partInfo.get("PART_NO"));
detailParam.put("PART_NAME", partInfo.get("PART_NAME"));
detailParam.put("RAW_MATERIAL", "");
detailParam.put("SIZE", "");
detailParam.put("QTY", partInfo.get("PRODUCTION_QTY"));
}
}
detailParam.put("UNIT_PRICE", 0); // 단가는 견적 수신 후 입력
detailParam.put("REMARK", "");