| DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -11,7 +11,6 @@ using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; using MES.Service.Modes; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -19,8 +18,8 @@ { public partial class Frm_IQCLookups : XtraForm { private List<FilterEntity> _filterList = new List<FilterEntity>(); private readonly string _webServiceName = "MesSysLookupTypesManager/"; private List<FilterEntity> _filterList = new List<FilterEntity>(); public Frm_IQCLookups() { DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.resx
@@ -59,7 +59,8 @@ : 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" <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns=""> <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/> <xsd:element name="root" msdata:IsDataSet="true"> DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -1,47 +1,47 @@ using DevExpress.XtraGrid.Views.Grid; using DevExpress.XtraGrid.Views.Grid.ViewInfo; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Data; using System.Drawing; using System.Text; using System.Windows.Forms; using DevExpress.XtraEditors; using DevExpress.XtraGrid.Views.Grid; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; using Newtonsoft.Json; using Newtonsoft.Json.Linq; namespace Gs.DevApp.DevFrm { public partial class Frm_MesQmCheckitemDt : DevExpress.XtraEditors.XtraForm public partial class Frm_MesQmCheckitemDt : XtraForm { string _webServiceName = "MesQmCheckitemManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); private List<FilterEntity> _filterList = new List<FilterEntity>(); private readonly string _webServiceName = "MesQmCheckitemManager/"; public Frm_MesQmCheckitemDt() { InitializeComponent(); this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; getPageList(1, UtilityHelper.GetPageSize()); pageBar1.PagerEvent += PageBar1_PagerEvent; gridView1.CustomDrawRowIndicator += (s, e) => { if (e.Info.IsRowIndicator && e.RowHandle >= 0) { e.Info.DisplayText = (e.RowHandle + 1).ToString(); } }; gridView1.CustomDrawEmptyForeground += (s, e) => { string str = "暂未查找到匹配的数据!"; Font f = new Font("微软雅黑", 16); Rectangle r = new Rectangle( var str = "暂未查找到匹配的数据!"; var f = new Font("微软雅黑", 16); var r = new Rectangle( gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); @@ -49,21 +49,21 @@ } /// <summary> /// 双击事件 /// 双击事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e) { string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, var rowGuid = UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid"); if (!string.IsNullOrEmpty(rowGuid)) getModel(rowGuid, false, 999); } /// <summary> /// 分页事件 /// 分页事件 /// </summary> /// <param name="curPage"></param> /// <param name="pageSize"></param> @@ -73,21 +73,21 @@ } /// <summary> /// 查询事件 /// 查询事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) { Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, var frm = new ShowFilter(gridView1.Columns, _filterList); frm.UpdateParent += Frm_UpdateParent; frm.ShowDialog(); } /// <summary> /// 查询回调 /// 查询回调 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> @@ -98,7 +98,7 @@ } /// <summary> /// 取消事件 /// 取消事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> @@ -108,7 +108,7 @@ } /// <summary> /// 删除事件 /// 删除事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> @@ -118,38 +118,38 @@ // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); if (string.IsNullOrEmpty(rowGuid)) { ToolBox.MsgHelper.Warning("请先选择你要操作的行！"); MsgHelper.Warning("请先选择你要操作的行！"); return; } if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？")) return; List<dynamic> lst = new List<dynamic>(); var lst = new List<dynamic>(); lst.Add(rowGuid); var _obj = lst; try { string strJson = UtilityHelper.HttpPost("", var strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { UtilityHelper.JumpToTab(xtraTabControl1, 0); getPageList(1, UtilityHelper.GetPageSize()); } ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); MsgHelper.Warning("提示：" + _rtn.rtnMsg); } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); MsgHelper.Warning("提示：" + ex.Message); } } /// <summary> /// 刷新事件 /// 刷新事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> @@ -160,7 +160,7 @@ } /// <summary> /// 修改事件 /// 修改事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> @@ -170,7 +170,7 @@ // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); if (string.IsNullOrEmpty(rowGuid)) { ToolBox.MsgHelper.Warning("请先选择你要操作的行！"); MsgHelper.Warning("请先选择你要操作的行！"); return; } @@ -178,7 +178,7 @@ } /// <summary> /// 新增事件 /// 新增事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> @@ -186,16 +186,16 @@ { UtilityHelper.JumpToTab(xtraTabControl1, 1); lbGuid.Text = ""; List<GridView> gridViews = var gridViews = new List<GridView>(); gridViews.Add(gvMx1); UtilityHelper.CleanValueByControl(this.panel1.Controls, true, UtilityHelper.CleanValueByControl(panel1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); UtilityHelper.SetDefaultTable(gcMx1, gvMx1); } /// <summary> /// 保存事件 /// 保存事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> @@ -204,67 +204,64 @@ toolBarMenu1.isSetBtn = false; //if (string.IsNullOrEmpty(txt_account.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("登录账号不能为空！"); MsgHelper.Warning("登录账号不能为空！"); // txt_account.Focus(); return; } var _obj = new { guid = lbGuid.Text.Trim(), //主建 guid = lbGuid.Text.Trim() //主建 }; try { string strJson = UtilityHelper.HttpPost("", var strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning("提示：" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { lbGuid.Text = _rtn.rtnData; toolBarMenu1.isSetBtn = true; UtilityHelper.ChangeEnableByControl(this.panel1.Controls, UtilityHelper.ChangeEnableByControl(panel1.Controls, false); } } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); MsgHelper.Warning("提示：" + ex.Message); } } /// <summary> /// /// </summary> /// <param name="curPage">第几页</param> /// <param name="pageSize">每页几条</param> private void getPageList(int curPage, int pageSize) { System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); foreach (FilterEntity itm in _filterList) { var _sbSqlWhere = new StringBuilder(); foreach (var itm in _filterList) _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'"); } PageQueryModel pgq = new PageQueryModel(curPage, pageSize, var pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); var json = JsonConvert.SerializeObject(pgq); try { string strReturn = UtilityHelper.HttpPost("", var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageIQC", json); ReturnModel<PageListModel> dd = var dd = UtilityHelper.ReturnToTablePage(strReturn); if (dd.rtnCode > 0) { DataTable dt = dd.rtnData.list; var dt = dd.rtnData.list; gcMain.BindingContext = new BindingContext(); gcMain.DataSource = dt; gcMain.ForceInitialize(); int dddd = dd.rtnData.pages; //总页 var dddd = dd.rtnData.pages; //总页 pageBar1.TotalPages = dddd; pageBar1.RecordCount = dd.rtnData.total; //记录总数 pageBar1.CurrentPage = curPage; //当前页 @@ -273,12 +270,12 @@ } else { ToolBox.MsgHelper.ShowError("提示：" + dd.rtnMsg); MsgHelper.ShowError("提示：" + dd.rtnMsg); } } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); MsgHelper.Warning("提示：" + ex.Message); } } @@ -286,39 +283,36 @@ { if (string.IsNullOrEmpty(strGuid)) { ToolBox.MsgHelper.Warning("请先选择你要操作的行！"); MsgHelper.Warning("请先选择你要操作的行！"); return; } UtilityHelper.JumpToTab(xtraTabControl1, tabIdx); var _obj = new { guid = strGuid, //主建 guid = strGuid //主建 }; try { string strJson = UtilityHelper.HttpPost("", var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModelIQC", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { dynamic dy = _rtn.rtnData; var dy = _rtn.rtnData; lbGuid.Text = strGuid; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); var gvList = new List<GridView>(); gvList.Add(gvMx1); UtilityHelper.SetValueByObj(this.panel1.Controls, dy, UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit, gvList); JObject _job = JObject.Parse(strJson); JArray array = new JArray(); foreach (var a in _job["rtnData"]["list"]) { array.Add(a); } var _job = JObject.Parse(strJson); var array = new JArray(); foreach (var a in _job["rtnData"]["list"]) array.Add(a); DataTable dt = var dt = JsonConvert.DeserializeObject<DataTable>( array.ToString()); if (dt.Rows.Count > 0) @@ -329,16 +323,18 @@ } else { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, UtilityHelper.SetDefaultTable(gcMx1, gvMx1); } } else ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); { MsgHelper.Warning("提示：" + _rtn.rtnMsg); } } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); MsgHelper.Warning("提示：" + ex.Message); } } } DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.resx
@@ -1,120 +1,134 @@ <?xml version="1.0" encoding="utf-8"?> <root> <!-- Microsoft ResX Schema Version 2.0 The primary goals of this format is to allow a simple XML format that is mostly human readable. The generation and parsing of the various data types are done through the TypeConverter classes associated with the data types. Example: ... ado.net/XML headers & schema ... <resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="version">2.0</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <value>[base64 mime encoded serialized .NET Framework object]</value> </data> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <comment>This is a comment</comment> </data> There are any number of "resheader" rows that contain simple name/value pairs. Each data row contains a name, and value. The row also contains a type or mimetype. Type corresponds to a .NET class that support text/value conversion through the TypeConverter architecture. Classes that don't support this are serialized and stored with the mimetype set. The mimetype is used for serialized objects, and tells the ResXResourceReader how to depersist the object. This is currently not extensible. For a given mimetype the value must be set accordingly: Note - application/x-microsoft.net.object.binary.base64 is the format that the ResXResourceWriter will generate, however the reader can read any of the formats listed below. mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.bytearray.base64 value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> <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> <xsd:choice maxOccurs="unbounded"> <xsd:element name="metadata"> <!-- Microsoft ResX Schema Version 2.0 The primary goals of this format is to allow a simple XML format that is mostly human readable. The generation and parsing of the various data types are done through the TypeConverter classes associated with the data types. Example: ... ado.net/XML headers & schema ... <resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="version">2.0</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <value>[base64 mime encoded serialized .NET Framework object]</value> </data> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <comment>This is a comment</comment> </data> There are any number of "resheader" rows that contain simple name/value pairs. Each data row contains a name, and value. The row also contains a type or mimetype. Type corresponds to a .NET class that support text/value conversion through the TypeConverter architecture. Classes that don't support this are serialized and stored with the mimetype set. The mimetype is used for serialized objects, and tells the ResXResourceReader how to depersist the object. This is currently not extensible. For a given mimetype the value must be set accordingly: Note - application/x-microsoft.net.object.binary.base64 is the format that the ResXResourceWriter will generate, however the reader can read any of the formats listed below. mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.bytearray.base64 value : The object must be serialized into a byte array : 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:import namespace="http://www.w3.org/XML/1998/namespace"/> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" /> </xsd:sequence> <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" /> <xsd:choice maxOccurs="unbounded"> <xsd:element name="metadata"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0"/> </xsd:sequence> <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"/> </xsd:complexType> </xsd:element> <xsd:element name="assembly"> <xsd:complexType> <xsd:attribute name="alias" type="xsd:string"/> <xsd:attribute name="name" type="xsd:string"/> </xsd:complexType> </xsd:element> <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: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 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:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> </xsd:complexType> </xsd:element> </xsd:choice> </xsd:complexType> </xsd:element> <xsd:element name="assembly"> <xsd:complexType> <xsd:attribute name="alias" type="xsd:string" /> <xsd:attribute name="name" type="xsd:string" /> </xsd:complexType> </xsd:element> <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: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 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:sequence> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> </xsd:complexType> </xsd:element> </xsd:schema> <resheader name="resmimetype"> <value>text/microsoft-resx</value> </resheader> <resheader name="version"> <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> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> </xsd:element> </xsd:schema> <resheader name="resmimetype"> <value>text/microsoft-resx</value> </resheader> <resheader name="version"> <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> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 </value> </resheader> </root> DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -11,7 +11,6 @@ using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; using MES.Service.Modes; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -19,8 +18,8 @@ { public partial class Frm_MesSysLookups : XtraForm { private List<FilterEntity> _filterList = new List<FilterEntity>(); private readonly string _webServiceName = "MesSysLookupTypesManager/"; private List<FilterEntity> _filterList = new List<FilterEntity>(); public Frm_MesSysLookups() { DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.resx
@@ -59,7 +59,8 @@ : 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" <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns=""> <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/> <xsd:element name="root" msdata:IsDataSet="true"> DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
@@ -7,213 +7,213 @@ /// </summary> public class MesQmCheckitemDt { /// <summary> /// 默认值: (newid()) /// </summary> public Guid Guid { get; set; } /// <summary> /// 默认值: (newid()) /// </summary> public Guid Guid { get; set; } /// <summary> /// 创建人 /// </summary> public string CreateBy { get; set; } /// <summary> /// 创建人 /// </summary> public string CreateBy { get; set; } /// <summary> /// 创建时间 /// </summary> public DateTime? CreateDate { get; set; } /// <summary> /// 创建时间 /// </summary> public DateTime? CreateDate { get; set; } /// <summary> /// 最后更新人 /// </summary> public string LastupdateBy { get; set; } /// <summary> /// 最后更新人 /// </summary> public string LastupdateBy { get; set; } /// <summary> /// 最后更新时间 /// </summary> public DateTime? LastupdateDate { get; set; } /// <summary> /// 最后更新时间 /// </summary> public DateTime? LastupdateDate { get; set; } /// <summary> /// 备注 /// </summary> public string Memo { get; set; } /// <summary> /// 备注 /// </summary> public string Memo { get; set; } /// <summary> /// 物料产品编码 /// </summary> public string ItemNo { get; set; } /// <summary> /// 物料产品编码 /// </summary> public string ItemNo { get; set; } /// <summary> /// 顺序 /// </summary> public long? Forder { get; set; } /// <summary> /// 顺序 /// </summary> public long? Forder { get; set; } /// <summary> /// 上公差 /// </summary> public string FupAllow { get; set; } /// <summary> /// 上公差 /// </summary> public string FupAllow { get; set; } /// <summary> /// 检验项目 /// </summary> public string FcheckItem { get; set; } /// <summary> /// 检验项目 /// </summary> public string FcheckItem { get; set; } /// <summary> /// 特殊特性类别 /// </summary> public string FspecType { get; set; } /// <summary> /// 特殊特性类别 /// </summary> public string FspecType { get; set; } /// <summary> /// 备用 /// </summary> public long? WorkshopCenterCode { get; set; } /// <summary> /// 备用 /// </summary> public long? WorkshopCenterCode { get; set; } /// <summary> /// 工序 /// </summary> public string ProcNo { get; set; } /// <summary> /// 工序 /// </summary> public string ProcNo { get; set; } /// <summary> /// 检验水准编码 /// </summary> public string SampleSizeNo { get; set; } /// <summary> /// 检验水准编码 /// </summary> public string SampleSizeNo { get; set; } /// <summary> /// 检验工具 /// </summary> public string FcheckTool { get; set; } /// <summary> /// 检验工具 /// </summary> public string FcheckTool { get; set; } /// <summary> /// 下公差 /// </summary> public string FdownAllow { get; set; } /// <summary> /// 下公差 /// </summary> public string FdownAllow { get; set; } /// <summary> /// 检验水平 /// </summary> public string FcheckLevel { get; set; } /// <summary> /// 检验水平 /// </summary> public string FcheckLevel { get; set; } /// <summary> /// 标准值 /// </summary> public string Fstand { get; set; } /// <summary> /// 标准值 /// </summary> public string Fstand { get; set; } /// <summary> /// 接收水平 /// </summary> public string FacLevel { get; set; } /// <summary> /// 接收水平 /// </summary> public string FacLevel { get; set; } /// <summary> /// 备用 /// </summary> public string FeatuProc { get; set; } /// <summary> /// 备用 /// </summary> public string FeatuProc { get; set; } /// <summary> /// 备用 /// </summary> public string FeatuProd { get; set; } /// <summary> /// 备用 /// </summary> public string FeatuProd { get; set; } /// <summary> /// 备用 /// </summary> public string Aql1Id { get; set; } /// <summary> /// 备用 /// </summary> public string Aql1Id { get; set; } /// <summary> /// 备用 /// </summary> public string FqaType { get; set; } /// <summary> /// 备用 /// </summary> public string FqaType { get; set; } /// <summary> /// 是否档位 /// 默认值: ((0)) /// </summary> public bool? Isdanwei { get; set; } /// <summary> /// 是否档位 /// 默认值: ((0)) /// </summary> public bool? Isdanwei { get; set; } /// <summary> /// 默认用于在库重检 /// 默认值: ((1)) /// </summary> public long? Ftype { get; set; } /// <summary> /// 默认用于在库重检 /// 默认值: ((1)) /// </summary> public long? Ftype { get; set; } /// <summary> /// 修改/ 新增状态 /// 默认值: ((0)) /// </summary> public bool? EditStatus { get; set; } /// <summary> /// 修改/ 新增状态 /// 默认值: ((0)) /// </summary> public bool? EditStatus { get; set; } /// <summary> /// 抽检数量 /// </summary> public long? CheckQty { get; set; } /// <summary> /// 抽检数量 /// </summary> public long? CheckQty { get; set; } /// <summary> /// 允收数量 /// 默认值: ((0)) /// </summary> public long? FacQty { get; set; } /// <summary> /// 允收数量 /// 默认值: ((0)) /// </summary> public long? FacQty { get; set; } /// <summary> /// </summary> public string Company { get; set; } /// <summary> /// </summary> public string Company { get; set; } /// <summary> /// </summary> public string Factory { get; set; } /// <summary> /// </summary> public string Factory { get; set; } /// <summary> /// 频次 /// </summary> public string Frequency { get; set; } /// <summary> /// 频次 /// </summary> public string Frequency { get; set; } /// <summary> /// 规格要求 /// </summary> public string FspecRequ { get; set; } /// <summary> /// 规格要求 /// </summary> public string FspecRequ { get; set; } /// <summary> /// 项目类别 /// </summary> public string FcheckType { get; set; } /// <summary> /// 项目类别 /// </summary> public string FcheckType { get; set; } /// <summary> /// 单位 /// </summary> public string Funit { get; set; } /// <summary> /// 单位 /// </summary> public string Funit { get; set; } /// <summary> /// 报表选择 /// 默认值: ((0)) /// </summary> public bool? ReporfCheck { get; set; } /// <summary> /// 报表选择 /// 默认值: ((0)) /// </summary> public bool? ReporfCheck { get; set; } /// <summary> /// 特定修改 /// 默认值: ((0)) /// </summary> public bool? GivenModify { get; set; } /// <summary> /// 特定修改 /// 默认值: ((0)) /// </summary> public bool? GivenModify { get; set; } /// <summary> /// UCL_X设定值 /// </summary> public decimal? Fucl { get; set; } /// <summary> /// UCL_X设定值 /// </summary> public decimal? Fucl { get; set; } /// <summary> /// LCL_X设定值 /// </summary> public decimal? Flcl { get; set; } /// <summary> /// LCL_X设定值 /// </summary> public decimal? Flcl { get; set; } /// <summary> /// UCL_R设定值 /// </summary> public decimal? Frucl { get; set; } /// <summary> /// UCL_R设定值 /// </summary> public decimal? Frucl { get; set; } /// <summary> /// 物料ID /// </summary> public long? ItemId { get; set; } /// <summary> /// 物料ID /// </summary> public long? ItemId { get; set; } /// <summary> /// </summary> public Guid? Pid { get; set; } /// <summary> /// </summary> public Guid? Pid { get; set; } public string SampleSizeName { get; set; }
