공급업체 테이블 client_mng로 변경, 채번 오류 수정

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

@@ -321,9 +321,9 @@ function fn_getSalesRequestTargetPartList(masterObjId,bomObjId){
 				var PART_NO 					= fnc_checkNull(resultData[i].PART_NO);
 				var PART_NAME 					= fnc_checkNull(resultData[i].PART_NAME);
 				
-				// 공급업체 셋팅
+				// 공급업체 셋팅 (CLIENT_MNG 테이블)
 				var PARTNER_OBJID = fnc_checkNull(resultData[i].PARTNER_OBJID);
-				fnc_getAdminSupCdListAppend("", "PARTNER_OBJID_"+rowObjId, PARTNER_OBJID);
+				fnc_getClientMngListAppend("PARTNER_OBJID_"+rowObjId, PARTNER_OBJID);
 				
 				fn_addBomPart("PART_OBJID_"+rowObjId, PART_OBJID, "PART_NAME_"+rowObjId,"");
 				
@@ -401,8 +401,8 @@ if(0 < $("#partListArea tr:first").lenght || typeof $("#partListArea tr:first").
 }else{
 	$("#partListArea").append(appendText);	
 }	
-// 공급업체 셋팅
+// 공급업체 셋팅 (CLIENT_MNG 테이블)
-fnc_getAdminSupCdListAppend("", "PARTNER_OBJID_"+rowObjId, "");
+fnc_getClientMngListAppend("PARTNER_OBJID_"+rowObjId, "");
 fn_addBomPart("PART_OBJID_"+rowObjId, "", "PART_NAME_"+rowObjId, "");
 	fnc_datepick();		
 	$(".select2").select2();
@@ -611,8 +611,8 @@ function fn_loadMbomParts(projectObjId){
 			
 			// 품번 드롭다운에 M-BOM 전체 품목 옵션 추가
 			fn_addBomPart("PART_OBJID_"+rowObjId, PART_OBJID, "PART_NAME_"+rowObjId, "");
-			// 공급업체 셋팅
+			// 공급업체 셋팅 (CLIENT_MNG 테이블)
-			fnc_getAdminSupCdListAppend("", "PARTNER_OBJID_"+rowObjId, "");
+			fnc_getClientMngListAppend("PARTNER_OBJID_"+rowObjId, "");
 		});
 		
 		$(".select2").select2();
@@ -737,27 +737,27 @@ function fn_callbackFnc(){
 						<option value="">선택</option> ${code_map.project_no}
 					</select>
 				</td>
-				<td class="input_title"><label for="">구매유형<span class="required-mark">*</span></label></td>
+				<!-- <td class="input_title"><label for="">구매유형<span class="required-mark">*</span></label></td>
 				<td>
 					<select name="PURCHASE_TYPE2" id="PURCHASE_TYPE2" reqTitle="구매유형" required type="select" class="select2" style="width: 100%;">
 						<option value="">선택</option> ${code_map.purchase_type}
 					</select>
-				</td>
+				</td> -->
 				<td class="input_title"><label for="">주문유형<span class="required-mark">*</span></label></td>
 				<td>
 					<select name="ORDER_TYPE" id="ORDER_TYPE" reqTitle="주문유형" required type="select" class="select2" style="width: 100%;">
 						<option value="">선택</option> ${code_map.category_cd}
 					</select>
 				</td>
-			</tr>
-			<!-- 2행: 제품구분, 국내/해외, 고객사, 유/무상 -->
-			<tr>				
 				<td class="input_title"><label for="">제품구분<span class="required-mark">*</span></label></td>
 				<td>
 					<select name="PRODUCT_NAME" id="PRODUCT_NAME" reqTitle="제품구분" required type="select" class="select2" style="width: 100%;">
 						<option value="">선택</option> ${code_map.product_name}
 					</select>
 				</td>
+			</tr>
+			<!-- 2행: 제품구분, 국내/해외, 고객사, 유/무상 -->
+			<tr>								
 				<td class="input_title"><label for="">국내/해외<span class="required-mark">*</span></label></td>
 				<td>
 					<select name="AREA_CD" id="AREA_CD" reqTitle="국내/해외" required type="select" class="select2" style="width: 100%;">
@@ -776,21 +776,22 @@ function fn_callbackFnc(){
 						<option value="">선택</option> ${code_map.paid_type}
 					</select>
 				</td>
-			</tr>
-			<!-- 3행: 입고요청일 -->
-			<tr>
 				<td class="input_title"><label for="">입고요청일</label></td>
 				<td>
 					<input type="text" class="date_icon" name="DELIVERY_REQUEST_DATE" id="DELIVERY_REQUEST_DATE" reqTitle="입고요청일" value="${resultMap.DELIVERY_REQUEST_DATE}">
 					<input type="hidden" name="REQUEST_USER_ID" id="REQUEST_USER_ID" value="${resultMap.REQUEST_USER_ID}">
 				</td>
-				<td></td>
-				<td></td>
-				<td></td>
-				<td></td>
-				<td></td>
-				<td></td>
 			</tr>
+			<!-- 3행: 입고요청일 -->
+			<!-- <tr>
+				
+				<td></td>
+				<td></td>
+				<td></td>
+				<td></td>
+				<td></td>
+				<td></td>
+			</tr> -->
 			</table>
 		</div>
 		

WebContent/js/common.js

@@ -1165,7 +1165,7 @@ function fnc_getSupplyCodeListAppend2(supplyCode,selectboxId,selectedVal){
 	});
 }
 
-//공급업체 정보목록을 가져온다.
+//공급업체 정보목록을 가져온다. (ADMIN_SUPPLY_MNG 테이블)
 function fnc_getAdminSupCdListAppend(supplyCode,selectboxId,selectedVal){
 	$.ajax({
 		url:"/common/getAdminSupCdList.do",
@@ -1195,6 +1195,37 @@ function fnc_getAdminSupCdListAppend(supplyCode,selectboxId,selectedVal){
 	});
 }
 
+// 일반거래처(공급업체) 정보목록을 가져온다. (CLIENT_MNG 테이블)
+function fnc_getClientMngListAppend(selectboxId, selectedVal){
+	$.ajax({
+		url:"/common/getClientMngList.do",
+		type:"POST",
+		data:{},
+		dataType:"json",
+		async:false,
+		success:function(data){
+			var resultList = data;
+			
+			$("#"+selectboxId).empty();
+			$("#"+selectboxId).append("<option value=''>선택</option>");
+			
+			if(resultList && resultList.length > 0){
+				for (var i = 0; i < resultList.length; i++) {
+					var commonCodeId = resultList[i].CODE_ID;
+					var commonCodeName = resultList[i].CODE_NAME || resultList[i].NAME;
+					$("#"+selectboxId).append("<option value='"+commonCodeId+"'>"+commonCodeName+"</option>");
+				}
+				if(selectedVal){
+					$("#"+selectboxId).val(selectedVal);
+				}
+			}
+		},
+		error: function(jqxhr, status, error){
+			console.error("일반거래처 목록 조회 실패");
+		}
+	});
+}
+
 //targetCode에 해당하는 대상구분명을 반환한다.
 function fnc_getApprovalTargetName(targetCode){
 	var targetTypeTitle = "";

src/com/pms/mapper/salesMng.xml

@@ -613,7 +613,7 @@
 VALUES 
 (
 	#{SALES_REQUEST_MASTER_OBJID	},
-	(SELECT 'R'||TO_CHAR(NOW(),'YYYYMMDD')||'-'||LPAD((COALESCE(MAX(SUBSTR(REQUEST_MNG_NO,11,13)),'0')::INTEGER+1)::TEXT,3,'0') FROM SALES_REQUEST_MASTER WHERE DOC_TYPE = 'PURCHASE_REQUEST' OR DOC_TYPE IS NULL),
+	(SELECT 'R'||TO_CHAR(NOW(),'YYYYMMDD')||'-'||LPAD((COALESCE(MAX(SUBSTR(REQUEST_MNG_NO,11,13)),'0')::INTEGER+1)::TEXT,3,'0') FROM SALES_REQUEST_MASTER WHERE DOC_TYPE IN ('PURCHASE_REQUEST', 'PURCHASE_REG') OR DOC_TYPE IS NULL),
 	#{REQUEST_CD			        },
 	#{PROJECT_NO         			},
 	#{RELEASE		               	},
@@ -3438,7 +3438,7 @@ ORDER BY V.PATH2
 <select id="getNextRequestMngNo" resultType="string">
 	SELECT 'R'||TO_CHAR(NOW(),'YYYYMMDD')||'-'||LPAD((COALESCE(MAX(SUBSTR(REQUEST_MNG_NO,11,13)),'0')::INTEGER+1)::TEXT,3,'0')
 	FROM SALES_REQUEST_MASTER
-	WHERE DOC_TYPE = 'PURCHASE_REQUEST' OR DOC_TYPE IS NULL
+	WHERE DOC_TYPE IN ('PURCHASE_REQUEST', 'PURCHASE_REG') OR DOC_TYPE IS NULL
 </select>
 
 <!-- 다음 품의서 번호 생성 (P + YYYYMMDD + - + 3자리 순번) - 품의서용 -->