From d7f658e6494827016e3a599364970cc374e8987e Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 02 十二月 2024 16:11:17 +0800
Subject: [PATCH] 入库申请
---
DevApp/Gs.DevApp/Gs.DevApp.csproj.user | 2
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs | 154 +++++++++++++++++++++++--
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs | 160 +++++++++++++++-----------
4 files changed, 235 insertions(+), 85 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 3ac99d8..77ee15e 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <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" />
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs
index 6bd8aee..e4bf3fa 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs
@@ -29,6 +29,11 @@
/// </summary>
private void InitializeComponent()
{
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1qd011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd009 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -45,6 +50,8 @@
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemGridLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit();
this.repositoryItemGridLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -94,8 +101,6 @@
this.lb_qtck = new DevExpress.XtraEditors.LabelControl();
this.txt_qtck = new DevExpress.XtraEditors.TextEdit();
this.gv_qtck = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -113,9 +118,11 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.lb_qt011 = new DevExpress.XtraEditors.LabelControl();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemGridLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemGridLookUpEdit1View)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt021.Properties)).BeginInit();
@@ -138,6 +145,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt020.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// gvMx1qd011
@@ -150,20 +158,24 @@
this.gvMx1qd011.Name = "gvMx1qd011";
this.gvMx1qd011.Tag = "query_a.qd011";
this.gvMx1qd011.Visible = true;
- this.gvMx1qd011.VisibleIndex = 13;
+ this.gvMx1qd011.VisibleIndex = 14;
this.gvMx1qd011.Width = 94;
//
// gvMx1qd010
//
this.gvMx1qd010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1qd010.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gvMx1qd010.AppearanceCell.Options.UseFont = true;
+ this.gvMx1qd010.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1qd010.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1qd010.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1qd010.Caption = "澶囨敞 ";
this.gvMx1qd010.FieldName = "qd010";
this.gvMx1qd010.MinWidth = 50;
this.gvMx1qd010.Name = "gvMx1qd010";
this.gvMx1qd010.Tag = "query_a.qd010";
this.gvMx1qd010.Visible = true;
- this.gvMx1qd010.VisibleIndex = 12;
+ this.gvMx1qd010.VisibleIndex = 13;
this.gvMx1qd010.Width = 94;
//
// gvMx1qd009
@@ -176,7 +188,7 @@
this.gvMx1qd009.Name = "gvMx1qd009";
this.gvMx1qd009.Tag = "query_a.qd009";
this.gvMx1qd009.Visible = true;
- this.gvMx1qd009.VisibleIndex = 11;
+ this.gvMx1qd009.VisibleIndex = 12;
this.gvMx1qd009.Width = 94;
//
// gvMx1qd008
@@ -189,7 +201,7 @@
this.gvMx1qd008.Name = "gvMx1qd008";
this.gvMx1qd008.Tag = "query_a.qd008";
this.gvMx1qd008.Visible = true;
- this.gvMx1qd008.VisibleIndex = 10;
+ this.gvMx1qd008.VisibleIndex = 11;
this.gvMx1qd008.Width = 94;
//
// gvMx1qd007
@@ -206,7 +218,7 @@
this.gvMx1qd007.Name = "gvMx1qd007";
this.gvMx1qd007.Tag = "query_a.qd007";
this.gvMx1qd007.Visible = true;
- this.gvMx1qd007.VisibleIndex = 9;
+ this.gvMx1qd007.VisibleIndex = 10;
this.gvMx1qd007.Width = 94;
//
// gvMx1qd006
@@ -219,7 +231,7 @@
this.gvMx1qd006.Name = "gvMx1qd006";
this.gvMx1qd006.Tag = "query_a.qd006";
this.gvMx1qd006.Visible = true;
- this.gvMx1qd006.VisibleIndex = 8;
+ this.gvMx1qd006.VisibleIndex = 9;
this.gvMx1qd006.Width = 94;
//
// gvMx1qd005
@@ -232,7 +244,7 @@
this.gvMx1qd005.Name = "gvMx1qd005";
this.gvMx1qd005.Tag = "query_a.qd005";
this.gvMx1qd005.Visible = true;
- this.gvMx1qd005.VisibleIndex = 7;
+ this.gvMx1qd005.VisibleIndex = 8;
this.gvMx1qd005.Width = 94;
//
// gvMx1qd004
@@ -245,7 +257,7 @@
this.gvMx1qd004.Name = "gvMx1qd004";
this.gvMx1qd004.Tag = "query_a.qd004";
this.gvMx1qd004.Visible = true;
- this.gvMx1qd004.VisibleIndex = 6;
+ this.gvMx1qd004.VisibleIndex = 7;
this.gvMx1qd004.Width = 94;
//
// gvMx1qd003
@@ -258,7 +270,7 @@
this.gvMx1qd003.Name = "gvMx1qd003";
this.gvMx1qd003.Tag = "query_a.qd003";
this.gvMx1qd003.Visible = true;
- this.gvMx1qd003.VisibleIndex = 5;
+ this.gvMx1qd003.VisibleIndex = 6;
this.gvMx1qd003.Width = 94;
//
// gvMx1qd002
@@ -271,7 +283,7 @@
this.gvMx1qd002.Name = "gvMx1qd002";
this.gvMx1qd002.Tag = "query_a.qd002";
this.gvMx1qd002.Visible = true;
- this.gvMx1qd002.VisibleIndex = 4;
+ this.gvMx1qd002.VisibleIndex = 5;
this.gvMx1qd002.Width = 94;
//
// gvMx1qd001
@@ -284,7 +296,7 @@
this.gvMx1qd001.Name = "gvMx1qd001";
this.gvMx1qd001.Tag = "query_a.qd001";
this.gvMx1qd001.Visible = true;
- this.gvMx1qd001.VisibleIndex = 2;
+ this.gvMx1qd001.VisibleIndex = 3;
this.gvMx1qd001.Width = 94;
//
// gvMx1qtrkGuid
@@ -297,7 +309,7 @@
this.gvMx1qtrkGuid.Name = "gvMx1qtrkGuid";
this.gvMx1qtrkGuid.Tag = "query_a.qtrkGuid";
this.gvMx1qtrkGuid.Visible = true;
- this.gvMx1qtrkGuid.VisibleIndex = 1;
+ this.gvMx1qtrkGuid.VisibleIndex = 2;
this.gvMx1qtrkGuid.Width = 94;
//
// gvMx1guid
@@ -310,7 +322,7 @@
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
this.gvMx1guid.Visible = true;
- this.gvMx1guid.VisibleIndex = 0;
+ this.gvMx1guid.VisibleIndex = 1;
this.gvMx1guid.Width = 94;
//
// tabMxPage1
@@ -327,7 +339,8 @@
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemGridLookUpEdit1});
+ this.repositoryItemGridLookUpEdit1,
+ this.repositoryItemButtonEdit1});
this.gcMx1.Size = new System.Drawing.Size(1124, 372);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -338,6 +351,7 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1qtrkGuid,
+ this.gvMxDel,
this.gvMx1qd001,
this.gridColumn1,
this.gvMx1qd002,
@@ -357,6 +371,27 @@
this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
+ // gvMxDel
+ //
+ this.gvMxDel.Caption = "绉诲嚭";
+ this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.Name = "gvMxDel";
+ this.gvMxDel.Visible = true;
+ this.gvMxDel.VisibleIndex = 0;
+ this.gvMxDel.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", 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);
+ //
// gridColumn1
//
this.gridColumn1.Caption = "鐗╂枡ID";
@@ -365,7 +400,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.VisibleIndex = 4;
this.gridColumn1.Width = 94;
//
// repositoryItemGridLookUpEdit1
@@ -465,7 +500,7 @@
this.gv_qt021.OptionsColumn.AllowEdit = false;
this.gv_qt021.Tag = "query_a.qt021";
this.gv_qt021.Visible = true;
- this.gv_qt021.VisibleIndex = 22;
+ this.gv_qt021.VisibleIndex = 20;
this.gv_qt021.Width = 94;
//
// lb_qt020
@@ -489,7 +524,7 @@
this.gv_qt020.OptionsColumn.AllowEdit = false;
this.gv_qt020.Tag = "query_a.qt020";
this.gv_qt020.Visible = true;
- this.gv_qt020.VisibleIndex = 21;
+ this.gv_qt020.VisibleIndex = 19;
this.gv_qt020.Width = 94;
//
// lb_qt019
@@ -513,7 +548,7 @@
this.gv_qt019.OptionsColumn.AllowEdit = false;
this.gv_qt019.Tag = "query_a.qt019";
this.gv_qt019.Visible = true;
- this.gv_qt019.VisibleIndex = 20;
+ this.gv_qt019.VisibleIndex = 18;
this.gv_qt019.Width = 94;
//
// lb_qt018
@@ -537,7 +572,7 @@
this.gv_qt018.OptionsColumn.AllowEdit = false;
this.gv_qt018.Tag = "query_a.qt018";
this.gv_qt018.Visible = true;
- this.gv_qt018.VisibleIndex = 19;
+ this.gv_qt018.VisibleIndex = 17;
this.gv_qt018.Width = 94;
//
// gv_qt017
@@ -551,7 +586,7 @@
this.gv_qt017.OptionsColumn.AllowEdit = false;
this.gv_qt017.Tag = "query_a.qt017";
this.gv_qt017.Visible = true;
- this.gv_qt017.VisibleIndex = 18;
+ this.gv_qt017.VisibleIndex = 16;
this.gv_qt017.Width = 94;
//
// lb_qt016
@@ -585,7 +620,7 @@
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 17;
+ this.gv_qt016.VisibleIndex = 15;
this.gv_qt016.Width = 94;
//
// lb_qt015
@@ -609,7 +644,7 @@
this.gv_qt015.OptionsColumn.AllowEdit = false;
this.gv_qt015.Tag = "query_a.qt015";
this.gv_qt015.Visible = true;
- this.gv_qt015.VisibleIndex = 16;
+ this.gv_qt015.VisibleIndex = 14;
this.gv_qt015.Width = 94;
//
// gv_qt014
@@ -623,7 +658,7 @@
this.gv_qt014.OptionsColumn.AllowEdit = false;
this.gv_qt014.Tag = "query_a.qt014";
this.gv_qt014.Visible = true;
- this.gv_qt014.VisibleIndex = 15;
+ this.gv_qt014.VisibleIndex = 13;
this.gv_qt014.Width = 94;
//
// gv_qt013
@@ -637,7 +672,7 @@
this.gv_qt013.OptionsColumn.AllowEdit = false;
this.gv_qt013.Tag = "query_a.qt013";
this.gv_qt013.Visible = true;
- this.gv_qt013.VisibleIndex = 14;
+ this.gv_qt013.VisibleIndex = 12;
this.gv_qt013.Width = 94;
//
// gv_qt012
@@ -651,7 +686,7 @@
this.gv_qt012.OptionsColumn.AllowEdit = false;
this.gv_qt012.Tag = "query_a.qt012";
this.gv_qt012.Visible = true;
- this.gv_qt012.VisibleIndex = 13;
+ this.gv_qt012.VisibleIndex = 11;
this.gv_qt012.Width = 94;
//
// gv_qt011
@@ -665,7 +700,7 @@
this.gv_qt011.OptionsColumn.AllowEdit = false;
this.gv_qt011.Tag = "query_a.qt011";
this.gv_qt011.Visible = true;
- this.gv_qt011.VisibleIndex = 12;
+ this.gv_qt011.VisibleIndex = 10;
this.gv_qt011.Width = 94;
//
// lb_qt010
@@ -698,7 +733,7 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 11;
+ this.gv_qt010.VisibleIndex = 9;
this.gv_qt010.Width = 94;
//
// lb_qt009
@@ -731,7 +766,7 @@
this.gv_qt009.OptionsColumn.AllowEdit = false;
this.gv_qt009.Tag = "query_a.qt009";
this.gv_qt009.Visible = true;
- this.gv_qt009.VisibleIndex = 10;
+ this.gv_qt009.VisibleIndex = 8;
this.gv_qt009.Width = 94;
//
// gv_qt008
@@ -745,7 +780,7 @@
this.gv_qt008.OptionsColumn.AllowEdit = false;
this.gv_qt008.Tag = "query_a.qt008";
this.gv_qt008.Visible = true;
- this.gv_qt008.VisibleIndex = 9;
+ this.gv_qt008.VisibleIndex = 7;
this.gv_qt008.Width = 94;
//
// gv_qt006
@@ -759,7 +794,7 @@
this.gv_qt006.OptionsColumn.AllowEdit = false;
this.gv_qt006.Tag = "query_a.qt006";
this.gv_qt006.Visible = true;
- this.gv_qt006.VisibleIndex = 8;
+ this.gv_qt006.VisibleIndex = 6;
this.gv_qt006.Width = 94;
//
// gv_qt005
@@ -773,7 +808,7 @@
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
this.gv_qt005.Visible = true;
- this.gv_qt005.VisibleIndex = 7;
+ this.gv_qt005.VisibleIndex = 5;
this.gv_qt005.Width = 94;
//
// lb_qt004
@@ -806,7 +841,7 @@
this.gv_qt004.OptionsColumn.AllowEdit = false;
this.gv_qt004.Tag = "query_a.qt004";
this.gv_qt004.Visible = true;
- this.gv_qt004.VisibleIndex = 6;
+ this.gv_qt004.VisibleIndex = 4;
this.gv_qt004.Width = 94;
//
// lb_qt003
@@ -839,7 +874,7 @@
this.gv_qt003.OptionsColumn.AllowEdit = false;
this.gv_qt003.Tag = "query_a.qt003";
this.gv_qt003.Visible = true;
- this.gv_qt003.VisibleIndex = 5;
+ this.gv_qt003.VisibleIndex = 3;
this.gv_qt003.Width = 94;
//
// lb_qt002
@@ -873,7 +908,7 @@
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 4;
+ this.gv_qt002.VisibleIndex = 2;
this.gv_qt002.Width = 94;
//
// gv_qt001
@@ -887,7 +922,7 @@
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
- this.gv_qt001.VisibleIndex = 3;
+ this.gv_qt001.VisibleIndex = 1;
this.gv_qt001.Width = 94;
//
// lb_qtck
@@ -921,36 +956,8 @@
this.gv_qtck.OptionsColumn.AllowEdit = false;
this.gv_qtck.Tag = "query_a.qtck";
this.gv_qtck.Visible = true;
- this.gv_qtck.VisibleIndex = 2;
+ this.gv_qtck.VisibleIndex = 0;
this.gv_qtck.Width = 94;
- //
- // gv_id
- //
- this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_id.AppearanceCell.Options.UseFont = true;
- this.gv_id.Caption = "ID ";
- this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 50;
- this.gv_id.Name = "gv_id";
- this.gv_id.OptionsColumn.AllowEdit = false;
- this.gv_id.Tag = "query_a.id";
- this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 1;
- this.gv_id.Width = 94;
- //
- // gv_guid
- //
- this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_guid.AppearanceCell.Options.UseFont = true;
- this.gv_guid.Caption = "guid ";
- this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
- this.gv_guid.Name = "gv_guid";
- this.gv_guid.OptionsColumn.AllowEdit = false;
- this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Visible = true;
- this.gv_guid.VisibleIndex = 0;
- this.gv_guid.Width = 94;
//
// toolBarMenu1
//
@@ -983,8 +990,6 @@
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_guid,
- this.gv_id,
this.gv_qtck,
this.gv_qt001,
this.gv_qt002,
@@ -1189,17 +1194,30 @@
this.lb_qt011.TabIndex = 243;
this.lb_qt011.Text = "閫夋嫨浠撳簱";
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(951, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 5;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// Frm_MesItemQtrk
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesItemQtrk";
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemGridLookUpEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemGridLookUpEdit1View)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt021.Properties)).EndInit();
@@ -1223,6 +1241,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt020.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -1308,8 +1327,6 @@
private DevExpress.XtraEditors.LabelControl lb_qtck;
private DevExpress.XtraEditors.TextEdit txt_qtck;
private DevExpress.XtraGrid.Columns.GridColumn gv_qtck;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
- private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraEditors.ComboBoxEdit txt_qt020;
private DevExpress.XtraEditors.ComboBoxEdit txt_qt019;
private DevExpress.XtraEditors.CheckEdit txt_qt015;
@@ -1324,5 +1341,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private System.Windows.Forms.PictureBox picCheckBox;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs
index 9eac23d..3c65bd7 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs
@@ -30,6 +30,8 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -40,6 +42,10 @@
{
e.Info.DisplayText = (e.RowHandle + 1).ToString();
}
+ };
+ gridView1.FocusedRowChanged += (s, e) =>
+ {
+ UtilityHelper.SetCheckIco(s, picCheckBox, this, "qt015", "");
};
gridView1.CustomDrawEmptyForeground += (s, e) =>
{
@@ -152,31 +158,37 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_qtck, gridView1, "qtck");
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
return;
- List<dynamic> lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
+ var _obj = new
+ {
+ guid = rowGuid,
+ mxGuid = Guid.Empty.ToString(),
+ };
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelOrMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
getPageList(1);
}
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
@@ -209,7 +221,8 @@
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_qtck, gridView1, "qtck");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -289,8 +302,9 @@
_obj.list.Add(new
{
Guid = _guid,
- itemId = (row["itemId"].ToString()),
- sqsl = (row["qd007"].ToString()),
+ ItemId = (row["itemId"].ToString()),
+ Sqsl = (row["qd007"].ToString()),
+ Bz = (row["qd010"].ToString()),
});
}
}
@@ -413,5 +427,121 @@
gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
}
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ gvMx1.DeleteRow(rowhandle);
+ return;
+ }
+ var _obj = new
+ {
+ guid = lbGuid.Text.Trim(),
+ mxGuid = mxGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelOrMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+ }
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+
+ /// <summary>
+ /// 瀹℃牳浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private async void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ {
+ _toolCk(1);
+ }
+
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private async void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ _toolCk(0);
+ }
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private async void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_qtck, gridView1, "qtck");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+ UcLoading _loading = new UcLoading();
+ var _obj = new
+ {
+ guid = rowGuid,
+ inFieldValue = _inFieldValue,
+ };
+ try
+ {
+ var strJson = await UtilityHelper.HttpPostAsync("",
+ _webServiceName + "EditModelSubmit",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ _loading.Stop();
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
index 7a74901..cebb4cf 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
<PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
--
Gitblit v1.9.3