발주서 공급업체 테이블 변경(admin_supply_mng -> CLIENT_MNG)

WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp

@@ -164,14 +164,13 @@ $(document).ready(function(){
 	});
 });
 
-// 공급업체 목록 로드 (협력업체관리 ADMIN_SUPPLY_MNG + 일반거래처관리 CLIENT_MNG)
+// 공급업체 목록 로드 (일반거래처관리 CLIENT_MNG)
 function fn_loadVendorList(callback) {
 	vendorList = {};  // 객체 형태로 변경
 	vendorList[''] = '선택';  // 빈 값
 	
-	// 1. 협력업체 로드 (ADMIN_SUPPLY_MNG)
 	$.ajax({
-		url: "/admin/supplyMngPagingGridList.do",
+		url: "/admin/clientMngListPagingGridList.do",
 		method: 'post',
 		data: { 
 			countPerPage: 9999
@@ -180,44 +179,18 @@ function fn_loadVendorList(callback) {
 		success: function(data) {
 			if(data && data.RESULTLIST) {
 				data.RESULTLIST.forEach(function(item) {
-					var name = item.SUPPLY_NAME || '';
+					var name = item.CLIENT_NM || '';
 					var objid = item.OBJID || '';
 					if(objid && name) {
 						vendorList[objid] = name;
 					}
 				});
 			}
-			console.log("협력업체 로드 완료:", Object.keys(vendorList).length + "개", vendorList);
+			console.log("공급업체 로드 완료:", Object.keys(vendorList).length + "개", vendorList);
-			
+			if(callback) callback();
-			// 2. 일반거래처 로드 (CLIENT_MNG) - C_ 접두사 붙여서 구분
-			$.ajax({
-				url: "/admin/clientMngListPagingGridList.do",
-				method: 'post',
-				data: { 
-					countPerPage: 9999
-				},
-				dataType: 'json',
-				success: function(data2) {
-					if(data2 && data2.RESULTLIST) {
-						data2.RESULTLIST.forEach(function(item) {
-							var name = item.CLIENT_NM || '';
-							var objid = item.OBJID || '';
-							if(objid && name) {
-								vendorList['C_' + objid] = name + ' (일반)';
-							}
-						});
-					}
-					console.log("vendorList 최종 생성 완료:", Object.keys(vendorList).length + "개", vendorList);
-					if(callback) callback();
-				},
-				error: function(xhr, status, error) {
-					logError("일반거래처 목록 로드 실패:", error);
-					if(callback) callback();
-				}
-			});
 		},
 		error: function(xhr, status, error) {
-			logError("협력업체 목록 로드 실패:", error);
+			logError("공급업체 목록 로드 실패:", error);
 			if(callback) callback();
 		}
 	});

src/com/pms/controller/PurchaseOrderController.java

@@ -610,8 +610,8 @@ public class PurchaseOrderController {
 			code_map.put("PO_CLIENT_ID", commonService.bizMakeOptionList("Y", (String)info.get("PO_CLIENT_ID"),"admin.getSUPPLYInfoGridList", "searchHeadOffice", true, "objid", "supply_name", new String []{"supply_address","office_no","supply_fax_no","bus_reg_no","email"} ));
 			//당사프로젝트번호 project_no
 			code_map.put("project_no", commonService.bizMakeOptionList("", (String)info.get("CONTRACT_MGMT_OBJID"),"common.getProjectNameList"));
-			//공급업체
+			//공급업체 (CLIENT_MNG 테이블 사용)
-			code_map.put("partner_cd", commonService.bizMakeOptionList("", (String)info.get("PARTNER_OBJID"      ),"common.getmatersupplyselect"));
+			code_map.put("partner_cd", commonService.bizMakeOptionList("", (String)info.get("PARTNER_OBJID"      ),"common.getClientMngSupplySelect"));
 			//구매담당자
 			code_map.put("sales_mng_user_id", commonService.bizMakeOptionList("", (String)info.get("SALES_MNG_USER_ID"),"common.getUserselect", new String []{"cell_phone"} ));
 			

src/com/pms/mapper/common.xml

@@ -2717,24 +2717,48 @@ ORDER BY COALESCE(T.REVISION, '1.0')
 			  WHERE OBJID::numeric = #{OBJID}::numeric
 	</select>
 	
-		<select id="getmatersupplyselect" parameterType="map" resultType="map">
+	<!-- 공급업체 목록 조회 (ADMIN_SUPPLY_MNG 테이블) -->
-		SELECT 
+<select id="getmatersupplyselect" parameterType="map" resultType="map">
-		   OBJID::VARCHAR AS CODE
+	SELECT 
-		   ,SUPPLY_NAME AS NAME 
+	   OBJID::VARCHAR AS CODE
-		   ,OBJID::VARCHAR AS CODE_ID
+	   ,SUPPLY_NAME AS NAME 
-		   ,SUPPLY_NAME AS CODE_NAME 
+	   ,OBJID::VARCHAR AS CODE_ID
-		   ,SUPPLY_CODE AS CODE_CD
+	   ,SUPPLY_NAME AS CODE_NAME 
-		   ,REG_NO
+	   ,SUPPLY_CODE AS CODE_CD
-		   ,CHARGE_USER_NAME
+	   ,REG_NO
-		   ,SUPPLY_TEL_NO
+	   ,CHARGE_USER_NAME
-		   ,SUPPLY_FAX_NO
+	   ,SUPPLY_TEL_NO
-		   ,PAYMENT_METHOD
+	   ,SUPPLY_FAX_NO
-		   ,STATUS AS STATUS
+	   ,PAYMENT_METHOD
-		   ,'' AS ID
+	   ,STATUS AS STATUS
-		   ,'' AS EXT_VAL
+	   ,'' AS ID
-		FROM ADMIN_SUPPLY_MNG
+	   ,'' AS EXT_VAL
-		ORDER BY SUPPLY_NAME
+	FROM ADMIN_SUPPLY_MNG
-	</select>
+	ORDER BY SUPPLY_NAME
+</select>
+
+	<!-- 일반거래처 목록 조회 (CLIENT_MNG 테이블) - 발주서용 -->
+<select id="getClientMngSupplySelect" parameterType="map" resultType="map">
+	SELECT 
+	   OBJID::VARCHAR AS CODE
+	   ,CLIENT_NM AS NAME 
+	   ,OBJID::VARCHAR AS CODE_ID
+	   ,CLIENT_NM AS CODE_NAME 
+	   ,CLIENT_CD AS CODE_CD
+	   ,BUS_REG_NO AS REG_NO
+	   ,CEO_NM AS CHARGE_USER_NAME
+	   ,TEL_NO AS SUPPLY_TEL_NO
+	   ,FAX_NO AS SUPPLY_FAX_NO
+	   ,EMAIL AS SUPPLY_EMAIL
+	   ,PAYMENT_TERM AS PAYMENT_METHOD
+	   ,USE_YN AS STATUS
+	   ,'' AS ID
+	   ,'' AS EXT_VAL
+	FROM CLIENT_MNG
+	WHERE 1=1
+	--AND USE_YN = 'Y'
+	ORDER BY CLIENT_NM
+</select>
 	
 		<select id="getsupCode" parameterType="map" resultType="map">
 			 SELECT OBJID::VARCHAR SUPPLY_CODE 

src/com/pms/mapper/purchaseOrder.xml

@@ -2376,25 +2376,20 @@
 		 WHERE OBJID = #{objId} OR MULTI_MASTER_OBJID = #{objId}
 	</delete>
 	
+<!-- 공급처 정보 조회 (CLIENT_MNG 테이블) -->
 <select id="purchaseOrderAdminSupplyInfo" parameterType="map" resultType="map">
 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
+		,T1.CEO_NM AS SUPPLY_USER_NAME
-		,(CASE WHEN T2.OBJID IS NULL THEN T1.SUPPLY_TEL_NO    ELSE T2.PHONE        END) AS SUPPLY_USER_HP
+		,T1.VENDOR_MOBILE AS SUPPLY_USER_HP
-		,(CASE WHEN T2.OBJID IS NULL THEN T1.OFFICE_NO        ELSE T2.TEL          END) AS SUPPLY_USER_TEL
+		,T1.TEL_NO AS SUPPLY_USER_TEL
-		,(CASE WHEN T2.OBJID IS NULL THEN T1.SUPPLY_FAX_NO    ELSE T2.FAX          END) AS SUPPLY_USER_FAX
+		,T1.FAX_NO AS SUPPLY_USER_FAX
-		,(CASE WHEN T2.OBJID IS NULL THEN T1.EMAIL            ELSE T2.EMAIL        END) AS SUPPLY_USER_EMAIL
+		,T1.EMAIL AS SUPPLY_USER_EMAIL
-		,T1.SUPPLY_ADDRESS AS SUPPLY_ADDR 
+		,CONCAT(COALESCE(T1.ADDR1,''), ' ', COALESCE(T1.ADDR2,'')) AS SUPPLY_ADDR 
-  FROM ADMIN_SUPPLY_MNG AS T1
+  FROM CLIENT_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
  WHERE 1=1
-   AND T1.OBJID = #{PARTNER_OBJID}::NUMERIC
+   AND T1.OBJID::VARCHAR = #{PARTNER_OBJID}::VARCHAR
 </select>
 
 <select id="purchaseOrderSalesBomPartListByPartnerContract" parameterType="map" resultType="map">
@@ -3164,10 +3159,11 @@ SELECT 	 POM.OBJID
         ,(SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = POM.TYPE) AS TYPE_NAME
 		
 		,POM.PARTNER_OBJID
-		,CASE 
+		,(SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = POM.PARTNER_OBJID) AS PARTNER_NAME
+		<!-- ,CASE 
 					WHEN POM.PARTNER_OBJID LIKE 'C_%' THEN (SELECT CLIENT_NM FROM CLIENT_MNG WHERE 'C_' || OBJID::VARCHAR = POM.PARTNER_OBJID)
 					ELSE (SELECT SUPPLY_NAME FROM ADMIN_SUPPLY_MNG WHERE 1=1 AND OBJID::VARCHAR = POM.PARTNER_OBJID)
-				END AS PARTNER_NAME
+				END AS PARTNER_NAME -->
 		
 		,POM.SALES_MNG_USER_ID
 		,(SELECT USER_NAME FROM USER_INFO WHERE USER_ID = POM.SALES_MNG_USER_ID) AS SALES_MNG_USER_NAME