From a4a066390d10e20ec87773c1f9cd73ea9ca57ad1 Mon Sep 17 00:00:00 2001 From: hjjeong Date: Tue, 9 Dec 2025 11:53:57 +0900 Subject: [PATCH] =?UTF-8?q?=ED=92=88=EC=A7=88=EA=B4=80=EB=A6=AC=5F?= =?UTF-8?q?=EA=B3=A0=EA=B0=9DCS=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/view/common/ImageRegistPopup.jsp | 347 +++++++++++++ .../quality/customerCsActionFormPopUp.jsp | 459 ++++++++++++++---- .../quality/customerCsDefectFormPopUp.jsp | 252 +++++++--- .../WEB-INF/view/quality/customerCsList.jsp | 221 +++++---- .../view/quality/incomingInspectionList.jsp | 7 + .../view/quality/processInspectionList.jsp | 6 + WebContent/WEB-INF/view/viewImageByObjId.jsp | 68 +++ src/com/pms/controller/CommonController.java | 27 ++ src/com/pms/controller/QualityController.java | 49 +- src/com/pms/mapper/quality.xml | 136 +++++- src/com/pms/service/QualityService.java | 80 +++ 11 files changed, 1378 insertions(+), 274 deletions(-) create mode 100644 WebContent/WEB-INF/view/common/ImageRegistPopup.jsp create mode 100644 WebContent/WEB-INF/view/viewImageByObjId.jsp diff --git a/WebContent/WEB-INF/view/common/ImageRegistPopup.jsp b/WebContent/WEB-INF/view/common/ImageRegistPopup.jsp new file mode 100644 index 0000000..5329234 --- /dev/null +++ b/WebContent/WEB-INF/view/common/ImageRegistPopup.jsp @@ -0,0 +1,347 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page import="com.pms.common.utils.*"%> +<%@ page import="java.util.*" %> +<%@include file= "/init.jsp" %> + + + + +<%=Constants.SYSTEM_NAME%> + + + + +
+ +
+
+

+ 이미지 등록 +

+
+
+ + + + + + + + + +
이미지
업로드		 + +
+

📷 이미지 파일을 여기에 드래그하거나 아래에서 선택하세요

+

허용 확장자: jpg, jpeg, png, gif, bmp, webp

+
+ +
+ + +
+
이미지
목록		 + +
+
등록된 이미지가 없습니다.
+
+
+
+
+ +
+
+
+
+
+ + diff --git a/WebContent/WEB-INF/view/quality/customerCsActionFormPopUp.jsp b/WebContent/WEB-INF/view/quality/customerCsActionFormPopUp.jsp index 9ddd305..7a41d37 100644 --- a/WebContent/WEB-INF/view/quality/customerCsActionFormPopUp.jsp +++ b/WebContent/WEB-INF/view/quality/customerCsActionFormPopUp.jsp @@ -3,23 +3,84 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ page import="com.pms.common.utils.*"%> <%@ page import="java.util.*" %> -<%@include file= "/init.jsp" %> +<%@include file= "/init_new.jsp" %> <% String menuObjId = request.getParameter("menuObjId"); -String menuName = CommonUtils.getMenuName(menuObjId, "조치결과 등록"); +String actionType = CommonUtils.checkNull(request.getParameter("actionType")); +// 뷰 모드인지 판단 +boolean isViewMode = "view".equals(actionType); +String menuName = isViewMode ? "조치결과 조회" : CommonUtils.getMenuName(menuObjId, "조치결과 등록"); + Map info = (Map)request.getAttribute("info"); if(info == null) info = new HashMap(); + +String objId = CommonUtils.checkNull(info.get("objid")); + +// 오늘 날짜 +String today = new java.text.SimpleDateFormat("yyyy-MM-dd").format(new java.util.Date()); +String actionDate = CommonUtils.checkNull(info.get("action_date")); +if(actionDate.isEmpty()) actionDate = today; + +// 조치자 +String actionUserName = CommonUtils.checkNull(info.get("action_user_name")); +if(actionUserName.isEmpty()) actionUserName = connectUserName; %> <%=Constants.SYSTEM_NAME%> +
- "> -
-
-

<%=menuName%>

-
- - + + +
+
+

+ <%=menuName%> +

+
+ +
+
+ +
+
+ 접수 정보 +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${info.receipt_date}${info.qty}
${info.customer_name}
${info.product_name}${info.product_no}
${info.part_name}${info.part_no}
${info.production_date}${info.sales_date}
${info.serial_no}${info.manufacturer}
+ +
+
+
+ + +
+
+ 조치결과 등록 +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ +
+ +
+
+ + +
+
+
+ + + + + + + + + + + + + +
No파일명등록일Size
+
+
+ + + + + + + + + +
+
+
+
+
-
-

■ 접수 정보

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
접수번호" readonly>접수일" readonly>고객사" readonly>
모델명" readonly>제품명" readonly>품번" readonly>
불만내용
- -

■ 조치 정보

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
조치일">조치자">상태 - -
귀책판정 - -
조치내용
비고
+
+ +
+
+ +
+ +
- diff --git a/WebContent/WEB-INF/view/quality/customerCsDefectFormPopUp.jsp b/WebContent/WEB-INF/view/quality/customerCsDefectFormPopUp.jsp index e039471..8abc402 100644 --- a/WebContent/WEB-INF/view/quality/customerCsDefectFormPopUp.jsp +++ b/WebContent/WEB-INF/view/quality/customerCsDefectFormPopUp.jsp @@ -3,21 +3,40 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ page import="com.pms.common.utils.*"%> <%@ page import="java.util.*" %> -<%@include file= "/init.jsp" %> +<%@include file= "/init_new.jsp" %> <% String menuObjId = request.getParameter("menuObjId"); String menuName = CommonUtils.getMenuName(menuObjId, "고객 불량 등록"); +String actionType = CommonUtils.checkNull(request.getParameter("actionType")); + +// OBJID가 없으면 신규 생성 (첨부파일 연결용) +String objId = CommonUtils.checkNull(request.getAttribute("info") != null ? ((Map)request.getAttribute("info")).get("objid") : ""); +boolean isNew = objId.isEmpty() || "new".equals(actionType); +if(objId.isEmpty()){ + objId = String.valueOf(CommonUtils.createObjId()); +} %> <%=Constants.SYSTEM_NAME%> +
-
-
-

<%=menuName%>

-
- - -
+ + + + +
+
+

+ <%=menuName%> +

+
+ +
+
+ 기본정보
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
접수일수량고객사
모델명제품명품번
생산일판매일S/N
제조사귀책판정 - - 상태 - -
불만내용
비고
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ +
+ + + +
+ + + +
+ + + +
+ + + +
+ +
+
+ +
+
+ +
+ +
- diff --git a/WebContent/WEB-INF/view/quality/customerCsList.jsp b/WebContent/WEB-INF/view/quality/customerCsList.jsp index 0ae33ab..1342d62 100644 --- a/WebContent/WEB-INF/view/quality/customerCsList.jsp +++ b/WebContent/WEB-INF/view/quality/customerCsList.jsp @@ -22,11 +22,12 @@ String menuName = CommonUtils.getMenuName(menuObjId, "고객 CS 관리"); .status-receipt { color: #007bff; font-weight: bold; } .status-progress { color: #ffc107; font-weight: bold; } .status-complete { color: #28a745; font-weight: bold; } - - /* 검색필터 아이템 스타일 */ - .search-item { display: flex; align-items: center; gap: 5px; } - .search-item label { font-weight: bold; white-space: nowrap; min-width: 60px; } - .search-item input, .search-item select { height: 28px; } + body, html { + overflow-x: hidden; + width: 100%; + margin: 0; + padding: 0; + } @@ -201,66 +251,63 @@ function fn_openAttachFilePopUp(objId){
-
-
- - - ~ - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - ~ - -
-
- - -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ ~ + + + +
+ + + + + ~ + +
<%@include file= "/WEB-INF/view/common/common_gridArea.jsp" %> diff --git a/WebContent/WEB-INF/view/quality/incomingInspectionList.jsp b/WebContent/WEB-INF/view/quality/incomingInspectionList.jsp index 814bb96..3510ef4 100644 --- a/WebContent/WEB-INF/view/quality/incomingInspectionList.jsp +++ b/WebContent/WEB-INF/view/quality/incomingInspectionList.jsp @@ -43,6 +43,13 @@ String menuName = CommonUtils.getMenuName(menuObjId, "수입검사 관리"); .inspection-ng { color: #dc3545; font-weight: bold; cursor: pointer; } .inspection-ok { color: #28a745; font-weight: bold; cursor: pointer; } .inspection-ng:hover, .inspection-ok:hover { text-decoration: underline; } + + body, html { + overflow-x: hidden; + width: 100%; + margin: 0; + padding: 0; + }