From 652561038e3a76660bb27ca75b06c40be3da45bb Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 25 十月 2024 18:56:55 +0800
Subject: [PATCH] 优化格式
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.resx | 244 +++++++++--------
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs | 334 ++++++++++++------------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 170 ++++++------
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.resx | 3
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.resx | 3
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 3
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | 3
7 files changed, 385 insertions(+), 375 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index 1a7d0b5..16d1b40 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/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()
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.resx
index 4795337..53f3a41 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.resx
+++ b/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">
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 5c49237..5174a7a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/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);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.resx
index d58980a..4795337 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.resx
+++ b/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>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index 92e5e9c..595487e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/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()
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.resx
index 4795337..53f3a41 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.resx
+++ b/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">
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
index b273f88..dd025e0 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
+++ b/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; }
--
Gitblit v1.9.3