diff --git a/SYS.Common/HttpHelper.cs b/SYS.Common/HttpHelper.cs index cd61e6243fb05579c5ec63c783a57fc32de7ed06..d495dae88f50fac9b602841f963ccca6d23e7a41 100644 --- a/SYS.Common/HttpHelper.cs +++ b/SYS.Common/HttpHelper.cs @@ -1,32 +1,49 @@ -using System; +using jvncorelib_fr.EncryptorLib; +using jvncorelib_fr.EntityLib; +using jvncorelib_fr.HttpLib; +using Newtonsoft.Json; +using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Net; +using System.Net.Security; +using System.Security.Cryptography; +using System.Security.Cryptography.X509Certificates; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; +using System.Web; +using System.Web.Script.Serialization; namespace SYS.Common { /// /// 文件上传帮助类 /// - public class HttpHelper + public static class HttpHelper { + static EncryptLib encryptLib = new EncryptLib(); + #region 受限于打包插件的限制才放在这，个人开发时建议统一在App.Config进行配置 /// /// 数据库配置连接 /// public const string mysqlString = "server = localhost; user id = softuser; password = .; database = tshoteldb;"; - public const string pgsqlString = "PORT=5620;DATABASE=tshoteldb;HOST=localhost;PASSWORD=.;USER ID=postgres"; + public const string pgsqlString = ""; /// /// 照片文件配置URL /// - public const string baseUrl = "http://localhost:5622/FileVisualPath/"; + public const string baseUrl = ""; /// /// 上传照片URL /// - public const string postUrl = "http://localhost:5622/api/Upload"; + public const string postUrl = ""; + /// + /// WebApi URL + /// + public const string apiUrl = ""; #endregion @@ -44,5 +61,355 @@ namespace SYS.Common return str.Replace('\"', ' '); } + + /// + /// 统一请求方法 + /// + /// + /// + /// + /// + public static ResponseMsg Request(string url, string json = null, Dictionary dic = null) + { + ResponseMsg msg= new ResponseMsg(); + + //处理url + var sourceStr = url.Replace("​", string.Empty); + + //解密原始URL + var api = encryptLib.Decryption(apiUrl); + + var requestUrl = api + sourceStr; + + if (!json.IsNullOrEmpty()) + { + msg = DoPost(requestUrl, json); + } + else if (!dic.IsNullOrEmpty()) + { + msg = DoGet(requestUrl, dic); + } + else + { + msg = DoGet(requestUrl); + } + + return msg; + } + /// + /// GET请求 + /// + /// + /// + /// + /// + /// + /// + /// + public static ResponseMsg DoGet(string url, IDictionary parameters = null, string contentType = null, string referer = null, string cookie = null, Dictionary dicHeaders = null) + { + if (parameters != null && parameters.Count > 0) + { + if (url.Contains("?")) + { + url = url + "&" + BuildQuery(parameters); + } + else + { + url = url + "?" + BuildQuery(parameters); + } + } + + HttpWebRequest req = null; + string resultContent = ""; + System.IO.Stream stream = null; + StreamReader reader = null; + HttpWebResponse rsp = null; + + try + { + req = GetWebRequest(url, "GET");//post也行 + + if (!string.IsNullOrEmpty(contentType)) + { + req.ContentType = contentType; + } + else + { + req.ContentType = "application/x-www-form-urlencoded;charset=utf-8"; + } + + if (!string.IsNullOrEmpty(referer)) + { + req.Referer = referer; + } + + if (!string.IsNullOrEmpty(cookie)) + { + req.Headers.Add("Cookie", cookie); + } + + if (dicHeaders != null) + { + foreach (var key in dicHeaders.Keys) + { + req.Headers.Add(key, dicHeaders[key]); + } + } + + rsp = (HttpWebResponse)req.GetResponse(); + + Encoding encoding = null; + try + { + encoding = string.IsNullOrEmpty(rsp.CharacterSet) ? Encoding.UTF8 : Encoding.GetEncoding(rsp.CharacterSet); + } + catch (Exception) + { + encoding = Encoding.UTF8; + } + + if (!string.IsNullOrEmpty(contentType)) + { + Regex regex = new Regex("charset\\s*=\\s*(\\S+)", RegexOptions.IgnoreCase); + Match match = null; + match = regex.Match(contentType); + if (match.Success) + { + try + { + encoding = Encoding.GetEncoding(match.Groups[1].Value.Trim()); + } + catch (Exception) + { + encoding = string.IsNullOrEmpty(rsp.CharacterSet) ? Encoding.UTF8 : Encoding.GetEncoding(rsp.CharacterSet); + } + } + } + + // 以字符流的方式读取HTTP响应 + stream = rsp.GetResponseStream(); + reader = new StreamReader(stream, encoding); + resultContent = reader.ReadToEnd(); + } + catch (Exception) + { + //LogWriter.WriteError(ex, MethodBase.GetCurrentMethod(), url, parameters, contentType, referer); + throw; + } + finally + { + // 释放资源 + if (reader != null) reader.Close(); + if (stream != null) stream.Close(); + if (rsp != null) rsp.Close(); + if (req != null) req.Abort(); + //GC.Collect(); + } + + return new ResponseMsg() { statusCode = (int)rsp.StatusCode, message = resultContent }; + } + + /// + /// Post请求 + /// + /// + /// + /// + /// + /// + /// + /// + public static ResponseMsg DoPost(string url, string jsonParam = null, string contentType = null, string referer = null, string cookie = null, Dictionary dicHeaders = null) + { + var resultContent = string.Empty; + var request = (HttpWebRequest)WebRequest.Create(url); + request.Method = "POST"; + + if (!string.IsNullOrEmpty(contentType)) + { + request.ContentType = contentType; + } + else + { + request.ContentType = "application/json;charset=utf-8"; + } + + if (!string.IsNullOrEmpty(referer)) + { + request.Referer = referer; + } + + if (!string.IsNullOrEmpty(cookie)) + { + request.Headers.Add("Cookie", cookie); + } + + if (dicHeaders != null) + { + foreach (var key in dicHeaders.Keys) + { + request.Headers.Add(key, dicHeaders[key]); + } + } + Stream writer = null; + + if (jsonParam != null) + { + byte[] byteData = Encoding.UTF8.GetBytes(jsonParam); + int length = byteData.Length; + request.ContentLength = length; + writer = request.GetRequestStream(); + writer.Write(byteData, 0, length); + writer.Close(); + } + + var response = (HttpWebResponse)request.GetResponse(); + var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd(); + + resultContent = responseString.ToString(); + + return new ResponseMsg() { statusCode = (int)response.StatusCode, message = resultContent }; + } + + /// + /// 组装普通文本请求参数。 + /// + /// Key-Value形式请求参数字典 + /// URL编码后的请求数据 + public static string BuildQuery(IDictionary parameters) + { + StringBuilder postData = new StringBuilder(); + bool hasParam = false; + + IEnumerator> dem = parameters.GetEnumerator(); + while (dem.MoveNext()) + { + string name = dem.Current.Key; + string value = dem.Current.Value; + // 忽略参数名或参数值为空的参数 + if (!string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(value)) + { + if (hasParam) + { + postData.Append("&"); + } + + postData.Append(name); + postData.Append("="); + postData.Append(UrlEncode(value, Encoding.UTF8)); + hasParam = true; + } + } + + return postData.ToString(); + } + + /** + * C#的URL encoding有两个问题： + * 1.左右括号没有转移（Java的URLEncoder.encode有） + * 2.转移符合都是小写的，Java是大写的 + */ + public static string UrlEncode(string str, Encoding e) + { + var REG_URL_ENCODING = new Regex(@"%[a-f0-9]{2}"); + + if (str == null) + { + return null; + } + + String stringToEncode = HttpUtility.UrlEncode(str, e).Replace("+", "%20").Replace("*", "%2A").Replace("(", "%28").Replace(")", "%29"); + return REG_URL_ENCODING.Replace(stringToEncode, m => m.Value.ToUpperInvariant()); + } + + /// + /// 获取网页请求 + /// + /// + /// + /// + public static HttpWebRequest GetWebRequest(string url, string method) + { + HttpWebRequest req = null; + if (url.Contains("https")) + { + ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(CheckValidationResult); + req = (HttpWebRequest)WebRequest.CreateDefault(new Uri(url)); + } + else + { + req = (HttpWebRequest)WebRequest.Create(url); + } + + req.ServicePoint.Expect100Continue = false; + req.Method = method; + req.KeepAlive = true; + req.UserAgent = "userAgent"; + req.Timeout = 100000; + + return req; + } + + /// + /// 获取网页请求扩展-检查请求 + /// + /// + /// + /// + /// + /// + public static bool CheckValidationResult(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors errors) + { //直接确认，否则打不开 + return true; + } + + /// + /// Json转数组列表 + /// + /// + /// + /// + public static List JsonToList(string JsonStr) + { + JavaScriptSerializer javaScriptSerializer = new JavaScriptSerializer(); + return javaScriptSerializer.Deserialize>(JsonStr); + } + + /// + /// Json转实体 + /// + /// + /// + /// + public static T JsonToModel(this string input) + { + try + { + return JsonConvert.DeserializeObject(input); + } + catch (Exception ex) + { + return default(T); + } + } + + /// + /// 实体转Json + /// + /// + /// + /// + public static string ModelToJson(this T input) + { + try + { + return Newtonsoft.Json.JsonConvert.SerializeObject(input); + } + catch (Exception ex) + { + return ex.Message; + } + } } } diff --git a/SYS.Common/SYS.Common.csproj b/SYS.Common/SYS.Common.csproj index 5a01803c26f4c865980aa4728bb604242f5c2877..3de539230f651074c2804620df16b8f6e216b7fc 100644 --- a/SYS.Common/SYS.Common.csproj +++ b/SYS.Common/SYS.Common.csproj @@ -39,7 +39,8 @@ 4 - bitbug_favicon %281%29.ico + + @@ -96,9 +97,6 @@ - - - diff --git a/SYS.Common/Util/Util.cs b/SYS.Common/Util/Util.cs index 157ddcb2dfc56811776ba75f718203080f3e41cd..2196802f94a6311d06d37dfbce30c718b4f4810a 100644 --- a/SYS.Common/Util/Util.cs +++ b/SYS.Common/Util/Util.cs @@ -24,7 +24,7 @@ namespace SYS.Common ResponseMsg result = HttpHelper.Request("App/SelectCardCode", null, dic); if (result.statusCode != 200) { - return new card { message = "SelectCardCode+接口服务异常，请提交Issue！" }; + return new card { message = "SelectCardCode+接口服务异常，请提交Issue或尝试更新版本！" }; } var addrResult = result.message; var address = addrResult.Replace(",", "").ToString(); diff --git a/SYS.Common/bitbug_favicon (1).ico b/SYS.Common/bitbug_favicon (1).ico deleted file mode 100644 index deaead31de45df54f39388e2b4727a00a4f99eca..0000000000000000000000000000000000000000 Binary files a/SYS.Common/bitbug_favicon (1).ico and /dev/null differ diff --git a/SYS.Core/Business/Cash/Cash.cs b/SYS.Core/Business/Cash/Cash.cs index fd41f554d87672478214a86d3fd664301236b2ed..f7a206a0d577a87b757060c6d1b8c2b1eb11af98 100644 --- a/SYS.Core/Business/Cash/Cash.cs +++ b/SYS.Core/Business/Cash/Cash.cs @@ -83,17 +83,9 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Business/Customer/Custo.cs b/SYS.Core/Business/Customer/Custo.cs index 11f6d0cfcb5b001547314b22f4d973b08a94f806..9bb6ce1b14255197e3dbfd990d8ae5d985e6f152 100644 --- a/SYS.Core/Business/Customer/Custo.cs +++ b/SYS.Core/Business/Customer/Custo.cs @@ -101,17 +101,9 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Business/Customer/CustoType.cs b/SYS.Core/Business/Customer/CustoType.cs index 1fe44e31869d3dfba85bd31bde7f2b24528e5bf2..31aa232a6424dba3a4590fcf53f57920dac1822e 100644 --- a/SYS.Core/Business/Customer/CustoType.cs +++ b/SYS.Core/Business/Customer/CustoType.cs @@ -49,16 +49,8 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Business/Customer/PassPortType.cs b/SYS.Core/Business/Customer/PassPortType.cs index 3ba5679bcf997b3d23534072f09605873671eab5..464ddaee8f4861a7a403b933d3129e04d17e8d5f 100644 --- a/SYS.Core/Business/Customer/PassPortType.cs +++ b/SYS.Core/Business/Customer/PassPortType.cs @@ -54,16 +54,8 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Business/Customer/SexType.cs b/SYS.Core/Business/Customer/SexType.cs index 2fc2e72d38d24b5202110c74132ec4e33f142ec0..2c99ccd2b89f4b9524afe846dc6279d57a914743 100644 --- a/SYS.Core/Business/Customer/SexType.cs +++ b/SYS.Core/Business/Customer/SexType.cs @@ -55,16 +55,8 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Business/Reser/Reser.cs b/SYS.Core/Business/Reser/Reser.cs index 02cc7bdc5e4041689b9ad118f897f9c78cdb157d..91471114d27ce98d5e379a53a315e3b5433435c1 100644 --- a/SYS.Core/Business/Reser/Reser.cs +++ b/SYS.Core/Business/Reser/Reser.cs @@ -69,17 +69,9 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Business/Room/Room.cs b/SYS.Core/Business/Room/Room.cs index 1fc34d268ea61a2db00632eb158f32d7a6d97494..5af4395fa54113a461177155c6953c7a1dc79fb7 100644 --- a/SYS.Core/Business/Room/Room.cs +++ b/SYS.Core/Business/Room/Room.cs @@ -112,17 +112,9 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Business/Room/RoomState.cs b/SYS.Core/Business/Room/RoomState.cs index 759282920d57ee110318ae42b5c7caa04e2744fd..5e8da763e3c1172b1400b8a12170ef931e4badaf 100644 --- a/SYS.Core/Business/Room/RoomState.cs +++ b/SYS.Core/Business/Room/RoomState.cs @@ -50,16 +50,8 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Business/Room/RoomType.cs b/SYS.Core/Business/Room/RoomType.cs index ca7ed2b39671c2cfeb2536dc391e7d4fb24fd227..2e73b3e64f11c2a39f1b098d30c1a898417046b7 100644 --- a/SYS.Core/Business/Room/RoomType.cs +++ b/SYS.Core/Business/Room/RoomType.cs @@ -51,16 +51,19 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } + } + + + public enum RT + { + 标准单人间 = 0, + 标准双人间 = 1, + 豪华单人间 = 2, + 豪华双人间 = 3, + 情侣套房 = 4, + 总统套房 = 5, } } diff --git a/SYS.Core/Business/Sellthing/SellThing.cs b/SYS.Core/Business/Sellthing/SellThing.cs index d354cb4ad62d62eb8d6295224703ea90705fd7c3..52ab2e487b7b61fb5143c76e4f8bf0ca2ea1b32e 100644 --- a/SYS.Core/Business/Sellthing/SellThing.cs +++ b/SYS.Core/Business/Sellthing/SellThing.cs @@ -67,16 +67,8 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Business/Spend/Spend.cs b/SYS.Core/Business/Spend/Spend.cs index 1bcf30a235b70742fa231cb7dd80421731afd413..1c4cb6125375c5ff4f0cafad791902bbbe67170a 100644 --- a/SYS.Core/Business/Spend/Spend.cs +++ b/SYS.Core/Business/Spend/Spend.cs @@ -83,17 +83,9 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } /// /// 结算状态描述 diff --git a/SYS.Core/Business/Wti/Wti.cs b/SYS.Core/Business/Wti/Wti.cs index a6a476761c8b42c555c42700c3b52add37cbd720..7ff12f2dca8e6420e7f3180e24a5fbdb06515b34 100644 --- a/SYS.Core/Business/Wti/Wti.cs +++ b/SYS.Core/Business/Wti/Wti.cs @@ -82,17 +82,9 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } diff --git a/SYS.Core/Sys/NavBar/NavBar.cs b/SYS.Core/Sys/NavBar/NavBar.cs index 89b9f0f4958444794d32fea8aab0a711a9d7d80b..c17053cbee1a68fb69a876a253706238b82224e4 100644 --- a/SYS.Core/Sys/NavBar/NavBar.cs +++ b/SYS.Core/Sys/NavBar/NavBar.cs @@ -42,20 +42,12 @@ namespace SYS.Core /// public int delete_mk { get; set; } /// - /// 新增人 + /// 资料创建人 /// public string datains_usr { get; set; } /// - /// 新增时间 - /// - public DateTime? datains_date { get; set; } - /// - /// 修改人 + /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 修改时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Worker/GBType.cs b/SYS.Core/Worker/GBType.cs index ca62ac73895f5003568c0269a09d06d3f66023d4..786fa9739f77623166630d6c1997580f372a4c3f 100644 --- a/SYS.Core/Worker/GBType.cs +++ b/SYS.Core/Worker/GBType.cs @@ -46,25 +46,13 @@ namespace SYS.Application /// 删除标记 /// public int delete_mk { get; set; } - /// - /// 资料新增人 + /// 资料创建人 /// public string datains_usr { get; set; } - - /// - /// 资料新增日期 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - - /// - /// 资料更新日期 - /// - public DateTime? datachg_date { get; set; } } } \ No newline at end of file diff --git a/SYS.Core/Worker/Worker.cs b/SYS.Core/Worker/Worker.cs index 2977c57a92b9104c5c12efaa76a565703f45bf10..379d402b9dba50047e1dc1c4da8f63be54db3154 100644 --- a/SYS.Core/Worker/Worker.cs +++ b/SYS.Core/Worker/Worker.cs @@ -136,18 +136,11 @@ namespace SYS.Core /// /// 资料创建人 /// + [SqlSugar.SugarColumn(IsOnlyIgnoreUpdate = true)] public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Worker/WorkerCheck.cs b/SYS.Core/Worker/WorkerCheck.cs index 4654d48cc7b1e71512e77b4b3beb11f343d6577f..a644a7a9dc762cacd189607b407a39d6cdc39fb0 100644 --- a/SYS.Core/Worker/WorkerCheck.cs +++ b/SYS.Core/Worker/WorkerCheck.cs @@ -68,17 +68,9 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Worker/WorkerGoodBad.cs b/SYS.Core/Worker/WorkerGoodBad.cs index 1199a2be0d7802bd4cae5bdc1138eb7d7a35058c..d5c5747dee63d8c640a06c323f5e12079bc3adf5 100644 --- a/SYS.Core/Worker/WorkerGoodBad.cs +++ b/SYS.Core/Worker/WorkerGoodBad.cs @@ -80,16 +80,8 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Worker/WorkerHistory.cs b/SYS.Core/Worker/WorkerHistory.cs index d978bfcaae1e15c1093b7ce9c9abcfd1a1ad86cd..e896e2bcad1bf078768c4aed0620c7da1469e90b 100644 --- a/SYS.Core/Worker/WorkerHistory.cs +++ b/SYS.Core/Worker/WorkerHistory.cs @@ -66,16 +66,8 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Zero/Admin.cs b/SYS.Core/Zero/Admin.cs index 6b4356d44fbca2c104bb9ec8bd55db3f1d054005..80752155e85197b185e6af1c031b3b6cdbf27eb1 100644 --- a/SYS.Core/Zero/Admin.cs +++ b/SYS.Core/Zero/Admin.cs @@ -79,30 +79,14 @@ namespace SYS.Core /// public System.Int32 DeleteMk { get { return this._DeleteMk; } set { this._DeleteMk = value; } } - private string _datains_usr; /// - /// 资料新增人 + /// 资料创建人 /// - public string datains_usr { get { return this._datains_usr; } set { this._datains_usr = value; } } - - private System.DateTime? _datains_time; - /// - /// 资料新增时间 - /// - public System.DateTime? datains_time { get { return this._datains_time; } set { this._datains_time = value; } } - - private string _datachg_usr; + public string datains_usr { get; set; } /// /// 资料更新人 /// - public string datachg_usr { get { return this._datachg_usr; } set { this._datachg_usr = value; } } - - private System.DateTime? _datachg_time; - /// - /// 资料更新时间 - /// - public System.DateTime? datachg_time { get { return this._datachg_time; } set { this._datachg_time = value; } } - + public string datachg_usr { get; set; } /// /// 管理员类型描述 /// diff --git a/SYS.Core/Zero/AdminType.cs b/SYS.Core/Zero/AdminType.cs index 067125480985b5189dfd22afa8c8b0ef53130ec3..927446636b30c6e7160f848b0bc19a1c0408e0bd 100644 --- a/SYS.Core/Zero/AdminType.cs +++ b/SYS.Core/Zero/AdminType.cs @@ -57,20 +57,12 @@ namespace SYS.Core public int delete_mk { get; set; } /// - /// 新增人 + /// 资料创建人 /// public string datains_usr { get; set; } /// - /// 新增时间 - /// - public DateTime? datains_date { get; set; } - /// - /// 修改人 + /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 修改时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Zero/CheckInfo.cs b/SYS.Core/Zero/CheckInfo.cs index 1972e3b7241cd29e64c6b9b00b1b16fd7d2deee7..ef98c69b92fa40ed707134fe7732b8e822db618b 100644 --- a/SYS.Core/Zero/CheckInfo.cs +++ b/SYS.Core/Zero/CheckInfo.cs @@ -70,16 +70,8 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Zero/Dept.cs b/SYS.Core/Zero/Dept.cs index 80a12e5431d0153d76a153d147b249ba3b464d92..4cf47ee372d92a8f88d00a30d739fc186409bf1f 100644 --- a/SYS.Core/Zero/Dept.cs +++ b/SYS.Core/Zero/Dept.cs @@ -79,17 +79,9 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Zero/Education.cs b/SYS.Core/Zero/Education.cs index 80c34d9192885d4d11c370ec138c548d0880295f..9a4bf0f3d5eb75bf55f63a2b81fa98cf0fb8922c 100644 --- a/SYS.Core/Zero/Education.cs +++ b/SYS.Core/Zero/Education.cs @@ -53,17 +53,9 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Zero/Module.cs b/SYS.Core/Zero/Module.cs index e7cb194079271507782836d2ada6f3c54520e28f..bad32cacb2eea20645050b518ef0e3a1846e8729 100644 --- a/SYS.Core/Zero/Module.cs +++ b/SYS.Core/Zero/Module.cs @@ -36,20 +36,9 @@ namespace SYS.Core /// 资料创建人 /// public string datains_usr { get; set; } - - /// - /// 资料创建时间 - /// - public DateTime? datains_time { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - - /// - /// 资料更新时间 - /// - public DateTime? datachg_time { get; set; } } } diff --git a/SYS.Core/Zero/Nation.cs b/SYS.Core/Zero/Nation.cs index 85f98b76649feeba0e4d92f164eff9a23c188497..b1c69383c7f0b2f45d71dfc4cf4fe4c89430cf63 100644 --- a/SYS.Core/Zero/Nation.cs +++ b/SYS.Core/Zero/Nation.cs @@ -53,17 +53,9 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Zero/Notice.cs b/SYS.Core/Zero/Notice.cs index 032a8ea184169e8a86fb7d6e5ac83221d74da6d2..3a83b00d9cc58f2c6ee014938cd3344cd07c8fdc 100644 --- a/SYS.Core/Zero/Notice.cs +++ b/SYS.Core/Zero/Notice.cs @@ -77,17 +77,9 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.Core/Zero/VipRule.cs b/SYS.Core/Zero/VipRule.cs index d97b673edfd9c9d6aa81668162b5df896b845729..bb5e2f734414b4a61fb9d6c936da9e77cdb5fa70 100644 --- a/SYS.Core/Zero/VipRule.cs +++ b/SYS.Core/Zero/VipRule.cs @@ -65,24 +65,15 @@ namespace SYS.Core /// 删除标识 /// public int delete_mk { get; set; } - /// - /// 新增人 - /// - public string datains_usr { get; set; } /// - /// 新增时间 + /// 资料创建人 /// - public DateTime? datains_date { get; set; } + public string datains_usr { get; set; } /// - /// 修改人 + /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 修改时间 - /// - public DateTime? datachg_date { get; set; } - /// /// 会员等级描述 /// diff --git a/SYS.Core/Zero/position.cs b/SYS.Core/Zero/position.cs index e9d0b0419a2f1ca6e6a15c3a1baed0307758707c..72d2dfe7c5c63d15d3f3aa893fc1a13482207e77 100644 --- a/SYS.Core/Zero/position.cs +++ b/SYS.Core/Zero/position.cs @@ -53,17 +53,9 @@ namespace SYS.Core /// public string datains_usr { get; set; } /// - /// 资料创建时间 - /// - public DateTime? datains_date { get; set; } - /// /// 资料更新人 /// public string datachg_usr { get; set; } - /// - /// 资料更新时间 - /// - public DateTime? datachg_date { get; set; } } } diff --git a/SYS.FormUI/AppFunction/FrmAddAdmin.cs b/SYS.FormUI/AppFunction/FrmAddAdmin.cs index cba01a883caa4e65a7d3451ca79b1f86a488ed7c..6ff76a59354aeec739f9c71af4cf0a1b5688e4d7 100644 --- a/SYS.FormUI/AppFunction/FrmAddAdmin.cs +++ b/SYS.FormUI/AppFunction/FrmAddAdmin.cs @@ -36,7 +36,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Admin/GetAllAdmin"); if (result.statusCode != 200) { - UIMessageBox.ShowError("GetAllAdmin+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("GetAllAdmin+接口服务异常，请提交Issue或尝试更新版本！"); return; } dgvAdminList.AutoGenerateColumns = false; @@ -53,15 +53,14 @@ namespace SYS.FormUI AdminType = cbAccountType.SelectedValue.ToString(), IsAdmin = cbAccountType.SelectedValue.ToString() == "超级管理员" ? 1 : 0, DeleteMk = 0, - datains_usr = AdminInfo.Account, - datains_time = DateTime.Now + datains_usr = AdminInfo.Account }; if (CheckInputs(admin)) { result = HttpHelper.Request("Admin​/AddAdmin", HttpHelper.ModelToJson(admin)); if (result.statusCode != 200) { - UIMessageBox.ShowError("AddAdmin+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("AddAdmin+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool tf = result.message.ToString().Equals("true"); @@ -79,7 +78,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Admin/GetAllAdminTypes"); if (result.statusCode != 200) { - UIMessageBox.ShowError("GetAllAdminTypes+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("GetAllAdminTypes+接口服务异常，请提交Issue或尝试更新版本！"); return; } cbAccountType.DataSource = HttpHelper.JsonToList(result.message); diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs b/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs index b229da2c48a6f720e3aca0088c23a4d95c583967..e0fae6bb9b57c86fd1076d6a90d9984aa8d176b0 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmAddRoom.Designer.cs @@ -118,7 +118,9 @@ this.txtMoney.Style = Sunny.UI.UIStyle.Custom; this.txtMoney.StyleCustomMode = true; this.txtMoney.TabIndex = 110; + this.txtMoney.Text = "0.00"; this.txtMoney.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.txtMoney.Type = Sunny.UI.UITextBox.UIEditType.Double; // // label4 // diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.cs b/SYS.FormUI/AppFunction/FrmAddRoom.cs index b0b0b3ec8403e3427d958577bcd9c5519345e702..fcfbc05048b64b75ebb2f853e64b2055c7b9e67e 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.cs +++ b/SYS.FormUI/AppFunction/FrmAddRoom.cs @@ -47,7 +47,7 @@ namespace SYS.FormUI private void btnAddRoom_Click(object sender, EventArgs e) { - if (!string.IsNullOrWhiteSpace(txtRoomNo.Text)) + if (!string.IsNullOrWhiteSpace(txtRoomNo.Text)&& !txtMoney.Text.IsNullOrWhiteSpace() && !txtDeposit.Text.IsNullOrWhiteSpace()) { rn = new Room() { @@ -57,13 +57,12 @@ namespace SYS.FormUI RoomPosition = txtRoomPosition.Text, RoomStateId = 0, RoomDeposit = Convert.ToDecimal(txtDeposit.Text), - datains_usr = AdminInfo.Account, - datains_date = DateTime.Now + datains_usr = AdminInfo.Account }; result = HttpHelper.Request("Room​/InsertRoom", HttpHelper.ModelToJson(rn)); if (result.statusCode != 200) { - UIMessageBox.ShowError("InsertRoom+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertRoom+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool tf = result.message.ToString().Equals("true"); @@ -91,7 +90,7 @@ namespace SYS.FormUI result = HttpHelper.Request("RoomType/SelectRoomTypesAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectRoomTypesAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectRoomTypesAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboRoomType.DataSource = HttpHelper.JsonToList(result.message); @@ -105,7 +104,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectCanUseRoomAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCanUseRoomAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCanUseRoomAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } List rooms = HttpHelper.JsonToList(result.message); @@ -124,34 +123,34 @@ namespace SYS.FormUI private void cboRoomType_TextChanged(object sender, EventArgs e) { - if (cboRoomType.Text == "标准单人间") + if (cboRoomType.Text == nameof(RT.标准单人间)) { txtMoney.Text = "300"; txtRoomPosition.Text = "A层"; } - else if (cboRoomType.Text == "标准双人间") + else if (cboRoomType.Text == nameof(RT.标准双人间)) { txtMoney.Text = "425"; txtRoomPosition.Text = "A层"; } - else if (cboRoomType.Text == "豪华单人间") + else if (cboRoomType.Text == nameof(RT.豪华单人间)) { txtMoney.Text = "625"; txtRoomPosition.Text = "B层"; } - else if (cboRoomType.Text == "豪华双人间") + else if (cboRoomType.Text == nameof(RT.豪华双人间)) { txtMoney.Text = "660"; txtRoomPosition.Text = "B层"; } - else if (cboRoomType.Text == "情侣套房") + else if (cboRoomType.Text == nameof(RT.情侣套房)) { txtMoney.Text = "845"; txtRoomPosition.Text = "C层"; } - else if (cboRoomType.Text == "总统套房") + else if (cboRoomType.Text == nameof(RT.总统套房)) { - txtMoney.Text = "1080"; + txtMoney.Text = RT.豪华单人间.ToString(); txtRoomPosition.Text = "D层"; } } @@ -175,7 +174,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectRoomByRoomNo",null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return ret; } var room = HttpHelper.JsonToModel(result.message); diff --git a/SYS.FormUI/AppFunction/FrmAddWorker.cs b/SYS.FormUI/AppFunction/FrmAddWorker.cs index 0e0550d02ad1a29b6006bd65a75b4eabce240733..34e7302bcef2eabb3fc041a2ada20aa98982b3de 100644 --- a/SYS.FormUI/AppFunction/FrmAddWorker.cs +++ b/SYS.FormUI/AppFunction/FrmAddWorker.cs @@ -61,7 +61,7 @@ namespace SYS.FormUI var result = HttpHelper.Request("Base/SelectDeptAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } //加载部门信息 @@ -74,7 +74,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectNationAll",null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectNationAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectNationAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cbWorkerNation.DataSource = HttpHelper.JsonToList(result.message); @@ -86,7 +86,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectPositionAll", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectPositionAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectPositionAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboWorkerPosition.DataSource = HttpHelper.JsonToList(result.message); @@ -98,7 +98,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectSexTypeAll", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboSex.DataSource = HttpHelper.JsonToList(result.message); @@ -110,7 +110,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectEducationAll", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectEducationAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectEducationAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboEducation.DataSource = HttpHelper.JsonToList(result.message); @@ -161,7 +161,7 @@ namespace SYS.FormUI result = HttpHelper.Request("WorkerPicture/WorkerPic", null, dic); //if (result.statusCode != 200) //{ - // UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue！"); + // UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue或尝试更新版本！"); // return; //} var workerPicSource = HttpHelper.JsonToModel(result.message); @@ -178,7 +178,7 @@ namespace SYS.FormUI result = HttpHelper.Request("WorkerHistory/SelectHistoryByWorkerId", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectHistoryByWorkerId+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectHistoryByWorkerId+接口服务异常，请提交Issue或尝试更新版本！"); return; } List workerHistories = HttpHelper.JsonToList(result.message); @@ -235,7 +235,7 @@ namespace SYS.FormUI result = HttpHelper.Request("WorkerPicture/WorkerPic", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue或尝试更新版本！"); return; } var workerPicSource = HttpHelper.JsonToModel(result.message); @@ -256,7 +256,7 @@ namespace SYS.FormUI result = HttpHelper.Request("WorkerHistory/SelectHistoryByWorkerId", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectHistoryByWorkerId+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectHistoryByWorkerId+接口服务异常，请提交Issue或尝试更新版本！"); return; } List workerHistories = HttpHelper.JsonToList(result.message); @@ -294,13 +294,12 @@ namespace SYS.FormUI WorkerFace = cboWorkerFace.SelectedValue.ToString(), WorkerEducation = cboEducation.SelectedValue.ToString(), WorkerBirthday = dtpBirthday.Value, - datachg_usr = AdminInfo.Account, - datachg_date = DateTime.Now + datachg_usr = AdminInfo.Account }; var result = HttpHelper.Request("Worker/UpdateWorker", HttpHelper.ModelToJson(worker)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateWorker+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateWorker+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool i = result.message.ToString().Equals("true") ? true:false; /*new WorkerService().UpdateWorker(worker);*/ @@ -403,7 +402,7 @@ namespace SYS.FormUI var response = HttpHelper.Request("WorkerPicture/InsertWorkerPic", HttpHelper.ModelToJson(workerPic)); if (response.statusCode != 200) { - UIMessageBox.ShowError("InsertWorkerPic+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertWorkerPic+接口服务异常，请提交Issue或尝试更新版本！"); return; } @@ -429,8 +428,7 @@ namespace SYS.FormUI WorkerTime = dtpTime.Value, WorkerFace = cboWorkerFace.Text, WorkerEducation = cboEducation.SelectedValue.ToString(), - datains_usr = AdminInfo.Account, - datains_date = DateTime.Now + datains_usr = AdminInfo.Account }; try { @@ -438,7 +436,7 @@ namespace SYS.FormUI var response = HttpHelper.Request("Worker/AddWorker", HttpHelper.ModelToJson(worker)); if (response.statusCode != 200) { - UIMessageBox.ShowError("AddWorker+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("AddWorker+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool n = response.message.ToString().Equals("true")?true:false; @@ -459,7 +457,7 @@ namespace SYS.FormUI response = HttpHelper.Request("WorkerHistory/AddHistoryByWorkerId", HttpHelper.ModelToJson(workerHistory)); if (response.statusCode != 200) { - UIMessageBox.ShowError("AddHistoryByWorkerId+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("AddHistoryByWorkerId+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool j = response.message.ToString().Equals("true") ? true : false; diff --git a/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs b/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs index b17ddd58044aa4d15a4aff9b522940bf64521818..fcb82a4101a4f5d785a5b9c4b6a7f5682408f74d 100644 --- a/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmAdminManager.Designer.cs @@ -33,6 +33,7 @@ namespace SYS.FormUI System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAdminManager)); this.btnAuthority = new Sunny.UI.UIButton(); this.dgvAdminList = new Sunny.UI.UIDataGridView(); @@ -81,7 +82,7 @@ namespace SYS.FormUI dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F); dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dgvAdminList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; @@ -116,9 +117,18 @@ namespace SYS.FormUI this.dgvAdminList.Location = new System.Drawing.Point(3, 38); this.dgvAdminList.Name = "dgvAdminList"; this.dgvAdminList.ReadOnly = true; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvAdminList.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvAdminList.RowHeadersVisible = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.White; - this.dgvAdminList.RowsDefaultCellStyle = dataGridViewCellStyle4; + this.dgvAdminList.RowHeight = 29; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; + this.dgvAdminList.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvAdminList.RowTemplate.Height = 29; this.dgvAdminList.SelectedIndex = -1; this.dgvAdminList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -210,7 +220,7 @@ namespace SYS.FormUI // // Column5 // - this.Column5.DataPropertyName = "datains_time"; + this.Column5.DataPropertyName = "datains_date"; this.Column5.HeaderText = "Column5"; this.Column5.Name = "Column5"; this.Column5.ReadOnly = true; @@ -226,7 +236,7 @@ namespace SYS.FormUI // // Column7 // - this.Column7.DataPropertyName = "datachg_time"; + this.Column7.DataPropertyName = "datachg_date"; this.Column7.HeaderText = "Column7"; this.Column7.Name = "Column7"; this.Column7.ReadOnly = true; diff --git a/SYS.FormUI/AppFunction/FrmAdminManager.cs b/SYS.FormUI/AppFunction/FrmAdminManager.cs index fa5501e0b165bf28b214de9a184db7e7d0eaab4c..f6b1232e7418566efa86553a305c0cded0c2ecf3 100644 --- a/SYS.FormUI/AppFunction/FrmAdminManager.cs +++ b/SYS.FormUI/AppFunction/FrmAdminManager.cs @@ -35,7 +35,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Admin/GetAllAdminList"); if (result.statusCode != 200) { - UIMessageBox.ShowError("GetAllAdminList+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("GetAllAdminList+接口服务异常，请提交Issue或尝试更新版本！"); return; } dgvAdminList.AutoGenerateColumns = false; @@ -49,12 +49,13 @@ namespace SYS.FormUI Admin admin = new Admin() { Id = Convert.ToInt32(dgvAdminList.SelectedRows[0].Cells["clId"].Value), - DeleteMk = Convert.ToInt32(dgvAdminList.SelectedRows[0].Cells["Column1"].Value) + DeleteMk = Convert.ToInt32(dgvAdminList.SelectedRows[0].Cells["Column1"].Value), + datachg_usr = AdminInfo.Account }; result = HttpHelper.Request("Admin/UpdAccount",HttpHelper.ModelToJson(admin)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdAccount+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdAccount+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool tf = result.message.ToString().Equals("true"); diff --git a/SYS.FormUI/AppFunction/FrmAuthority.cs b/SYS.FormUI/AppFunction/FrmAuthority.cs index 386f9f0a27c8c51bd5ccf7388f3d05c4bda26f29..d8977f95daf937de26b71946e7b8051a2f9c5990 100644 --- a/SYS.FormUI/AppFunction/FrmAuthority.cs +++ b/SYS.FormUI/AppFunction/FrmAuthority.cs @@ -39,7 +39,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Admin/GetAdminInfoByAdminAccount", null,dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("GetAdminInfoByAdminAccount+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("GetAdminInfoByAdminAccount+接口服务异常，请提交Issue或尝试更新版本！"); return; } var adminInfo = HttpHelper.JsonToModel(result.message); @@ -67,7 +67,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Module/GetAllModuleByAdmin", HttpHelper.ModelToJson(admin)); if (result.statusCode != 200) { - UIMessageBox.ShowError("GetAllModuleByAdmin+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("GetAllModuleByAdmin+接口服务异常，请提交Issue或尝试更新版本！"); return; } var listMyModule = HttpHelper.JsonToList(result.message); @@ -78,7 +78,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Module/GetAllModule"); if (result.statusCode != 200) { - UIMessageBox.ShowError("GetAllModule+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("GetAllModule+接口服务异常，请提交Issue或尝试更新版本！"); return; } var listModules = HttpHelper.JsonToList(result.message); @@ -113,7 +113,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Module/GetAllModuleByAdmin", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("GetAllModuleByAdmin+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("GetAllModuleByAdmin+接口服务异常，请提交Issue或尝试更新版本！"); return; } var listExsitModule = HttpHelper.JsonToList(result.message); @@ -124,7 +124,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Module/DelModuleZeroList", HttpHelper.ModelToJson(moduleZero)); if (result.statusCode != 200) { - UIMessageBox.ShowError("DelModuleZeroList+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("DelModuleZeroList+接口服务异常，请提交Issue或尝试更新版本！"); return; } for (int i = 0; i < tfModuleZero.ItemsRight.Count; i++) @@ -138,7 +138,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Module/AddModuleZeroList", HttpHelper.ModelToJson(listAddModule)); if (result.statusCode != 200) { - UIMessageBox.ShowError("AddModuleZeroList+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("AddModuleZeroList+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool tf = result.message.ToString().Equals("true"); diff --git a/SYS.FormUI/AppFunction/FrmCash.cs b/SYS.FormUI/AppFunction/FrmCash.cs index e202edf96c37c17271beb282f52653ec27927a01..8c9faaa55a2be9b4d86149509117d3e10ac34890 100644 --- a/SYS.FormUI/AppFunction/FrmCash.cs +++ b/SYS.FormUI/AppFunction/FrmCash.cs @@ -47,7 +47,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectDeptAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboClub.DataSource = HttpHelper.JsonToList(result.message); @@ -57,7 +57,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Worker/SelectWorkerAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectWorkerAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectWorkerAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboCashPerson.DataSource = HttpHelper.JsonToList(result.message); @@ -80,7 +80,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Cash/SelectCashInfoAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCashInfoAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCashInfoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } dgvCashList.DataSource = HttpHelper.JsonToList(result.message); @@ -126,8 +126,7 @@ namespace SYS.FormUI CashTime = dtpDate.Value, CashSource = txtFrom.Text.Trim(), CashPerson = cboCashPerson.SelectedValue.ToString(), - datains_usr = AdminInfo.Account, - datains_date = DateTime.Now + datains_usr = AdminInfo.Account }; if (CheckInput(cash)) { @@ -137,7 +136,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Cash/AddCashInfo",HttpHelper.ModelToJson(cash)); if (result.statusCode != 200) { - UIMessageBox.ShowError("AddCashInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("AddCashInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool n = result.message.ToString().Equals("true")?true:false; diff --git a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs b/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs index 689463c715eec7b10d7b706502736594cbb24c3d..d2c6ec001c39348b653c8c2fd69cbfb0091c4f6f 100644 --- a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs +++ b/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs @@ -56,11 +56,11 @@ namespace SYS.FormUI private void btnUpdPwd_Click(object sender, EventArgs e) { - Admin admin = new Admin() { AdminAccount = AdminInfo.Account, AdminPassword = txtNewPwd.Text.Trim() }; + Admin admin = new Admin() { AdminAccount = AdminInfo.Account, AdminPassword = txtNewPwd.Text.Trim(),datachg_usr = AdminInfo.Account }; result = HttpHelper.Request("Admin​/UpdateNewPwdByOldPwd", HttpHelper.ModelToJson(admin)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateNewPwdByOldPwd+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateNewPwdByOldPwd+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool tf = result.message.ToString().Equals("true"); @@ -91,7 +91,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Admin​/SelectMangerByPass", HttpHelper.ModelToJson(admin)); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectMangerByPass+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectMangerByPass+接口服务异常，请提交Issue或尝试更新版本！"); return; } var source = HttpHelper.JsonToModel(result.message); diff --git a/SYS.FormUI/AppFunction/FrmChangePosition.cs b/SYS.FormUI/AppFunction/FrmChangePosition.cs index 3a8df183ddddbb1c5f04e5a6d9bef000565f3141..a40abedf79ecbd38a8eb8e8fc32a9af82f2e8d0c 100644 --- a/SYS.FormUI/AppFunction/FrmChangePosition.cs +++ b/SYS.FormUI/AppFunction/FrmChangePosition.cs @@ -60,7 +60,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectPositionAll",null,dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectPositionAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectPositionAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboNewPosition.DataSource = HttpHelper.JsonToList(result.message); @@ -70,7 +70,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectDeptAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboNewClub.DataSource = HttpHelper.JsonToList(result.message); @@ -95,12 +95,13 @@ namespace SYS.FormUI { WorkerClub = cboNewClub.SelectedValue.ToString(), WorkerPosition = cboNewPosition.SelectedValue.ToString(), - WorkerId = txtworkerId.Text + WorkerId = txtworkerId.Text, + datachg_usr = AdminInfo.Account }; result = HttpHelper.Request("Worker​/UpdateWorkerPositionAndClub", HttpHelper.ModelToJson(worker)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateWorkerPositionAndClub+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateWorkerPositionAndClub+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool n = result.message.ToString().Equals("true"); diff --git a/SYS.FormUI/AppFunction/FrmChangeRoom.cs b/SYS.FormUI/AppFunction/FrmChangeRoom.cs index c2b6a42d0f9611bccce58aff07c44f84dacc22a9..150230fbf81393ad538de639710cbab0dfa8fc2f 100644 --- a/SYS.FormUI/AppFunction/FrmChangeRoom.cs +++ b/SYS.FormUI/AppFunction/FrmChangeRoom.cs @@ -48,7 +48,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectCanUseRoomAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCanUseRoomAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCanUseRoomAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboRoomList.DataSource = HttpHelper.JsonToList(result.message); @@ -70,8 +70,7 @@ namespace SYS.FormUI CustoNo = ucRoomList.CustoNo, RoomStateId = 1, CheckTime = DateTime.Now, - datains_usr = LoginInfo.WorkerNo, - datains_date = DateTime.Now + datains_usr = LoginInfo.WorkerNo }; dic = new Dictionary() { @@ -80,7 +79,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/DayByRoomNo",null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("DayByRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("DayByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } if (rno.StartsWith("BD")) @@ -122,7 +121,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room​/UpdateRoomInfo",HttpHelper.ModelToJson(checkInRoom), null); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateRoomInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateRoomInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool result1 = result.message.ToString().Equals("true"); @@ -133,7 +132,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room​/UpdateRoomByRoomNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateRoomByRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool result2 = result.message.ToString().Equals("true"); @@ -144,7 +143,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Spend​/SelectSpendByCustoNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSpendByCustoNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSpendByCustoNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } var result3 = HttpHelper.JsonToList(result.message); @@ -154,7 +153,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Spend​/UpdateSpendInfoByRoomNo", HttpHelper.ModelToJson(spend)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateSpendInfoByRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateSpendInfoByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool result4 = result.message.ToString().Equals("true"); @@ -165,7 +164,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Spend​/InsertSpendInfo", HttpHelper.ModelToJson(s)); if (result.statusCode != 200) { - UIMessageBox.ShowError("InsertSpendInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertSpendInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool m = result.message.ToString().Equals("true"); diff --git a/SYS.FormUI/AppFunction/FrmChangeWorker.cs b/SYS.FormUI/AppFunction/FrmChangeWorker.cs index 156fa05d985a1e2abf614a0094bbd1eca4ce2d50..7e4f24b4ccd205ba8a6c5491e083cfce83df5f48 100644 --- a/SYS.FormUI/AppFunction/FrmChangeWorker.cs +++ b/SYS.FormUI/AppFunction/FrmChangeWorker.cs @@ -268,7 +268,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Worker​/ManagerWorkerAccount", HttpHelper.ModelToJson(worker)); if (result.statusCode != 200) { - UIMessageBox.ShowError("ManagerWorkerAccount+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("ManagerWorkerAccount+接口服务异常，请提交Issue或尝试更新版本！"); return; } #region 获取添加操作日志所需的信息 @@ -287,7 +287,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Worker​/ManagerWorkerAccount", HttpHelper.ModelToJson(worker)); if (result.statusCode != 200) { - UIMessageBox.ShowError("ManagerWorkerAccount+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("ManagerWorkerAccount+接口服务异常，请提交Issue或尝试更新版本！"); return; } #region 获取添加操作日志所需的信息 diff --git a/SYS.FormUI/AppFunction/FrmChart.cs b/SYS.FormUI/AppFunction/FrmChart.cs index b2af4703469fd27f1a354eba15053539bd8ccbc4..33b41b765ee298684fe32d1d63ba77e2ebd23201 100644 --- a/SYS.FormUI/AppFunction/FrmChart.cs +++ b/SYS.FormUI/AppFunction/FrmChart.cs @@ -50,7 +50,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Custo/SelectAllMoney"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectAllMoney+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectAllMoney+接口服务异常，请提交Issue或尝试更新版本！"); return; } var listHotelMoney = HttpHelper.JsonToList(result.message); diff --git a/SYS.FormUI/AppFunction/FrmCheckIn.cs b/SYS.FormUI/AppFunction/FrmCheckIn.cs index ce020ea2e28858e94e6d7a353494395d9d930357..0bcf46db31cc6a7e017480c4a57f1d45c39ed05c 100644 --- a/SYS.FormUI/AppFunction/FrmCheckIn.cs +++ b/SYS.FormUI/AppFunction/FrmCheckIn.cs @@ -214,8 +214,7 @@ namespace SYS.FormUI CustoNo = txtCustoNo.Text, RoomStateId = 1, RoomNo = txtRoomNo.Text, - datachg_usr = LoginInfo.WorkerNo, - datachg_date = DateTime.Now, + datachg_usr = LoginInfo.WorkerNo }; result = HttpHelper.Request("Room/UpdateRoomInfo", HttpHelper.ModelToJson(r), null); if (result.statusCode != 200) diff --git a/SYS.FormUI/AppFunction/FrmCheckList.cs b/SYS.FormUI/AppFunction/FrmCheckList.cs index ee96a098bb825c62a600659d19cd2e946d8dfc9d..bbbd9613208a4822dd5b7fd9ab3a876e3f441a1f 100644 --- a/SYS.FormUI/AppFunction/FrmCheckList.cs +++ b/SYS.FormUI/AppFunction/FrmCheckList.cs @@ -44,7 +44,7 @@ namespace SYS.FormUI var result = HttpHelper.Request("CheckInfo/SelectCheckInfoAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCheckInfoAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCheckInfoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } dgvCheckInfo.AutoGenerateColumns = false; diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs b/SYS.FormUI/AppFunction/FrmCheckOutForm.cs index 7026a346e9833db17c0d5e791d30fbf34ae647ef..9e8f8b83e8e75d1e073fcf6105a0c580ab681c20 100644 --- a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs +++ b/SYS.FormUI/AppFunction/FrmCheckOutForm.cs @@ -89,7 +89,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectCustoTypeAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } List lstSourceGrid = HttpHelper.JsonToList(result.message); @@ -104,7 +104,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectPassPortTypeAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectPassPortTypeAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectPassPortTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } List passPorts = HttpHelper.JsonToList(result.message); @@ -118,7 +118,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectSexTypeAll?delete_mk=0"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } List listSexType = HttpHelper.JsonToList(result.message); @@ -132,16 +132,28 @@ namespace SYS.FormUI txtCustoNo.Text = ucRoomList.rm_CustoNo; CustoNo.Text = ucRoomList.rm_CustoNo; txtRoomNo.Text = ucRoomList.rm_RoomNo; - string rn = txtRoomNo.Text.ToString(); - string rs = rn.Substring(0, 2); + + dic = new Dictionary() + { + { "no",txtRoomNo.Text.ToString()} + }; - if (ucRoomList.co_CheckTime == null) + result = HttpHelper.Request("Room/SelectRoomByRoomNo",null, dic); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + + Room room = HttpHelper.JsonToModel(result.message); + + if (room.CheckTime == null) { dtpCheckTime.Text = DateTime.Now.ToString("yyyy年MM月dd日"); } else { - dtpCheckTime.Text = Convert.ToDateTime(ucRoomList.co_CheckTime).ToString("yyyy年MM月dd日"); + dtpCheckTime.Text = Convert.ToDateTime(room.CheckTime).ToString("yyyy年MM月dd日"); } dic = new Dictionary() { @@ -150,33 +162,12 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/DayByRoomNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("DayByRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("DayByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } - if (rs == "BD") - { - sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(result.message) * 300)); - } - if (rs == "BS") - { - sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(result.message) * 425)); - } - if (rs == "HD") - { - sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(result.message) * 625)); - } - if (rs == "HS") - { - sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(result.message) * 660)); - } - if (rs == "QL") - { - sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(result.message) * 845)); - } - if (rs == "ZT") - { - sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(result.message) * 1080)); - } + + sum = Convert.ToDouble(Convert.ToString(Convert.ToInt32(result.message) * room.RoomMoney)); + lblDay.Text = Convert.ToString(Convert.ToInt32(result.message)); w = new Wti() { @@ -197,7 +188,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Custo​/SelectCardInfoByCustoNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCardInfoByCustoNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCardInfoByCustoNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } Custo cto = HttpHelper.JsonToModel(result.message); @@ -230,7 +221,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Spend/SelectSpendInfoRoomNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSpendInfoRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSpendInfoRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } dgvSpendList.AutoGenerateColumns = false; @@ -250,7 +241,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Spend/SelectMoneyByRoomNoAndTime", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectMoneyByRoomNoAndTime+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectMoneyByRoomNoAndTime+接口服务异常，请提交Issue或尝试更新版本！"); return; } total = Convert.ToDouble(result.message); @@ -266,7 +257,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Wti/ListWtiInfoByRoomNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("ListWtiInfoByRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("ListWtiInfoByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } var listWti = HttpHelper.JsonToList(result.message); @@ -364,7 +355,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } Room r = HttpHelper.JsonToModel(result.message);//根据房间编号查询房间信息 @@ -378,7 +369,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/UpdateRoomByRoomNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateRoomByRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool n = result.message.ToString().Equals("true"); @@ -387,7 +378,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Wti​/InsertWtiInfo", HttpHelper.ModelToJson(w)); if (result.statusCode != 200) { - UIMessageBox.ShowError("InsertWtiInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertWtiInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } this.Close(); @@ -414,7 +405,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Spend​/UpdateMoneyState", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateMoneyState+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateMoneyState+接口服务异常，请提交Issue或尝试更新版本！"); return; } if (result.message.ToString().Equals("true")) @@ -426,7 +417,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/UpdateRoomByRoomNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateMoneyState+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateMoneyState+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool n = result.message.ToString().Equals("true"); @@ -435,7 +426,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Wti​/InsertWtiInfo", HttpHelper.ModelToJson(w)); if (result.statusCode != 200) { - UIMessageBox.ShowError("InsertWtiInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertWtiInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } this.Close(); diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs b/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs index fb9a0779fb3013041097321f7af79cc00b3189d5..fc7b67cb944c6d4c8ecc595c42e03b9ffc76e548 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCustoManager.Designer.cs @@ -385,7 +385,7 @@ this.btnPg.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnPg.MinimumSize = new System.Drawing.Size(1, 1); this.btnPg.Name = "btnPg"; - this.btnPg.PageSize = 12; + this.btnPg.PageSize = 15; this.btnPg.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.btnPg.Size = new System.Drawing.Size(782, 34); this.btnPg.Style = Sunny.UI.UIStyle.Custom; diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.cs b/SYS.FormUI/AppFunction/FrmCustoManager.cs index 94b4d880729709cb4acf9524fe6e939d2394d5da..a14be72c4447810925df5208a097c30a7d936cd4 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustoManager.cs @@ -66,7 +66,7 @@ namespace SYS.FormUI private void FrmCustoManager_Load(object sender, EventArgs e) { //dgvCustomerList.AutoGenerateColumns = false; - this.btnPg.PageSize = 12; + this.btnPg.PageSize = 15; LoadCustomer(); LoadCustoType(); //txtCustoNo.ReadOnly = true; @@ -88,14 +88,13 @@ namespace SYS.FormUI { dic = new Dictionary() { - { "delete_mk","0"}, { "pageIndex","1"}, { "pageSize","15"} }; result = HttpHelper.Request("Custo/SelectCustoAll",null,dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } OSelectCustoAllDto custos = HttpHelper.JsonToModel(result.message); @@ -153,7 +152,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Custo/SelectCustoByInfo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } custos = HttpHelper.JsonToModel(result.message); @@ -167,17 +166,17 @@ namespace SYS.FormUI result = HttpHelper.Request("Custo/SelectCustoByInfo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } custos = HttpHelper.JsonToModel(result.message); } else { - result = HttpHelper.Request("Custo/SelectCustoAll?pageIndex=1&pageSize=20"); + result = HttpHelper.Request("Custo/SelectCustoAll?pageIndex=1&pageSize=15"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } custos = HttpHelper.JsonToModel(result.message); @@ -258,14 +257,13 @@ namespace SYS.FormUI { dic = new Dictionary() { - { "delete_mk","0"}, { "pageIndex",pageIndex.ToString()}, { "pageSize",count.ToString()} }; result = HttpHelper.Request("Custo/SelectCustoAll", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } OSelectCustoAllDto custos = HttpHelper.JsonToModel(result.message); diff --git a/SYS.FormUI/AppFunction/FrmCustoSpend.cs b/SYS.FormUI/AppFunction/FrmCustoSpend.cs index 464d74ff302161a0e2c27878770f38b8bbc3f2b0..6bdcc1245ae2e2bc6de04c829e84e66ed82129cb 100644 --- a/SYS.FormUI/AppFunction/FrmCustoSpend.cs +++ b/SYS.FormUI/AppFunction/FrmCustoSpend.cs @@ -43,7 +43,7 @@ namespace SYS.FormUI var result = HttpHelper.Request("Spend/SelectSpendInfoAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSpendInfoAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSpendInfoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } dgvSpendList.AutoGenerateColumns = false; diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs b/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs index 4efb160b49560dd1109862a6101980e191db9f61..bcc5274a1db924926aae313d2eb791cf9ce3d11d 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.Designer.cs @@ -409,7 +409,7 @@ this.btnPg.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnPg.MinimumSize = new System.Drawing.Size(1, 1); this.btnPg.Name = "btnPg"; - this.btnPg.PageSize = 12; + this.btnPg.PageSize = 15; this.btnPg.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.btnPg.Size = new System.Drawing.Size(755, 34); this.btnPg.TabIndex = 120; diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.cs b/SYS.FormUI/AppFunction/FrmCustomerManager.cs index 51e93c7215720524a4aaeb545e90019d8a3830a4..f820504067d82848998196b0ee191913ce171155 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.cs @@ -56,7 +56,7 @@ namespace SYS.FormUI #region 用户管理界面加载事件方法 private void FrmCustomerManager_Load(object sender, EventArgs e) { - this.btnPg.PageSize = 12; + this.btnPg.PageSize = 15; LoadCustomer(); } #endregion @@ -66,14 +66,13 @@ namespace SYS.FormUI { dic = new Dictionary() { - { "delete_mk","0"}, { "pageIndex","1"}, - { "pageSize","12"} + { "pageSize","15"} }; result = HttpHelper.Request("Custo/SelectCustoAll", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } OSelectCustoAllDto custos = HttpHelper.JsonToModel(result.message); @@ -166,43 +165,50 @@ namespace SYS.FormUI List custos = new List(); if (!txtCustoNo.Text.IsNullOrEmpty()) { - dic = new Dictionary + var custo = new Custo() { - { "CustoNo", txtCustoNo.Text.Trim() } + CustoNo = txtCustoNo.Text.Trim() }; - result = HttpHelper.Request("Custo/SelectCustoAll", null, dic); + result = HttpHelper.Request("Custo/SelectCustoByInfo", HttpHelper.ModelToJson(custo)); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } //custos = HttpHelper.JsonToList(result.message); - var listSource = HttpHelper.JsonToModel(result.message); - custos = listSource.listSource; + custos = HttpHelper.JsonToList(result.message); + //var listSource = HttpHelper.JsonToModel(result.message); + //custos = listSource.listSource; } else if (!txtCustoName.Text.IsNullOrEmpty()) { - dic = new Dictionary + var custo = new Custo() { - { "CustoName", txtCustoName.Text.Trim() } + CustoName = txtCustoName.Text.Trim() }; - result = HttpHelper.Request("Custo/SelectCustoAll", null, dic); + result = HttpHelper.Request("Custo/SelectCustoByInfo", HttpHelper.ModelToJson(custo)); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } - var listSource = HttpHelper.JsonToModel(result.message); - custos = listSource.listSource; + //if (result.statusCode != 200) + //{ + // UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！"); + // return; + //} + //var listSource = HttpHelper.JsonToModel(result.message); + //custos = listSource.listSource; + custos = HttpHelper.JsonToList(result.message); } else { - result = HttpHelper.Request("Custo/SelectCustoAll?pageIndex=1&pageSize=10"); - if (result.statusCode != 200) - { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue！"); - return; - } + result = HttpHelper.Request("Custo/SelectCustoAll?pageIndex=1&pageSize=15"); + //if (result.statusCode != 200) + //{ + // UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); + // return; + //} var listSource = HttpHelper.JsonToModel(result.message); custos = listSource.listSource; } @@ -254,14 +260,13 @@ namespace SYS.FormUI { dic = new Dictionary() { - { "delete_mk","0"}, { "pageIndex",pageIndex.ToString()}, { "pageSize",count.ToString()} }; result = HttpHelper.Request("Custo/SelectCustoAll", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } OSelectCustoAllDto custos = HttpHelper.JsonToModel(result.message); diff --git a/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs b/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs index 4f46cfb74ff5f27160bd00837e7b728aae219c41..d202186acbce782f18c1bfeebcd8768a6ba07c93 100644 --- a/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmDepartment.Designer.cs @@ -133,7 +133,7 @@ namespace SYS.FormUI this.dgvDeptList.ShowGridLine = true; this.dgvDeptList.Size = new System.Drawing.Size(788, 582); this.dgvDeptList.TabIndex = 0; - this.dgvDeptList.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDeptList_CellClick); + this.dgvDeptList.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvDeptList_CellMouseClick); // // clDeptNo // diff --git a/SYS.FormUI/AppFunction/FrmDepartment.cs b/SYS.FormUI/AppFunction/FrmDepartment.cs index df5c3b5ef7609894a8e910d46c36e773b882c8d8..78d5c476d212a48ecb806885b5b8269c4d0e243e 100644 --- a/SYS.FormUI/AppFunction/FrmDepartment.cs +++ b/SYS.FormUI/AppFunction/FrmDepartment.cs @@ -62,7 +62,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectDeptAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } dgvDeptList.DataSource =HttpHelper.JsonToList(result.message); @@ -73,7 +73,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectDeptAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboDeptParent.DataSource = HttpHelper.JsonToList(result.message); @@ -86,7 +86,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Worker/SelectWorkerAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectWorkerAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectWorkerAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboDeptLeader.DataSource = HttpHelper.JsonToList(result.message); @@ -120,14 +120,15 @@ namespace SYS.FormUI dept_desc = txtDeptDesc.Text.Trim(), dept_parent = cboDeptParent.SelectedValue.ToString(), dept_date = DateTime.Now, - dept_leader = cboDeptLeader.SelectedValue.ToString() + dept_leader = cboDeptLeader.SelectedValue.ToString(), + datains_usr = AdminInfo.Account }; if (CheckInput(dept)) { result = HttpHelper.Request("Base/AddDept",HttpHelper.ModelToJson(dept)); if (result.statusCode != 200) { - UIMessageBox.ShowError("AddDept+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("AddDept+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool tf = result.message.ToString().Equals("true"); @@ -155,12 +156,7 @@ namespace SYS.FormUI private void dgvDeptList_CellClick(object sender, DataGridViewCellEventArgs e) { - if (dgvDeptList.SelectedRows.Count == 1) - { - txtDeptNo.Text = dgvDeptList.SelectedRows[0].Cells["clDeptNo"].Value.ToString(); - txtDeptName.Text = dgvDeptList.SelectedRows[0].Cells["clDeptName"].Value.ToString(); - txtDeptDesc.Text = dgvDeptList.SelectedRows[0].Cells["clDeptDesc"].Value.ToString(); - } + } private void btnUpdateDept_Click(object sender, EventArgs e) @@ -173,14 +169,13 @@ namespace SYS.FormUI dept_parent = cboDeptParent.SelectedValue == null ? "" : cboDeptParent.SelectedValue.ToString(), dept_leader = cboDeptLeader.SelectedValue == null ? "" : cboDeptLeader.SelectedValue.ToString(), datachg_usr = AdminInfo.Account, - datachg_date = DateTime.Now }; if (CheckInput(dept)) { result = HttpHelper.Request("Base/UpdDept", HttpHelper.ModelToJson(dept)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdDept+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdDept+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool tf = result.message.ToString().Equals("true"); @@ -209,17 +204,34 @@ namespace SYS.FormUI { if (dgvDeptList.SelectedRows.Count > 0) { + //删除前先检索该部门下是否存在员工 + dic = new Dictionary() + { + { "deptNo",txtDeptNo.Text.Trim()} + }; + result = HttpHelper.Request("Worker/CheckWorkerBydepartment",null, dic); + if (result.statusCode != 200) + { + UIMessageBox.ShowError("CheckWorkerBydepartment+接口服务异常，请提交Issue或尝试更新版本！"); + return; + } + + if (result.message.ToString().Equals("true")) + { + UIMessageBox.ShowError("当前部门下存在工作人员信息，无法删除该部门"); + return; + } + Dept dept = new Dept() { dept_no = txtDeptNo.Text.Trim(), delete_mk = 1, datachg_usr = AdminInfo.Account, - datains_date = DateTime.Now }; result = HttpHelper.Request("Base/DelDept", HttpHelper.ModelToJson(dept)); if (result.statusCode != 200) { - UIMessageBox.ShowError("DelDept+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("DelDept+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool tf = result.message.ToString().Equals("true"); @@ -239,6 +251,16 @@ namespace SYS.FormUI } } + + private void dgvDeptList_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) + { + if (dgvDeptList.SelectedRows.Count == 1) + { + txtDeptNo.Text = dgvDeptList.SelectedRows[0].Cells["clDeptNo"].Value.ToString(); + txtDeptName.Text = dgvDeptList.SelectedRows[0].Cells["clDeptName"].Value.ToString(); + txtDeptDesc.Text = dgvDeptList.SelectedRows[0].Cells["clDeptDesc"].Value.ToString(); + } + } } diff --git a/SYS.FormUI/AppFunction/FrmEditInputs.cs b/SYS.FormUI/AppFunction/FrmEditInputs.cs index 45ece6aced9bf170db79c483cf60e118765a5bc6..a875a3a927f26b02123ce21566558b56432f70f3 100644 --- a/SYS.FormUI/AppFunction/FrmEditInputs.cs +++ b/SYS.FormUI/AppFunction/FrmEditInputs.cs @@ -43,7 +43,7 @@ namespace SYS.FormUI var result = HttpHelper.Request("Base/SelectCustoTypeAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } List lstSourceGrid = HttpHelper.JsonToList(result.message); @@ -58,7 +58,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectPassPortTypeAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectPassPortTypeAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectPassPortTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } List passPorts = HttpHelper.JsonToList(result.message); @@ -72,7 +72,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectSexTypeAll?delete_mk=0"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } List listSexType = HttpHelper.JsonToList(result.message); @@ -123,13 +123,12 @@ namespace SYS.FormUI CustoTel = txtTel.Text, CustoAdress = txtCustoAdress.Text, datachg_usr = LoginInfo.WorkerNo == null ? AdminInfo.Account : LoginInfo.WorkerNo, - datachg_date = DateTime.Now }; result = HttpHelper.Request("Custo/UpdCustomerInfoByCustoNo", HttpHelper.ModelToJson(custo)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdCustomerInfoByCustoNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdCustomerInfoByCustoNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool t = result.message.ToString().Equals("true") ? true : false; @@ -175,14 +174,13 @@ namespace SYS.FormUI CustoTel = txtTel.Text, CustoAdress = txtCustoAdress.Text, datains_usr = LoginInfo.WorkerNo == null ? AdminInfo.Account : LoginInfo.WorkerNo, - datains_date = DateTime.Now }; result = HttpHelper.Request("Custo/InsertCustomerInfo", HttpHelper.ModelToJson(custo), null); if (result.statusCode != 200) { - UIMessageBox.ShowError("InsertCustomerInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertCustomerInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } if (result.message.ToString().Equals("true")) diff --git a/SYS.FormUI/AppFunction/FrmEducation.Designer.cs b/SYS.FormUI/AppFunction/FrmEducation.Designer.cs index 18b4e32986f7ca8e2cf4a64dd13760383b632f11..cee511b1505a0e53fe7767c6e3af09c6b110fa7e 100644 --- a/SYS.FormUI/AppFunction/FrmEducation.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmEducation.Designer.cs @@ -45,7 +45,7 @@ namespace SYS.FormUI this.dgvEducationList = new Sunny.UI.UIDataGridView(); this.clEducationNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clEducationName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clDeleteMk = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -175,7 +175,7 @@ namespace SYS.FormUI this.dgvEducationList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.clEducationNo, this.clEducationName, - this.Column1, + this.clDeleteMk, this.Column2, this.Column3, this.Column4, @@ -213,7 +213,7 @@ namespace SYS.FormUI this.dgvEducationList.ShowGridLine = true; this.dgvEducationList.Size = new System.Drawing.Size(788, 582); this.dgvEducationList.TabIndex = 185; - this.dgvEducationList.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvEducationList_CellClick); + this.dgvEducationList.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvEducationList_CellMouseClick); // // clEducationNo // @@ -229,13 +229,13 @@ namespace SYS.FormUI this.clEducationName.Name = "clEducationName"; this.clEducationName.ReadOnly = true; // - // Column1 + // clDeleteMk // - this.Column1.DataPropertyName = "delete_mk"; - this.Column1.HeaderText = "Column1"; - this.Column1.Name = "Column1"; - this.Column1.ReadOnly = true; - this.Column1.Visible = false; + this.clDeleteMk.DataPropertyName = "delete_mk"; + this.clDeleteMk.HeaderText = "Column1"; + this.clDeleteMk.Name = "clDeleteMk"; + this.clDeleteMk.ReadOnly = true; + this.clDeleteMk.Visible = false; // // Column2 // @@ -309,7 +309,7 @@ namespace SYS.FormUI private Sunny.UI.UIDataGridView dgvEducationList; private System.Windows.Forms.DataGridViewTextBoxColumn clEducationNo; private System.Windows.Forms.DataGridViewTextBoxColumn clEducationName; - private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn clDeleteMk; private System.Windows.Forms.DataGridViewTextBoxColumn Column2; private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column4; diff --git a/SYS.FormUI/AppFunction/FrmEducation.cs b/SYS.FormUI/AppFunction/FrmEducation.cs index 54c3161f9728a4df60da7598d9cb2f7cf0a2466f..d8dc0d13ed01bde9d4d2c5b98456e1448b8d175a 100644 --- a/SYS.FormUI/AppFunction/FrmEducation.cs +++ b/SYS.FormUI/AppFunction/FrmEducation.cs @@ -71,7 +71,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectEducationAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectEducationAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectEducationAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } educations = HttpHelper.JsonToList(result.message); @@ -92,13 +92,12 @@ namespace SYS.FormUI education_no = txtEducationNo.Text.Trim(), education_name = txtEducationName.Text.Trim(), delete_mk = 0, - datains_usr = AdminInfo.Account, - datains_date = DateTime.Now + datains_usr = AdminInfo.Account }; result = HttpHelper.Request("Base​/AddEducation",HttpHelper.ModelToJson(edu)); if (result.statusCode != 200 || result.message.ToString().Equals("false")) { - UIMessageTip.ShowError("AddEducation+接口服务异常，请提交Issue！", 1500); + UIMessageTip.ShowError("AddEducation+接口服务异常，请提交Issue或尝试更新版本！", 1500); return; } UIMessageTip.ShowOk("添加学历成功！", 1500); @@ -122,12 +121,11 @@ namespace SYS.FormUI education_no = txtEducationNo.Text.Trim(), education_name = txtEducationName.Text.Trim(), datachg_usr = AdminInfo.Account, - datachg_date = DateTime.Now }; result = HttpHelper.Request("Base​/UpdEducation", HttpHelper.ModelToJson(edu)); if (result.statusCode != 200 || result.message.ToString().Equals("false")) { - UIMessageTip.ShowError("UpdEducation+接口服务异常，请提交Issue！", 1500); + UIMessageTip.ShowError("UpdEducation+接口服务异常，请提交Issue或尝试更新版本！", 1500); return; } } @@ -144,20 +142,49 @@ namespace SYS.FormUI education_no = txtEducationNo.Text.Trim(), education_name = txtEducationName.Text.Trim(), datachg_usr = AdminInfo.Account, - datachg_date = DateTime.Now }; result = HttpHelper.Request("Base​/DelEducation", HttpHelper.ModelToJson(edu)); if (result.statusCode != 200 || result.message.ToString().Equals("false")) { - UIMessageTip.ShowError("DelEducation+接口服务异常，请提交Issue！", 1500); + UIMessageTip.ShowError("DelEducation+接口服务异常，请提交Issue或尝试更新版本！", 1500); return; } + UIMessageTip.ShowOk("删除成功！"); + return; + } + + private void dgvEducationList_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) + { + txtEducationNo.Text = dgvEducationList.SelectedRows[0].Cells["clEducationNo"].Value.ToString(); + txtEducationName.Text = dgvEducationList.SelectedRows[0].Cells["clEducationName"].Value.ToString(); + if (dgvEducationList.SelectedRows[0].Cells["clDeleteMk"].Value.ToString() == "1") + { + btnDeleteEducation.Text = "恢复学历"; + btnDeleteEducation.FillColor = Color.Green; + btnDeleteEducation.Click += btnRecoveryEducation_Click; + } } - private void dgvEducationList_CellClick(object sender, DataGridViewCellEventArgs e) + private void btnRecoveryEducation_Click(object sender, EventArgs e) { - txtEducationNo.Text = dgvEducationList.Rows[0].Cells["clEducationNo"].Value.ToString(); - txtEducationName.Text = dgvEducationList.Rows[0].Cells["clEducationName"].Value.ToString(); + if (dgvEducationList.SelectedRows.Count <= 0) + { + UIMessageTip.ShowWarning("未选择需修改的学历数据，请检查", 1500); + return; + } + var edu = new Education() + { + education_no = txtEducationNo.Text.Trim(), + education_name = txtEducationName.Text.Trim(), + delete_mk = 0, + datachg_usr = AdminInfo.Account, + }; + result = HttpHelper.Request("Base​/UpdEducation", HttpHelper.ModelToJson(edu)); + if (result.statusCode != 200 || result.message.ToString().Equals("false")) + { + UIMessageTip.ShowError("UpdEducation+接口服务异常，请提交Issue或尝试更新版本！", 1500); + return; + } } } } diff --git a/SYS.FormUI/AppFunction/FrmEducation.resx b/SYS.FormUI/AppFunction/FrmEducation.resx index 94aa12d9bf63cdb67e5a1b85627419a28633b617..02a1cfd045c917e693aada6723ef3c92c6d26634 100644 --- a/SYS.FormUI/AppFunction/FrmEducation.resx +++ b/SYS.FormUI/AppFunction/FrmEducation.resx @@ -123,7 +123,7 @@ True - + True diff --git a/SYS.FormUI/AppFunction/FrmGoodOrBad.cs b/SYS.FormUI/AppFunction/FrmGoodOrBad.cs index 00e1fa250f177c8aff85d8723a1c36e370aef2a9..b44a48c1e3efbf518f617de7cbe773f86595b570 100644 --- a/SYS.FormUI/AppFunction/FrmGoodOrBad.cs +++ b/SYS.FormUI/AppFunction/FrmGoodOrBad.cs @@ -53,7 +53,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectGBTypeAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectGBTypeAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectGBTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } CboType.DataSource = HttpHelper.JsonToList(result.message); @@ -74,7 +74,7 @@ namespace SYS.FormUI result = HttpHelper.Request("WorkerGoodBad/SelectAllGoodBadByWorkNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectAllGoodBadByWorkNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectAllGoodBadByWorkNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } DgvGoodBadList.AutoGenerateColumns = false; @@ -116,7 +116,6 @@ namespace SYS.FormUI GBOperation = AdminInfo.Account, GBTime = DtpDate.Value, datains_usr = AdminInfo.Account, - datains_date = DateTime.Now }; if (CheckInput(goodBad)) { @@ -126,7 +125,7 @@ namespace SYS.FormUI result = HttpHelper.Request("WorkerGoodBad​/AddGoodBad",HttpHelper.ModelToJson(goodBad)); if (result.statusCode != 200) { - UIMessageBox.ShowError("AddGoodBad+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("AddGoodBad+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool n = result.message.ToString().Equals("true"); diff --git a/SYS.FormUI/AppFunction/FrmMySpace.cs b/SYS.FormUI/AppFunction/FrmMySpace.cs index 0d5f8f244ca9b3fa86ba7e2c124fcaf7c1650205..481b6e9447956dcb66d2eb6df13e496e50c57a57 100644 --- a/SYS.FormUI/AppFunction/FrmMySpace.cs +++ b/SYS.FormUI/AppFunction/FrmMySpace.cs @@ -57,7 +57,7 @@ namespace SYS.FormUI var result = HttpHelper.Request("Base/SelectNationAll", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectNationAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectNationAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cbWorkerNation.DataSource = HttpHelper.JsonToList(result.message); @@ -69,7 +69,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectSexTypeAll", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboSex.DataSource = HttpHelper.JsonToList(result.message); @@ -79,7 +79,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectDeptAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboWorkerClub.DataSource = HttpHelper.JsonToList(result.message); @@ -91,7 +91,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectPositionAll", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectPositionAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectPositionAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboWorkerPosition.DataSource = HttpHelper.JsonToList(result.message); @@ -112,7 +112,7 @@ namespace SYS.FormUI var result = HttpHelper.Request("Worker/SelectWorkerInfoByWorkerId", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectWorkerInfoByWorkerId+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectWorkerInfoByWorkerId+接口服务异常，请提交Issue或尝试更新版本！"); return; } Worker worker = HttpHelper.JsonToModel(result.message); @@ -135,7 +135,7 @@ namespace SYS.FormUI result = HttpHelper.Request("WorkerPicture/WorkerPic", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue或尝试更新版本！"); return; } var workerPicSource = HttpHelper.JsonToModel(result.message); @@ -163,7 +163,7 @@ namespace SYS.FormUI var result = HttpHelper.Request("Worker/SelectWorkerInfoByWorkerIdAndWorkerPwd", HttpHelper.ModelToJson(worker), null); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectWorkerInfoByWorkerIdAndWorkerPwd+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectWorkerInfoByWorkerIdAndWorkerPwd+接口服务异常，请提交Issue或尝试更新版本！"); return; } worker = HttpHelper.JsonToModel(result.message); @@ -217,7 +217,7 @@ namespace SYS.FormUI var result = HttpHelper.Request("Worker/UpdWorkerPwdByWorkNo", HttpHelper.ModelToJson(new Worker { WorkerId = LoginInfo.WorkerNo, WorkerPwd = txtNewPwd.Text.Trim() }), null); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdWorkerPwdByWorkNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdWorkerPwdByWorkNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool tf = result.message.ToString().Equals("true") ? true : false; @@ -275,8 +275,7 @@ namespace SYS.FormUI WorkerNation = cbWorkerNation.SelectedValue.ToString(), WorkerTel = txtTel.Text.Trim(), WorkerAddress = txtAddress.Text.Trim(), - datachg_usr = LoginInfo.WorkerNo, - datachg_date = DateTime.Now + datachg_usr = LoginInfo.WorkerNo }; if (CheckInput(worker)) @@ -284,7 +283,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Worker/UpdateWorker", HttpHelper.ModelToJson(worker), null); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateWorker+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateWorker+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool tf = result.message.ToString().Equals("true") ? true:false; @@ -324,7 +323,7 @@ namespace SYS.FormUI result = HttpHelper.Request("WorkerPicture/WorkerPic", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue或尝试更新版本！"); return; } var source = HttpHelper.JsonToModel(result.message); @@ -333,7 +332,7 @@ namespace SYS.FormUI result = HttpHelper.Request("WorkerPicture/DeleteWorkerPic", HttpHelper.ModelToJson(workerPic), null); if (result.statusCode != 200) { - UIMessageBox.ShowError("DeleteWorkerPic+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("DeleteWorkerPic+接口服务异常，请提交Issue或尝试更新版本！"); return; } if (result.message.ToString().Equals("true")) @@ -361,7 +360,7 @@ namespace SYS.FormUI var requestResult = HttpHelper.Request("WorkerPicture/InsertWorkerPic", HttpHelper.ModelToJson(workerPic), null); if (requestResult.statusCode != 200) { - UIMessageBox.ShowError("InsertWorkerPic+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertWorkerPic+接口服务异常，请提交Issue或尝试更新版本！"); return; } picWorkerPic.BackgroundImage = null; diff --git a/SYS.FormUI/AppFunction/FrmNation.Designer.cs b/SYS.FormUI/AppFunction/FrmNation.Designer.cs index bd477d06d1958db76b721bb5f198d0af9952857f..b28ca19f5421cbba7592bd619427927cff812cb6 100644 --- a/SYS.FormUI/AppFunction/FrmNation.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmNation.Designer.cs @@ -43,9 +43,9 @@ namespace SYS.FormUI this.label20 = new System.Windows.Forms.Label(); this.txtNationNo = new Sunny.UI.UITextBox(); this.dgvNationList = new Sunny.UI.UIDataGridView(); - this.clEducationNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.clEducationName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clNationNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clNationName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clDeleteMk = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -173,9 +173,9 @@ namespace SYS.FormUI this.dgvNationList.ColumnHeadersHeight = 32; this.dgvNationList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dgvNationList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.clEducationNo, - this.clEducationName, - this.Column1, + this.clNationNo, + this.clNationName, + this.clDeleteMk, this.Column2, this.Column3, this.Column4, @@ -213,29 +213,29 @@ namespace SYS.FormUI this.dgvNationList.ShowGridLine = true; this.dgvNationList.Size = new System.Drawing.Size(788, 582); this.dgvNationList.TabIndex = 199; - this.dgvNationList.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvNationList_CellClick); + this.dgvNationList.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvNationList_CellMouseClick); // - // clEducationNo + // clNationNo // - this.clEducationNo.DataPropertyName = "nation_no"; - this.clEducationNo.HeaderText = "民族编号"; - this.clEducationNo.Name = "clEducationNo"; - this.clEducationNo.ReadOnly = true; + this.clNationNo.DataPropertyName = "nation_no"; + this.clNationNo.HeaderText = "民族编号"; + this.clNationNo.Name = "clNationNo"; + this.clNationNo.ReadOnly = true; // - // clEducationName + // clNationName // - this.clEducationName.DataPropertyName = "nation_name"; - this.clEducationName.HeaderText = "民族名称"; - this.clEducationName.Name = "clEducationName"; - this.clEducationName.ReadOnly = true; + this.clNationName.DataPropertyName = "nation_name"; + this.clNationName.HeaderText = "民族名称"; + this.clNationName.Name = "clNationName"; + this.clNationName.ReadOnly = true; // - // Column1 + // clDeleteMk // - this.Column1.DataPropertyName = "delete_mk"; - this.Column1.HeaderText = "Column1"; - this.Column1.Name = "Column1"; - this.Column1.ReadOnly = true; - this.Column1.Visible = false; + this.clDeleteMk.DataPropertyName = "delete_mk"; + this.clDeleteMk.HeaderText = "Column1"; + this.clDeleteMk.Name = "clDeleteMk"; + this.clDeleteMk.ReadOnly = true; + this.clDeleteMk.Visible = false; // // Column2 // @@ -307,9 +307,9 @@ namespace SYS.FormUI private System.Windows.Forms.Label label20; private Sunny.UI.UITextBox txtNationNo; private Sunny.UI.UIDataGridView dgvNationList; - private System.Windows.Forms.DataGridViewTextBoxColumn clEducationNo; - private System.Windows.Forms.DataGridViewTextBoxColumn clEducationName; - private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn clNationNo; + private System.Windows.Forms.DataGridViewTextBoxColumn clNationName; + private System.Windows.Forms.DataGridViewTextBoxColumn clDeleteMk; private System.Windows.Forms.DataGridViewTextBoxColumn Column2; private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column4; diff --git a/SYS.FormUI/AppFunction/FrmNation.cs b/SYS.FormUI/AppFunction/FrmNation.cs index 9090a9cb5a7314d01809e981ff05924a1ecf7bdb..65ccd11f803fa7b29aa962c0ed6ece35a9924324 100644 --- a/SYS.FormUI/AppFunction/FrmNation.cs +++ b/SYS.FormUI/AppFunction/FrmNation.cs @@ -24,6 +24,7 @@ using Sunny.UI; using SYS.Application; using SYS.Common; +//using SYS.Common; using SYS.Core; using SYS.FormUI.Properties; using System; @@ -64,10 +65,11 @@ namespace SYS.FormUI public void ReloadNationList() { txtNationNo.Text = Util.GetListNewId("N", 3, 1, "-").FirstOrDefault(); + result = HttpHelper.Request("Base/SelectNationAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectNationAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectNationAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } nations = HttpHelper.JsonToList(result.message); @@ -75,12 +77,6 @@ namespace SYS.FormUI dgvNationList.DataSource = nations; } - private void dgvNationList_CellClick(object sender, DataGridViewCellEventArgs e) - { - txtNationNo.Text = dgvNationList.Rows[0].Cells["clNationNo"].Value.ToString(); - txtNationName.Text = dgvNationList.Rows[0].Cells["clNationName"].Value.ToString(); - } - private void btnAddNation_Click(object sender, EventArgs e) { if (txtNationName.Text.Trim().IsNullOrEmpty()) @@ -95,12 +91,11 @@ namespace SYS.FormUI nation_name = txtNationName.Text.Trim(), delete_mk = 0, datains_usr = AdminInfo.Account, - datains_date = DateTime.Now }; result = HttpHelper.Request("Base​/AddNation", HttpHelper.ModelToJson(nat)); if (result.statusCode != 200 || result.message.ToString().Equals("false")) { - UIMessageTip.ShowError("AddNation+接口服务异常，请提交Issue！", 1500); + UIMessageTip.ShowError("AddNation+接口服务异常，请提交Issue或尝试更新版本！", 1500); return; } UIMessageTip.ShowOk("添加民族成功！", 1500); @@ -123,12 +118,11 @@ namespace SYS.FormUI nation_no = txtNationNo.Text.Trim(), nation_name = txtNationName.Text.Trim(), datachg_usr = AdminInfo.Account, - datachg_date = DateTime.Now }; result = HttpHelper.Request("Base​/UpdNation", HttpHelper.ModelToJson(nat)); if (result.statusCode != 200 || result.message.ToString().Equals("false")) { - UIMessageTip.ShowError("UpdNation+接口服务异常，请提交Issue！", 1500); + UIMessageTip.ShowError("UpdNation+接口服务异常，请提交Issue或尝试更新版本！", 1500); return; } } @@ -145,12 +139,47 @@ namespace SYS.FormUI nation_no = txtNationNo.Text.Trim(), nation_name = txtNationName.Text.Trim(), datachg_usr = AdminInfo.Account, - datachg_date = DateTime.Now }; result = HttpHelper.Request("Base​/DelNation", HttpHelper.ModelToJson(nat)); if (result.statusCode != 200 || result.message.ToString().Equals("false")) { - UIMessageTip.ShowError("DelNation+接口服务异常，请提交Issue！", 1500); + UIMessageTip.ShowError("DelNation+接口服务异常，请提交Issue或尝试更新版本！", 1500); + return; + } + UIMessageTip.ShowOk("删除成功！"); + return; + } + + private void dgvNationList_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) + { + txtNationNo.Text = dgvNationList.SelectedRows[0].Cells["clNationNo"].Value.ToString(); + txtNationName.Text = dgvNationList.SelectedRows[0].Cells["clNationName"].Value.ToString(); + if (dgvNationList.SelectedRows[0].Cells["clDeleteMk"].Value.ToString() == "1") + { + btnDeleteNation.Text = "恢复民族"; + btnDeleteNation.FillColor = Color.Green; + btnDeleteNation.Click += btnRecoveryNation_Click; + } + } + + private void btnRecoveryNation_Click(object sender, EventArgs e) + { + if (dgvNationList.SelectedRows.Count <= 0) + { + UIMessageTip.ShowWarning("未选择需修改的民族数据，请检查", 1500); + return; + } + var nat = new Nation() + { + nation_no = txtNationNo.Text.Trim(), + nation_name = txtNationName.Text.Trim(), + delete_mk = 0, + datachg_usr = AdminInfo.Account, + }; + result = HttpHelper.Request("Base​/UpdNation", HttpHelper.ModelToJson(nat)); + if (result.statusCode != 200 || result.message.ToString().Equals("false")) + { + UIMessageTip.ShowError("UpdNation+接口服务异常，请提交Issue或尝试更新版本！", 1500); return; } } diff --git a/SYS.FormUI/AppFunction/FrmNation.resx b/SYS.FormUI/AppFunction/FrmNation.resx index 9eafb6be56899413c16ba55ddb45bb6d487c93cf..ba89dc915e85a415187230bc42c9dd2f066d77dc 100644 --- a/SYS.FormUI/AppFunction/FrmNation.resx +++ b/SYS.FormUI/AppFunction/FrmNation.resx @@ -117,13 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - + True diff --git a/SYS.FormUI/AppFunction/FrmNotice.cs b/SYS.FormUI/AppFunction/FrmNotice.cs index 6c9aca96751f91dffa51f6a5cf870a2c98a2491c..89cd72237ffe433c00fbbec8ef8b75e6209ce320 100644 --- a/SYS.FormUI/AppFunction/FrmNotice.cs +++ b/SYS.FormUI/AppFunction/FrmNotice.cs @@ -52,7 +52,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Notice/SelectNoticeAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectNoticeAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectNoticeAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } List notices = HttpHelper.JsonToList(result.message); @@ -73,7 +73,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Notice/SelectNoticeByNoticeNo",null,dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectNoticeAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectNoticeAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } Notice notice = HttpHelper.JsonToModel(result.message); diff --git a/SYS.FormUI/AppFunction/FrmOperation.cs b/SYS.FormUI/AppFunction/FrmOperation.cs index 2a03527b13f0750ac515bfb3ca4d456eee9ff398..f53188aee10ab168f0804e17b78142b1538b1ec6 100644 --- a/SYS.FormUI/AppFunction/FrmOperation.cs +++ b/SYS.FormUI/AppFunction/FrmOperation.cs @@ -46,7 +46,7 @@ namespace SYS.FormUI result = HttpHelper.Request("App/SelectOperationlogAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectOperationlogAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectOperationlogAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } dgvOperationlog.AutoGenerateColumns = false; diff --git a/SYS.FormUI/AppFunction/FrmPosition.Designer.cs b/SYS.FormUI/AppFunction/FrmPosition.Designer.cs index 6bd26bd901a11a558fcd1c6ae294e2a0c81145ae..48360419b3c1aac26836a0126d8c3741da462535 100644 --- a/SYS.FormUI/AppFunction/FrmPosition.Designer.cs +++ b/SYS.FormUI/AppFunction/FrmPosition.Designer.cs @@ -45,7 +45,7 @@ namespace SYS.FormUI this.dgvPositionList = new Sunny.UI.UIDataGridView(); this.clPositionNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.clPositionName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.clDeleteMk = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -175,7 +175,7 @@ namespace SYS.FormUI this.dgvPositionList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.clPositionNo, this.clPositionName, - this.Column1, + this.clDeleteMk, this.Column2, this.Column3, this.Column4, @@ -213,7 +213,7 @@ namespace SYS.FormUI this.dgvPositionList.ShowGridLine = true; this.dgvPositionList.Size = new System.Drawing.Size(788, 582); this.dgvPositionList.TabIndex = 207; - this.dgvPositionList.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPositionList_CellClick); + this.dgvPositionList.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvPositionList_CellMouseClick); // // clPositionNo // @@ -229,13 +229,13 @@ namespace SYS.FormUI this.clPositionName.Name = "clPositionName"; this.clPositionName.ReadOnly = true; // - // Column1 + // clDeleteMk // - this.Column1.DataPropertyName = "delete_mk"; - this.Column1.HeaderText = "Column1"; - this.Column1.Name = "Column1"; - this.Column1.ReadOnly = true; - this.Column1.Visible = false; + this.clDeleteMk.DataPropertyName = "delete_mk"; + this.clDeleteMk.HeaderText = "Column1"; + this.clDeleteMk.Name = "clDeleteMk"; + this.clDeleteMk.ReadOnly = true; + this.clDeleteMk.Visible = false; // // Column2 // @@ -309,7 +309,7 @@ namespace SYS.FormUI private Sunny.UI.UIDataGridView dgvPositionList; private System.Windows.Forms.DataGridViewTextBoxColumn clPositionNo; private System.Windows.Forms.DataGridViewTextBoxColumn clPositionName; - private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn clDeleteMk; private System.Windows.Forms.DataGridViewTextBoxColumn Column2; private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column4; diff --git a/SYS.FormUI/AppFunction/FrmPosition.cs b/SYS.FormUI/AppFunction/FrmPosition.cs index 9790d97b5db43dc90f4b97d537749f551663d7d4..2aa1f91b3d4e468a0154c38bb90ac8f7ade8a95d 100644 --- a/SYS.FormUI/AppFunction/FrmPosition.cs +++ b/SYS.FormUI/AppFunction/FrmPosition.cs @@ -70,7 +70,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectPositionAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectPositionAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectPositionAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } positions = HttpHelper.JsonToList(result.message); @@ -91,13 +91,12 @@ namespace SYS.FormUI position_no = txtPositionNo.Text.Trim(), position_name = txtPositionName.Text.Trim(), delete_mk = 0, - datains_usr = AdminInfo.Account, - datains_date = DateTime.Now + datains_usr = AdminInfo.Account }; result = HttpHelper.Request("Base​/AddPosition", HttpHelper.ModelToJson(pos)); if (result.statusCode != 200 || result.message.ToString().Equals("false")) { - UIMessageTip.ShowError("AddPosition+接口服务异常，请提交Issue！", 1500); + UIMessageTip.ShowError("AddPosition+接口服务异常，请提交Issue或尝试更新版本！", 1500); return; } UIMessageTip.ShowOk("添加职位成功！", 1500); @@ -108,12 +107,6 @@ namespace SYS.FormUI return; } - private void dgvPositionList_CellClick(object sender, DataGridViewCellEventArgs e) - { - txtPositionNo.Text = dgvPositionList.Rows[0].Cells["clPositionNo"].Value.ToString(); - txtPositionName.Text = dgvPositionList.Rows[0].Cells["clPositionName"].Value.ToString(); - } - private void btnUpdatePosition_Click(object sender, EventArgs e) { if (dgvPositionList.SelectedRows.Count <= 0) @@ -126,12 +119,11 @@ namespace SYS.FormUI position_no = txtPositionNo.Text.Trim(), position_name = txtPositionName.Text.Trim(), datachg_usr = AdminInfo.Account, - datachg_date = DateTime.Now }; result = HttpHelper.Request("Base​/UpdPosition", HttpHelper.ModelToJson(pos)); if (result.statusCode != 200 || result.message.ToString().Equals("false")) { - UIMessageTip.ShowError("UpdPosition+接口服务异常，请提交Issue！", 1500); + UIMessageTip.ShowError("UpdPosition+接口服务异常，请提交Issue或尝试更新版本！", 1500); return; } } @@ -149,12 +141,48 @@ namespace SYS.FormUI position_name = txtPositionName.Text.Trim(), delete_mk = 1, datachg_usr = AdminInfo.Account, - datachg_date = DateTime.Now }; result = HttpHelper.Request("Base​/DelPosition", HttpHelper.ModelToJson(pos)); if (result.statusCode != 200 || result.message.ToString().Equals("false")) { - UIMessageTip.ShowError("DelPosition+接口服务异常，请提交Issue！", 1500); + UIMessageTip.ShowError("DelPosition+接口服务异常，请提交Issue或尝试更新版本！", 1500); + return; + } + UIMessageTip.ShowOk("删除成功！"); + return; + } + + private void dgvPositionList_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) + { + txtPositionNo.Text = dgvPositionList.SelectedRows[0].Cells["clPositionNo"].Value.ToString(); + txtPositionName.Text = dgvPositionList.SelectedRows[0].Cells["clPositionName"].Value.ToString(); + if (dgvPositionList.SelectedRows[0].Cells["clDeleteMk"].Value.ToString() == "1") + { + btnDeletePosition.Text = "恢复职位"; + btnDeletePosition.FillColor = Color.Green; + btnDeletePosition.RectColor = Color.Green; + btnDeletePosition.Click += btnRecoveryPosition_Click; + } + } + + private void btnRecoveryPosition_Click(object sender, EventArgs e) + { + if (dgvPositionList.SelectedRows.Count <= 0) + { + UIMessageTip.ShowWarning("未选择需修改的职位数据，请检查", 1500); + return; + } + var pos = new Position() + { + position_no = txtPositionNo.Text.Trim(), + position_name = txtPositionName.Text.Trim(), + delete_mk = 0, + datachg_usr = AdminInfo.Account, + }; + result = HttpHelper.Request("Base​/UpdPosition", HttpHelper.ModelToJson(pos)); + if (result.statusCode != 200 || result.message.ToString().Equals("false")) + { + UIMessageTip.ShowError("UpdPosition+接口服务异常，请提交Issue或尝试更新版本！", 1500); return; } } diff --git a/SYS.FormUI/AppFunction/FrmPosition.resx b/SYS.FormUI/AppFunction/FrmPosition.resx index 0506287af8d57fbe423252739bfbb7b41a623494..19a1cb384a934f9896bfc605bba38ae69f19e645 100644 --- a/SYS.FormUI/AppFunction/FrmPosition.resx +++ b/SYS.FormUI/AppFunction/FrmPosition.resx @@ -123,7 +123,7 @@ True - + True diff --git a/SYS.FormUI/AppFunction/FrmReserList.cs b/SYS.FormUI/AppFunction/FrmReserList.cs index 933b3bea116175e99df430370f7609cada0fc38c..bf4c5e20b668f1df3bc17d76eb9b1c36593022b9 100644 --- a/SYS.FormUI/AppFunction/FrmReserList.cs +++ b/SYS.FormUI/AppFunction/FrmReserList.cs @@ -27,7 +27,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Reser/SelectReserAll", null, null); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectReserAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectReserAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } dgvReserList.AutoGenerateColumns = false; @@ -37,7 +37,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectCustoTypeAllCanUse", null, null); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } List lstSourceGrid = HttpHelper.JsonToList(result.message); @@ -52,7 +52,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectPassPortTypeAllCanUse", null, null); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectPassPortTypeAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectPassPortTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } List passPorts = HttpHelper.JsonToList(result.message); @@ -66,7 +66,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectSexTypeAll", null, null); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } List listSexType = HttpHelper.JsonToList(result.message); @@ -97,13 +97,12 @@ namespace SYS.FormUI CustoBirth = dtpBirthday.Value, CustoType = cbCustoType.SelectedIndex, delete_mk = 0, - datains_usr = LoginInfo.WorkerNo, - datains_date=DateTime.Now + datains_usr = LoginInfo.WorkerNo }; result = HttpHelper.Request("Custo​/InsertCustomerInfo", HttpHelper.ModelToJson(custo)); if (result.statusCode != 200) { - UIMessageBox.ShowError("InsertCustomerInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertCustomerInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } @@ -117,7 +116,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room​/UpdateRoomInfo", HttpHelper.ModelToJson(r), null); if (result.statusCode != 200) { - UIMessageBox.ShowError("InsertCustomerInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertCustomerInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } var reser = new Reser @@ -127,7 +126,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Reser/DeleteReserInfo", HttpHelper.ModelToJson(reser)); if (result.statusCode != 200) { - UIMessageBox.ShowError("DeleteReserInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("DeleteReserInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } @@ -136,7 +135,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Reser/SelectReserAll", null, null); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectReserAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectReserAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } dgvReserList.DataSource = HttpHelper.JsonToList(result.message); diff --git a/SYS.FormUI/AppFunction/FrmReserManager.cs b/SYS.FormUI/AppFunction/FrmReserManager.cs index 2e2a70fae6f14de8e233cbb9644ecfd07debb3be..382ed08b9d5789f41cbb33aa72fcfcd858c0cce8 100644 --- a/SYS.FormUI/AppFunction/FrmReserManager.cs +++ b/SYS.FormUI/AppFunction/FrmReserManager.cs @@ -38,8 +38,7 @@ namespace SYS.FormUI ReserRoom = cboReserRoomNo.Text, ReserDate = dtpBouDate.Value, ReserEndDay = dtpEndDate.Value, - datains_usr = LoginInfo.WorkerNo, - datains_date = DateTime.Now + datains_usr = LoginInfo.WorkerNo }; Room room = new Room() { @@ -49,14 +48,14 @@ namespace SYS.FormUI result = HttpHelper.Request("Reser​/InserReserInfo",HttpHelper.ModelToJson(reser)); if (result.statusCode != 200) { - UIMessageBox.ShowError("InserReserInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InserReserInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool result1 = result.message.ToString().Equals("true"); result = HttpHelper.Request("Room​/UpdateRoomInfoWithReser", HttpHelper.ModelToJson(room)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateRoomInfoWithReser+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateRoomInfoWithReser+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool result2 = result.message.ToString().Equals("true"); @@ -83,7 +82,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectCanUseRoomAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCanUseRoomAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCanUseRoomAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboReserRoomNo.DataSource = HttpHelper.JsonToList(result.message); diff --git a/SYS.FormUI/AppFunction/FrmRoomManager.cs b/SYS.FormUI/AppFunction/FrmRoomManager.cs index b96667b169b5eaef1fff1bd681dd8b0e73f323fa..ac4a7347ebce926fe03f706031d0b9fac692821b 100644 --- a/SYS.FormUI/AppFunction/FrmRoomManager.cs +++ b/SYS.FormUI/AppFunction/FrmRoomManager.cs @@ -95,35 +95,35 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectCanUseRoomAllByRoomState"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCanUseRoomAllByRoomState+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCanUseRoomAllByRoomState+接口服务异常，请提交Issue或尝试更新版本！"); return; } lblCanUse.Text = result.message.ToString(); result = HttpHelper.Request("Room/SelectNotUseRoomAllByRoomState"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectNotUseRoomAllByRoomState+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectNotUseRoomAllByRoomState+接口服务异常，请提交Issue或尝试更新版本！"); return; } lblCheck.Text = result.message.ToString(); result = HttpHelper.Request("Room/SelectNotClearRoomAllByRoomState"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectNotClearRoomAllByRoomState+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectNotClearRoomAllByRoomState+接口服务异常，请提交Issue或尝试更新版本！"); return; } lblNotClear.Text = result.message.ToString(); result = HttpHelper.Request("Room/SelectFixingRoomAllByRoomState"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectFixingRoomAllByRoomState+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectFixingRoomAllByRoomState+接口服务异常，请提交Issue或尝试更新版本！"); return; } lblFix.Text = result.message.ToString(); result = HttpHelper.Request("Room/SelectReseredRoomAllByRoomState"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectReseredRoomAllByRoomState+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectReseredRoomAllByRoomState+接口服务异常，请提交Issue或尝试更新版本！"); return; } lblReser.Text = result.message.ToString(); @@ -142,7 +142,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectRoomAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectRoomAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectRoomAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } romsty = HttpHelper.JsonToList(result.message); @@ -156,7 +156,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectRoomByTypeName",null,dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectRoomByTypeName+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectRoomByTypeName+接口服务异常，请提交Issue或尝试更新版本！"); return; } romsty = HttpHelper.JsonToList(result.message); @@ -219,7 +219,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectRoomByRoomState", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectRoomByRoomState+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectRoomByRoomState+接口服务异常，请提交Issue或尝试更新版本！"); return; } romsty = HttpHelper.JsonToList(result.message); diff --git a/SYS.FormUI/AppFunction/FrmRoomMap.cs b/SYS.FormUI/AppFunction/FrmRoomMap.cs index c0a4066cf0fde0768b0983344e4b3b5bfcc960af..986b4598bb56d1616a86fd6be5f90f30e7df857e 100644 --- a/SYS.FormUI/AppFunction/FrmRoomMap.cs +++ b/SYS.FormUI/AppFunction/FrmRoomMap.cs @@ -56,7 +56,7 @@ namespace SYS.FormUI.AppFunction var result = HttpHelper.Request("Room/SelectRoomAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectRoomAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectRoomAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } List rooms = HttpHelper.JsonToList(result.message); diff --git a/SYS.FormUI/AppFunction/FrmRoomStateManager.cs b/SYS.FormUI/AppFunction/FrmRoomStateManager.cs index 2997fe152e634027dc58e69ff7eda90e95401090..038d3c0385047142ee94494c513b11a87f732d19 100644 --- a/SYS.FormUI/AppFunction/FrmRoomStateManager.cs +++ b/SYS.FormUI/AppFunction/FrmRoomStateManager.cs @@ -48,7 +48,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectRoomStateAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectRoomStateAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectRoomStateAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } cboState.DataSource = HttpHelper.JsonToList(result.message); @@ -78,7 +78,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/UpdateRoomStateByRoomNo",null,dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateRoomStateByRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateRoomStateByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } if (result.message.ToString().Equals("true")) diff --git a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs b/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs index 9d08ce65e1fa69a3e53c29e72fc3e47c08855027..a8fc69f4c1c785ead0aaa5dadbfc9bb76bc52d1c 100644 --- a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs +++ b/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs @@ -60,7 +60,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectCustoTypeAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } List lstSourceGrid = HttpHelper.JsonToList(result.message); @@ -75,7 +75,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectPassPortTypeAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectPassPortTypeAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectPassPortTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } List passPorts = HttpHelper.JsonToList(result.message); @@ -89,7 +89,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectSexTypeAll?delete_mk=0"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } List listSexType = HttpHelper.JsonToList(result.message); @@ -100,14 +100,14 @@ namespace SYS.FormUI #endregion txtCustoNo.Text = ucRoomList.rm_CustoNo; - dic = new Dictionary() + dic = new Dictionary() { - { "CustoNo",txtCustoNo.Text.Trim()} + { "CustoNo",txtCustoNo.Text.Trim() } }; result = HttpHelper.Request("Custo/SelectCardInfoByCustoNo",null,dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectCardInfoByCustoNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectCardInfoByCustoNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } Custo c = HttpHelper.JsonToModel(result.message); diff --git a/SYS.FormUI/AppFunction/FrmSellThing.cs b/SYS.FormUI/AppFunction/FrmSellThing.cs index eebd056629afdb2c47e268ca0f572c8572bdde05..2a6f99e106661837631f6929147252774c7ba68c 100644 --- a/SYS.FormUI/AppFunction/FrmSellThing.cs +++ b/SYS.FormUI/AppFunction/FrmSellThing.cs @@ -56,7 +56,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectRoomByStateAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectRoomByStateAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectRoomByStateAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } List roms = HttpHelper.JsonToList(result.message); @@ -88,7 +88,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/SelectSellThingAll",null,dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } List lstSource = HttpHelper.JsonToList(result.message); @@ -107,7 +107,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Spend/SelectSpendByRoomNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSpendByRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSpendByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } this.dgvRoomSell.AutoGenerateColumns = false; @@ -122,7 +122,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/SelectSellThingAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } List lstSource = HttpHelper.JsonToList(result.message); @@ -193,7 +193,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/SelectSellThingAll",null,dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } List st = HttpHelper.JsonToList(result.message); @@ -204,7 +204,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } r = HttpHelper.JsonToModel(result.message); @@ -215,7 +215,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Spend/SelectSpendInfoRoomNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSpendInfoRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSpendInfoRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } var listSource = HttpHelper.JsonToList(result.message); @@ -235,11 +235,12 @@ namespace SYS.FormUI SpendMoney = Convert.ToDecimal(Convert.ToDouble(txtPrice.Text) * nudNum.Value) + listSource.FirstOrDefault(a => a.SpendName.Equals(txtSellName.Text.Trim())).SpendMoney, SpendTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")), MoneyState = SpendConsts.UnSettle, + datachg_usr = LoginInfo.WorkerNo }; result = HttpHelper.Request("Spend/UpdSpenInfo", HttpHelper.ModelToJson(s)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdSpenInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdSpenInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } if (result.message.ToString().Equals("true")) @@ -249,7 +250,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/UpdateSellthingInfo", HttpHelper.ModelToJson(sellThing)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateSellthingInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateSellthingInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } UIMessageBox.Show("添加成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK, true); @@ -272,11 +273,12 @@ namespace SYS.FormUI SpendMoney = Convert.ToDecimal(Convert.ToDouble(txtPrice.Text) * nudNum.Value), SpendTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")), MoneyState = SpendConsts.UnSettle, + datains_usr = LoginInfo.WorkerNo, }; result = HttpHelper.Request("Spend​/InsertSpendInfo", HttpHelper.ModelToJson(s)); if (result.statusCode != 200) { - UIMessageBox.ShowError("InsertSpendInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertSpendInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool m = result.message.ToString().Equals("true"); @@ -287,7 +289,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/UpdateSellthingInfo", HttpHelper.ModelToJson(sellThing)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateSellthingInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateSellthingInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } UIMessageBox.Show("添加成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK, true); @@ -322,7 +324,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Spend​/InsertSpendInfo", HttpHelper.ModelToJson(s)); if (result.statusCode != 200) { - UIMessageBox.ShowError("InsertSpendInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertSpendInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } bool m = result.message.ToString().Equals("true"); @@ -333,7 +335,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/UpdateSellthingInfo", HttpHelper.ModelToJson(sellThing)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateSellthingInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateSellthingInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } UIMessageBox.Show("添加成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK, true); @@ -385,7 +387,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/SelectSellThingByNameAndPrice", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSellThingByNameAndPrice+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSellThingByNameAndPrice+接口服务异常，请提交Issue或尝试更新版本！"); return; } SellThing s = HttpHelper.JsonToModel(result.message); @@ -400,7 +402,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/DeleteSellThing", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("DeleteSellThing+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("DeleteSellThing+接口服务异常，请提交Issue或尝试更新版本！"); return; } if (result.message.ToString().Equals("true")) @@ -409,7 +411,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/UpdateSellthingInfo", HttpHelper.ModelToJson(sellThing)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateSellthingInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateSellthingInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } UIMessageTip.ShowOk("撤销成功！", 1000); @@ -484,7 +486,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } Room r = HttpHelper.JsonToModel(result.message); diff --git a/SYS.FormUI/AppFunction/FrmSellThingManager.cs b/SYS.FormUI/AppFunction/FrmSellThingManager.cs index 96b8fa68ad5bde56c2a13fc5ed17be3f4847b5c3..80a370a730a0ea49df75ca59732f9e66f187dc61 100644 --- a/SYS.FormUI/AppFunction/FrmSellThingManager.cs +++ b/SYS.FormUI/AppFunction/FrmSellThingManager.cs @@ -51,7 +51,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/SelectSellThingAll"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } dgvSellthing.AutoGenerateColumns = false; @@ -75,7 +75,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/SelectSellThingAll",null,dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！"); return; } dgvSellthing.DataSource = HttpHelper.JsonToList(result.message); @@ -90,7 +90,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/DeleteSellThingBySellNo", null,dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("DeleteSellThingBySellNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("DeleteSellThingBySellNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } UIMessageBox.ShowSuccess("删除商品成功!"); @@ -132,7 +132,6 @@ namespace SYS.FormUI format = string.IsNullOrWhiteSpace(txtformat.Text) ? "" : Convert.ToString(txtformat.Text), Stock = txtStock.Value == 0 ? 0 : Convert.ToInt32(txtStock.Value), datains_usr = AdminInfo.Account, - datains_date = DateTime.Now }; if (CheckInput(st)) { @@ -143,7 +142,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing/SelectSellInfoBySellNo",null,dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectSellInfoBySellNo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectSellInfoBySellNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } var SellThing = HttpHelper.JsonToModel(result.message); @@ -155,7 +154,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Sellthing​/InsertSellThing", HttpHelper.ModelToJson(st)); if (result.statusCode != 200) { - UIMessageBox.ShowError("InsertSellThing+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertSellThing+接口服务异常，请提交Issue或尝试更新版本！"); return; } if (!result.ToString().Equals("true")) @@ -208,14 +207,13 @@ namespace SYS.FormUI format = string.IsNullOrWhiteSpace(txtformat.Text) ? "" : Convert.ToString(txtformat.Text), Stock = txtStock.Value == 0 ? 0 : Convert.ToInt32(txtStock.Value), datachg_usr = AdminInfo.Account, - datachg_date = DateTime.Now }; if (CheckInput(st)) { result = HttpHelper.Request("Sellthing​/UpdateSellthingInfo", HttpHelper.ModelToJson(st)); if (result.statusCode != 200) { - UIMessageBox.ShowError("UpdateSellthingInfo+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("UpdateSellthingInfo+接口服务异常，请提交Issue或尝试更新版本！"); return; } if (!result.message.ToString().Equals("true")) diff --git a/SYS.FormUI/AppFunction/FrmUnLockSystem.cs b/SYS.FormUI/AppFunction/FrmUnLockSystem.cs index 5aeabd9a7a7259f49a2cec410719239c1d98001f..7f6a75023c07f16ab11402bf63e5df46964b1634 100644 --- a/SYS.FormUI/AppFunction/FrmUnLockSystem.cs +++ b/SYS.FormUI/AppFunction/FrmUnLockSystem.cs @@ -83,7 +83,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Admin/SelectAdminPwdByAccount", null, dic); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectAdminPwdByAccount+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectAdminPwdByAccount+接口服务异常，请提交Issue或尝试更新版本！"); return; } var account = HttpHelper.JsonToModel(result.message); diff --git a/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs b/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs index 9d38fd116398a80422963ba346a6039051a533f0..388c67fd3e03461d6fec0431bd92d0835467c132 100644 --- a/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs +++ b/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs @@ -70,7 +70,6 @@ namespace SYS.FormUI NoticeTime = dtpUpLoadDate.Value, NoticeClub = cboSelectClub.SelectedValue.ToString(), datains_usr = AdminInfo.Account, - datains_date = DateTime.Now }; switch (cbNoticeType.Text) @@ -85,7 +84,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Notice​/InsertNotice", HttpHelper.ModelToJson(notice)); if (result.statusCode != 200) { - UIMessageBox.ShowError("InsertNotice+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("InsertNotice+接口服务异常，请提交Issue或尝试更新版本！"); return; } if (!result.message.ToString().Equals("true")) @@ -123,7 +122,7 @@ namespace SYS.FormUI result = HttpHelper.Request("Base/SelectDeptAllCanUse"); if (result.statusCode != 200) { - UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("SelectDeptAllCanUse+接口服务异常，请提交Issue或尝试更新版本！"); return; } //加载部门信息 diff --git a/SYS.FormUI/AppFunction/FrmVipRule.cs b/SYS.FormUI/AppFunction/FrmVipRule.cs index 1072e8b2ca244454ef35729f858376909c7d1263..4ed90a329caac35914c32aa8e9d4bf0241d3df1b 100644 --- a/SYS.FormUI/AppFunction/FrmVipRule.cs +++ b/SYS.FormUI/AppFunction/FrmVipRule.cs @@ -84,8 +84,7 @@ namespace SYS.FormUI rule_value = vipRule.rule_value, type_id = vipRule.type_id, delete_mk = 0, - datains_usr = AdminInfo.Account, - datains_date = DateTime.Now + datains_usr = AdminInfo.Account }; result = HttpHelper.Request("VipRule/AddVipRule",HttpHelper.ModelToJson(vipRule1)); if (result.statusCode != 200) @@ -106,7 +105,8 @@ namespace SYS.FormUI rule_id = txtRuleId.Text.Trim(), rule_name = txtRuleName.Text.Trim(), rule_value = Convert.ToDecimal(dudSpendAmount.Value), - type_id = Convert.ToInt32(cboCustoType.SelectedValue) + type_id = Convert.ToInt32(cboCustoType.SelectedValue), + datains_usr = AdminInfo.Account }; if (InsertVipRule(vipRule1)) { diff --git a/SYS.FormUI/AppFunction/FrmWtiInfo.cs b/SYS.FormUI/AppFunction/FrmWtiInfo.cs index eb3aef40575cc86925ec75892a06e31b2fa37697..be26cef893fdcbf8561eb793ac0a0fe13df25a1b 100644 --- a/SYS.FormUI/AppFunction/FrmWtiInfo.cs +++ b/SYS.FormUI/AppFunction/FrmWtiInfo.cs @@ -86,7 +86,6 @@ namespace SYS.FormUI WaterUse = string.IsNullOrEmpty(txtWInfo.Text.Trim()) ? 0 : Convert.ToDecimal(txtWInfo.Text.Trim()), Record = AdminInfo.Account, datachg_usr = AdminInfo.Account, - datachg_date = DateTime.Now }; result = HttpHelper.Request("Wti/UpdateWtiInfo",HttpHelper.ModelToJson(wti)); if (result.statusCode != 200) diff --git a/SYS.FormUI/AppInterface/FrmLoading.cs b/SYS.FormUI/AppInterface/FrmLoading.cs index d2b114b1dd013d883fdf122504c805121c0a87ff..8da8d98802a4bd8d71eb67490cdd5883c72acf35 100644 --- a/SYS.FormUI/AppInterface/FrmLoading.cs +++ b/SYS.FormUI/AppInterface/FrmLoading.cs @@ -51,7 +51,7 @@ namespace SYS.FormUI result = HttpHelper.Request("App/CheckBaseVersion"); if (result.statusCode != 200) { - UIMessageBox.ShowError("CheckBaseVersion+接口服务异常，请提交Issue！"); + UIMessageBox.ShowError("CheckBaseVersion+接口服务异常，请提交Issue或尝试更新版本！"); return; } var newversion = HttpHelper.JsonToModel(result.message); diff --git a/SYS.FormUI/AppMain/FrmMain.cs b/SYS.FormUI/AppMain/FrmMain.cs index 97ca1aba9b1275e4cfea73305ddd96dc49203807..cc2756c99a9bbbbddf0fe64b311606728b91a8af 100644 --- a/SYS.FormUI/AppMain/FrmMain.cs +++ b/SYS.FormUI/AppMain/FrmMain.cs @@ -498,8 +498,7 @@ namespace SYS.FormUI WorkerNo = LoginInfo.WorkerNo, CheckWay = "系统界面", CheckTime = DateTime.Parse(GetNetDateTime()), - datains_usr = LoginInfo.WorkerNo, - datains_date = DateTime.Now + datains_usr = LoginInfo.WorkerNo }; result = HttpHelper.Request("WorkerCheck/AddCheckInfo", workerCheck.ModelToJson(), null); if (result.statusCode != 200) diff --git a/SYS.FormUI/AppUserControls/ucRoomList.cs b/SYS.FormUI/AppUserControls/ucRoomList.cs index 11f5b2848c8074090ef1a4fab78fffe811fe124f..2e317a6d7398d44e30a1523e047fe78901c831d6 100644 --- a/SYS.FormUI/AppUserControls/ucRoomList.cs +++ b/SYS.FormUI/AppUserControls/ucRoomList.cs @@ -10,6 +10,7 @@ using SYS.Application; using Sunny.UI; using SYS.Common; using System.Collections.Generic; +using SqlSugar; namespace SYS.FormUI { @@ -285,18 +286,20 @@ namespace SYS.FormUI #region 双击进入入住/退房事件方法 private void ucRoomList_DoubleClick(object sender, EventArgs e) { - - if (lblCustoNo.Text == "") + List custos = new List(); + if (!lblCustoNo.Text.IsNullOrEmpty()) { - Dictionary room = new Dictionary(); - room.Add("no", lblRoomNo.Text); - var result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, room); - + Dictionary dic = new Dictionary() + { + { "CustoNo",lblCustoNo.Text.Trim() } + } ; + var result = HttpHelper.Request("Custo/SelectCardInfoByCustoNo", null, dic); if (result.statusCode != 200) { - UIMessageBox.Show("接口服务异常！", "来自小T提示", UIStyle.Red); + UIMessageBox.ShowError("SelectCardInfoByCustoNo+接口服务异常，请提交Issue或尝试更新版本！"); return; } + Room r = HttpHelper.JsonToModel(result.message); if (r.RoomStateId == 0) {