From d244ba3b97c426cefbfa7923a7a8c438c37d5b0e Mon Sep 17 00:00:00 2001
From: yjnoh <yjnoh@interplug.co.kr>
Date: Wed, 7 May 2025 15:18:59 +0900
Subject: [PATCH] =?UTF-8?q?[1014]=20:=20[819=E3=81=AE=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E3=80=80=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E9=85=8D=E7=BD=AE=E3=81=AE=E8=87=AA=E5=8B=95=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[작업내용] : 고도화 단수 열수 자동 배치 작업
---
 .gitmessage.txt                                       |  3 +++
 .../floor-plan/modal/basic/step/Placement.jsx         |  9 +++++----
 src/hooks/module/useModuleBasicSetting.js             | 11 +++--------
 src/locales/ja.json                                   |  3 ++-
 src/locales/ko.json                                   |  3 ++-
 5 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 .gitmessage.txt

diff --git a/.gitmessage.txt b/.gitmessage.txt
new file mode 100644
index 00000000..07932f22
--- /dev/null
+++ b/.gitmessage.txt
@@ -0,0 +1,3 @@
+[일감번호] : [제목]
+
+[작업내용] : 
\ No newline at end of file
diff --git a/src/components/floor-plan/modal/basic/step/Placement.jsx b/src/components/floor-plan/modal/basic/step/Placement.jsx
index c6556ea3..1d2545e6 100644
--- a/src/components/floor-plan/modal/basic/step/Placement.jsx
+++ b/src/components/floor-plan/modal/basic/step/Placement.jsx
@@ -330,20 +330,21 @@ const Placement = forwardRef((props, refs) => {
                   <th rowSpan={2} style={{ width: '22%' }}></th>
                   {selectedModules &&
                     selectedModules.itemList.map((item) => (
-                      <th colSpan={colspan}>
+                      // <th colSpan={colspan}>
+                      <th>
                         <div className="color-wrap">
                           <span className="color-box" style={{ backgroundColor: item.color }}></span>
                           <span className="name">{item.itemNm}</span>
                         </div>
                       </th>
                     ))}
-                  {colspan > 1 && <th rowSpan={2}>{getMessage('total')}</th>}
+                  {colspan > 1 && <th rowSpan={2}>{getMessage('modal.module.basic.setting.module.placement.max.rows.multiple')}</th>}
                 </tr>
                 <tr>
                   {selectedModules.itemList.map((item) => (
                     <>
                       <th>{getMessage('modal.module.basic.setting.module.placement.max.row')}</th>
-                      {colspan > 1 && <th>{getMessage('modal.module.basic.setting.module.placement.max.rows.multiple')}</th>}
+                      {/* {colspan > 1 && <th>{getMessage('modal.module.basic.setting.module.placement.max.rows.multiple')}</th>} */}
                     </>
                   ))}
                 </tr>
@@ -360,7 +361,7 @@ const Placement = forwardRef((props, refs) => {
                     {moduleRowColArray[index]?.map((item, index2) => (
                       <>
                         <td className="al-c">{item.moduleMaxRows}</td>
-                        {colspan > 1 && <td className="al-c">{item.mixModuleMaxRows}</td>}
+                        {/* {colspan > 1 && <td className="al-c">{item.mixModuleMaxRows}</td>} */}
                         {colspan > 1 && index2 === moduleRowColArray[index].length - 1 && <td className="al-c">{item.maxRow}</td>}
                       </>
                     ))}
diff --git a/src/hooks/module/useModuleBasicSetting.js b/src/hooks/module/useModuleBasicSetting.js
index c43477d7..c7173dca 100644
--- a/src/hooks/module/useModuleBasicSetting.js
+++ b/src/hooks/module/useModuleBasicSetting.js
@@ -2809,14 +2809,9 @@ export function useModuleBasicSetting(tabNum) {
     /**
      * 자동 레이아웃일떄 설치 가능한 애들은 설치 해주고 실패한 애들은 이름, 최대 설치 가능한 높이 알려줄라고
      */
-    if (type === MODULE_SETUP_TYPE.LAYOUT && failAutoSetupRoof.length > 0) {
-      const roofNamesList = failAutoSetupRoof.map((roof) => ({
-        roofName: roof.roofMaterial.roofMatlNmJp,
-        moduleMaxRows: roof.trestleDetail.moduleMaxRows,
-      }))
-
-      const alertString = roofNamesList.map((item, index) => `${item.roofName}(${item.moduleMaxRows})`)
-      swalFire({ text: alertString, icon: 'warning' })
+    if (type === MODULE_SETUP_TYPE.LAYOUT && failAutoSetupRoof.length) {
+      const roofNames = failAutoSetupRoof.map((roof) => roof.roofMaterial.roofMatlNmJp).join(', ')
+      swalFire({ text: getMessage('modal.module.basic.setting.module.placement.over.max.row', [roofNames]), icon: 'warning' })
     }
   }
 
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 44bf3bb4..343673d5 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -1075,5 +1075,6 @@
   "modal.module.basic.setting.module.placement.max.rows.multiple": "2種混合時\rの最大段数",
   "modal.module.basic.setting.module.placement.mix.asg.yn.error": "混合インストール不可能なモジュールです。 (JA)",
   "modal.module.basic.setting.module.placement.mix.asg.yn": "混合",
-  "modal.module.basic.setting.layoutpassivity.placement": "layout配置 (JA)"
+  "modal.module.basic.setting.layoutpassivity.placement": "layout配置 (JA)",
+  "modal.module.basic.setting.module.placement.over.max.row": "{0}의 최대단수를 초과했습니다. 최대단수표를 참고해 주세요.(JA)"
 }
diff --git a/src/locales/ko.json b/src/locales/ko.json
index cd8b855b..b3e3e99b 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -1076,5 +1076,6 @@
   "modal.module.basic.setting.module.placement.max.rows.multiple": "2종 혼합 최대단수",
   "modal.module.basic.setting.module.placement.mix.asg.yn.error": "혼합 설치 불가능한 모듈입니다.",
   "modal.module.basic.setting.module.placement.mix.asg.yn": "혼합",
-  "modal.module.basic.setting.layoutpassivity.placement": "레이아웃 배치"
+  "modal.module.basic.setting.layoutpassivity.placement": "레이아웃 배치",
+  "modal.module.basic.setting.module.placement.over.max.row": "{0}의 최대단수를 초과했습니다. 최대단수표를 참고해 주세요."
 }