Merge branch 'master' of https://git.lgzn.space/hejiayao/TaiZhouChangChu

Assets/Script/ERP/WorkInfoTeam.cs

@@ -13,6 +13,7 @@ public class WorkInfoTeam : MonoBehaviour
     public WorkInfo wInfo;
     public ExamRecord ExamRec;//操作记录
     public InfoPanel[] InfoPanels;//面板组
+    public GameMannage mannage;
     string CourseName;
     int i;
 
@@ -129,7 +130,11 @@ public class WorkInfoTeam : MonoBehaviour
                     case "总价": wInfo.ZJ = ReadCon.List_Task[i].Value; break;
 
                 }
+                mannage.AddDataToDic(ReadCon.List_Task[i].PropName, ReadCon.List_Task[i].Value);
+                
             }
+
+            Debug.Log(mannage.allData.Count);
             //物料编码
             if (wInfo.TaskType.Contains("入库"))
             {
@@ -177,6 +182,7 @@ public class WorkInfoTeam : MonoBehaviour
     }
     
 
+
     public void ShowPaperOrder()//显示对应业务的纸质单据
     {
         //if(wInfo.Panel_Paper!=null) 

Assets/Script/LH/GameMannage.cs

@@ -55,12 +55,12 @@ public class GameMannage : MonoBehaviour
     //业务脚本
     public WorkInfoTeam info;
 
-    public List<List<GameObject>> new2 = new List<List<GameObject>>();
-
-    public Dictionary<string, string> new1 = new Dictionary<string, string>();
-
     public Dictionary<string, List<GameObject>> allTaskMessage = new Dictionary<string, List<GameObject>>();
 
+    public Dictionary<string, TaskModel> allTasks = new Dictionary<string, TaskModel>();
+
+    public Dictionary<string, string> allData = new Dictionary<string, string>();
+
     void Awake()
     {
         instance = this;
@@ -77,6 +77,8 @@ public class GameMannage : MonoBehaviour
 
     }
 
+    #region  流程
+
     //车辆进入 工厂
     public void TruckInFactory()
     {
@@ -153,6 +155,32 @@ public class GameMannage : MonoBehaviour
         cangwaiWuzi.SetActive(false);
     }
 
+    #endregion
+
+    #region 加载所有任务 数据
+    public void AddTaskToDic(string key,TaskModel value)
+    {
+        if (!allTasks.ContainsKey(key))
+        {
+            allTasks.Add(key, value);
+        }
+    }
+
+    public void AddDataToDic(string key ,string value)
+    {
+        if (!allData.ContainsKey(key))
+        {
+            allData.Add(key, value);
+        }
+    }
+
+    #endregion
+
+    #region
+    #endregion
+
+    #region
+    #endregion
     //返回上一场景
     public void ReturnToExitScene()
     {