Merge branch 'iipbs/wr/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/wr/dev

apps/wr/app/(popUp-layout)/mapFeaturePopup/page.tsx

@@ -7,6 +7,95 @@ import { Title, UiTable } from "@common/business_components/ui";
 import { useSearchParams } from "next/navigation";
 import { useEffect, useState } from "react";
 
+
+export const htdflData ={
+  "bdstInfoSn": 54,
+  "ctpvCd": 11,
+  "sggCd": 11110,
+  "daddr": "청라동 100-80",
+  "bdstNm": "한국중부발전(주)",
+  "frstArchPrmsnDt": "2013-01-01",
+  "archArea": "-1.000000000",
+  "ctpvNm": null,
+  "sggNm": null,
+  "lat": 37.57096,
+  "lot": 126.98143,
+  "regDt": "2025-04-16",
+  "rgtr": null,
+  "mdfcnDt": "2025-04-16",
+  "mdfr": null,
+  "reuseBuilding": [
+    {
+      "bdstRuseFcltSn": 4881,
+      "bdstInfoSn": 54,
+      "instlCmptnDt": "2025-06-20",
+      "instlCst": 300,
+      "operMngCd": null,
+      "anlOperCst": 400,
+      "instlCstSprtYn": null,
+      "instlCstSprtAmt": 0,
+      "grntchBdstCertYn": null,
+      "grntchBdstCertYr": null,
+      "grntchBdstCertNo": "",
+      "grntchBdstCertGrd": "",
+      "crgRdctYn": null,
+      "crgRdctBss": null,
+      "crgRdctAmt": 0,
+      "ruseFcltFlg": "HTB",
+      "bdstUsgCd": 2,
+      "lawTrgtYn": "N",
+      "regDt": "2025-04-16",
+      "rgtr": null,
+      "mdfcnDt": "2025-04-16",
+      "mdfr": null,
+      "htdflObj": {
+        "bdstRuseFcltSn": 4881,
+        "etgtType": "",
+        "fclCpct": 400,
+        "plwtYn": "Y",
+        "orgwtWtritSpt": "공장내",
+        "orgwtOcrnProcs": "1",
+        "wtritEntrcTp": 3,
+        "amtgnr": 1,
+        "prcsProcsYn": "Y",
+        "prcsFcltCpct": 14,
+        "regDt": "2025-04-16",
+        "rgtr": null,
+        "mdfcnDt": "2025-04-16",
+        "mdfr": null,
+        "fmYn": "Y",
+        "utztnCpct": 1,
+        "utztnUsg": "1",
+        "grssClfg": 0,
+        "combResdch": 0,
+        "trbt": 4,
+        "bod": 4,
+        "smll": "불쾌하지않을것",
+        "crmty": 4,
+        "tn": 10,
+        "tph": 10,
+        "ph": '1~3',
+        "clIonQnt": 1,
+        "cdtnv": 0,
+        "emsnExitTp": 5
+      }
+    }
+  ],
+  "chgBuilding": [
+    {
+      "bdstInfoSn": 54,
+      "archChgPrmsnDt": null,
+      "archChgArea": null,
+      "bdstChgNm": null,
+      "regDt": "2025-04-16",
+      "rgtr": null,
+      "mdfcnDt": "2025-04-16",
+      "mdfr": null
+    }
+  ]
+}
+
+
 export default function MapFeaturePopup() {
   const [isFeatureCd, setIsFeatureCd] = useState<any>(null);
   const {
@@ -61,7 +150,9 @@ export default function MapFeaturePopup() {
         });
       } else if (layerNm === "온배수시설") {
         htdfMapDetile(isFeatureCd).then((res) => {
-          setIsDetail(res);
+//가짜데이터로 하였음!!!!!!!!! 기능 수정시 res를 넣어야함
+          console.log(res)
+          setIsDetail(htdflData);
         });
       } else if (layerNm === "잠재수요처") {
         ldrmntMapDetile(isFeatureCd).then((res) => {

apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx

@@ -389,9 +389,9 @@ export default function CoMatRvw() {
                                 className="w-full pr-16 border py-2 text-right rounded-md"
                                 placeholder=""
                                 value={
-                                  field.value != -1
+                                  field.value != -1 ||field.value != undefined
                                     ? `${field.value}`
-                                    : "불검출"
+                                    : "불검출" 
                                 }
                                 readOnly
                               />

apps/wr/app/store/matDmd/coMatRvw/type.tsx

@@ -79,11 +79,11 @@ export const DmdCoReqSchema = z.object({
   grssClfg: z.number().nullish(),
   combResdch: z.number().nullish(),
   trbt: z.number().nullish(),
-  smll: z.number().nullish(),
+  smll: z.string().nullish(),
   crmty: z.number().nullish(),
   tn: z.number().nullish(),
   tph: z.number().nullish(),
-  ph: z.number().nullish(),
+  ph: z.string().nullish(),
   clIonQnt: z.number().nullish(),
   cdtnv: z.number().nullish(),
   rmrk: z.string().nullish(),

apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx

@@ -67,6 +67,7 @@ export default function ConCostForm({
   useEffect(() => {
     // 다른 행을 선택하면(selectionVersion 변경) 체크박스 상태를 초기화합니다.
     setCheckFinish(false);
+    setLastSub(null)
   }, [selectionVersion]);
 
   //공급처 팝업 값 셋팅
@@ -173,12 +174,13 @@ export default function ConCostForm({
       return;
     }
 
-    const splycd = form.getValues("splyCndtList");
-    const pk =
-      splycd && splycd[0]?.ruseUtztnFcltCd
-        ? splycd[0]?.ruseUtztnFcltCd
-        : "11000SW001R1";
+    // const pk =
+    //   splycd && splycd[0]?.ruseUtztnFcltCd
+    //     ? splycd[0]?.ruseUtztnFcltCd
+    //     : "11000SW001R1";
 
+        const pk =lastSub?.ruseUtztnFcltCd??null
+  
     if (type === "mat") {
       if (value.demandCst) {
         const data: DedMatUpdateType = {
@@ -190,31 +192,37 @@ export default function ConCostForm({
           flg: checkFinish ? "Checked" : "Sub",
           rgtr: TEST_UUID,
         };
-        if (checkFinish) {
-          toast((t) => (
-            <span className="flex flex-col items-center text-2xl">
-              검토완료 변경시 공사비는 변경할수 없습니다.
-              <br />
-              진행하시겠습니까?
-              <div className="flex gap-2 mt-2">
-                <Button
-                  size="sm"
-                  onClick={() => {
-                    toast.dismiss(t.id);
 
-                    coMatRvwUpdate(pk, form.getValues("dmdInfoId"), data);
-                  }}
-                >
-                  확인
-                </Button>
-                <Button size="sm" onClick={() => toast.dismiss(t.id)}>
-                  취소
-                </Button>
-              </div>
-            </span>
-          ));
-        } else {
-          coMatRvwUpdate(pk, form.getValues("dmdInfoId"), data);
+        if(pk !==null){
+
+          if (checkFinish) {
+            toast((t) => (
+              <span className="flex flex-col items-center text-2xl">
+                검토완료 변경시 공사비는 변경할수 없습니다.
+                <br />
+                진행하시겠습니까?
+                <div className="flex gap-2 mt-2">
+                  <Button
+                    size="sm"
+                    onClick={() => {
+                      toast.dismiss(t.id);
+  
+                      coMatRvwUpdate(pk, form.getValues("dmdInfoId"), data);
+                    }}
+                  >
+                    확인
+                  </Button>
+                  <Button size="sm" onClick={() => toast.dismiss(t.id)}>
+                    취소
+                  </Button>
+                </div>
+              </span>
+            ));
+          } else {
+           coMatRvwUpdate(pk, form.getValues("dmdInfoId"), data);
+          }
+        }else{
+          toast.error('후보지를 먼저 선택해주세요')
         }
       }
     } else if (type === "hist") {