| DevApp/Gs.DevApp/UserControl/UcLookCk.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcLookCk.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcLookSupplier.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/bin/Debug/logo_ico.ico | 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/UserControl/UcLookCk.cs
@@ -41,7 +41,7 @@ var dt = rtn.rtnData.list; lookSearchSupplier.Properties.DataSource = dt; lookSearchSupplier.Properties.DisplayMember = "depotName"; lookSearchSupplier.Properties.ValueMember = "depotId"; lookSearchSupplier.Properties.ValueMember = "depotsCode"; } catch (Exception ex) { @@ -55,18 +55,15 @@ /// <return>Object</return> public string[] GetValue() { var id = lookSearchSupplier.EditValue.ToString(); var code = lookSearchSupplier.EditValue.ToString(); var name = lookSearchSupplier.Text.Trim(); var code = ""; var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView; if (row != null) code = row["depotCode"].ToString(); string[] _ary = { id, name, code }; string[] _ary = { code, name }; return _ary; } public void SetId(string id) public void SetCode(string Code) { lookSearchSupplier.EditValue = long.Parse(id); lookSearchSupplier.EditValue = Code; } } } DevApp/Gs.DevApp/UserControl/UcLookCk.resx
@@ -59,8 +59,7 @@ : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns=""> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> @@ -68,11 +67,9 @@ <xsd:element name="metadata"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0"/> <xsd:element name="value" type="xsd:string" minOccurs="0" /> </xsd:sequence> <xsd:attribute name="name" use="required" type="xsd:string"/> <xsd:attribute name="name" use="required" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string"/> <xsd:attribute name="mimetype" type="xsd:string"/> <xsd:attribute ref="xml:space"/> @@ -87,28 +84,21 @@ <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute ref="xml:space"/> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> @@ -122,13 +112,9 @@ <value>2.0</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 </value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 </value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> </root> DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
@@ -50,7 +50,7 @@ var dt = rtn.rtnData.list; lookSearchSupplier.Properties.DataSource = dt; lookSearchSupplier.Properties.DisplayMember = "suppName"; lookSearchSupplier.Properties.ValueMember = "id"; lookSearchSupplier.Properties.ValueMember = "suppno"; } catch (Exception ex) { @@ -64,19 +64,23 @@ /// <return>Object</return> public string[] GetValue() { //https://www.cnblogs.com/lhyqzx/p/6928817.html var id = lookSearchSupplier.EditValue.ToString(); ////https://www.cnblogs.com/lhyqzx/p/6928817.html //var id = lookSearchSupplier.EditValue.ToString(); //var name = lookSearchSupplier.Text.Trim(); //var code = ""; //var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView; //if (row != null) code = row["suppNo"].ToString(); //string[] _ary = { id, name, code }; //return _ary; var code = lookSearchSupplier.EditValue.ToString(); var name = lookSearchSupplier.Text.Trim(); var code = ""; var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView; if (row != null) code = row["suppNo"].ToString(); string[] _ary = { id, name, code }; string[] _ary = { code, name }; return _ary; } public void SetId(string id) public void SetCode(string Code) { lookSearchSupplier.EditValue = long.Parse(id); lookSearchSupplier.EditValue = Code; } } } DevApp/Gs.DevApp/UserControl/UcLookSupplier.resx
@@ -59,8 +59,7 @@ : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns=""> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> @@ -68,11 +67,9 @@ <xsd:element name="metadata"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0"/> <xsd:element name="value" type="xsd:string" minOccurs="0" /> </xsd:sequence> <xsd:attribute name="name" use="required" type="xsd:string"/> <xsd:attribute name="name" use="required" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string"/> <xsd:attribute name="mimetype" type="xsd:string"/> <xsd:attribute ref="xml:space"/> @@ -87,28 +84,21 @@ <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute ref="xml:space"/> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> @@ -122,13 +112,9 @@ <value>2.0</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 </value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 </value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> </root> DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -3,6 +3,7 @@ using System.Configuration; using System.Data; using System.Linq; using System.Net; using System.Windows.Forms; using DevExpress.XtraBars; using DevExpress.XtraEditors; @@ -198,45 +199,45 @@ private void BtnOut_ItemClick(object sender, ItemClickEventArgs e) { //if (string.IsNullOrEmpty(this.xlsOutView)) //{ // ToolBox.MsgHelper.ShowError("没有指定导出服务，请联系开发人员获取支持！"); // return; //} //using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog()) //{ // folderBrowserDialog.Description = "选择导出文件的保存路径"; // DialogResult dialogResult = folderBrowserDialog.ShowDialog(); // if (dialogResult == DialogResult.OK) // { // string _folder = folderBrowserDialog.SelectedPath; // var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutView); // try // { // string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj)); // ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); // if (_rtn.rtnCode > 0) // { // string _file = _rtn.rtnData.fileUrl.ToString(); // string _folderName = _folder + "\\" + _file.Replace("down/", ""); // string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file; // using (WebClient client = new WebClient()) // { // client.DownloadFile(_url, _folderName); // } // ToolBox.MsgHelper.ShowInformation("导出成功！"); // } // else // { // ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); // } // } // catch (Exception ex) // { // ToolBox.MsgHelper.Warning("提示：" + ex.Message); // } // } //} if (string.IsNullOrEmpty(this.xlsOutParameter)) { ToolBox.MsgHelper.ShowError("没有指定导出存储过程，请联系开发人员获取支持！"); return; } using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog()) { folderBrowserDialog.Description = "选择导出文件的保存路径"; DialogResult dialogResult = folderBrowserDialog.ShowDialog(); if (dialogResult == DialogResult.OK) { string _folder = folderBrowserDialog.SelectedPath; var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutParameter); try { string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { string _file = _rtn.rtnData.fileUrl.ToString(); string _folderName = _folder + "\\" + _file.Replace("down/", ""); string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file; using (WebClient client = new WebClient()) { client.DownloadFile(_url, _folderName); } ToolBox.MsgHelper.ShowInformation("导出成功！"); } else { ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); } } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); } } } } private void BtnReport_ItemClick(object sender, ItemClickEventArgs e) @@ -652,7 +653,7 @@ public string rptParameter { get; set; } /// <summary> /// 导出，视图名,如：视图名{入参1名|入参值,入参2名|入参值} /// 导出，视图名,如：存储过程名{入参1名|入参值,入参2名|入参值} /// </summary> public string xlsOutParameter { get; set; }
