出库、绑定修改

海波 张

2 天以前 89943f29476e3de04c638cc7aefbdf2dd24d00c7

 util/Settings.cs

@@ -17,10 +17,19 @@

        public static string TmDeviceIp { get; set; }



        //hosttoagv鉴权
        //public static string AppKey { get; set; }
        //public static string AppSecret { get; set; }


        public static int TmDevicePort { get; set; }

        public static List<safetyLocation> safetyLocations { get; set; }
        public static string WcsApiAddres { get; set; }

        public static string MesApiAddres { get; set; }

        /// <summary>
        /// 空托缓存区
@@ -32,17 +41,28 @@
        /// </summary>
        public static string MesGetItemApi { get; set; }
        
        /// <summary>
        /// 配置
        /// </summary>
        public static List<deviceInfo> deviceInfos { get; set; }


        /// <summary>
        /// 胎面设备配置
        /// </summary>
        public static List<TmDeviceInfo> TmDeviceInfos { get; set; }

        public static List<areaInfo> areaInfos { get; set; }

         public static OutMinutePriority outMinutePriority { get; set; }
        /// <summary>
        /// 优先级配置
        /// </summary>
        //public static OutMinutePriority outMinutePriority { get; set; }



 
        
        /// <summary>
        /// NDC地址
        /// </summary>
        public static string NDCApiUrl { get; set; }
        

@@ -66,7 +86,11 @@
                            {
                                WcsApiAddres = keyValue.Value.ToString();
                            }

                            if (keyValue.Name == "MesApiAddres")
                            {
                                MesApiAddres = keyValue.Value.ToString();
                            }
                            
                            if (keyValue.Name == "MesGetItemApi")
                            {
                                MesGetItemApi = keyValue.Value.ToString();
@@ -89,7 +113,16 @@
                            {
                                EmptyPalletBufferArea = keyValue.Value.ToString();
                            }
                            

                            //hosttoagv鉴权
                            //if (keyValue.Name == "AppKey")
                            //{
                            //    AppKey = keyValue.Value.ToString();
                            //}
                            //if (keyValue.Name == "AppSecret")
                            //{
                            //    AppSecret = keyValue.Value.ToString();
                            //}

                            if (keyValue.Name == "SafetyLocation")
                            {
@@ -101,10 +134,10 @@
                                TmDeviceInfos = JsonConvert.DeserializeObject<List<TmDeviceInfo>>(keyValue.Value.ToString());
                            }

                            if (keyValue.Name == "OutMinutePriority")
                            {
                                outMinutePriority = JsonConvert.DeserializeObject<OutMinutePriority> (keyValue.Value.ToString());
                            }
                            //if (keyValue.Name == "OutMinutePriority")
                            //{
                            //    outMinutePriority = JsonConvert.DeserializeObject<OutMinutePriority> (keyValue.Value.ToString());
                            //}
                            //if (keyValue.Name == "DeviceInfo")
                            //{
                            //    deviceInfos = JsonConvert.DeserializeObject<List<deviceInfo>>(keyValue.Value.ToString());