From 0577ec53bf1bddb17c74618d1cf60ca6ec837949 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 29 五月 2025 18:08:10 +0800
Subject: [PATCH] 认证信息
---
DevApp/Gs.DevApp/DevFrm/QC/DefectCode.Designer.cs | 290 +++++++++++++++++
DevApp/Gs.DevApp/DevFrm/QC/DefectCode.resx | 123 +++++++
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.resx | 120 +++++++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.cs | 21 +
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.cs | 21 +
DevApp/Gs.DevApp/Gs.DevApp.csproj | 33 +
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.Designer.cs | 58 +++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs | 6
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs | 22 +
DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs | 210 ++++++++++++
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.Designer.cs | 58 +++
12 files changed, 947 insertions(+), 16 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.Designer.cs
new file mode 100644
index 0000000..164a915
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.Designer.cs
@@ -0,0 +1,290 @@
+锘縩amespace Gs.DevApp.DevFrm.QC
+{
+ partial class DefectCode
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.toolStripMenuItemRoot = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripMenuItemEdt = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripMenuItemAdd = new System.Windows.Forms.ToolStripMenuItem();
+ this.cms1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.toolStripMenuItemDel = new System.Windows.Forms.ToolStripMenuItem();
+ this.treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tl9 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tl8 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcActions = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcMenuCaption = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcModuleID = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.tlMenu = new DevExpress.XtraTreeList.TreeList();
+ this.tlcMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+ this.cms1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // toolStripMenuItemRoot
+ //
+ this.toolStripMenuItemRoot.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_16x16;
+ this.toolStripMenuItemRoot.Name = "toolStripMenuItemRoot";
+ this.toolStripMenuItemRoot.Size = new System.Drawing.Size(214, 26);
+ this.toolStripMenuItemRoot.Text = "澧炲姞涓婚」";
+ //
+ // toolStripMenuItemEdt
+ //
+ this.toolStripMenuItemEdt.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_16x16;
+ this.toolStripMenuItemEdt.Name = "toolStripMenuItemEdt";
+ this.toolStripMenuItemEdt.Size = new System.Drawing.Size(214, 26);
+ this.toolStripMenuItemEdt.Text = "缂栬緫璇ラ」";
+ //
+ // toolStripMenuItemAdd
+ //
+ this.toolStripMenuItemAdd.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_16x16;
+ this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd";
+ this.toolStripMenuItemAdd.Size = new System.Drawing.Size(214, 26);
+ this.toolStripMenuItemAdd.Text = "澧炲姞瀛愰」";
+ //
+ // cms1
+ //
+ this.cms1.ImageScalingSize = new System.Drawing.Size(20, 20);
+ this.cms1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripMenuItemAdd,
+ this.toolStripMenuItemEdt,
+ this.toolStripMenuItemDel,
+ this.toolStripMenuItemRoot});
+ this.cms1.Name = "contextMenuStrip1";
+ this.cms1.Size = new System.Drawing.Size(215, 136);
+ //
+ // toolStripMenuItemDel
+ //
+ this.toolStripMenuItemDel.Image = global::Gs.DevApp.Properties.Resources.deletelist2_16x16;
+ this.toolStripMenuItemDel.Name = "toolStripMenuItemDel";
+ this.toolStripMenuItemDel.Size = new System.Drawing.Size(214, 26);
+ this.toolStripMenuItemDel.Text = "鍒犻櫎璇ラ」";
+ //
+ // treeListColumn1
+ //
+ this.treeListColumn1.Caption = "鍙敤鏍囪瘑";
+ this.treeListColumn1.FieldName = "type1";
+ this.treeListColumn1.Name = "treeListColumn1";
+ this.treeListColumn1.Visible = true;
+ this.treeListColumn1.VisibleIndex = 4;
+ //
+ // tl9
+ //
+ this.tl9.Caption = "鏈�鍚庢洿鏂版椂闂�";
+ this.tl9.FieldName = "lastupdateDate";
+ this.tl9.Name = "tl9";
+ this.tl9.Visible = true;
+ this.tl9.VisibleIndex = 6;
+ //
+ // tl8
+ //
+ this.tl8.Caption = "鏈�鍚庢洿鏂颁汉";
+ this.tl8.FieldName = "lastupdateBy";
+ this.tl8.Name = "tl8";
+ this.tl8.Visible = true;
+ this.tl8.VisibleIndex = 5;
+ //
+ // tlcActions
+ //
+ this.tlcActions.Caption = "瀛楀吀鍒嗙粍";
+ this.tlcActions.FieldName = "sType";
+ this.tlcActions.MinWidth = 23;
+ this.tlcActions.Name = "tlcActions";
+ this.tlcActions.Visible = true;
+ this.tlcActions.VisibleIndex = 3;
+ this.tlcActions.Width = 50;
+ //
+ // tlcMenuCaption
+ //
+ this.tlcMenuCaption.Caption = "瀛楀吀缂栧彿";
+ this.tlcMenuCaption.FieldName = "defectCode";
+ this.tlcMenuCaption.MinWidth = 23;
+ this.tlcMenuCaption.Name = "tlcMenuCaption";
+ this.tlcMenuCaption.Visible = true;
+ this.tlcMenuCaption.VisibleIndex = 1;
+ this.tlcMenuCaption.Width = 139;
+ //
+ // tlcModuleID
+ //
+ this.tlcModuleID.Caption = "guid";
+ this.tlcModuleID.FieldName = "guid";
+ this.tlcModuleID.MinWidth = 23;
+ this.tlcModuleID.Name = "tlcModuleID";
+ this.tlcModuleID.Visible = true;
+ this.tlcModuleID.VisibleIndex = 0;
+ this.tlcModuleID.Width = 103;
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Name = "split1";
+ //
+ // split1.Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.tlMenu);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Size = new System.Drawing.Size(988, 679);
+ this.split1.SplitterPosition = 0;
+ this.split1.TabIndex = 0;
+ //
+ // tlMenu
+ //
+ this.tlMenu.Appearance.Row.Options.UseFont = true;
+ this.tlMenu.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] {
+ this.tlcModuleID,
+ this.tlcMenuCaption,
+ this.tlcMenuName,
+ this.tlcActions,
+ this.tl8,
+ this.tl9,
+ this.treeListColumn1});
+ this.tlMenu.Cursor = System.Windows.Forms.Cursors.Default;
+ this.tlMenu.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tlMenu.Location = new System.Drawing.Point(0, 0);
+ this.tlMenu.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.tlMenu.MinWidth = 23;
+ this.tlMenu.Name = "tlMenu";
+ this.tlMenu.OptionsBehavior.Editable = false;
+ this.tlMenu.OptionsFind.AlwaysVisible = true;
+ this.tlMenu.OptionsMenu.EnableColumnMenu = false;
+ this.tlMenu.OptionsMenu.EnableFooterMenu = false;
+ this.tlMenu.OptionsMenu.EnableNodeMenu = false;
+ this.tlMenu.OptionsMenu.ShowAddNodeItems = DevExpress.Utils.DefaultBoolean.False;
+ this.tlMenu.OptionsMenu.ShowAutoFilterRowItem = false;
+ this.tlMenu.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Solid;
+ this.tlMenu.Size = new System.Drawing.Size(988, 667);
+ this.tlMenu.TabIndex = 3;
+ this.tlMenu.TreeLevelWidth = 21;
+ //
+ // tlcMenuName
+ //
+ this.tlcMenuName.Caption = "瀛楀吀鍚嶇О鍊�";
+ this.tlcMenuName.FieldName = "defectName";
+ this.tlcMenuName.MinWidth = 38;
+ this.tlcMenuName.Name = "tlcMenuName";
+ this.tlcMenuName.Visible = true;
+ this.tlcMenuName.VisibleIndex = 2;
+ this.tlcMenuName.Width = 215;
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(988, 679);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(990, 711);
+ this.xtraTabControl1.TabIndex = 5;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1});
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
+ this.toolBarMenu1.isSetBtn = false;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.Size = new System.Drawing.Size(990, 80);
+ this.toolBarMenu1.TabIndex = 4;
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = null;
+ //
+ // DefectCode
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.toolBarMenu1);
+ this.Name = "DefectCode";
+ this.Size = new System.Drawing.Size(990, 791);
+ this.cms1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).EndInit();
+ this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemRoot;
+ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemEdt;
+ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemAdd;
+ private System.Windows.Forms.ContextMenuStrip cms1;
+ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemDel;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tl9;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tl8;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcActions;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuCaption;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcModuleID;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraTreeList.TreeList tlMenu;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuName;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private UserControl.UcToolBarMenu toolBarMenu1;
+ }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
new file mode 100644
index 0000000..8ae7cc6
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
@@ -0,0 +1,210 @@
+锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraTreeList.Nodes;
+using DevExpress.XtraTreeList;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.QC
+{
+ public partial class DefectCode : DevExpress.XtraEditors.XtraUserControl
+ {
+ string _webServiceName = "MesDefectCodeManager/";
+ List<FilterEntity> _filterList = new List<FilterEntity>();
+
+ public string strType = "";//绫诲埆(鏅�氫俊鎭紝璁よ瘉淇℃伅)
+ public DefectCode(string _strType)
+ {
+ InitializeComponent();
+ strType = _strType;
+ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+
+ tlMenu.IndicatorWidth = 50;
+ tlMenu.CustomDrawNodeIndicator += (s, ee) =>
+ {
+ if (ee.IsNodeIndicator)
+ {
+ var index = ee.Node.TreeList.GetVisibleIndexByNode(ee.Node);
+ ee.Info.DisplayText = (index + 1).ToString();
+ }
+ };
+ getPageList(1);
+ this.tlMenu.MouseDown += TlMenu_MouseDown;
+ this.toolStripMenuItemAdd.Click += (s, ee) =>
+ {
+ string strGuid = "";
+ string strUpGuid = "";
+ if (tlMenu.FocusedNode != null)
+ {
+ strUpGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
+ }
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid,strType);
+ frm.UpdateParent += (s2, ee2) =>
+ {
+ getPageList(1);
+ };
+ frm.ShowDialog();
+ };
+ this.toolStripMenuItemRoot.Click += (s, ee) =>
+ {
+ string strGuid = "";
+ string strUpGuid = "";
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid, strType);
+ frm.UpdateParent += (s2, ee2) =>
+ {
+ getPageList(1);
+ };
+ frm.ShowDialog();
+ };
+ this.toolStripMenuItemDel.Click += (s, ee) =>
+ {
+ if (tlMenu.FocusedNode != null)
+ {
+ string rowGuid = "";
+ string rowName = "";
+ rowGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
+ rowName = tlMenu.FocusedNode.GetValue("defectName").ToString();
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ List<dynamic> lst = new List<dynamic>();
+ lst.Add(rowGuid);
+ var _obj = lst;
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ tlMenu.DeleteNode(tlMenu.FocusedNode);
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ };
+ this.toolStripMenuItemEdt.Click += (s, ee) =>
+ {
+ string strGuid = "";
+ string strUpGuid = "";
+ if (tlMenu.FocusedNode != null)
+ {
+ strGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
+ strUpGuid = tlMenu.FocusedNode.GetValue("pid").ToString();
+ }
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid, strType);
+ frm.UpdateParent += (s2, ee2) =>
+ {
+ getPageList(1);
+ };
+ frm.ShowDialog();
+ };
+ }
+
+ /// <summary>
+ /// 鍙抽敭寮瑰嚭鑿滃崟,濡傛灉鏄锛屽鍔犲瓙椤圭洰锛屽惁鍒欏鍔犱富椤�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void TlMenu_MouseDown(object sender, MouseEventArgs e)
+ {
+ if (e.Button == MouseButtons.Right)
+ {
+ TreeListHitInfo hInfo = tlMenu.CalcHitInfo(new Point(e.X, e.Y));
+ TreeListNode node = hInfo.Node;
+ tlMenu.FocusedNode = node;
+ if (hInfo.HitInfoType == HitInfoType.Cell ||
+ hInfo.HitInfoType == HitInfoType.Row ||
+ hInfo.HitInfoType == HitInfoType.RowIndent ||
+ hInfo.HitInfoType == HitInfoType.RowIndicator
+ )
+ {
+ if (node != null)
+ {
+ toolStripMenuItemAdd.Visible = true;
+ toolStripMenuItemEdt.Visible = true;
+ toolStripMenuItemDel.Visible = true;
+ toolStripMenuItemRoot.Visible = false;
+ cms1.Show(tlMenu, e.Location);
+ }
+ }
+ else
+ {
+ toolStripMenuItemAdd.Visible = false;
+ toolStripMenuItemEdt.Visible = false;
+ toolStripMenuItemDel.Visible = false;
+ toolStripMenuItemRoot.Visible = true;
+ cms1.Show(tlMenu, e.Location);
+ }
+ }
+ }
+
+
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
+ }
+
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ _filterList.Clear();
+ getPageList(1);
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ System.Text.StringBuilder sbWhere = new StringBuilder();
+ sbWhere.Append(" and a.defect_sort='" + strType + "'");
+ var pgq = new PageQueryModel(1, 999999, "a.defect_code ", "asc","", sbWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ tlMenu.DataSource = dt;
+ tlMenu.KeyFieldName = "guid";
+ tlMenu.ParentFieldName = "pid";
+ tlMenu.EndUpdate();
+ this.tlMenu.CollapseAll();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.resx b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.resx
new file mode 100644
index 0000000..eee23a6
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.resx
@@ -0,0 +1,123 @@
+锘�<?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">
+ <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: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>
+ <metadata name="cms1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.Designer.cs
new file mode 100644
index 0000000..80890f2
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.Designer.cs
@@ -0,0 +1,58 @@
+锘縩amespace Gs.DevApp.DevFrm.QC
+{
+ partial class DefectCodeDic
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("鏅�氫俊鎭�");
+ this.SuspendLayout();
+ //
+ // defectCode1
+ //
+ this.defectCode1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.defectCode1.Location = new System.Drawing.Point(0, 0);
+ this.defectCode1.Name = "defectCode1";
+ this.defectCode1.Size = new System.Drawing.Size(1001, 568);
+ this.defectCode1.TabIndex = 0;
+ //
+ // DefectCodeDic
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1001, 568);
+ this.Controls.Add(this.defectCode1);
+ this.Name = "DefectCodeDic";
+ this.Text = "DefectCodeDic";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DefectCode defectCode1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.cs
new file mode 100644
index 0000000..2bef61b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.cs
@@ -0,0 +1,21 @@
+锘縰sing DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.QC
+{
+ public partial class DefectCodeDic : DevExpress.XtraEditors.XtraForm
+ {
+ public DefectCodeDic()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.resx b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.resx
@@ -0,0 +1,120 @@
+锘�<?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">
+ <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: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/DefectCodeRenZheng.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.Designer.cs
new file mode 100644
index 0000000..f84546a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.Designer.cs
@@ -0,0 +1,58 @@
+锘縩amespace Gs.DevApp.DevFrm.QC
+{
+ partial class DefectCodeRenZheng
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("璁よ瘉淇℃伅");
+ this.SuspendLayout();
+ //
+ // defectCode1
+ //
+ this.defectCode1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.defectCode1.Location = new System.Drawing.Point(0, 0);
+ this.defectCode1.Name = "defectCode1";
+ this.defectCode1.Size = new System.Drawing.Size(1001, 568);
+ this.defectCode1.TabIndex = 0;
+ //
+ // DefectCodeDic
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1001, 568);
+ this.Controls.Add(this.defectCode1);
+ this.Name = "DefectCodeDic";
+ this.Text = "DefectCodeDic";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DefectCode defectCode1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.cs
new file mode 100644
index 0000000..bf08f8a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.cs
@@ -0,0 +1,21 @@
+锘縰sing DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.QC
+{
+ public partial class DefectCodeRenZheng : DevExpress.XtraEditors.XtraForm
+ {
+ public DefectCodeRenZheng()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
index 98e7f07..715938c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
@@ -40,7 +40,7 @@
{
strUpGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
}
- Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid);
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid,strType);
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
@@ -51,7 +51,7 @@
{
string strGuid = "";
string strUpGuid = "";
- Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid);
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid, strType);
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
@@ -102,7 +102,7 @@
strGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
strUpGuid = tlMenu.FocusedNode.GetValue("pid").ToString();
}
- Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid);
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid, strType);
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.Designer.cs
index cde7285..1d5231f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.Designer.cs
@@ -107,6 +107,7 @@
//
// txt_type1
//
+ this.txt_type1.EditValue = true;
this.txt_type1.Location = new System.Drawing.Point(12, 211);
this.txt_type1.Name = "txt_type1";
this.txt_type1.Properties.Caption = "鍙敤鏍囪瘑";
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
index 776ec67..74432e1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
@@ -4,6 +4,7 @@
using Newtonsoft.Json;
using System;
using System.Data;
+using System.Text;
namespace Gs.DevApp.DevFrm.QC
@@ -12,14 +13,23 @@
{
string strGuid = "";
string strUpGuid = "";
+ string strType = "";//绫诲埆(鏅�氫俊鎭紝璁よ瘉淇℃伅)
string _webServiceName = "MesDefectCodeManager/";
- public Frm_MesDefectCodeShow(string _strGuid, string _strUpGuid)
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_strGuid">涓婚敭</param>
+ /// <param name="_strUpGuid">鐖朵翰涓婚敭</param>
+ /// <param name="_strType">绫诲埆</param>
+ public Frm_MesDefectCodeShow(string _strGuid, string _strUpGuid, string _strType)
{
InitializeComponent();
- getSelect();
this.strGuid = _strGuid;
this.strUpGuid = _strUpGuid;
-
+ this.strType = _strType;
+ getSelect();
//杩欐槸鏇存柊
if (!string.IsNullOrEmpty(this.strGuid))
{
@@ -74,7 +84,8 @@
SType = txt_sType.Text.Trim(),
DefectName = txt_defectName.Text.Trim(),
Pid = UtilityHelper.ToGuid(strUpGuid.Trim()),
- Type1 = txt_type1.Checked
+ Type1 = txt_type1.Checked,
+ DefectSort = strType,
};
try
{
@@ -108,8 +119,11 @@
/// </summary>
private void getSelect()
{
+ System.Text.StringBuilder sbWhere = new StringBuilder();
+ sbWhere.Append(" and a.defect_sort='" + strType + "'");
var _obj = new
{
+ strWhere = sbWhere.ToString()
};
var strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectCategory", JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index a32fbe4..d4254b3 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -419,17 +419,29 @@
<Compile Include="DevFrm\PDA\SelectUser.Designer.cs">
<DependentUpon>SelectUser.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\QC\DefectCode.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\DefectCode.Designer.cs">
+ <DependentUpon>DefectCode.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\DefectCodeDic.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\DefectCodeDic.Designer.cs">
+ <DependentUpon>DefectCodeDic.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\DefectCodeRenZheng.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\DefectCodeRenZheng.Designer.cs">
+ <DependentUpon>DefectCodeRenZheng.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\QC\Frm_IQCLookups.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DevFrm\QC\Frm_IQCLookups.Designer.cs">
<DependentUpon>Frm_IQCLookups.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\QC\Frm_MesDefectCode.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\QC\Frm_MesDefectCode.Designer.cs">
- <DependentUpon>Frm_MesDefectCode.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\QC\Frm_MesDefectCodeShow.cs">
<SubType>Form</SubType>
@@ -1333,11 +1345,14 @@
<EmbeddedResource Include="DevFrm\PDA\SelectUser.resx">
<DependentUpon>SelectUser.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\DefectCode.resx">
+ <DependentUpon>DefectCode.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\DefectCodeDic.resx">
+ <DependentUpon>DefectCodeDic.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx">
<DependentUpon>Frm_IQCLookups.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\QC\Frm_MesDefectCode.resx">
- <DependentUpon>Frm_MesDefectCode.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Frm_MesDefectCodeShow.resx">
<DependentUpon>Frm_MesDefectCodeShow.cs</DependentUpon>
--
Gitblit v1.9.3