plm_admin/duckil_plm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://gdnsipms.com:3000/plm_admin/duckil_plm

Browse Source
This commit is contained in:
chpark 2025-01-02 18:49:05 +09:00
commit e9cad28c3a
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plm-api/src/controllers/app/common/product.controller.js
View File

@ -46,7 +46,12 @@ router.put(
"/productUpdate/:id", "/productUpdate/:id",
[ [
param("id").isUUID().withMessage("유효한 ID가 필요합니다"), param("id").isUUID().withMessage("유효한 ID가 필요합니다"),
<<<<<<< HEAD
body("product_name").optional().notEmpty().withMessage("제품군 이름이 필요합니다."), body("product_name").optional().notEmpty().withMessage("제품군 이름이 필요합니다."),
=======
body("product_code").optional().notEmpty().withMessage("제품 코드가 필요합니다."),
body("product_name").optional().notEmpty().withMessage("제품 이름이 필요합니다."),
>>>>>>> 996616fc2324b66b3ae033eced43180612cac2bf
body("companyId").optional().isUUID().withMessage("유효한 회사 ID가 필요합니다"), body("companyId").optional().isUUID().withMessage("유효한 회사 ID가 필요합니다"),
validate, validate,
], ],

4
plm-api/src/services/product.service.js
View File

@ -152,7 +152,11 @@ class productService {
await alertService.createAlert({ await alertService.createAlert({
type: "info", type: "info",
<<<<<<< HEAD
message: `제품 ${productName}이(가) ${currentUser.name}에 의해 삭제되었습니다.`, message: `제품 ${productName}이(가) ${currentUser.name}에 의해 삭제되었습니다.`,
=======
message: `제품군 ${productName}이(가) ${currentUser.name}에 의해 삭제되었습니다.`,
>>>>>>> 996616fc2324b66b3ae033eced43180612cac2bf
companyId: companyId, companyId: companyId,
}); });