From ecbc7ae710e491695373b13f393d0b5a2b4ac927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?sanguu=28=EB=B0=95=EC=83=81=ED=98=84=29?=
 <sanguu516@naver.com>
Date: Thu, 20 Oct 2022 17:50:45 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=B2=B4=EC=A0=95=EB=B3=B4-=EC=8B=9D?=
 =?UTF-8?q?=EB=B3=84=EC=9E=A5=EC=B9=98=20=EC=A0=95=EB=B3=B4(=EA=B8=B0?=
 =?UTF-8?q?=EB=B3=B8=EA=B0=92=20=EC=B6=94=EA=B0=80=20=EA=B8=B0=EB=8A=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/basis/dron/BasisIdntform.js    |  3 ++-
 .../basis/dron/BasisIdntfContainer.js         | 25 +++++++++++--------
 src/modules/basis/dron/sagas/basisDronSaga.ts |  9 ++++++-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/components/basis/dron/BasisIdntform.js b/src/components/basis/dron/BasisIdntform.js
index a16ac6c..250b84e 100644
--- a/src/components/basis/dron/BasisIdntform.js
+++ b/src/components/basis/dron/BasisIdntform.js
@@ -17,6 +17,7 @@ import { X } from 'react-feather';
 import Repeater from '@components/repeater';
 
 export const BasisIdntfForm = props => {
+
   return (
     <Row>
       <Col>
@@ -69,8 +70,8 @@ export const BasisIdntfForm = props => {
                                   <Label for={`idntfNum.${i}`}>식별번호</Label>
                                   <Input
                                     className='pa-input'
+                                    value={'PA'}
                                     type='text'
-                                    value='PA'
                                     readOnly
                                     bsSize='sm'
                                   ></Input>
diff --git a/src/containers/basis/dron/BasisIdntfContainer.js b/src/containers/basis/dron/BasisIdntfContainer.js
index cb1540f..a4d87ce 100644
--- a/src/containers/basis/dron/BasisIdntfContainer.js
+++ b/src/containers/basis/dron/BasisIdntfContainer.js
@@ -14,6 +14,7 @@ export const BasisIdntfContainer = props => {
   const [idntfData, setIdntfData] = useState({
     id: '',
     idntfNum: '',
+    idntfNum2: '',
     idntfTypeCd: 'DRON',
     ownerNm: '',
     hpno: '',
@@ -98,7 +99,7 @@ export const BasisIdntfContainer = props => {
         const check_kor =
           /^[가-힣a-zA-Z0-9][^!@#$%^&*()+\=\[\]{};':"\\|,.<>\/?\s]*$/;
 
-        if (idntf.idntfNum === 'PA') {
+        if (idntf.idntfNum < 2) {
           setModal({
             isOpen: true,
             title: '필수값 입력 오류',
@@ -156,11 +157,17 @@ export const BasisIdntfContainer = props => {
       });
 
       if (!checking) return false;
+      //saveArr[0].idntfNum = 'PA' + saveArr[0].idntfNum
+      // saveArr = 'PA' + saveArr[0].idntfNum, saveArr
 
+      saveArr
       dispatch(
         Actions.IDNTF_CREATE.request({
           arcrftSno: detail?.arcrftSno,
-          data: saveArr
+          data: saveArr.map((i) => ({
+            ...i,
+            idntfNum: `PA${i.idntfNum}`
+          }))
         })
       );
     } else {
@@ -178,6 +185,7 @@ export const BasisIdntfContainer = props => {
   };
 
   const addData = () => {
+
     setIdntfDataList([...idntDataList, { ...idntfData, id: Math.random() }]);
   };
 
@@ -185,21 +193,18 @@ export const BasisIdntfContainer = props => {
     if (!isSave) {
       setIdntfDataList(idntDataList.filter(item => item.id !== id));
     } else {
+
       dispatch(Actions.IDNTF_DELETE.request(id));
     }
   };
 
   const handlerInput = (event, index) => {
     const { name, value } = event.target;
-    let newArr = [...idntDataList]; // copying the old datas array
+    let newArr = [...idntDataList];
     newArr[index] = { ...newArr[index], [name]: value };
-    // if (newArr[index].idntfNum.length < 2) {
-    //   setModal({
-    //     isOpen: true,
-    //     title: '필수값 입력 오류',
-    //     desc: '식별 장치 기본값입니다.'
-    //   });
-    newArr[index] = { ...newArr[index], idntfNum: 'PA' };
+
+    newArr[index] = { ...newArr[index] };
+
     setIdntfDataList(newArr);
   };
 
diff --git a/src/modules/basis/dron/sagas/basisDronSaga.ts b/src/modules/basis/dron/sagas/basisDronSaga.ts
index 729a523..962044a 100644
--- a/src/modules/basis/dron/sagas/basisDronSaga.ts
+++ b/src/modules/basis/dron/sagas/basisDronSaga.ts
@@ -19,6 +19,7 @@ function* listSaga(action: ActionType<typeof Actions.LIST.request>) {
       count,
       errorCode
     } = res;
+
     if (errorCode) {
       // 오류메시지 호출
       yield put(
@@ -67,7 +68,12 @@ function* listIdntfSaga(action: ActionType<typeof Actions.IDNTF_LIST.request>) {
     let dataArr = new Array();
 
     data?.map(item => {
-      dataArr.push({ ...item, isSave: true, id: item?.idntfNum });
+      dataArr.push({
+        ...item,
+        isSave: true,
+        id: item?.idntfNum,
+        idntfNum: item.idntfNum.substring(2)
+      });
     });
 
     yield put(
@@ -145,6 +151,7 @@ function* createIdntfSaga(
 
     const res = yield call(Apis.dronAPI.idntfCreate, detail);
     const { data } = res;
+
     if (data.result) {
       yield put(
         MessageActions.IS_MESSAGE({