Merge branch 'main' into V20251023001
This commit is contained in:
Johngreen
@@ -3850,6 +3850,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
|
||||
PARENT_PART_NO,
|
||||
PART_NO,
|
||||
QTY,
|
||||
ITEM_QTY,
|
||||
QTY_TEMP,
|
||||
REGDATE,
|
||||
WRITER,
|
||||
@@ -3873,6 +3874,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
|
||||
<!-- (SELECT PART_NO FROM BOM_PART_QTY WHERE 1=1 AND CHILD_OBJID = #{PARENT_OBJID} AND BOM_REPORT_OBJID = #{BOM_REPORT_OBJID}),
|
||||
#{PART_OBJID}, -->
|
||||
#{QTY},
|
||||
#{ITEM_QTY},
|
||||
#{QTY_TEMP},
|
||||
NOW(),
|
||||
#{WRITER},
|
||||
@@ -6353,6 +6355,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
|
||||
BPQ.PART_NO,
|
||||
BPQ.PARENT_PART_NO,
|
||||
BPQ.QTY,
|
||||
BPQ.ITEM_QTY,
|
||||
BPQ.SEQ,
|
||||
COALESCE(BPQ.LAST_PART_OBJID, BPQ.PART_NO) AS LAST_PART_OBJID,
|
||||
1 AS LEV,
|
||||
@@ -6380,6 +6383,7 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
|
||||
BPQ.PART_NO,
|
||||
BPQ.PARENT_PART_NO,
|
||||
BPQ.QTY,
|
||||
BPQ.ITEM_QTY,
|
||||
BPQ.SEQ,
|
||||
COALESCE(BPQ.LAST_PART_OBJID, BPQ.PART_NO) AS LAST_PART_OBJID,
|
||||
BT.LEV + 1,
|
||||
@@ -6400,12 +6404,14 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.*
|
||||
BT.LEV,
|
||||
BT.LEV AS LEVEL,
|
||||
BT.QTY,
|
||||
BT.ITEM_QTY,
|
||||
BT.QTY AS P_QTY,
|
||||
BT.SEQ,
|
||||
-- PART 정보
|
||||
PM.OBJID AS PART_OBJID,
|
||||
PM.PART_NO AS PART_NO_TITLE,
|
||||
PM.PART_NO,
|
||||
PM.PART_NAME,
|
||||
PM.REVISION AS REV,
|
||||
PM.REVISION,
|
||||
PM.MATERIAL,
|
||||
PM.SPEC,
|
||||
PM.WEIGHT,
|
||||
@@ -7643,6 +7649,15 @@ SELECT PM.OBJID
|
||||
AND PARENT_CODE_ID='0000062'
|
||||
</select>
|
||||
|
||||
<!-- 공급업체명으로 OBJID 조회 -->
|
||||
<select id="getSupplyCodeByName" parameterType="map" resultType="map">
|
||||
SELECT
|
||||
OBJID
|
||||
FROM ADMIN_SUPPLY_MNG
|
||||
WHERE SUPPLY_NAME = #{SUPPLY_NAME}
|
||||
LIMIT 1
|
||||
</select>
|
||||
|
||||
<!-- PART 관리 목록 조회 -->
|
||||
<select id="supplyInfo" parameterType="map" resultType="map">
|
||||
SELECT
|
||||
|
||||
@@ -3064,7 +3064,7 @@ public class PartMngService extends BaseService {
|
||||
insertMap.put("LENGTH", CommonUtils.checkNull((String)insertMap.get("LENGTH")));
|
||||
insertMap.put("PART_TYPE", CommonUtils.checkNull((String)insertMap.get("PART_TYPE")));
|
||||
insertMap.put("REMARK", CommonUtils.checkNull((String)insertMap.get("REMARK")));
|
||||
insertMap.put("SUPPLY_CODE", CommonUtils.checkNull((String)insertMap.get("SUP_CODE")));
|
||||
insertMap.put("SUPPLY_CODE", CommonUtils.checkNull((String)insertMap.get("SUPPLY_CODE")));
|
||||
insertMap.put("MAKER", CommonUtils.checkNull((String)insertMap.get("MAKER")));
|
||||
insertMap.put("POST_PROCESSING", CommonUtils.checkNull((String)insertMap.get("POST_PROCESSING")));
|
||||
// insertMap.put("CONTRACT_OBJID", CommonUtils.checkNull((String)paramMap.get("CONTRACT_OBJID")));
|
||||
@@ -3080,7 +3080,7 @@ public class PartMngService extends BaseService {
|
||||
//PART저장
|
||||
insertMap.put("OBJID", part_objid);
|
||||
insertMap.put("CONNECTUSERID", CommonUtils.checkNull((String)paramMap.get("CONNECTUSERID")));
|
||||
insertMap.put("SUPPLY_CODE", CommonUtils.checkNull((String)insertMap.get("SUP_CODE")));
|
||||
insertMap.put("SUPPLY_CODE", CommonUtils.checkNull((String)insertMap.get("SUPPLY_CODE")));
|
||||
//sqlSession.insert("partMng.insertpartInfo", insertMap);
|
||||
sqlSession.insert("partMng.mergePartMng", insertMap);
|
||||
/*
|
||||
@@ -3292,6 +3292,20 @@ public class PartMngService extends BaseService {
|
||||
}
|
||||
}
|
||||
|
||||
// SUPPLY_CODE 코드 조회 (공급업체명 -> OBJID 변환)
|
||||
String supplyCode = "";
|
||||
if(!StringUtils.isBlank(supplier)) {
|
||||
Map sqlParamMap = new HashMap();
|
||||
sqlParamMap.put("SUPPLY_NAME", supplier);
|
||||
Map supplyMap = sqlSession.selectOne("partMng.getSupplyCodeByName", sqlParamMap);
|
||||
if(null != supplyMap && supplyMap.get("objid") != null){
|
||||
// OBJID는 BIGINT 타입이므로 String으로 변환
|
||||
supplyCode = String.valueOf(supplyMap.get("objid"));
|
||||
} else {
|
||||
noteMsg += "공급업체 확인:" + supplier + ";";
|
||||
}
|
||||
}
|
||||
|
||||
// Map에 데이터 저장
|
||||
partMap.put("LEVEL", level); // 수준 값 (화면 표시용)
|
||||
partMap.put("PARENT_PART_NO", parentPartNo); // 실제 부모 품번 (저장용)
|
||||
@@ -3303,7 +3317,7 @@ public class PartMngService extends BaseService {
|
||||
partMap.put("HEAT_TREATMENT_HARDNESS", heatTreatmentHardness);
|
||||
partMap.put("HEAT_TREATMENT_METHOD", heatTreatmentMethod);
|
||||
partMap.put("SURFACE_TREATMENT", surfaceTreatment);
|
||||
partMap.put("SUPPLIER", supplier);
|
||||
partMap.put("SUPPLY_CODE", supplyCode);
|
||||
partMap.put("PART_TYPE", partTypeCode);
|
||||
partMap.put("NOTE", noteMsg);
|
||||
|
||||
@@ -3626,6 +3640,20 @@ public class PartMngService extends BaseService {
|
||||
}
|
||||
}
|
||||
|
||||
// SUPPLY_CODE 코드 조회 (공급업체명 -> OBJID 변환)
|
||||
String supplyCode = "";
|
||||
if(!StringUtils.isBlank(supplier)) {
|
||||
Map sqlParamMap = new HashMap();
|
||||
sqlParamMap.put("SUPPLY_NAME", supplier);
|
||||
Map supplyMap = sqlSession.selectOne("partMng.getSupplyCodeByName", sqlParamMap);
|
||||
if(null != supplyMap && supplyMap.get("objid") != null){
|
||||
// OBJID는 BIGINT 타입이므로 String으로 변환
|
||||
supplyCode = String.valueOf(supplyMap.get("objid"));
|
||||
} else {
|
||||
noteMsg += "공급업체 확인:" + supplier + ";";
|
||||
}
|
||||
}
|
||||
|
||||
// Map에 데이터 저장
|
||||
partMap.put("PARENT_PART_NO", parentPartNo);
|
||||
partMap.put("PART_NO", partNo);
|
||||
@@ -3636,7 +3664,7 @@ public class PartMngService extends BaseService {
|
||||
partMap.put("HEAT_TREATMENT_HARDNESS", heatHardness);
|
||||
partMap.put("HEAT_TREATMENT_METHOD", heatMethod);
|
||||
partMap.put("SURFACE_TREATMENT", surfaceTreatment);
|
||||
partMap.put("SUPPLIER", supplier);
|
||||
partMap.put("SUPPLY_CODE", supplyCode);
|
||||
partMap.put("PART_TYPE", partTypeCode);
|
||||
partMap.put("NOTE", noteMsg);
|
||||
|
||||
@@ -4412,7 +4440,7 @@ public class PartMngService extends BaseService {
|
||||
insertMap.put("LENGTH", CommonUtils.checkNull((String)insertMap.get("LENGTH")));
|
||||
insertMap.put("PART_TYPE", CommonUtils.checkNull((String)insertMap.get("PART_TYPE")));
|
||||
insertMap.put("REMARK", CommonUtils.checkNull((String)insertMap.get("REMARK")));
|
||||
insertMap.put("SUPPLY_CODE", CommonUtils.checkNull((String)insertMap.get("SUP_CODE")));
|
||||
insertMap.put("SUPPLY_CODE", CommonUtils.checkNull((String)insertMap.get("SUPPLY_CODE")));
|
||||
insertMap.put("MAKER", CommonUtils.checkNull((String)insertMap.get("MAKER")));
|
||||
insertMap.put("POST_PROCESSING", CommonUtils.checkNull((String)insertMap.get("POST_PROCESSING")));
|
||||
insertMap.put("HEAT_TREATMENT_HARDNESS", CommonUtils.checkNull((String)insertMap.get("HEAT_TREATMENT_HARDNESS")));
|
||||
@@ -4424,6 +4452,12 @@ public class PartMngService extends BaseService {
|
||||
insertMap.put("CONTRACT_OBJID", CommonUtils.checkNull((String)paramMap.get("CONTRACT_OBJID")));
|
||||
insertMap.put("PRODUCT_MGMT_OBJID", CommonUtils.checkNull((String)paramMap.get("product_mgmt_objid")));
|
||||
insertMap.put("CONNECTUSERID", CommonUtils.checkNull((String)paramMap.get("CONNECTUSERID")));
|
||||
|
||||
// 디버깅: SUPPLY_CODE 값 확인
|
||||
//System.out.println("=== SUPPLY_CODE DEBUG ===");
|
||||
//System.out.println("PART_NO: " + PART_NO);
|
||||
//System.out.println("SUPPLY_CODE: " + insertMap.get("SUPPLY_CODE"));
|
||||
//System.out.println("========================");
|
||||
|
||||
partobjMap.put("PART_NO", PART_NO);
|
||||
resultMap = (HashMap)sqlSession.selectOne("partMng.getPartObjid", partobjMap); //part_no로 is_last = 1 건 조회
|
||||
|
||||
Reference in New Issue
Block a user