From 140d87bb82b516a5798d7d692e4bc7fb77dc3b43 Mon Sep 17 00:00:00 2001 From: leeheejin Date: Tue, 16 Dec 2025 14:52:19 +0900 Subject: [PATCH] =?UTF-8?q?=ED=99=95=EC=9D=B8=EC=A0=84=20=EC=BB=A4?= =?UTF-8?q?=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../classes/com/pms/mapper/purchaseOrder.xml | 169 +- .../classes/com/pms/mapper/quality.xml | 1424 ++++++++++++++++- .../semiProductInspectionFormPopUp.jsp | 702 +++++++- .../quality/semiProductInspectionList.jsp | 170 +- .../controller/PurchaseOrderController.java | 24 + src/com/pms/controller/QualityController.java | 44 +- src/com/pms/mapper/purchaseOrder.xml | 22 + src/com/pms/mapper/quality.xml | 357 ++++- src/com/pms/service/PurchaseOrderService.java | 11 + src/com/pms/service/QualityService.java | 270 ++++ 10 files changed, 2981 insertions(+), 212 deletions(-) diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml b/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml index 66fd97a..e4fbb29 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml @@ -544,11 +544,14 @@ EFFECTIVE_DATE, PAYMENT_TERMS, REMARK, + REQUEST_CONTENT, WRITER, REGDATE, STATUS, SALES_REQUEST_OBJID, - SALES_MNG_USER_ID + SALES_MNG_USER_ID, + SALES_MNG_USER_ID2, + FORM_TYPE ,TITLE ,PURCHASE_DATE ,CONTRACT_MGMT_OBJID @@ -562,6 +565,7 @@ ,TOTAL_REAL_SUPPLY_PRICE ,DISCOUNT_PRICE ,TOTAL_PRICE + ,TOTAL_PRICE_ALL ,NEGO_RATE ,SUPPLY_BUS_NO ,SUPPLY_USER_NAME @@ -597,14 +601,17 @@ #{EFFECTIVE_DATE}, #{PAYMENT_TERMS}, #{REMARK}, + #{REQUEST_CONTENT}, #{WRITER}, NOW(), #{STATUS}, #{SALES_REQUEST_OBJID}, - #{SALES_MNG_USER_ID} + #{SALES_MNG_USER_ID}, + #{SALES_MNG_USER_ID2}, + #{FORM_TYPE} ,#{TITLE} ,#{PURCHASE_DATE} - ,#{CONTRACT_MGMT_OBJID}::NUMERIC + ,#{CONTRACT_MGMT_OBJID} ,#{TYPE } ,#{INSPECT_METHOD } ,#{TOTAL_PRICE_TXT } @@ -615,6 +622,7 @@ ,#{TOTAL_REAL_SUPPLY_PRICE} ,#{DISCOUNT_PRICE } ,#{TOTAL_PRICE } + ,#{TOTAL_PRICE_ALL } ,#{NEGO_RATE } ,#{SUPPLY_BUS_NO } ,#{SUPPLY_USER_NAME } @@ -650,12 +658,17 @@ EFFECTIVE_DATE = #{EFFECTIVE_DATE}, PAYMENT_TERMS = #{PAYMENT_TERMS}, REMARK = #{REMARK}, + REQUEST_CONTENT = #{REQUEST_CONTENT}, WRITER = #{WRITER}, STATUS = #{STATUS}, - SALES_MNG_USER_ID = #{SALES_MNG_USER_ID} + SALES_MNG_USER_ID = #{SALES_MNG_USER_ID}, + SALES_MNG_USER_ID2 = #{SALES_MNG_USER_ID2} + + ,FORM_TYPE = #{FORM_TYPE} + ,TITLE = #{TITLE} ,PURCHASE_DATE = #{PURCHASE_DATE} - ,CONTRACT_MGMT_OBJID = #{CONTRACT_MGMT_OBJID}::NUMERIC + ,CONTRACT_MGMT_OBJID = #{CONTRACT_MGMT_OBJID} ,TYPE = #{TYPE } ,INSPECT_METHOD = #{INSPECT_METHOD } ,TOTAL_PRICE_TXT = #{TOTAL_PRICE_TXT } @@ -669,6 +682,7 @@ ,TOTAL_REAL_SUPPLY_PRICE = #{TOTAL_REAL_SUPPLY_PRICE} ,DISCOUNT_PRICE = #{DISCOUNT_PRICE } ,TOTAL_PRICE = #{TOTAL_PRICE } + ,TOTAL_PRICE_ALL = #{TOTAL_PRICE_ALL } ,NEGO_RATE = #{NEGO_RATE } ,SUPPLY_BUS_NO = #{SUPPLY_BUS_NO } ,SUPPLY_USER_NAME = #{SUPPLY_USER_NAME } @@ -736,7 +750,8 @@ REGDATE, STATUS, SALES_REQUEST_OBJID, - SALES_MNG_USER_ID + SALES_MNG_USER_ID, + FORM_TYPE ,TITLE ,PURCHASE_DATE ,CONTRACT_MGMT_OBJID @@ -775,7 +790,8 @@ NOW(), 'create', #{SALES_REQUEST_OBJID}, - #{SALES_MNG_USER_ID} + #{SALES_MNG_USER_ID}, + #{FORM_TYPE} ,#{TITLE} ,#{PURCHASE_DATE} ,NULLIF(#{PROJECT_NO}::TEXT, '')::NUMERIC @@ -813,7 +829,7 @@ SALES_MNG_USER_ID = #{SALES_MNG_USER_ID} ,TITLE = #{TITLE} ,PURCHASE_DATE = #{PURCHASE_DATE} - ,CONTRACT_MGMT_OBJID = NULLIF(#{CONTRACT_MGMT_OBJID}::TEXT, '')::NUMERIC + ,CONTRACT_MGMT_OBJID = #{CONTRACT_MGMT_OBJID} ,TYPE = #{TYPE } ,INSPECT_METHOD = #{INSPECT_METHOD } ,TOTAL_PRICE_TXT = #{TOTAL_PRICE_TXT } @@ -970,7 +986,7 @@ #{SALES_MNG_USER_ID} ,#{TITLE} ,#{PURCHASE_DATE} - ,#{CONTRACT_MGMT_OBJID}::NUMERIC + ,#{CONTRACT_MGMT_OBJID} ,#{TYPE } ,#{INSPECT_METHOD } ,#{TOTAL_PRICE_TXT } @@ -1157,6 +1173,10 @@ ,STOCK_QTY ,REAL_ORDER_QTY ,REAL_SUPPLY_PRICE + ,PART_DELIVERY_PLACE + ,PRODUCT_NAME + ,WORK_ORDER_NO + ,DELIVERY_REQUEST_DATE ) VALUES ( @@ -1196,6 +1216,10 @@ ,REPLACE(#{STOCK_QTY} ::VARCHAR, ',', '') ,REPLACE(#{REAL_ORDER_QTY} ::VARCHAR, ',', '') ,REPLACE(#{REAL_SUPPLY_PRICE} ::VARCHAR, ',', '') + ,#{PART_DELIVERY_PLACE} + ,#{PRODUCT_NAME} + ,#{WORK_ORDER_NO} + ,#{DELIVERY_REQUEST_DATE} ) ON CONFLICT (OBJID) DO UPDATE SET @@ -1223,6 +1247,10 @@ ,STOCK_QTY = REPLACE(#{STOCK_QTY} ::VARCHAR, ',', '') ,REAL_ORDER_QTY = REPLACE(#{REAL_ORDER_QTY} ::VARCHAR, ',', '') ,REAL_SUPPLY_PRICE = REPLACE(#{REAL_SUPPLY_PRICE} ::VARCHAR, ',', '') + ,PART_DELIVERY_PLACE = #{PART_DELIVERY_PLACE} + ,PRODUCT_NAME = #{PRODUCT_NAME} + ,WORK_ORDER_NO = #{WORK_ORDER_NO} + ,DELIVERY_REQUEST_DATE = #{DELIVERY_REQUEST_DATE} SELECT T1.OBJID ,T1.BUS_REG_NO AS SUPPLY_BUS_NO - ,(CASE WHEN T2.OBJID IS NULL THEN T1.CHARGE_USER_NAME ELSE T2.CHARGER_NAME END) AS SUPPLY_USER_NAME - ,(CASE WHEN T2.OBJID IS NULL THEN T1.SUPPLY_TEL_NO ELSE T2.PHONE END) AS SUPPLY_USER_HP - ,(CASE WHEN T2.OBJID IS NULL THEN T1.OFFICE_NO ELSE T2.TEL END) AS SUPPLY_USER_TEL - ,(CASE WHEN T2.OBJID IS NULL THEN T1.SUPPLY_FAX_NO ELSE T2.FAX END) AS SUPPLY_USER_FAX - ,(CASE WHEN T2.OBJID IS NULL THEN T1.EMAIL ELSE T2.EMAIL END) AS SUPPLY_USER_EMAIL - ,T1.SUPPLY_ADDRESS AS SUPPLY_ADDR - FROM ADMIN_SUPPLY_MNG AS T1 - LEFT OUTER JOIN - (SELECT * FROM (SELECT DENSE_RANK() OVER(PARTITION BY T.SUPPLY_OBJID ORDER BY T.CHARGER_NAME ASC) AS TOP, T.* - FROM SUPPLY_CHARGER_MNG T WHERE CHARGER_TYPE = '0000330' /*발주서공급처담당*/ - ) AS T WHERE TOP = 1 - ) AS T2 - ON T1.OBJID = T2.SUPPLY_OBJID::NUMERIC + ,T1.CEO_NM AS SUPPLY_USER_NAME + ,T1.VENDOR_MOBILE AS SUPPLY_USER_HP + ,T1.TEL_NO AS SUPPLY_USER_TEL + ,T1.FAX_NO AS SUPPLY_USER_FAX + ,T1.EMAIL AS SUPPLY_USER_EMAIL + ,CONCAT(COALESCE(T1.ADDR1,''), ' ', COALESCE(T1.ADDR2,'')) AS SUPPLY_ADDR + FROM CLIENT_MNG AS T1 WHERE 1=1 - AND T1.OBJID = #{PARTNER_OBJID}::NUMERIC + AND T1.OBJID::VARCHAR = #{PARTNER_OBJID}::VARCHAR + SELECT + AP.ORDER_PART_OBJID AS OBJID + ,AP.PART_OBJID + ,COALESCE(CASE WHEN POM.TYPE IN ('0001070','0001069') THEN PM.PART_NO ELSE POP.PART_NO END, PM.PART_NO, '') AS PART_NO + ,COALESCE(POP.PART_NAME, PM.PART_NAME, '') AS PART_NAME + ,COALESCE(POP.PART_NAME, PM.PART_NAME, '') AS MODEL_NAME + ,COALESCE(POM.PURCHASE_ORDER_NO, '') AS WORK_ORDER_NO + ,COALESCE(SUM(AP.RECEIPT_QTY::NUMERIC), 0) AS RECEIPT_QTY + FROM ARRIVAL_PLAN AP + LEFT JOIN PURCHASE_ORDER_PART POP ON POP.OBJID = AP.ORDER_PART_OBJID + LEFT JOIN PART_MNG PM ON PM.OBJID::VARCHAR = AP.PART_OBJID OR PM.OBJID = POP.PART_OBJID + LEFT JOIN PURCHASE_ORDER_MASTER POM ON POM.OBJID = AP.PARENT_OBJID + WHERE AP.RECEIPT_QTY IS NOT NULL + AND AP.RECEIPT_QTY::NUMERIC > 0 + AND AP.INVENTORY_STATUS = 'Y' + GROUP BY AP.ORDER_PART_OBJID, AP.PART_OBJID, POP.PART_NO, POP.PART_NAME, PM.PART_NO, PM.PART_NAME, POM.PURCHASE_ORDER_NO, POM.TYPE + ORDER BY PART_NO + + \ No newline at end of file diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml b/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml index 43abae3..ddf54e4 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml @@ -660,64 +660,139 @@ @@ -731,13 +806,13 @@ , A.INSPECTION_MEMO , A.WRITER , TO_CHAR(A.REG_DATE, 'YYYY-MM-DD') AS REG_DATE - FROM PMS_QUALITY_INCOMING_INSPECTION A + FROM QUALITY_INCOMING_INSPECTION A WHERE A.OBJID = #{OBJID} - INSERT INTO PMS_QUALITY_INCOMING_INSPECTION ( + INSERT INTO QUALITY_INCOMING_INSPECTION ( OBJID , PURCHASE_ORDER_MASTER_OBJID , INSPECTOR_ID @@ -760,7 +835,7 @@ - UPDATE PMS_QUALITY_INCOMING_INSPECTION + UPDATE QUALITY_INCOMING_INSPECTION SET INSPECTOR_ID = #{INSPECTOR_ID} , INSPECTION_DATE = TO_DATE(#{INSPECTION_DATE}, 'YYYY-MM-DD') , INSPECTION_RESULT = #{INSPECTION_RESULT} @@ -768,38 +843,1239 @@ WHERE OBJID = #{OBJID} - + + + + + + + + + + + + + + + INSERT INTO PROCESS_INSPECTION_MASTER ( + OBJID + , INSPECTION_DATE + , INSPECTOR_ID + , REMARK + , WRITER + , REG_DATE + ) VALUES ( + #{OBJID} + , #{INSPECTION_DATE} + , #{INSPECTOR_ID} + , #{REMARK} + , #{WRITER} + , NOW() + ) + + + + + UPDATE PROCESS_INSPECTION_MASTER SET + INSPECTION_DATE = #{INSPECTION_DATE} + , INSPECTOR_ID = #{INSPECTOR_ID} + , REMARK = #{REMARK} + , MOD_DATE = NOW() + WHERE OBJID = #{OBJID} + + + + + INSERT INTO PROCESS_INSPECTION_DETAIL ( + OBJID + , MASTER_OBJID + , PROCESS_CD + , PROJECT_OBJID + , PART_OBJID + , PART_NO + , PART_NAME + , INSPECTION_QTY + , DEFECT_QTY + , WORK_ENV_STATUS + , MEASURING_DEVICE + , DEPT_CD + , USER_ID + , REMARK + , ACTION_STATUS + , INSPECTION_RESULT + , WRITER + , REG_DATE + ) VALUES ( + #{OBJID} + , #{MASTER_OBJID} + , #{PROCESS_CD} + , #{PROJECT_OBJID} + , #{PART_OBJID} + , #{PART_NO} + , #{PART_NAME} + , NULLIF(#{INSPECTION_QTY}, '')::NUMERIC + , NULLIF(#{DEFECT_QTY}, '')::NUMERIC + , #{WORK_ENV_STATUS} + , #{MEASURING_DEVICE} + , #{DEPT_CD} + , #{USER_ID} + , #{REMARK} + , #{ACTION_STATUS} + , #{INSPECTION_RESULT} + , #{WRITER} + , NOW() + ) + ON CONFLICT (OBJID) DO UPDATE SET + PROCESS_CD = #{PROCESS_CD} + , PROJECT_OBJID = #{PROJECT_OBJID} + , PART_OBJID = #{PART_OBJID} + , PART_NO = #{PART_NO} + , PART_NAME = #{PART_NAME} + , INSPECTION_QTY = NULLIF(#{INSPECTION_QTY}, '')::NUMERIC + , DEFECT_QTY = NULLIF(#{DEFECT_QTY}, '')::NUMERIC + , WORK_ENV_STATUS = #{WORK_ENV_STATUS} + , MEASURING_DEVICE = #{MEASURING_DEVICE} + , DEPT_CD = #{DEPT_CD} + , USER_ID = #{USER_ID} + , REMARK = #{REMARK} + , ACTION_STATUS = #{ACTION_STATUS} + , INSPECTION_RESULT = #{INSPECTION_RESULT} + , MOD_DATE = NOW() + + + + + DELETE FROM PROCESS_INSPECTION_DETAIL WHERE MASTER_OBJID = #{MASTER_OBJID} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO PMS_QUALITY_SEMI_PRODUCT_INSPECTION ( + OBJID + , PROJECT_NO + , WORK_ORDER_NO + , PART_NO + , PART_NAME + , RECEIPT_QTY + , DISPOSITION_TYPE + , REMARK + , WRITER + , REG_DATE + ) VALUES ( + #{OBJID} + , #{PROJECT_NO} + , #{WORK_ORDER_NO} + , #{PART_NO} + , #{PART_NAME} + , #{RECEIPT_QTY}::NUMERIC + , #{DISPOSITION_TYPE} + , #{REMARK} + , #{WRITER} + , NOW() + ) + + + + + UPDATE PMS_QUALITY_SEMI_PRODUCT_INSPECTION + SET PROJECT_NO = #{PROJECT_NO} + , WORK_ORDER_NO = #{WORK_ORDER_NO} + , PART_NO = #{PART_NO} + , PART_NAME = #{PART_NAME} + , RECEIPT_QTY = #{RECEIPT_QTY}::NUMERIC + , DISPOSITION_TYPE = #{DISPOSITION_TYPE} + , REMARK = #{REMARK} + , WRITER = #{WRITER} + , REG_DATE = NOW() + WHERE OBJID = #{OBJID} + + + + + INSERT INTO PMS_QUALITY_SEMI_PRODUCT_INSPECTION ( + OBJID + , MODEL_NAME + , PRODUCT_TYPE + , WORK_ORDER_NO + , PART_NO + , PART_NAME + , RECEIPT_QTY + , GOOD_QTY + , DEFECT_QTY + , DEFECT_TYPE + , DEFECT_CAUSE + , RESPONSIBLE_DEPT + , PROCESS_STATUS + , INSPECTION_DATE + , INSPECTOR + , DISPOSITION_TYPE + , REMARK + , WRITER + , REG_DATE + , DATA_TYPE + , INSPECTION_GROUP_ID + ) VALUES ( + #{OBJID} + , #{MODEL_NAME} + , #{PRODUCT_TYPE} + , #{WORK_ORDER_NO} + , #{PART_NO} + , #{PART_NAME} + , COALESCE(NULLIF(#{RECEIPT_QTY}, '')::NUMERIC, 0) + , COALESCE(NULLIF(#{GOOD_QTY}, '')::NUMERIC, 0) + , COALESCE(NULLIF(#{DEFECT_QTY}, '')::NUMERIC, 0) + , #{DEFECT_TYPE} + , #{DEFECT_CAUSE} + , #{RESPONSIBLE_DEPT} + , #{PROCESS_STATUS} + , CASE WHEN #{INSPECTION_DATE} = '' THEN NULL ELSE #{INSPECTION_DATE}::DATE END + , #{INSPECTOR} + , #{DISPOSITION_TYPE} + , #{REMARK} + , #{WRITER} + , NOW() + , #{DATA_TYPE} + , #{INSPECTION_GROUP_ID} + ) + + + + + + + + + + + + + + + + INSERT INTO CUSTOMER_CS ( + OBJID + , RECEIPT_NO + , RECEIPT_DATE + , QTY + , CUSTOMER_OBJID + , MODEL_NAME + , PRODUCT_NO + , PRODUCT_NAME + , PART_NO + , PART_NAME + , PRODUCTION_DATE + , SALES_DATE + , SERIAL_NO + , MANUFACTURER + , COMPLAINT_CONTENT + , BLAME_DECISION + , STATUS + , REMARK + , WRITER + , REG_DATE + ) VALUES ( + #{OBJID} + , #{RECEIPT_NO} + , #{RECEIPT_DATE} + , NULLIF(#{QTY}, '')::NUMERIC + , #{CUSTOMER_OBJID} + , #{MODEL_NAME} + , #{PRODUCT_NO} + , #{PRODUCT_NAME} + , #{PART_NO} + , #{PART_NAME} + , #{PRODUCTION_DATE} + , #{SALES_DATE} + , #{SERIAL_NO} + , #{MANUFACTURER} + , #{COMPLAINT_CONTENT} + , #{BLAME_DECISION} + , #{STATUS} + , #{REMARK} + , #{WRITER} + , NOW() + ) + + + + + UPDATE CUSTOMER_CS SET + RECEIPT_DATE = #{RECEIPT_DATE} + , QTY = NULLIF(#{QTY}, '')::NUMERIC + , CUSTOMER_OBJID = #{CUSTOMER_OBJID} + , MODEL_NAME = #{MODEL_NAME} + , PRODUCT_NO = #{PRODUCT_NO} + , PRODUCT_NAME = #{PRODUCT_NAME} + , PART_NO = #{PART_NO} + , PART_NAME = #{PART_NAME} + , PRODUCTION_DATE = #{PRODUCTION_DATE} + , SALES_DATE = #{SALES_DATE} + , SERIAL_NO = #{SERIAL_NO} + , MANUFACTURER = #{MANUFACTURER} + , COMPLAINT_CONTENT = #{COMPLAINT_CONTENT} + , MOD_DATE = NOW() + WHERE OBJID = #{OBJID} + + + + + UPDATE CUSTOMER_CS SET + ACTION_CONTENT = #{ACTION_CONTENT} + , BLAME_DECISION = #{BLAME_DECISION} + , ACTION_DATE = #{ACTION_DATE} + , ACTION_USER_ID = #{ACTION_USER_ID} + , STATUS = #{STATUS} + , REMARK = #{REMARK} + , MOD_DATE = NOW() + WHERE OBJID = #{OBJID} + + + + + + + + + + + + + + + + INSERT INTO PMS_QUALITY_ECR ( + OBJID + , ECR_NO + , REQUEST_DATE + , REQUESTER_ID + , PART_OBJID + , PART_NO + , PART_NAME + , ISSUE_CONTENT + , DUE_DATE + , ACTION_DEPT + , ACTION_MANAGER_ID + , ATTACH_FILE_OBJID + , REMARK + , WRITER + , REG_DATE + ) VALUES ( + #{OBJID} + , #{ECR_NO} + , #{REQUEST_DATE} + , #{REQUESTER_ID} + , #{PART_OBJID} + , #{PART_NO} + , #{PART_NAME} + , #{ISSUE_CONTENT} + , #{DUE_DATE} + , #{ACTION_DEPT} + , #{ACTION_MANAGER_ID} + , #{ATTACH_FILE_OBJID} + , #{REMARK} + , #{WRITER} + , NOW() + ) + + + + + UPDATE PMS_QUALITY_ECR SET + REQUEST_DATE = #{REQUEST_DATE} + , REQUESTER_ID = #{REQUESTER_ID} + , PART_OBJID = #{PART_OBJID} + , PART_NO = #{PART_NO} + , PART_NAME = #{PART_NAME} + , ISSUE_CONTENT = #{ISSUE_CONTENT} + , DUE_DATE = #{DUE_DATE} + , ACTION_DEPT = #{ACTION_DEPT} + , ACTION_MANAGER_ID = #{ACTION_MANAGER_ID} + , REMARK = #{REMARK} + , MODIFIER = #{WRITER} + , MOD_DATE = NOW() + WHERE OBJID = #{OBJID} + + + + + UPDATE PMS_QUALITY_ECR SET + ACTION_USER_ID = #{ACTION_USER_ID} + , ACTION_CONTENT = #{ACTION_CONTENT} + , COMPLETE_DATE = #{COMPLETE_DATE} + , MODIFIER = #{MODIFIER} + , MOD_DATE = NOW() + WHERE OBJID = #{OBJID} + + + + + + + + + + + + + INSERT INTO INCOMING_INSPECTION_DETAIL ( + OBJID + , INVENTORY_IN_OBJID + , PURCHASE_ORDER_MASTER_OBJID + , INSPECTION_DATE + , INSPECTOR_ID + , INSPECTION_TYPE + , INSPECTION_YN + , DEFECT_TYPE + , DEFECT_REASON + , ACTION_STATUS + , INSPECTION_QTY + , DEFECT_QTY + , INSPECTION_RESULT + , ATTACH_FILE_OBJID + , REMARK + , WRITER + , REG_DATE + ) VALUES ( + #{NEW_OBJID} + , #{OBJID} + , #{PURCHASE_ORDER_MASTER_OBJID} + , #{INSPECTION_DATE} + , #{INSPECTOR_ID} + , #{INSPECTION_TYPE} + , #{INSPECTION_YN} + , #{DEFECT_TYPE} + , #{DEFECT_REASON} + , #{ACTION_STATUS} + , #{INSPECTION_QTY} + , #{DEFECT_QTY} + , #{INSPECTION_RESULT} + , #{ATTACH_FILE_OBJID} + , #{REMARK} + , #{WRITER} + , NOW() + ) + ON CONFLICT (INVENTORY_IN_OBJID) DO UPDATE SET + INSPECTION_DATE = #{INSPECTION_DATE} + , INSPECTOR_ID = #{INSPECTOR_ID} + , INSPECTION_TYPE = #{INSPECTION_TYPE} + , INSPECTION_YN = #{INSPECTION_YN} + , DEFECT_TYPE = #{DEFECT_TYPE} + , DEFECT_REASON = #{DEFECT_REASON} + , ACTION_STATUS = #{ACTION_STATUS} + , INSPECTION_QTY = #{INSPECTION_QTY} + , DEFECT_QTY = #{DEFECT_QTY} + , INSPECTION_RESULT = #{INSPECTION_RESULT} + , ATTACH_FILE_OBJID = #{ATTACH_FILE_OBJID} + , REMARK = #{REMARK} + , MODIFIER = #{WRITER} + , MOD_DATE = NOW() + + \ No newline at end of file diff --git a/WebContent/WEB-INF/view/quality/semiProductInspectionFormPopUp.jsp b/WebContent/WEB-INF/view/quality/semiProductInspectionFormPopUp.jsp index 489a000..0035d7e 100644 --- a/WebContent/WEB-INF/view/quality/semiProductInspectionFormPopUp.jsp +++ b/WebContent/WEB-INF/view/quality/semiProductInspectionFormPopUp.jsp @@ -6,85 +6,669 @@ <%@include file= "/init.jsp" %> <% String menuObjId = request.getParameter("menuObjId"); -String menuName = CommonUtils.getMenuName(menuObjId, "반제품검사 등록"); +String menuName = CommonUtils.getMenuName(menuObjId, "반제품검사"); +String OBJID = CommonUtils.checkNull(request.getParameter("OBJID")); +String INSPECTION_GROUP_ID = CommonUtils.checkNull(request.getParameter("INSPECTION_GROUP_ID")); +String WORK_ORDER_NO = CommonUtils.checkNull(request.getParameter("WORK_ORDER_NO")); +String actionType = CommonUtils.checkNull(request.getParameter("actionType")); +Map info = (Map)request.getAttribute("info"); + +// 로그인 사용자 정보 +PersonBean person = (PersonBean)session.getAttribute(Constants.PERSON_BEAN); +String loginUserName = CommonUtils.checkNull(person.getUserName()); +String loginUserId = CommonUtils.checkNull(person.getUserId()); %> - <%=Constants.SYSTEM_NAME%> + <%=Constants.SYSTEM_NAME%> + + + + + + + +
+ +
+

<%=menuName%>

+
+ + +
+
+ + +
+ +
+
+

양품 정보 (입고관리)

+
+ + +
+
+
+
+ + +
+
+

불량 정보

+
+ + +
+
+
+
+
+
+ - - -
-
-
-

<%=menuName%>

-
- - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
프로젝트번호작업지시번호
품번품명
입고수량폐기/수정/특채 - -
비고
-
-
-
- diff --git a/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp b/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp index ef66061..9f2d387 100644 --- a/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp +++ b/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp @@ -18,15 +18,45 @@ String menuName = CommonUtils.getMenuName(menuObjId, "반제품검사 관리");