diff options
| -rw-r--r-- | lib/pq/pq-criteria/add-pq-dialog.tsx | 4 | ||||
| -rw-r--r-- | lib/site-visit/service.ts | 2 | ||||
| -rw-r--r-- | lib/vendor-regular-registrations/service.ts | 17 |
3 files changed, 14 insertions, 9 deletions
diff --git a/lib/pq/pq-criteria/add-pq-dialog.tsx b/lib/pq/pq-criteria/add-pq-dialog.tsx index 53fe28f1..33e656c2 100644 --- a/lib/pq/pq-criteria/add-pq-dialog.tsx +++ b/lib/pq/pq-criteria/add-pq-dialog.tsx @@ -44,7 +44,7 @@ const createPqSchema = z.object({ code: z.string().min(1, "Code is required"),
checkPoint: z.string().min(1, "Check point is required"),
groupName: z.string().min(1, "Group is required"),
- subGroupName: z.string().min(1, "Sub group is required"),
+ subGroupName: z.string().optional(),
description: z.string().optional(),
remarks: z.string().optional(),
inputFormat: z.string().default("TEXT"),
@@ -198,7 +198,7 @@ export function AddPqDialog({ pqListId }: AddPqDialogProps) { name="subGroupName"
render={({ field }) => (
<FormItem>
- <FormLabel>소분류 <span className="text-destructive">*</span></FormLabel>
+ <FormLabel>소분류</FormLabel>
<FormControl>
<Input
placeholder="서브 그룹명을 입력하세요"
diff --git a/lib/site-visit/service.ts b/lib/site-visit/service.ts index 8db05ce4..99370cb0 100644 --- a/lib/site-visit/service.ts +++ b/lib/site-visit/service.ts @@ -220,7 +220,7 @@ export async function createSiteVisitRequestAction(input: { additionalRequests: siteVisitRequest.additionalRequests,
// 포털 URL
- portalUrl: `${process.env.NEXTAUTH_URL}/ko/partners/site-visit`,
+ portalUrl: `${process.env.NEXT_PUBLIC_BASE_URL}/ko/partners/site-visit`,
// 현재 연도
currentYear: new Date().getFullYear()
diff --git a/lib/vendor-regular-registrations/service.ts b/lib/vendor-regular-registrations/service.ts index 42b43d6f..08e5c9ef 100644 --- a/lib/vendor-regular-registrations/service.ts +++ b/lib/vendor-regular-registrations/service.ts @@ -22,7 +22,8 @@ import { vendorPQSubmissions,
vendorBusinessContacts,
vendorAdditionalInfo,
- basicContractTemplates
+ basicContractTemplates,
+ users
} from "@/db/schema";
import db from "@/db/db";
import { inArray, eq, desc, and, lt } from "drizzle-orm";
@@ -312,7 +313,7 @@ export async function sendMissingContractRequestEmails(vendorIds: number[]) { const host = headersList.get('host') || 'localhost:3000';
const protocol = process.env.NODE_ENV === 'production' ? 'https' : 'http';
const baseUrl = `${protocol}://${host}`;
- const contractManagementUrl = `${baseUrl}/ko/login`; // 실제 기본계약 관리 페이지 URL로 수정 필요
+ const contractManagementUrl = `${baseUrl}/ko/partners/basic-contract`; // 실제 기본계약 관리 페이지 URL로 수정 필요
let successCount = 0;
let errorCount = 0;
@@ -393,7 +394,7 @@ export async function sendAdditionalInfoRequestEmails(vendorIds: number[]) { const host = headersList.get('host') || 'localhost:3000';
const protocol = process.env.NODE_ENV === 'production' ? 'https' : 'http';
const baseUrl = `${protocol}://${host}`;
- const vendorInfoUrl = `${baseUrl}/ko/login`; // 실제 업체정보 관리 페이지 URL로 수정 필요
+ const vendorInfoUrl = `${baseUrl}/ko/partners/info`; // 실제 업체정보 관리 페이지 URL로 수정 필요
let successCount = 0;
let errorCount = 0;
@@ -1280,8 +1281,12 @@ export async function sendRegistrationRequestToMDG( // 세션 사용자 정보 가져오기
const session = await getServerSession(authOptions);
const userId = session?.user?.id || 'EVCP_USER';
- const userName = session?.user?.name || 'EVCP_USER';
- const userKnoxId = session?.user?.knoxId || 'EVCP_USER';
+ //users table에서 userid로 nonsapuserid 찾기
+ const userResult = await db.query.users.findFirst({
+ where: eq(users.id, Number(userId)),
+ columns: { nonsapUserId: true }
+ });
+ const nonsapUserId = userResult?.nonsapUserId || 'EVCP_USER';
// 등록 정보 조회
const registration = await db
.select()
@@ -1334,7 +1339,7 @@ export async function sendRegistrationRequestToMDG( IBND_TYPE: 'I',
// 10. ZZREQID: SAP의 USER ID를 보내드리겠습니다. (필수)
- ZZREQID: userKnoxId,
+ ZZREQID: nonsapUserId,
// 11. ADDRNO: I/F정의서에는 필수입력으로 되어 있습니다. -> 빈값으로 처리 (필수)
ADDRNO: '',
|