From e0e004765b666c44950647a413edd342521a4bd6 Mon Sep 17 00:00:00 2001 From: hjjeong Date: Fri, 27 Feb 2026 14:36:28 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=8F=99=EC=9D=BC=20=ED=92=88=EB=B2=88=20?= =?UTF-8?q?=EC=88=98=EC=A3=BC=20=EC=8B=9C=20=EC=97=A0=EB=B4=84=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=20=EC=83=9D=EC=84=B1=20=EC=A3=BC=EC=84=9D=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ContractMgmtService.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/com/pms/salesmgmt/service/ContractMgmtService.java b/src/com/pms/salesmgmt/service/ContractMgmtService.java index 2398004..c799716 100644 --- a/src/com/pms/salesmgmt/service/ContractMgmtService.java +++ b/src/com/pms/salesmgmt/service/ContractMgmtService.java @@ -2821,15 +2821,16 @@ private String encodeImageToBase64(String imagePath) { // 프로젝트 SETUP_TASK 등록 cnt = sqlSession.insert("contractMgmt.insertProjectSetupTask", projectParam); - // 동일 품번 M-BOM 자동 복사 (Machine 제외) - if(!isMachine) { - copyMbomIfSamePartNoExists(sqlSession, - (String)projectParam.get("OBJID"), - CommonUtils.checkNull(item.get("PART_NO")), - CommonUtils.checkNull(item.get("PART_NAME")), - person.getUserId(), - itemQuantity); - } + // 동일 품번 M-BOM 자동 복사 제거 - 수주 시점에는 총생산수량 미확정이므로 + // M-BOM관리에서 생산계획 입력 후 수동 복사하도록 변경 + // if(!isMachine) { + // copyMbomIfSamePartNoExists(sqlSession, + // (String)projectParam.get("OBJID"), + // CommonUtils.checkNull(item.get("PART_NO")), + // CommonUtils.checkNull(item.get("PART_NAME")), + // person.getUserId(), + // itemQuantity); + // } // project_no - unit 폴더 생성 Map projectInfo = (Map)sqlSession.selectOne("project.getProjectMngInfo", projectParam); @@ -3046,15 +3047,16 @@ private String encodeImageToBase64(String imagePath) { // 프로젝트 SETUP_TASK 등록 cnt = sqlSession.insert("contractMgmt.insertProjectSetupTask", projectParam); - // 동일 품번 M-BOM 자동 복사 (Machine 제외) - if(!isMachine) { - copyMbomIfSamePartNoExists(sqlSession, - (String)projectParam.get("OBJID"), - CommonUtils.checkNull(item.get("PART_NO")), - CommonUtils.checkNull(item.get("PART_NAME")), - person.getUserId(), - itemQuantity); - } + // 동일 품번 M-BOM 자동 복사 제거 - 수주 시점에는 총생산수량 미확정이므로 + // M-BOM관리에서 생산계획 입력 후 수동 복사하도록 변경 + // if(!isMachine) { + // copyMbomIfSamePartNoExists(sqlSession, + // (String)projectParam.get("OBJID"), + // CommonUtils.checkNull(item.get("PART_NO")), + // CommonUtils.checkNull(item.get("PART_NAME")), + // person.getUserId(), + // itemQuantity); + // } // project_no - unit 폴더 생성 Map projectInfo = (Map)sqlSession.selectOne("project.getProjectMngInfo", projectParam); From dc721d1ab189d5946b5b178174db13373e8febd8 Mon Sep 17 00:00:00 2001 From: hjjeong Date: Fri, 27 Feb 2026 14:43:13 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EA=B2=B0?= =?UTF-8?q?=EC=9E=AC=20html=20=EB=8B=B4=EB=8B=B9=EC=9E=90=20->=20=EC=88=98?= =?UTF-8?q?=EC=8B=A0=EC=9D=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/pms/service/ApprovalService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/pms/service/ApprovalService.java b/src/com/pms/service/ApprovalService.java index 48a1132..641476e 100644 --- a/src/com/pms/service/ApprovalService.java +++ b/src/com/pms/service/ApprovalService.java @@ -2595,7 +2595,7 @@ public class ApprovalService { html.append("영업번호").append(contractNo).append(""); html.append("수신처").append(customerName).append(""); html.append("작성일").append(regdate).append(""); - html.append("담당자").append(contactPerson).append(""); + html.append("수신인").append(contactPerson).append(""); html.append("작성자").append(writerName).append(""); html.append("모델명").append(modelName).append(""); @@ -2717,7 +2717,7 @@ public class ApprovalService { html.append("작성일"); html.append("").append(escapeHtml(regdate)).append(""); - html.append("담당자"); + html.append("수신인"); html.append("").append(escapeHtml(contactPerson)).append(""); html.append("작성자"); From ac189cd114823dae765db857e16ae7ebf87f8e1b Mon Sep 17 00:00:00 2001 From: hjjeong Date: Fri, 27 Feb 2026 16:03:54 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B1=B0=EB=9E=98=EB=AA=85=EC=84=B8?= =?UTF-8?q?=EC=84=9C=20=EC=BB=AC=EB=9F=BC=20=EC=A3=BC=EC=84=9D=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp index 4ee7a37..fd440ff 100644 --- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp +++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp @@ -445,6 +445,7 @@ var columns = [ {headerHozAlign : 'center', hozAlign : 'center', width : '70', title : '출하방법', field : 'SHIPPING_METHOD'}, {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '담당자', field : 'MANAGER'}, {headerHozAlign : 'center', hozAlign : 'center', width : '70', title : '인도조건', field : 'INCOTERMS'}, + */ {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '거래명세서', field : 'TRANSACTION_STATEMENT', formatter: function(cell) { var data = cell.getRow().getData(); @@ -466,7 +467,6 @@ var columns = [ if(projectNo) fn_openTransactionStatementPopup(projectNo, hasStatement); } } - */ ]; // 헤더 텍스트 길이 기반 minWidth 자동 적용