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

Merge remote-tracking branch 'origin/main' into V2025112501

Browse Source
This commit is contained in:
leeheejin
2025-12-17 13:48:59 +09:00
parent c70b746c68 0daf1b262f
commit 7add878853
10 changed files with 584 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/pms/service/QualityService.java
View File

@@ -888,10 +888,7 @@ public class QualityService extends BaseService{
// 수정
masterParamMap.put("OBJID", masterObjId);
sqlSession.update("quality.updateProcessInspectionMaster", masterParamMap);
// 기존 디테일 삭제 후 재등록
Map<String, Object> deleteParamMap = new HashMap<String, Object>();
deleteParamMap.put("MASTER_OBJID", masterObjId);
sqlSession.delete("quality.deleteProcessInspectionDetailByMaster", deleteParamMap);
// 디테일은 삭제하지 않고 UPSERT로 처리 (파일 첨부 연동 유지)
}
// 디테일 저장
@@ -903,7 +900,11 @@ public class QualityService extends BaseService{
for(Map<String, Object> rowData : dataList){
Map<String, Object> sqlParamMap = new HashMap<String, Object>();
String detailObjId = CommonUtils.checkNull(CommonUtils.createObjId());
// 클라이언트에서 전달한 OBJID 사용 (파일 첨부 연동을 위해)
String detailObjId = CommonUtils.checkNull(rowData.get("OBJID"));
if(detailObjId.isEmpty()) {
detailObjId = CommonUtils.checkNull(CommonUtils.createObjId());
}
sqlParamMap.put("OBJID", detailObjId);
sqlParamMap.put("MASTER_OBJID", masterObjId);
@@ -918,6 +919,8 @@ public class QualityService extends BaseService{
sqlParamMap.put("MEASURING_DEVICE", CommonUtils.checkNull(rowData.get("MEASURING_DEVICE")));
sqlParamMap.put("DEPT_CD", CommonUtils.checkNull(rowData.get("DEPT_CD")));
sqlParamMap.put("USER_ID", CommonUtils.checkNull(rowData.get("USER_ID")));
sqlParamMap.put("INSPECTION_DATE", CommonUtils.checkNull(rowData.get("INSPECTION_DATE")));
sqlParamMap.put("INSPECTOR_ID", CommonUtils.checkNull(rowData.get("INSPECTOR_ID")));
sqlParamMap.put("REMARK", CommonUtils.checkNull(rowData.get("REMARK")));
sqlParamMap.put("ACTION_STATUS", CommonUtils.checkNull(rowData.get("ACTION_STATUS")));
sqlParamMap.put("INSPECTION_RESULT", CommonUtils.checkNull(rowData.get("INSPECTION_RESULT")));