DevApp/Gs.DevApp/App.config
@@ -35,9 +35,9 @@ </assemblyBinding> </runtime> <appSettings> <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> <add key="WebApiUrl" value="http://localhost:5263/" /> <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />--> <add key="WebApiUrl" value="http://192.168.1.145:81/" /> <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> <add key="LogPath" value="logs" /> <add key="ProductName" value="G-MES V2.0" /> <add key="PageSize" value="50" /> @@ -46,6 +46,7 @@ <add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" /> <add key="ToastSeconds" value="5" /> <add key="AsyncSeconds" value="2" /> <add key="IsWater" value="0" /> </appSettings> <userSettings> <Gs.DevApp.Properties.Settings> DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.Designer.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.Designer.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.Designer.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
@@ -46,6 +46,12 @@ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_UserBind)); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); @@ -54,11 +60,6 @@ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject(); @@ -69,6 +70,11 @@ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject(); this.isLocked = new DevExpress.XtraGrid.Columns.GridColumn(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); @@ -90,6 +96,8 @@ this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -154,6 +162,7 @@ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); this.xtraTabPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit(); @@ -279,7 +288,8 @@ this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit2, this.repositoryItemButtonEdit3, this.repositoryItemButtonEdit4}); this.repositoryItemButtonEdit4, this.repositoryItemButtonEdit1}); this.gcMain1.Size = new System.Drawing.Size(1002, 562); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -303,7 +313,8 @@ this.gridColumn3, this.gridColumn4, this.gridColumn1, this.gridColumn5}); this.gridColumn5, this.gridColumn14}); gridFormatRule1.Column = this.isLocked; gridFormatRule1.Name = "Format0"; formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Red; @@ -483,6 +494,28 @@ this.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4"; this.repositoryItemButtonEdit4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit4.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit4_ButtonClick); // // gridColumn14 // this.gridColumn14.Caption = "è¿ç«ç»å®çº¿ä½"; this.gridColumn14.ColumnEdit = this.repositoryItemButtonEdit1; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 12; this.gridColumn14.Width = 94; // // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image"))); editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "è¿ç«ç»å®çº¿ä½", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // // pageBar1 // @@ -881,10 +914,10 @@ // rptDel1 // this.rptDel1.AutoHeight = false; editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.rptDel1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移åº", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移åº", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.rptDel1.Name = "rptDel1"; this.rptDel1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.rptDel1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDel1_ButtonClick); @@ -955,10 +988,10 @@ // rptDel2 // this.rptDel2.AutoHeight = false; editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.rptDel2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移åº", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移åº", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.rptDel2.Name = "rptDel2"; this.rptDel2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.rptDel2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDel2_ButtonClick); @@ -1047,10 +1080,10 @@ // rptDel3 // this.rptDel3.AutoHeight = false; editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.rptDel3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移åº", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移åº", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.rptDel3.Name = "rptDel3"; this.rptDel3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.rptDel3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDel3_ButtonClick); @@ -1077,6 +1110,7 @@ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); this.xtraTabPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit(); this.splitMx1.Panel1.ResumeLayout(false); @@ -1197,5 +1231,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDel3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; } } DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
@@ -300,7 +300,22 @@ frm.ShowDialog(); } } /// <summary> /// è¿ç«æ¶ç»å®çº¿ä½ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void repositoryItemButtonEdit1_ButtonClick(object sender, ButtonPressedEventArgs e) { if (e.Button.Index == 0) { var rowhandle = gridView1.FocusedRowHandle; var dr = gridView1.GetDataRow(rowhandle); var userGuid = dr["guid"].ToString(); var frm = new SelectLine(userGuid); frm.ShowDialog(); } } /// <summary> /// å é¤pda /// </summary> @@ -364,5 +379,6 @@ } } } } } DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx
@@ -117,6 +117,23 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="editorButtonImageOptions4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABh0RVh0VGl0 bGUAU2VjdGlvbkJyZWFrc0xpc3Q7Geg62AAAAlxJREFUOE+FkutLk3EUxx90blMqL9WLFhFBCBH0IvoP CjRrYUH5wpFtuTIbY2uVZmUQRZSuZEhKhWUQQjeIgqKW05nZRe1C+DKCUteWm2v3Lfh2znPZi8egA1+e C7/v5xx+3yMAyIuq8PzdKXoFEpk/iJO+h+KoPfEE0VRO1Hwyh8B8Co6eN2zQqAGaswNf2J8HsHlHy+MF AFv3azZo1YCiM3c+s180x9I5/CbTtqOPyJgVFUlkMUuAJs8rNujUAO2p2x/Znzd/C8ZQ5XyIr4EYItQ9 TICZSAqNl/1s0KsButa+SfaLZh65yvEAW+z3sdl2D3PxLH6RpglgcQ+xoVhoH9iE/e5Kg6WzkgF61/X3 SNH4wWgaARKPOxtJUldJ06Qfc0k0XPIxoERovbkRVvc6NFxYa6AfWptn5KX96hgOd4/ikGcUB7tGYL3i pybDsHQOYV+HD3svDqL+3NNBOq8TnL0b0POiGrXHVzGxgKcgLSGVySonVchaRlouPxeTNEJz13rsblsN o2slT1Bwun/yOV9k260PaOmbwLEb43BdewdH71vwZBxfM03W2OH10XmdUNe+BjVOg6HGsYK+haKT/VIK /ys5hUXqFLTclStKMXLuU9YD+GQ2Y7zeRClkEIplECSZ6T7ofKkaoDtC43IpSxNOZETj2J46hChCNv+M ZpQUytQAvZ12nEsyZzFhMolm/66dojEgi5Og8+VqQDHHxxWmbkpH3gmv0UgAaTdmImkFUKEG6Jsody4F MEydvcbteFa99V+ABXdQSCohcca8C6Wy1PuwVPonaP4C++yEHJDPge4AAAAASUVORK5CYII= </value> </data> <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.resx
ÎļþÒÑɾ³ý DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.Designer.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,208 @@ namespace Gs.DevApp.DevFrm.PDA { partial class SelectLine { /// <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.panelControl2 = new DevExpress.XtraEditors.PanelControl(); this.gcMain = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_isNg = new DevExpress.XtraGrid.Columns.GridColumn(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit(); this.panelControl2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit(); this.panelControl1.SuspendLayout(); this.SuspendLayout(); // // panelControl2 // this.panelControl2.Controls.Add(this.gcMain); this.panelControl2.Controls.Add(this.panelControl1); this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Name = "panelControl2"; this.panelControl2.Size = new System.Drawing.Size(595, 691); this.panelControl2.TabIndex = 4; // // gcMain // this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; this.gcMain.Location = new System.Drawing.Point(2, 2); this.gcMain.MainView = this.gridView1; this.gcMain.Name = "gcMain"; this.gcMain.Size = new System.Drawing.Size(591, 644); this.gcMain.TabIndex = 6; this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); // // gridView1 // this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.ColumnPanelRowHeight = 60; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.colChkInt, this.gv_depotCode, this.gv_depottype, this.gv_createBy, this.gv_isNg}); this.gridView1.GridControl = this.gcMain; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; this.gridView1.OptionsView.ShowAutoFilterRow = true; this.gridView1.OptionsView.ShowGroupPanel = false; // // colChkInt // this.colChkInt.Caption = "."; this.colChkInt.FieldName = "chkInt"; this.colChkInt.MinWidth = 25; this.colChkInt.Name = "colChkInt"; this.colChkInt.Visible = true; this.colChkInt.VisibleIndex = 0; this.colChkInt.Width = 94; // // gv_depotCode // this.gv_depotCode.AppearanceCell.Options.UseFont = true; this.gv_depotCode.Caption = "线ä½ç¼å·"; this.gv_depotCode.FieldName = "lineNo"; this.gv_depotCode.MinWidth = 50; this.gv_depotCode.Name = "gv_depotCode"; this.gv_depotCode.OptionsColumn.AllowEdit = false; this.gv_depotCode.Tag = "query_a.depot_code"; this.gv_depotCode.Visible = true; this.gv_depotCode.VisibleIndex = 1; this.gv_depotCode.Width = 50; // // gv_depottype // this.gv_depottype.AppearanceCell.Options.UseFont = true; this.gv_depottype.Caption = "线ä½å称"; this.gv_depottype.FieldName = "name"; this.gv_depottype.MinWidth = 50; this.gv_depottype.Name = "gv_depottype"; this.gv_depottype.OptionsColumn.AllowEdit = false; this.gv_depottype.Tag = "query_a.depottype"; this.gv_depottype.Visible = true; this.gv_depottype.VisibleIndex = 2; this.gv_depottype.Width = 80; // // gv_createBy // this.gv_createBy.AppearanceCell.Options.UseFont = true; this.gv_createBy.Caption = "线ä½å¤æ³¨"; this.gv_createBy.FieldName = "remark"; this.gv_createBy.MinWidth = 50; this.gv_createBy.Name = "gv_createBy"; this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.create_by"; this.gv_createBy.Visible = true; this.gv_createBy.VisibleIndex = 3; this.gv_createBy.Width = 71; // // gv_isNg // this.gv_isNg.AppearanceCell.Options.UseFont = true; this.gv_isNg.Caption = "æå°æºå¤æ³¨"; this.gv_isNg.FieldName = "remark"; this.gv_isNg.MinWidth = 50; this.gv_isNg.Name = "gv_isNg"; this.gv_isNg.OptionsColumn.AllowEdit = false; this.gv_isNg.Tag = "query_a.is_ng"; this.gv_isNg.Visible = true; this.gv_isNg.VisibleIndex = 4; this.gv_isNg.Width = 100; // // panelControl1 // this.panelControl1.Controls.Add(this.btnIn); this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom; this.panelControl1.Location = new System.Drawing.Point(2, 646); this.panelControl1.Name = "panelControl1"; this.panelControl1.Size = new System.Drawing.Size(591, 43); this.panelControl1.TabIndex = 5; // // btnIn // this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question; this.btnIn.Appearance.Options.UseBackColor = true; this.btnIn.AppearancePressed.BackColor = System.Drawing.Color.White; this.btnIn.AppearancePressed.Options.UseBackColor = true; this.btnIn.Dock = System.Windows.Forms.DockStyle.Right; this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.selectvaluespivottable_16x16; this.btnIn.Location = new System.Drawing.Point(495, 2); this.btnIn.Name = "btnIn"; this.btnIn.Size = new System.Drawing.Size(94, 39); this.btnIn.TabIndex = 4; this.btnIn.Text = "ç¡®å®ä¿å"; // // SelectLine // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(595, 691); this.Controls.Add(this.panelControl2); this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "SelectLine"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "éæ©çº¿ä½"; this.TopMost = true; ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit(); this.panelControl2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit(); this.panelControl1.ResumeLayout(false); this.ResumeLayout(false); } #endregion private DevExpress.XtraEditors.PanelControl panelControl2; private DevExpress.XtraEditors.PanelControl panelControl1; private DevExpress.XtraEditors.SimpleButton btnIn; private DevExpress.XtraGrid.GridControl gcMain; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode; private DevExpress.XtraGrid.Columns.GridColumn gv_depottype; private DevExpress.XtraGrid.Columns.GridColumn gv_createBy; private DevExpress.XtraGrid.Columns.GridColumn gv_isNg; private DevExpress.XtraGrid.Columns.GridColumn colChkInt; } } DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,124 @@ using DevExpress.XtraEditors; 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.PDA { public partial class SelectLine : DevExpress.XtraEditors.XtraForm { private readonly string _webServiceName = "MesWorkshopLineManager/"; private string userGuid = ""; /// <summary> /// /// </summary> /// <param name="_suppId">ä¾åºå</param> /// <param name="_receiveOrgId">æ¶æç»ç»</param> /// <param name="_isWw">æ¯å¦å§å¤</param> public SelectLine(string _userGuid) { InitializeComponent(); this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); }; this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); }; this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.colChkInt.OptionsFilter.AllowAutoFilter = false; this.colChkInt.OptionsFilter.AllowFilter = false; this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False; this.userGuid = _userGuid; Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false); getPageList(1); btnIn.Click += (s, e) => { gridView1.PostEditor(); gridView1.UpdateCurrentRow(); System.Text.StringBuilder sbList = new System.Text.StringBuilder(); DataTable dt = this.gcMain.DataSource as DataTable; { foreach (DataRow dr in dt.Rows) { string checkBox = dr["chkInt"].ToString(); string _guid = dr["guid"].ToString(); if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox)) { if (sbList.Length > 0) sbList.Append(","); sbList.Append(_guid); } } } var _obj = new { userGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(userGuid), bindGuidslist = sbList.ToString(), fType = "è¿ç«æ¶ç»å®çº¿ä½", }; try { var strJson = UtilityHelper.HttpPost("", "MesSysPageviewManager/SetUserBind", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { MsgHelper.ShowInformation("æ示ï¼" + _rtn.rtnData.outMsg); this.Close(); } else MsgHelper.ShowError("æ示ï¼" + _rtn.rtnData.outMsg); } catch (Exception ex) { MsgHelper.ShowError("æ示ï¼" + ex.Message); } }; } /// <summary> /// </summary> /// <param name="curPage">第å 页</param> /// <param name="pageSize">æ¯é¡µå æ¡</param> private void getPageList(int curPage) { var _sbSqlWhere = ""; var pgq = new PageQueryModel(curPage, 999999, "a.line_no", "asc", "", _sbSqlWhere.ToString(), userGuid); var json = JsonConvert.SerializeObject(pgq); try { var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage2", json); var dd = UtilityHelper.ReturnToTablePage(strReturn); if (dd.rtnCode > 0) { DataTable dt = dd.rtnData.list; gcMain.BindingContext = new BindingContext(); if (dt.Rows.Count > 0) { gcMain.DataSource = dt; gcMain.ForceInitialize(); gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); } else { ToolBox.MsgHelper.ShowError("æ示ï¼" + dd.rtnMsg); } } catch (Exception ex) { MsgHelper.ShowError("æ示ï¼" + ex.Message); } } } } DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.resx
ÎļþÃû´Ó DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.resx ÐÞ¸Ä @@ -117,7 +117,4 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> </root> DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -42,6 +42,7 @@ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.lbCollectGuid = new DevExpress.XtraEditors.LabelControl(); this.txt_gdbh = new DevExpress.XtraEditors.TextEdit(); this.txt_gx = new DevExpress.XtraEditors.TextEdit(); this.txt_collectBy = new DevExpress.XtraEditors.TextEdit(); @@ -70,7 +71,13 @@ this.layShuiJian = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton(); this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton(); this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton(); @@ -126,12 +133,7 @@ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit(); this.splitMx1.Panel1.SuspendLayout(); @@ -172,7 +174,13 @@ ((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit(); this.panel3.SuspendLayout(); this.panel2.SuspendLayout(); @@ -186,12 +194,7 @@ this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit(); this.SuspendLayout(); // // splitMx1 @@ -212,7 +215,7 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1367, 619); this.splitMx1.SplitterPosition = 191; this.splitMx1.SplitterPosition = 221; this.splitMx1.TabIndex = 0; // // splitTop1 @@ -241,12 +244,13 @@ this.splitTop1.Panel2.Controls.Add(this.panel1); this.splitTop1.Panel2.Text = "Panel2"; this.splitTop1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitTop1.Size = new System.Drawing.Size(1367, 191); this.splitTop1.Size = new System.Drawing.Size(1367, 221); this.splitTop1.SplitterPosition = 527; this.splitTop1.TabIndex = 0; // // layoutMx1 // this.layoutMx1.Controls.Add(this.lbCollectGuid); this.layoutMx1.Controls.Add(this.txt_gdbh); this.layoutMx1.Controls.Add(this.txt_gx); this.layoutMx1.Controls.Add(this.txt_collectBy); @@ -265,13 +269,24 @@ this.layoutMx1.Controls.Add(this.btnBad); this.layoutMx1.Controls.Add(this.txt_dianJianPath); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem6}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500); this.layoutMx1.Root = this.Root; this.layoutMx1.Size = new System.Drawing.Size(828, 191); this.layoutMx1.Size = new System.Drawing.Size(828, 221); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // lbCollectGuid // this.lbCollectGuid.Location = new System.Drawing.Point(214, 177); this.lbCollectGuid.Name = "lbCollectGuid"; this.lbCollectGuid.Size = new System.Drawing.Size(79, 18); this.lbCollectGuid.StyleController = this.layoutMx1; this.lbCollectGuid.TabIndex = 22; this.lbCollectGuid.Text = "lbCollectGuid"; // // txt_gdbh // @@ -284,7 +299,7 @@ // // txt_gx // this.txt_gx.Location = new System.Drawing.Point(111, 40); this.txt_gx.Location = new System.Drawing.Point(111, 45); this.txt_gx.Name = "txt_gx"; this.txt_gx.Properties.ReadOnly = true; this.txt_gx.Size = new System.Drawing.Size(99, 24); @@ -293,7 +308,7 @@ // // txt_collectBy // this.txt_collectBy.Location = new System.Drawing.Point(111, 68); this.txt_collectBy.Location = new System.Drawing.Point(111, 78); this.txt_collectBy.Name = "txt_collectBy"; this.txt_collectBy.Properties.ReadOnly = true; this.txt_collectBy.Size = new System.Drawing.Size(99, 24); @@ -302,7 +317,7 @@ // // txt_barCode // this.txt_barCode.Location = new System.Drawing.Point(111, 96); this.txt_barCode.Location = new System.Drawing.Point(111, 111); this.txt_barCode.Name = "txt_barCode"; this.txt_barCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold); this.txt_barCode.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200))))); @@ -314,7 +329,7 @@ // // txt_currentBarCode // this.txt_currentBarCode.Location = new System.Drawing.Point(111, 124); this.txt_currentBarCode.Location = new System.Drawing.Point(111, 144); this.txt_currentBarCode.Name = "txt_currentBarCode"; this.txt_currentBarCode.Properties.ReadOnly = true; this.txt_currentBarCode.Size = new System.Drawing.Size(301, 24); @@ -323,7 +338,7 @@ // // txt_gongWei // this.txt_gongWei.Location = new System.Drawing.Point(111, 152); this.txt_gongWei.Location = new System.Drawing.Point(111, 177); this.txt_gongWei.Name = "txt_gongWei"; this.txt_gongWei.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold); this.txt_gongWei.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200))))); @@ -344,7 +359,7 @@ // // txt_bc // this.txt_bc.Location = new System.Drawing.Point(313, 40); this.txt_bc.Location = new System.Drawing.Point(313, 45); this.txt_bc.Name = "txt_bc"; this.txt_bc.Properties.ReadOnly = true; this.txt_bc.Size = new System.Drawing.Size(99, 24); @@ -353,7 +368,7 @@ // // txt_itemName // this.txt_itemName.Location = new System.Drawing.Point(515, 40); this.txt_itemName.Location = new System.Drawing.Point(515, 45); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Properties.ReadOnly = true; this.txt_itemName.Size = new System.Drawing.Size(99, 24); @@ -371,7 +386,7 @@ // // txt_sbNo // this.txt_sbNo.Location = new System.Drawing.Point(313, 68); this.txt_sbNo.Location = new System.Drawing.Point(313, 78); this.txt_sbNo.Name = "txt_sbNo"; this.txt_sbNo.Properties.ReadOnly = true; this.txt_sbNo.Size = new System.Drawing.Size(99, 24); @@ -380,7 +395,7 @@ // // txt_sjXt // this.txt_sjXt.Location = new System.Drawing.Point(515, 68); this.txt_sjXt.Location = new System.Drawing.Point(515, 78); this.txt_sjXt.Name = "txt_sjXt"; this.txt_sjXt.Properties.ReadOnly = true; this.txt_sjXt.Size = new System.Drawing.Size(99, 24); @@ -389,7 +404,7 @@ // // txt_yjDate // this.txt_yjDate.Location = new System.Drawing.Point(717, 40); this.txt_yjDate.Location = new System.Drawing.Point(717, 45); this.txt_yjDate.Name = "txt_yjDate"; this.txt_yjDate.Properties.ReadOnly = true; this.txt_yjDate.Size = new System.Drawing.Size(99, 24); @@ -398,7 +413,7 @@ // // txt_sjDate // this.txt_sjDate.Location = new System.Drawing.Point(717, 68); this.txt_sjDate.Location = new System.Drawing.Point(717, 78); this.txt_sjDate.Name = "txt_sjDate"; this.txt_sjDate.Properties.ReadOnly = true; this.txt_sjDate.Size = new System.Drawing.Size(99, 24); @@ -409,9 +424,9 @@ // this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success; this.btnGood.Appearance.Options.UseBackColor = true; this.btnGood.Location = new System.Drawing.Point(416, 96); this.btnGood.Location = new System.Drawing.Point(416, 111); this.btnGood.Name = "btnGood"; this.btnGood.Size = new System.Drawing.Size(198, 83); this.btnGood.Size = new System.Drawing.Size(198, 96); this.btnGood.StyleController = this.layoutMx1; this.btnGood.TabIndex = 19; this.btnGood.Text = "è¯å"; @@ -420,16 +435,16 @@ // this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger; this.btnBad.Appearance.Options.UseBackColor = true; this.btnBad.Location = new System.Drawing.Point(618, 96); this.btnBad.Location = new System.Drawing.Point(618, 111); this.btnBad.Name = "btnBad"; this.btnBad.Size = new System.Drawing.Size(198, 83); this.btnBad.Size = new System.Drawing.Size(198, 96); this.btnBad.StyleController = this.layoutMx1; this.btnBad.TabIndex = 20; this.btnBad.Text = "ä¸è¯å"; // // txt_dianJianPath // this.txt_dianJianPath.Location = new System.Drawing.Point(313, 152); this.txt_dianJianPath.Location = new System.Drawing.Point(313, 177); this.txt_dianJianPath.Name = "txt_dianJianPath"; this.txt_dianJianPath.Properties.ReadOnly = true; this.txt_dianJianPath.Size = new System.Drawing.Size(99, 24); @@ -451,13 +466,13 @@ this.layShuiJian, this.layoutControlItem16, this.layoutControlItem17, this.layDianJian, this.layoutControlItem12, this.layoutControlItem15, this.layoutControlItem14, this.layoutControlItem13, this.layoutControlItem10, this.layoutControlItem11}); this.layoutControlItem11, this.layDianJian}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -492,7 +507,7 @@ rowDefinition4, rowDefinition5, rowDefinition6}); this.Root.Size = new System.Drawing.Size(828, 191); this.Root.Size = new System.Drawing.Size(828, 221); this.Root.TextVisible = false; // // layoutControlItem1 @@ -500,17 +515,17 @@ this.layoutControlItem1.Control = this.txt_gdbh; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(202, 28); this.layoutControlItem1.Size = new System.Drawing.Size(202, 33); this.layoutControlItem1.Text = "å·¥åç¼å·"; this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_gx; this.layoutControlItem2.Location = new System.Drawing.Point(0, 28); this.layoutControlItem2.Location = new System.Drawing.Point(0, 33); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(202, 28); this.layoutControlItem2.Size = new System.Drawing.Size(202, 33); this.layoutControlItem2.Text = "å½åå·¥åº"; this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18); // @@ -518,21 +533,21 @@ // this.layoutControlItem3.Control = this.txt_collectBy; this.layoutControlItem3.CustomizationFormText = "æä½åå·¥"; this.layoutControlItem3.Location = new System.Drawing.Point(0, 56); this.layoutControlItem3.Location = new System.Drawing.Point(0, 66); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(202, 28); this.layoutControlItem3.Size = new System.Drawing.Size(202, 33); this.layoutControlItem3.Text = "æä½åå·¥"; this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_barCode; this.layoutControlItem4.Location = new System.Drawing.Point(0, 84); this.layoutControlItem4.Location = new System.Drawing.Point(0, 99); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem4.Size = new System.Drawing.Size(404, 28); this.layoutControlItem4.Size = new System.Drawing.Size(404, 33); this.layoutControlItem4.Text = "æ«è¿½æº¯ç "; this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18); // @@ -542,53 +557,53 @@ this.layoutControlItem7.Location = new System.Drawing.Point(202, 0); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem7.Size = new System.Drawing.Size(202, 28); this.layoutControlItem7.Size = new System.Drawing.Size(202, 33); this.layoutControlItem7.Text = "产åç¼ç "; this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_bc; this.layoutControlItem8.Location = new System.Drawing.Point(202, 28); this.layoutControlItem8.Location = new System.Drawing.Point(202, 33); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(202, 28); this.layoutControlItem8.Size = new System.Drawing.Size(202, 33); this.layoutControlItem8.Text = "ç次"; this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_currentBarCode; this.layoutControlItem5.Location = new System.Drawing.Point(0, 112); this.layoutControlItem5.Location = new System.Drawing.Point(0, 132); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem5.Size = new System.Drawing.Size(404, 28); this.layoutControlItem5.Size = new System.Drawing.Size(404, 33); this.layoutControlItem5.Text = "å½åæ¡ç "; this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18); // // layShuiJian // this.layShuiJian.Control = this.txt_gongWei; this.layShuiJian.Location = new System.Drawing.Point(0, 140); this.layShuiJian.Location = new System.Drawing.Point(0, 165); this.layShuiJian.Name = "layShuiJian"; this.layShuiJian.OptionsTableLayoutItem.RowIndex = 5; this.layShuiJian.Size = new System.Drawing.Size(202, 31); this.layShuiJian.Size = new System.Drawing.Size(202, 36); this.layShuiJian.Text = "æ«å·¥ä½ç "; this.layShuiJian.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.btnGood; this.layoutControlItem16.Location = new System.Drawing.Point(404, 84); this.layoutControlItem16.Location = new System.Drawing.Point(404, 99); this.layoutControlItem16.MaxSize = new System.Drawing.Size(0, 100); this.layoutControlItem16.MinSize = new System.Drawing.Size(41, 100); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 3; this.layoutControlItem16.Size = new System.Drawing.Size(202, 87); this.layoutControlItem16.Size = new System.Drawing.Size(202, 102); this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem16.Text = "è¯åæé®"; this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0); @@ -597,29 +612,97 @@ // layoutControlItem17 // this.layoutControlItem17.Control = this.btnBad; this.layoutControlItem17.Location = new System.Drawing.Point(606, 84); this.layoutControlItem17.Location = new System.Drawing.Point(606, 99); this.layoutControlItem17.MaxSize = new System.Drawing.Size(0, 100); this.layoutControlItem17.MinSize = new System.Drawing.Size(56, 100); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem17.OptionsTableLayoutItem.RowSpan = 3; this.layoutControlItem17.Size = new System.Drawing.Size(202, 87); this.layoutControlItem17.Size = new System.Drawing.Size(202, 102); this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem17.Text = "ä¸è¯åæé®"; this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem17.TextVisible = false; // // layDianJian // layoutControlItem12 // this.layDianJian.Control = this.txt_dianJianPath; this.layDianJian.Location = new System.Drawing.Point(202, 140); this.layDianJian.Name = "layDianJian"; this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1; this.layDianJian.OptionsTableLayoutItem.RowIndex = 5; this.layDianJian.Size = new System.Drawing.Size(202, 31); this.layDianJian.Text = "çµæ£è·¯å¾"; this.layDianJian.TextSize = new System.Drawing.Size(87, 18); this.layoutControlItem12.Control = this.txt_sbNo; this.layoutControlItem12.Location = new System.Drawing.Point(202, 66); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem12.Size = new System.Drawing.Size(202, 33); this.layoutControlItem12.Text = "设å¤ç¼ç "; this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_sjDate; this.layoutControlItem15.Location = new System.Drawing.Point(606, 66); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem15.Size = new System.Drawing.Size(202, 33); this.layoutControlItem15.Text = "Meså®é å¼å·¥"; this.layoutControlItem15.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_yjDate; this.layoutControlItem14.Location = new System.Drawing.Point(606, 33); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem14.Size = new System.Drawing.Size(202, 33); this.layoutControlItem14.Text = "Mes计åå¼å·¥"; this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_sjXt; this.layoutControlItem13.CustomizationFormText = "ç产线å«"; this.layoutControlItem13.Location = new System.Drawing.Point(404, 66); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem13.Size = new System.Drawing.Size(202, 33); this.layoutControlItem13.Text = "ç产线å«"; this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_itemName; this.layoutControlItem10.Location = new System.Drawing.Point(404, 33); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem10.Size = new System.Drawing.Size(202, 33); this.layoutControlItem10.Text = "产åå称"; this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_itemModel; this.layoutControlItem11.Location = new System.Drawing.Point(404, 0); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem11.Size = new System.Drawing.Size(404, 33); this.layoutControlItem11.Text = "产åè§æ ¼"; this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.lbCollectGuid; this.layoutControlItem6.Location = new System.Drawing.Point(202, 165); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem6.Size = new System.Drawing.Size(202, 36); this.layoutControlItem6.Text = "ééè¡guid"; this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem6.TextVisible = false; // // simpleButton7 // @@ -797,7 +880,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; this.tabMx.Size = new System.Drawing.Size(1367, 416); this.tabMx.Size = new System.Drawing.Size(1367, 386); this.tabMx.TabIndex = 4; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -807,7 +890,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1365, 384); this.tabMxPage1.Size = new System.Drawing.Size(1365, 354); this.tabMxPage1.Text = "è¯åå称"; // // gcMx1 @@ -816,7 +899,7 @@ this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; this.gcMx1.Size = new System.Drawing.Size(1365, 384); this.gcMx1.Size = new System.Drawing.Size(1365, 354); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1002,7 +1085,7 @@ // this.tabMxPage2.Controls.Add(this.gcMx2); this.tabMxPage2.Name = "tabMxPage2"; this.tabMxPage2.Size = new System.Drawing.Size(1365, 384); this.tabMxPage2.Size = new System.Drawing.Size(1365, 354); this.tabMxPage2.Text = "ä¸è¯åæç»"; // // gcMx2 @@ -1011,7 +1094,7 @@ this.gcMx2.Location = new System.Drawing.Point(0, 0); this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; this.gcMx2.Size = new System.Drawing.Size(1365, 384); this.gcMx2.Size = new System.Drawing.Size(1365, 354); this.gcMx2.TabIndex = 1; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1205,72 +1288,16 @@ this.gridColumn25.VisibleIndex = 12; this.gridColumn25.Width = 94; // // layoutControlItem12 // layDianJian // this.layoutControlItem12.Control = this.txt_sbNo; this.layoutControlItem12.Location = new System.Drawing.Point(202, 56); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem12.Size = new System.Drawing.Size(202, 28); this.layoutControlItem12.Text = "设å¤ç¼ç "; this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_sjDate; this.layoutControlItem15.Location = new System.Drawing.Point(606, 56); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem15.Size = new System.Drawing.Size(202, 28); this.layoutControlItem15.Text = "Meså®é å¼å·¥"; this.layoutControlItem15.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_yjDate; this.layoutControlItem14.Location = new System.Drawing.Point(606, 28); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem14.Size = new System.Drawing.Size(202, 28); this.layoutControlItem14.Text = "Mes计åå¼å·¥"; this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_sjXt; this.layoutControlItem13.CustomizationFormText = "ç产线å«"; this.layoutControlItem13.Location = new System.Drawing.Point(404, 56); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem13.Size = new System.Drawing.Size(202, 28); this.layoutControlItem13.Text = "ç产线å«"; this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_itemName; this.layoutControlItem10.Location = new System.Drawing.Point(404, 28); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem10.Size = new System.Drawing.Size(202, 28); this.layoutControlItem10.Text = "产åå称"; this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_itemModel; this.layoutControlItem11.Location = new System.Drawing.Point(404, 0); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem11.Size = new System.Drawing.Size(404, 28); this.layoutControlItem11.Text = "产åè§æ ¼"; this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18); this.layDianJian.Control = this.txt_dianJianPath; this.layDianJian.Location = new System.Drawing.Point(202, 165); this.layDianJian.Name = "layDianJian"; this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1; this.layDianJian.OptionsTableLayoutItem.RowIndex = 5; this.layDianJian.Size = new System.Drawing.Size(202, 36); this.layDianJian.Text = "çµæ£è·¯å¾"; this.layDianJian.TextSize = new System.Drawing.Size(87, 18); // // Frm_Work01 // @@ -1324,7 +1351,13 @@ ((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit(); this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); @@ -1342,12 +1375,7 @@ this.tabMxPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit(); this.ResumeLayout(false); } @@ -1438,7 +1466,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; private DevExpress.XtraEditors.TextEdit txt_dianJianPath; private DevExpress.XtraLayout.LayoutControlItem layDianJian; private DevExpress.XtraGrid.Columns.GridColumn gridColumn24; private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; @@ -1447,5 +1474,8 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraEditors.LabelControl lbCollectGuid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layDianJian; } } DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -4,6 +4,7 @@ using DevExpress.XtraLayout.Utils; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NModbus; @@ -22,6 +23,7 @@ { public partial class Frm_Work01 : DevExpress.XtraEditors.XtraForm { string isWater = "0"; string hostName = "192.168.60.51"; int hostNamePoint = 502; string strConn = "Data Source=192.168.1.146;Initial Catalog=GS_MES;User ID=mesUser;Password =qixi1qaz@WSXmes"; @@ -44,6 +46,16 @@ public Frm_Work01(string _fGx, string _fBc, string _strinOther) { InitializeComponent(); try { string _vanishingSeconds = ConfigurationManager.AppSettings["IsWater"]; if (!string.IsNullOrEmpty(_vanishingSeconds)) isWater = _vanishingSeconds; } catch (Exception) { } gvMx1.IndicatorWidth = 60; gvMx1.CustomDrawRowIndicator += (s, e) => { @@ -62,7 +74,7 @@ if (e.KeyCode == Keys.Enter) { //å¦ææ¯æ°´æ£ï¼è¿è¦æ«å·¥ä½ if (txt_gx.Text.Trim() == fGxShouJian) if (txt_gx.Text.Trim() == fGxShouJian && isWater == "1") { txt_gongWei.Focus(); } @@ -95,14 +107,15 @@ }; btnBad.Click += (s, e) => { string _barCode = txt_barCode.Text.Trim(); if (string.IsNullOrEmpty(_barCode)) string _collectGuid = lbCollectGuid.Text.Trim(); if (_collectGuid.Length < 30) { Toast vm = new Toast(-1, "~请å æ«è¿½æº¯ç ~"); Toast vm = new Toast(-1, "~请å éæ©è¿½æº¯ç ~"); vm.Show(); return; } UcDictionarySelect frm = new UcDictionarySelect("å·¥åºä¸è¯æè¿°", " a.s_type='å·¥åºä¸è¯æè¿°' and pid<>'00000000-0000-0000-0000-000000000000'"); string _msg = "ä½ åå¤å°ã" + txt_gdbh.Text + "ãã" + txt_currentBarCode.Text.Trim() + "ãåæ´ä¸ºä¸è¯"; UcDictionarySelect frm = new UcDictionarySelect("å·¥åºä¸è¯æè¿°", " a.s_type='å·¥åºä¸è¯æè¿°' and pid<>'00000000-0000-0000-0000-000000000000'", _msg); frm.UpdateParent += (ss, ee) => { System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder(); @@ -110,7 +123,7 @@ foreach (dynamic dym in lst) { if (stringBuilder.Length > 0) stringBuilder.Append("|"); stringBuilder.Append("&"); stringBuilder.Append(dym.dicTxt); } string _txt = stringBuilder.ToString(); @@ -120,12 +133,22 @@ vm.Show(); } else addModel(badTag, _txt); addModel(badTag, _txt, lbCollectGuid.Text.Trim()); }; frm.ShowDialog(); }; this.ActiveControl = this.txt_barCode; txt_barCode.Focus(); gvMx1.FocusedRowChanged += (s, e) => { if (e.FocusedRowHandle >= 0) { DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle); txt_gdbh.Text = row["gdbh"].ToString(); txt_currentBarCode.Text = row["barCode"].ToString(); lbCollectGuid.Text = row["guid"].ToString(); } }; } /// <summary> @@ -135,7 +158,7 @@ /// <param name="_checkResult">ç»æ</param> /// <param name="_badDescription">ä¸è¯æè¿°</param> /// <returns></returns> private dynamic getObj(string _barCode, string _checkResult, string _badDescription = "") private dynamic getObj(string _barCode, string _checkResult, string _badDescription = "", string _collectGuid = "") { dynamic _obj = new ExpandoObject(); _obj.barCode = _barCode; @@ -144,6 +167,11 @@ _obj.banCi = txt_bc.Text.Trim();//ç次 _obj.gongWei = txt_gongWei.Text.Trim();//å·¥ä½ _obj.badDescription = _badDescription.Trim();//ä¸è¯æè¿° _obj.collectGuid = _collectGuid; if (!string.IsNullOrEmpty(_collectGuid)) { return _obj; } if (txt_gx.Text.Trim() == fGxTouRu) { return _obj; @@ -200,6 +228,10 @@ //æ°´æ£ if (txt_gx.Text.Trim() == fGxShouJian) { if (isWater == "0") { return _obj; } string strCsl1 = "";//模å¼1åºæ°´é string strSw1 = "";//模å¼1水温 string strCsl2 = ""; @@ -241,18 +273,21 @@ /// </summary> /// <param name="_checkResult">ç»æï¼â</param> /// <param name="_badDescription">ä¸è¯æè¿°</param> private void addModel(string _checkResult, string _badDescription = "") private void addModel(string _checkResult, string _badDescription = "", string _collectGuid = "") { string _barCode = txt_barCode.Text.Trim(); if (string.IsNullOrEmpty(_barCode)) if (string.IsNullOrEmpty(_collectGuid)) { Toast vm = new Toast(-1, "~请å æ«è¿½æº¯ç ~"); vm.Show(); this.ActiveControl = this.txt_barCode; txt_barCode.Focus(); return; if (string.IsNullOrEmpty(_barCode)) { Toast vm = new Toast(-1, "~请å æ«è¿½æº¯ç ~"); vm.Show(); this.ActiveControl = this.txt_barCode; txt_barCode.Focus(); return; } } dynamic _obj = getObj(_barCode, _checkResult, _badDescription); dynamic _obj = getObj(_barCode, _checkResult, _badDescription, _collectGuid); try { string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); @@ -344,7 +379,7 @@ else layDianJian.Visibility = LayoutVisibility.Never; //åªææ°´æ£ææ¾ç¤º if (txt_gx.Text.Trim() == fGxShouJian) if (txt_gx.Text.Trim() == fGxShouJian && isWater == "1") layShuiJian.Visibility = LayoutVisibility.Always; else layShuiJian.Visibility = LayoutVisibility.Never; DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -500,6 +500,12 @@ <Compile Include="DevFrm\PDA\SelectItem.Designer.cs"> <DependentUpon>SelectItem.cs</DependentUpon> </Compile> <Compile Include="DevFrm\PDA\SelectLine.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\PDA\SelectLine.Designer.cs"> <DependentUpon>SelectLine.cs</DependentUpon> </Compile> <Compile Include="DevFrm\PDA\SelectPage.cs"> <SubType>Form</SubType> </Compile> @@ -1684,6 +1690,9 @@ <EmbeddedResource Include="DevFrm\PDA\SelectItem.resx"> <DependentUpon>SelectItem.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\PDA\SelectLine.resx"> <DependentUpon>SelectLine.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\PDA\SelectPage.resx"> <DependentUpon>SelectPage.cs</DependentUpon> </EmbeddedResource> DevApp/Gs.DevApp/Program.cs
@@ -52,8 +52,8 @@ fmLogin.ShowDialog(); if (fmLogin.DialogResult == DialogResult.OK) { //Application.Run(new DevFrm.User.SysMenu()); //return; Application.Run(new DevFrm.User.SysMenu()); return; bool IsWeight = false; try { DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
@@ -33,6 +33,7 @@ this.tlcActions = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.panel1 = new System.Windows.Forms.Panel(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); this.lbMsg = new DevExpress.XtraEditors.LabelControl(); ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit(); this.panel1.SuspendLayout(); this.SuspendLayout(); @@ -79,6 +80,7 @@ // // panel1 // this.panel1.Controls.Add(this.lbMsg); this.panel1.Controls.Add(this.btnIn); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel1.Location = new System.Drawing.Point(0, 475); @@ -98,6 +100,15 @@ this.btnIn.TabIndex = 5; this.btnIn.Text = "ç¡®å®éæ©"; // // lbMsg // this.lbMsg.Dock = System.Windows.Forms.DockStyle.Fill; this.lbMsg.Location = new System.Drawing.Point(0, 0); this.lbMsg.Name = "lbMsg"; this.lbMsg.Size = new System.Drawing.Size(81, 18); this.lbMsg.TabIndex = 6; this.lbMsg.Text = "labelControl1"; // // UcDictionarySelect // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -113,6 +124,7 @@ this.Text = "请éæ©"; ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.ResumeLayout(false); } @@ -124,5 +136,6 @@ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcActions; private System.Windows.Forms.Panel panel1; private DevExpress.XtraEditors.SimpleButton btnIn; private DevExpress.XtraEditors.LabelControl lbMsg; } } DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
@@ -16,9 +16,10 @@ private List<dynamic> lstCheckedKeyID = new List<dynamic>();//éæ©éå string strTitle = ""; string strWhere = ""; public UcDictionarySelect(string _strTitle, string _strWhere) public UcDictionarySelect(string _strTitle, string _strWhere,string _strMsg="") { InitializeComponent(); lbMsg.Text = _strMsg; this.strTitle = _strTitle; this.strWhere = _strWhere; this.Text = _strTitle;
