Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-02 cf8c3cb608bceb47bc4ea83fb7a9bfe22cb80d2e

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -57,6 +57,39 @@
                }
            }
        }
        /// <summary>
        ///     httpPost访问服务
        /// </summary>
        /// <param name="url">服务地址</param>
        /// <param name="meth">方法名称</param>
        /// <param name="param">参数</param>
        /// <returns></returns>
        public static async Task<string> HttpPostAsync(string url, string meth, string param)
        {
            if (string.IsNullOrEmpty(url))
                url = WebApiUrl;
            url += meth;
            var request = (HttpWebRequest)WebRequest.Create(url);
            request.Method = "POST";
            request.ContentType = "application/json";
            request.Headers.Add("token", GetBasicAuthTicket());
            request.Accept = "*/*";
            request.Timeout = 15000;
            request.AllowAutoRedirect = false;
            using (Stream requestStream = await request.GetRequestStreamAsync())
            {
                byte[] dataBytes = Encoding.UTF8.GetBytes(param);
                await requestStream.WriteAsync(dataBytes, 0, dataBytes.Length);
            }

            using (WebResponse response = await request.GetResponseAsync())
            {
                using (StreamReader reader = new StreamReader(response.GetResponseStream()))
                {
                    return await reader.ReadToEndAsync();
                }
            }
        }

        /// <summary>
        ///     httpPost访问服务
@@ -252,6 +285,13 @@
            if (gridViews != null)
                foreach (var gv in gridViews)
                    gv.OptionsBehavior.Editable = !isEdt;

           var _btnAry=  controls.Find("btnSelect", false);
            if (_btnAry.Length > 0) {
                var _btnType = _btnAry[0];
                _btnType.Enabled = !isEdt;
            }

            foreach (JProperty property in dynamicObject.Properties())
            {
                var strName = property.Name;
@@ -282,10 +322,7 @@
                                    txt.ReadOnly = isEdt;
                                    txt.SelectedIndex = i;
                                }

                                ;
                            }

                            continue;
                        }

@@ -332,7 +369,15 @@
                            txt.ReadOnly = isEdt;
                            continue;
                        }

                        if (colType is MemoEdit)
                        {
                            var txt = colType as MemoEdit;
                            if (txt != null)
                                txt.Text = strVal;
                            txt.ReadOnly = isEdt;
                            continue;
                        }
                        
                        //数字卡
                        if (colType is NumericUpDown)
                        {
@@ -410,12 +455,11 @@
                                txt.Text = strVal;
                            }
                        }

                        //自定义仓库
                        if (colType is UcLookCk)
                        {
                            var txt = colType as UcLookCk;
                            txt.SetCode( strVal);
                            txt.SetIdOrCode( strVal);
                            txt.Enabled = !isEdt;
                            continue;
                        }
@@ -423,18 +467,24 @@
                        if (colType is UcLookSupplier)
                        {
                            var txt = colType as UcLookSupplier;
                            txt.SetCode(strVal);
                            txt.SetIdOrCode(strVal);
                            txt.Enabled = !isEdt;
                            continue;
                        }
                        //自定义物料
                        if (colType is UcLookItems)
                        {
                            var txt = colType as UcLookItems;
                            txt.SetIdOrCode(strVal);
                            txt.Enabled = !isEdt;
                            continue;
                        }
                        if (colType is SimpleButton)
                        {
                            var txt = colType as UcLookCk;
                            txt.SetCode(strVal);
                            var txt = colType as SimpleButton;
                            txt.Enabled = !isEdt;
                            continue;
                        }

                    }
                }
                catch (Exception ex)
@@ -498,7 +548,14 @@
                    txt.ReadOnly = isEdt;
                    continue;
                }

                if (ctrl is MemoEdit)
                {
                    var txt = ctrl as MemoEdit;
                    if (txt != null)
                        txt.Text = "";
                    txt.ReadOnly = isEdt;
                    continue;
                }
                //时间
                if (ctrl is DateTimePicker)
                {
@@ -519,6 +576,38 @@
                    txt.ReadOnly = isEdt;
                    continue;
                }

                //自定义仓库
                if (ctrl is UcLookCk)
                {
                    var txt = ctrl as UcLookCk;
                    txt.SetIdOrCode("-1");
                    txt.Enabled = !isEdt;
                    continue;
                }
                //自定义供应商
                if (ctrl is UcLookSupplier)
                {
                    var txt = ctrl as UcLookSupplier;
                    txt.SetIdOrCode("-1");
                    txt.Enabled = !isEdt;
                    continue;
                }
                //自定义物料
                if (ctrl is UcLookItems)
                {
                    var txt = ctrl as UcLookItems;
                    txt.SetIdOrCode("-1");
                    txt.Enabled = !isEdt;
                    continue;
                }
                if (ctrl is SimpleButton)
                {
                    var txt = ctrl as SimpleButton;
                    txt.Enabled = !isEdt;
                    continue;
                }

            }
        }

@@ -544,7 +633,12 @@
                    txt.ReadOnly = isEdt;
                    continue;
                }

                if (ctrl is MemoEdit)
                {
                    var txt = ctrl as MemoEdit;
                    txt.ReadOnly = isEdt;
                    continue;
                }
                //数字卡
                if (ctrl is NumericUpDown)
                {
@@ -552,7 +646,6 @@
                    txt.ReadOnly = isEdt;
                    continue;
                }

                //下拉
                if (ctrl is UcComBox)
                {
@@ -677,7 +770,7 @@
        /// </summary>
        /// <param name="str"></param>
        /// <returns></returns>
        public Guid ToGuid(string str)
        public static Guid ToGuid(string str)
        {
            if (string.IsNullOrEmpty(str)) return Guid.Empty;
            return Guid.Parse(str);