작업 조건/시간 분석 UI, 진행 현황판 UI 활성화 기능 수정

Assets/Scripts/EventConnecter.cs

@@ -86,6 +86,18 @@ namespace CHN
             popupCanvas.panel_worktimeanalysis.onSearchData += httpManager.SearchWorkTime;
             popupCanvas.panel_worktimeanalysis.onClose += popupCanvas.panel_dashboard.dashBoardCheckListBox.OnCloseDashbordItem;
 
+            popupCanvas.panel_assemblyproduction.onOpen += popupCanvas.panel_injectionproduction.Close;
+            popupCanvas.panel_assemblyproduction.onOpen += popupCanvas.panel_workprogressstatus.Close;
+            popupCanvas.panel_assemblyproduction.onOpen += popupCanvas.panel_workconditionanalysis.OnClickCloseButton;
+
+            popupCanvas.panel_injectionproduction.onOpen += popupCanvas.panel_assemblyproduction.Close;
+            popupCanvas.panel_injectionproduction.onOpen += popupCanvas.panel_workprogressstatus.Close;
+            popupCanvas.panel_injectionproduction.onOpen += popupCanvas.panel_workconditionanalysis.OnClickCloseButton;
+
+            popupCanvas.panel_workprogressstatus.onOpen += popupCanvas.panel_assemblyproduction.Close;
+            popupCanvas.panel_workprogressstatus.onOpen += popupCanvas.panel_injectionproduction.Close;
+            popupCanvas.panel_workprogressstatus.onOpen += popupCanvas.panel_workconditionanalysis.OnClickCloseButton;
+
             libraryManager.onUpdateMachineFilters += popupCanvas.panel_library.UpdateFileterList;
             libraryManager.onLibraryFilterigComplete += popupCanvas.panel_library.AddLibrarayButtons;
 

Assets/Scripts/UI/Panel_AssemblyProduction.cs

@@ -22,6 +22,7 @@ public class Panel_AssemblyProduction : PanelBase
 
     public float changeDataTime;
     public float fadeTime;
+    public Action onOpen;
     public override void AfterAwake()
     {
         prf_statusContent = Resources.Load<UI_StatusContent>("Prefabs/UI/UI_StatusContent");
@@ -35,18 +36,20 @@ public class Panel_AssemblyProduction : PanelBase
     }
     public void Open()
     {
-        effect.ActivePanel(gameObject);
+        onOpen?.Invoke();
+
+        effect.gameObject.SetActive(true);
         gameObject.SetActive(true);
         gameObject.transform.SetAsLastSibling();
         
+
         StopAllCoroutines();
         StartCoroutine(ScaleUp());
-
         StartCoroutine(ChageStatusContent());
     }
     public void Close()
     {
-        effect.DeactivePanel(gameObject);
+        effect.gameObject.SetActive(false);
         gameObject.SetActive(false);
         gameObject.transform.localScale = Vector3.zero;
         ResetStatusContentOrder();

Assets/Scripts/UI/Panel_InjectionProduction.cs

@@ -22,6 +22,7 @@ public class Panel_InjectionProduction : PanelBase
 
     public float changeDataTime;
     public float fadeTime;
+    public Action onOpen;
     public override void AfterAwake()
     {
         prf_statusContent = Resources.Load<UI_StatusContent>("Prefabs/UI/UI_StatusContent");
@@ -36,7 +37,9 @@ public class Panel_InjectionProduction : PanelBase
     }
     public void Open()
     {
-        effect.ActivePanel(gameObject);
+        onOpen?.Invoke();
+
+        effect.gameObject.SetActive(true);
         gameObject.SetActive(true);
         gameObject.transform.SetAsLastSibling();
         
@@ -47,7 +50,7 @@ public class Panel_InjectionProduction : PanelBase
     }
     public void Close()
     {
-        effect.DeactivePanel(gameObject);
+        effect.gameObject.SetActive(false);
         gameObject.SetActive(false);
         gameObject.transform.localScale = Vector3.zero;
         ResetStatusContentOrder();

Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs

@@ -78,7 +78,7 @@ namespace CHN
         }
         public void Open()
         {
-            effect.ActivePanel(gameObject);
+            effect.transform.gameObject.SetActive(true);
             gameObject.SetActive(true);
             gameObject.transform.SetAsLastSibling();
 
@@ -87,7 +87,7 @@ namespace CHN
         }
         public void Close()
         {
-            effect.DeactivePanel(gameObject);
+            effect.transform.gameObject.SetActive(false);
             gameObject.SetActive(false);
             gameObject.transform.localScale = Vector3.zero;
         }

Assets/Scripts/UI/Panel_WorkProgressStatus.cs

@@ -18,7 +18,7 @@ public class Panel_WorkProgressStatus : PanelBase
     public TextMeshProUGUI CurrentTime;
 
     public float fadeTime;
-
+    public Action onOpen;
     public override void AfterAwake()
     {
         prf_workStatusItem = Resources.Load<UI_WorkStatusItem>("Prefabs/UI/UI_WorkStatusItem");
@@ -32,7 +32,9 @@ public class Panel_WorkProgressStatus : PanelBase
     }
     public void Open()
     {
-        effect.ActivePanel(gameObject);
+        onOpen?.Invoke();
+
+        effect.gameObject.SetActive(true);
         gameObject.SetActive(true);
         gameObject.transform.SetAsLastSibling();
 
@@ -41,7 +43,7 @@ public class Panel_WorkProgressStatus : PanelBase
     }
     public void Close()
     {
-        effect.DeactivePanel(gameObject);
+        effect.gameObject.SetActive(false);
         gameObject.SetActive(false);
         gameObject.transform.localScale = Vector3.zero;
     }

Assets/WorkSpace/Personal/JYM/HTTPRequester.cs

@@ -87,7 +87,6 @@ namespace CHN
         string kpiAPI = "/api/usp_ppmr020/list/facilityKpi";
 
         public string testAPIKey = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MywiZW1haWwiOiJ1dmMiLCJncm91cElkIjoyLCJncm91cENvZGUiOiJjaHVuaWxlbmciLCJyb2xlIjoiVGVuYW50QWRtaW4iLCJuYW1lIjoi7Jyg67mE7JSoIiwibGljZW5zZSI6ImJ1c2luZXNzIiwicGhvbmUiOiIiLCJpYXQiOjE3NDA1MzY0NzUsImV4cCI6NDg5NDEzNjQ3NX0.hr4D0bOA4K09Vhp12itiJgd-nVDQ3VZO8D7MVP5Ltw0";
-        public string testHttpServer = "http://106.247.236.204:8863";
         public string facilityAPI = "/api/workConditionAnalysis/facilityCode";
         public string workItemCodeAPI = "/api/workConditionAnalysis/workOrderAndItemCode";
         public string workingConditionsAPI = "/api/workConditionAnalysis/analyze";
@@ -156,7 +155,7 @@ namespace CHN
             this.startDate = startDate;
             this.endDate = endDate;
 
-            var path = testHttpServer + facilityAPI;
+            var path = httpServer + facilityAPI;
             var query = $"?startDate={startDate}&endDate={endDate}";
 
             string url = path + query;
@@ -192,7 +191,7 @@ namespace CHN
         }
         IEnumerator GetWorkItemCode(string panelName, string facilityCode)
         {
-            var path = testHttpServer + workItemCodeAPI;
+            var path = httpServer + workItemCodeAPI;
             var query = $"?startDate={startDate}&endDate={endDate}&workcd={facilityCode}";
 
             string url = path + query;
@@ -233,7 +232,7 @@ namespace CHN
                 WO = WO
             };
 
-            var path = testHttpServer + workingConditionsAPI;
+            var path = httpServer + workingConditionsAPI;
 
             var json = JsonUtility.ToJson(WorkConditionRequest);
 
@@ -270,7 +269,7 @@ namespace CHN
                 WO = WO
             };
 
-            var path = testHttpServer + workingTimeAPI;
+            var path = httpServer + workingTimeAPI;
 
             var json = JsonUtility.ToJson(WorkConditionRequest);
 

CompleteTimeAlarmInfo.json

@@ -852,7 +852,7 @@
                 "worknm": "X76 GORE CAP",
                 "workseq": "1",
                 "status": "1",
-                "statusnm": "가동중",
+                "statusnm": "비가동",
                 "itemcd": "24050078-GMA",
                 "itemdesc": "CAP ASM - TRANS FLUID FIL (W/VENT)",
                 "pjtcd": "X76",
@@ -1395,7 +1395,7 @@
                 "sttm": "0757",
                 "totm": "",
                 "goaltime": "147",
-                "ptotm": "2025-04-02 18:09:43",
+                "ptotm": "2025-04-02 19:33:50",
                 "psttm": "2025-04-02 07:57:28"
             },
             "isCheck": false