设备资料添加工序编号和名称

UAS_DeviceMonitor/Main.Designer.cs

@@ -160,6 +160,8 @@ namespace UAS_DeviceMonitor
             this.GridViewWorkCenterStatus = new UAS_DeviceMonitor.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
             this.TimerDeviceStatus = new System.Windows.Forms.Timer(this.components);
             this.CommonTipController = new DevExpress.Utils.ToolTipController(this.components);
+            this.de_stepname = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_stepcode = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.RibbonNav)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
             this.MainTabControl.SuspendLayout();
@@ -480,6 +482,8 @@ namespace UAS_DeviceMonitor
             this.de_code,
             this.de_name,
             this.de_runstatus,
+            this.de_stepcode,
+            this.de_stepname,
             this.de_indate,
             this.de_spec,
             this.de_inman,
@@ -541,7 +545,7 @@ namespace UAS_DeviceMonitor
             this.de_spec.FieldName = "DE_SPEC";
             this.de_spec.Name = "de_spec";
             this.de_spec.Visible = true;
-            this.de_spec.VisibleIndex = 4;
+            this.de_spec.VisibleIndex = 6;
             // 
             // de_inman
             // 
@@ -549,15 +553,13 @@ namespace UAS_DeviceMonitor
             this.de_inman.FieldName = "DE_INMAN";
             this.de_inman.Name = "de_inman";
             this.de_inman.Visible = true;
-            this.de_inman.VisibleIndex = 6;
+            this.de_inman.VisibleIndex = 7;
             // 
             // de_vendcode
             // 
             this.de_vendcode.Caption = "供应商编号";
             this.de_vendcode.FieldName = "DE_VENDCODE";
             this.de_vendcode.Name = "de_vendcode";
-            this.de_vendcode.Visible = true;
-            this.de_vendcode.VisibleIndex = 5;
             // 
             // de_vendname
             // 
@@ -565,7 +567,7 @@ namespace UAS_DeviceMonitor
             this.de_vendname.FieldName = "DE_VENDNAME";
             this.de_vendname.Name = "de_vendname";
             this.de_vendname.Visible = true;
-            this.de_vendname.VisibleIndex = 7;
+            this.de_vendname.VisibleIndex = 8;
             // 
             // de_address
             // 
@@ -573,7 +575,7 @@ namespace UAS_DeviceMonitor
             this.de_address.FieldName = "DE_ADDRESS";
             this.de_address.Name = "de_address";
             this.de_address.Visible = true;
-            this.de_address.VisibleIndex = 8;
+            this.de_address.VisibleIndex = 9;
             // 
             // de_linecode
             // 
@@ -581,7 +583,7 @@ namespace UAS_DeviceMonitor
             this.de_linecode.FieldName = "DE_LINECODE";
             this.de_linecode.Name = "de_linecode";
             this.de_linecode.Visible = true;
-            this.de_linecode.VisibleIndex = 9;
+            this.de_linecode.VisibleIndex = 10;
             // 
             // de_wccode
             // 
@@ -589,7 +591,7 @@ namespace UAS_DeviceMonitor
             this.de_wccode.FieldName = "DE_WCCODE";
             this.de_wccode.Name = "de_wccode";
             this.de_wccode.Visible = true;
-            this.de_wccode.VisibleIndex = 10;
+            this.de_wccode.VisibleIndex = 11;
             // 
             // PageCommandSet
             // 
@@ -1520,6 +1522,22 @@ namespace UAS_DeviceMonitor
             // 
             this.CommonTipController.AutoPopDelay = 10000;
             // 
+            // de_stepname
+            // 
+            this.de_stepname.Caption = "工序名称";
+            this.de_stepname.FieldName = "DE_STEPNAME";
+            this.de_stepname.Name = "de_stepname";
+            this.de_stepname.Visible = true;
+            this.de_stepname.VisibleIndex = 5;
+            // 
+            // de_stepcode
+            // 
+            this.de_stepcode.Caption = "工序编号";
+            this.de_stepcode.FieldName = "DE_STEPCODE";
+            this.de_stepcode.Name = "de_stepcode";
+            this.de_stepcode.Visible = true;
+            this.de_stepcode.VisibleIndex = 4;
+            // 
             // Main
             // 
             this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
@@ -1708,5 +1726,7 @@ namespace UAS_DeviceMonitor
         private DevExpress.XtraGrid.Columns.GridColumn em_name1;
         private DevExpress.XtraGrid.Columns.GridColumn dc_man;
         private DevExpress.XtraGrid.Columns.GridColumn dc_date;
+        private DevExpress.XtraGrid.Columns.GridColumn de_stepcode;
+        private DevExpress.XtraGrid.Columns.GridColumn de_stepname;
     }
 }

UAS_DeviceMonitor/Main.cs

@@ -78,7 +78,7 @@ namespace UAS_DeviceMonitor
         private void Main_Load(object sender, EventArgs e)
         {
             //设备列表
-            GridDeviceList.GetDataSQL = "select de_id,de_code,de_name,de_spec,de_indate,de_runstatus,de_address,de_inman,de_linecode,de_wccode,de_vendcode,de_vendname from device order by de_code".ToUpper();
+            GridDeviceList.GetDataSQL = "select de_id,de_code,de_name,de_spec,de_indate,de_runstatus,de_address,de_inman,de_linecode,de_wccode,de_vendcode,de_vendname,de_stepcode,de_stepname from device order by de_code".ToUpper();
             //ToolPageControlDeviceList.Gridcontrol = GridDeviceList;
             //轮询业务
             //GridPolling.GetDataSQL = "select 0 CHECKEDCOLUMN,pl_id,pl_code,pl_name,pl_type,pl_dccode,pl_remark from polling".ToUpper();
@@ -155,7 +155,7 @@ namespace UAS_DeviceMonitor
             DeviceListQuerySQL.Clear();
             string WC = BaseUtil.GetComboxEditValue(ComboxDeviceListWC);
             DeviceListQuerySQL.Append("select de_id,de_code,de_name,de_spec,de_indate,de_runstatus,de_address,de_wccode,de_inman,de_linecode");
-            DeviceListQuerySQL.Append("de_vendcode,de_vendname from device where de_wccode='" + WC + "' order by de_code");
+            DeviceListQuerySQL.Append("de_vendcode,de_vendname,de_stepcode,de_stepname from device where de_wccode='" + WC + "' order by de_code");
             sql.Clear();
             if (WC == "全部")
                 sql.Append("select li_code,li_name from line");
@@ -172,7 +172,7 @@ namespace UAS_DeviceMonitor
             string WC = BaseUtil.GetComboxEditValue(ComboxDeviceListWC);
             string LC = BaseUtil.GetComboxEditValue(ComboxDeviceListLC);
             DeviceListQuerySQL.Append("select de_id,de_code,de_name,de_spec,de_indate,de_runstatus,de_address,de_wccode, ");
-            DeviceListQuerySQL.Append("de_vendcode,de_vendname,de_inman,de_linecode from device ");
+            DeviceListQuerySQL.Append("de_vendcode,de_vendname,de_inman,de_linecode,de_stepcode,de_stepname from device ");
             if (WC != "全部" && LC != "全部")
                 DeviceListQuerySQL.Append(" where de_wccode='" + WC + "' and de_linecode='" + LC + "' ");
             if (WC == "全部" && LC != "全部")