From 0f05ac123fb9528c6c27ddfe9fdbd9ef4c4b17a6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 11 二月 2025 10:47:36 +0800
Subject: [PATCH] 其它出入库
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 16 +-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs | 242 ++++++++++++++++--------------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs | 24 ++-
DevApp/Gs.DevApp/Gs.DevApp.csproj | 10
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.resx | 0
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 33 ++--
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 49 +++--
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 45 ++--
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs | 2
9 files changed, 225 insertions(+), 196 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 95d3a71..4c027d9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- 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 editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -137,7 +137,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 390);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 396);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
@@ -149,7 +149,7 @@
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemSearchLookUpEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 390);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 396);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -405,10 +405,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
@@ -451,7 +451,7 @@
//
this.lb_qt018.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qt018.Appearance.Options.UseFont = true;
- this.lb_qt018.Location = new System.Drawing.Point(546, 86);
+ this.lb_qt018.Location = new System.Drawing.Point(546, 83);
this.lb_qt018.Name = "lb_qt018";
this.lb_qt018.Size = new System.Drawing.Size(82, 21);
this.lb_qt018.TabIndex = 273;
@@ -461,7 +461,7 @@
//
this.lb_qt016.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qt016.Appearance.Options.UseFont = true;
- this.lb_qt016.Location = new System.Drawing.Point(900, 86);
+ this.lb_qt016.Location = new System.Drawing.Point(900, 83);
this.lb_qt016.Name = "lb_qt016";
this.lb_qt016.Size = new System.Drawing.Size(51, 21);
this.lb_qt016.TabIndex = 262;
@@ -469,12 +469,13 @@
//
// txt_qt016
//
- this.txt_qt016.Location = new System.Drawing.Point(957, 82);
+ this.txt_qt016.Location = new System.Drawing.Point(957, 79);
this.txt_qt016.Name = "txt_qt016";
this.txt_qt016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_qt016.Properties.Appearance.Options.UseFont = true;
this.txt_qt016.Size = new System.Drawing.Size(162, 28);
this.txt_qt016.TabIndex = 262;
+ this.txt_qt016.Tag = "readonly";
//
// gv_qt016
//
@@ -536,7 +537,7 @@
//
this.lb_qt010.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qt010.Appearance.Options.UseFont = true;
- this.lb_qt010.Location = new System.Drawing.Point(24, 115);
+ this.lb_qt010.Location = new System.Drawing.Point(24, 112);
this.lb_qt010.Name = "lb_qt010";
this.lb_qt010.Size = new System.Drawing.Size(68, 21);
this.lb_qt010.TabIndex = 235;
@@ -544,7 +545,7 @@
//
// txt_qt010
//
- this.txt_qt010.Location = new System.Drawing.Point(98, 111);
+ this.txt_qt010.Location = new System.Drawing.Point(98, 108);
this.txt_qt010.Name = "txt_qt010";
this.txt_qt010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_qt010.Properties.Appearance.Options.UseFont = true;
@@ -569,7 +570,7 @@
//
this.lb_qt009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qt009.Appearance.Options.UseFont = true;
- this.lb_qt009.Location = new System.Drawing.Point(546, 119);
+ this.lb_qt009.Location = new System.Drawing.Point(546, 116);
this.lb_qt009.Name = "lb_qt009";
this.lb_qt009.Size = new System.Drawing.Size(82, 21);
this.lb_qt009.TabIndex = 231;
@@ -621,6 +622,7 @@
this.txt_qt002.Properties.Appearance.Options.UseFont = true;
this.txt_qt002.Size = new System.Drawing.Size(162, 28);
this.txt_qt002.TabIndex = 216;
+ this.txt_qt002.Tag = "readonly";
//
// gv_qt002
//
@@ -668,6 +670,7 @@
this.txt_qtck.Properties.Appearance.Options.UseFont = true;
this.txt_qtck.Size = new System.Drawing.Size(210, 28);
this.txt_qtck.TabIndex = 211;
+ this.txt_qtck.Tag = "readonly";
//
// gv_qtck
//
@@ -800,10 +803,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 148);
+ this.tabMx.Location = new System.Drawing.Point(0, 142);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 422);
+ this.tabMx.Size = new System.Drawing.Size(1126, 428);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -843,13 +846,13 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 148);
+ this.panel1.Size = new System.Drawing.Size(1126, 142);
this.panel1.TabIndex = 1;
//
// txt_qt018_1
//
this.txt_qt018_1.IsReadly = false;
- this.txt_qt018_1.Location = new System.Drawing.Point(633, 113);
+ this.txt_qt018_1.Location = new System.Drawing.Point(633, 110);
this.txt_qt018_1.Name = "txt_qt018_1";
this.txt_qt018_1.Size = new System.Drawing.Size(247, 28);
this.txt_qt018_1.TabIndex = 316;
@@ -857,7 +860,7 @@
// txt_qt008
//
this.txt_qt008.IsReadly = false;
- this.txt_qt008.Location = new System.Drawing.Point(98, 80);
+ this.txt_qt008.Location = new System.Drawing.Point(98, 77);
this.txt_qt008.Margin = new System.Windows.Forms.Padding(0);
this.txt_qt008.Name = "txt_qt008";
this.txt_qt008.Size = new System.Drawing.Size(445, 30);
@@ -867,7 +870,7 @@
//
this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl5.Appearance.Options.UseFont = true;
- this.labelControl5.Location = new System.Drawing.Point(24, 80);
+ this.labelControl5.Location = new System.Drawing.Point(24, 77);
this.labelControl5.Name = "labelControl5";
this.labelControl5.Size = new System.Drawing.Size(68, 21);
this.labelControl5.TabIndex = 314;
@@ -938,7 +941,7 @@
// txt_qt018
//
this.txt_qt018.IsReadly = false;
- this.txt_qt018.Location = new System.Drawing.Point(633, 82);
+ this.txt_qt018.Location = new System.Drawing.Point(633, 79);
this.txt_qt018.Name = "txt_qt018";
this.txt_qt018.Size = new System.Drawing.Size(247, 28);
this.txt_qt018.TabIndex = 304;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
index 7d02caa..e62ea0c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
@@ -316,7 +316,7 @@
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "billNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index f45aa1d..4d5de96 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -693,7 +693,7 @@
this.gv_qt019.AppearanceCell.Options.UseFont = true;
this.gv_qt019.Caption = "搴撳瓨鏂瑰悜";
this.gv_qt019.FieldName = "qt019";
- this.gv_qt019.MinWidth = 50;
+ this.gv_qt019.MinWidth = 25;
this.gv_qt019.Name = "gv_qt019";
this.gv_qt019.OptionsColumn.AllowEdit = false;
this.gv_qt019.Tag = "query_a.qt019";
@@ -737,7 +737,7 @@
this.gv_qt016.AppearanceCell.Options.UseFont = true;
this.gv_qt016.Caption = "瀹℃牳浜� ";
this.gv_qt016.FieldName = "qt016";
- this.gv_qt016.MinWidth = 50;
+ this.gv_qt016.MinWidth = 25;
this.gv_qt016.Name = "gv_qt016";
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
@@ -810,7 +810,7 @@
this.gv_qt010.AppearanceCell.Options.UseFont = true;
this.gv_qt010.Caption = "鍏ュ簱鍘熷洜 ";
this.gv_qt010.FieldName = "qt010";
- this.gv_qt010.MinWidth = 50;
+ this.gv_qt010.MinWidth = 25;
this.gv_qt010.Name = "gv_qt010";
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
@@ -834,7 +834,7 @@
this.gv_qt005.AppearanceCell.Options.UseFont = true;
this.gv_qt005.Caption = "鐢宠浜�";
this.gv_qt005.FieldName = "qt005";
- this.gv_qt005.MinWidth = 50;
+ this.gv_qt005.MinWidth = 25;
this.gv_qt005.Name = "gv_qt005";
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
@@ -858,7 +858,7 @@
this.gv_qt003.AppearanceCell.Options.UseFont = true;
this.gv_qt003.Caption = "鍗曟嵁绫诲瀷";
this.gv_qt003.FieldName = "qt003";
- this.gv_qt003.MinWidth = 50;
+ this.gv_qt003.MinWidth = 25;
this.gv_qt003.Name = "gv_qt003";
this.gv_qt003.OptionsColumn.AllowEdit = false;
this.gv_qt003.Tag = "query_a.qt003";
@@ -892,7 +892,7 @@
this.gv_qt002.AppearanceCell.Options.UseFont = true;
this.gv_qt002.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_qt002.FieldName = "qt002";
- this.gv_qt002.MinWidth = 180;
+ this.gv_qt002.MinWidth = 25;
this.gv_qt002.Name = "gv_qt002";
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
@@ -906,7 +906,7 @@
this.gv_qt001.AppearanceCell.Options.UseFont = true;
this.gv_qt001.Caption = "鐢宠鏃ユ湡 ";
this.gv_qt001.FieldName = "qt001";
- this.gv_qt001.MinWidth = 180;
+ this.gv_qt001.MinWidth = 25;
this.gv_qt001.Name = "gv_qt001";
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
@@ -940,7 +940,7 @@
this.gv_qtck.AppearanceCell.Options.UseFont = true;
this.gv_qtck.Caption = "鐢宠鍗曞彿 ";
this.gv_qtck.FieldName = "qtck";
- this.gv_qtck.MinWidth = 180;
+ this.gv_qtck.MinWidth = 25;
this.gv_qtck.Name = "gv_qtck";
this.gv_qtck.OptionsColumn.AllowEdit = false;
this.gv_qtck.Tag = "query_a.qtck";
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 18c9a08..96275cb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -10,7 +10,6 @@
using System.Threading.Tasks;
using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemQtrk : DevExpress.XtraEditors.XtraForm
@@ -31,7 +30,7 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "qt015", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isSh", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -114,7 +113,6 @@
+ "}";
};
}
-
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -201,7 +199,6 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
-
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
@@ -271,8 +268,10 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gridViews.Add(gvMx1);
+ gridViews.Add(gvMx2);
UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -347,9 +346,13 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
- lbGuid.Text = _rtn.rtnData;
+ lbGuid.Text = _rtn.rtnData.outGuid;
+ txt_qtck.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
}
}
catch (Exception ex)
@@ -365,7 +368,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "qt001", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
@@ -400,7 +402,6 @@
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
}
private void getModel(string strGuid)
{
@@ -426,6 +427,7 @@
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -571,7 +573,6 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
-
var _obj = new
{
guid = rowGuid,
@@ -584,21 +585,23 @@
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- if (_rtn.rtnCode > 0)
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(1);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ Form parentForm = this.FindForm();
+ UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, parentForm, _inFieldValue.ToString());
}
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
-
private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
if (e.FocusedRowHandle >= 0)
@@ -653,7 +656,5 @@
}
}
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
similarity index 94%
rename from DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.Designer.cs
rename to DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
index 964d5c3..7c70921 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace Gs.DevApp.DevFrm.Rk
{
- partial class Frm_MesItemQtrk_Rk
+ partial class Frm_MesItemQtrkDj
{
/// <summary>
@@ -122,10 +122,10 @@
this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cbillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_insDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -156,6 +156,7 @@
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -179,6 +180,7 @@
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// gvMx2itemInId
@@ -748,8 +750,8 @@
this.gridBand1,
this.gridBand2,
this.gridBand3,
- this.gridBand4,
this.gridBand5,
+ this.gridBand4,
this.gridBand6,
this.gridBand7,
this.gridBand8,
@@ -821,7 +823,7 @@
//
this.gridBand1.AppearanceHeader.Options.UseTextOptions = true;
this.gridBand1.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand1.Caption = "宸插鏍�";
+ this.gridBand1.Caption = "瀹℃牳鏍囪";
this.gridBand1.Columns.Add(this.gv_status);
this.gridBand1.Columns.Add(this.gv_fstatus);
this.gridBand1.Columns.Add(this.gv_guid);
@@ -862,10 +864,10 @@
this.gridBand1.Columns.Add(this.gv_fcheckUser);
this.gridBand1.Columns.Add(this.gv_rbillNo);
this.gridBand1.Columns.Add(this.gv_bgr);
- this.gridBand1.MinWidth = 150;
+ this.gridBand1.MinWidth = 50;
this.gridBand1.Name = "gridBand1";
this.gridBand1.VisibleIndex = 0;
- this.gridBand1.Width = 150;
+ this.gridBand1.Width = 50;
//
// gv_status
//
@@ -873,7 +875,7 @@
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\\缁撴 ";
this.gv_status.FieldName = "status2";
- this.gv_status.MinWidth = 50;
+ this.gv_status.MinWidth = 25;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.STATUS";
@@ -886,7 +888,7 @@
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "f鐘舵�� | 0-鏈鏍� 1-瀹℃牳鍏ュ簱/缁撴 ";
this.gv_fstatus.FieldName = "fstatus";
- this.gv_fstatus.MinWidth = 50;
+ this.gv_fstatus.MinWidth = 25;
this.gv_fstatus.Name = "gv_fstatus";
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.FSTATUS";
@@ -898,7 +900,7 @@
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "ID(SEQ_INV_ID) ";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
+ this.gv_guid.MinWidth = 25;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.Tag = "query_a.GUID";
@@ -910,7 +912,7 @@
this.gv_reason.AppearanceCell.Options.UseFont = true;
this.gv_reason.Caption = "鍘熷洜 ";
this.gv_reason.FieldName = "reason";
- this.gv_reason.MinWidth = 50;
+ this.gv_reason.MinWidth = 25;
this.gv_reason.Name = "gv_reason";
this.gv_reason.OptionsColumn.AllowEdit = false;
this.gv_reason.Tag = "query_a.REASON";
@@ -922,7 +924,7 @@
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 50;
+ this.gv_lastupdateBy.MinWidth = 25;
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
@@ -934,7 +936,7 @@
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 50;
+ this.gv_lastupdateDate.MinWidth = 25;
this.gv_lastupdateDate.Name = "gv_lastupdateDate";
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
@@ -946,7 +948,7 @@
this.gv_billTypeId.AppearanceCell.Options.UseFont = true;
this.gv_billTypeId.Caption = "鍗曟嵁绫诲瀷ID ";
this.gv_billTypeId.FieldName = "billTypeId";
- this.gv_billTypeId.MinWidth = 50;
+ this.gv_billTypeId.MinWidth = 25;
this.gv_billTypeId.Name = "gv_billTypeId";
this.gv_billTypeId.OptionsColumn.AllowEdit = false;
this.gv_billTypeId.Tag = "query_a.BILL_TYPE_ID";
@@ -958,7 +960,7 @@
this.gv_transactionId.AppearanceCell.Options.UseFont = true;
this.gv_transactionId.Caption = "浜嬪姟绫诲瀷ID ";
this.gv_transactionId.FieldName = "transactionId";
- this.gv_transactionId.MinWidth = 50;
+ this.gv_transactionId.MinWidth = 25;
this.gv_transactionId.Name = "gv_transactionId";
this.gv_transactionId.OptionsColumn.AllowEdit = false;
this.gv_transactionId.Tag = "query_a.TRANSACTION_ID";
@@ -970,7 +972,7 @@
this.gv_userNoBack.AppearanceCell.Options.UseFont = true;
this.gv_userNoBack.Caption = "閫�鏂欎汉宸ュ彿 ";
this.gv_userNoBack.FieldName = "userNoBack";
- this.gv_userNoBack.MinWidth = 50;
+ this.gv_userNoBack.MinWidth = 25;
this.gv_userNoBack.Name = "gv_userNoBack";
this.gv_userNoBack.OptionsColumn.AllowEdit = false;
this.gv_userNoBack.Tag = "query_a.USER_NO_BACK";
@@ -982,7 +984,7 @@
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 50;
+ this.gv_checkUser.MinWidth = 25;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
@@ -994,7 +996,7 @@
this.gv_taskNo.AppearanceCell.Options.UseFont = true;
this.gv_taskNo.Caption = "TASK_NO ";
this.gv_taskNo.FieldName = "taskNo";
- this.gv_taskNo.MinWidth = 50;
+ this.gv_taskNo.MinWidth = 25;
this.gv_taskNo.Name = "gv_taskNo";
this.gv_taskNo.OptionsColumn.AllowEdit = false;
this.gv_taskNo.Tag = "query_a.TASK_NO";
@@ -1006,7 +1008,7 @@
this.gv_checkRes.AppearanceCell.Options.UseFont = true;
this.gv_checkRes.Caption = "CHECK_RES ";
this.gv_checkRes.FieldName = "checkRes";
- this.gv_checkRes.MinWidth = 50;
+ this.gv_checkRes.MinWidth = 25;
this.gv_checkRes.Name = "gv_checkRes";
this.gv_checkRes.OptionsColumn.AllowEdit = false;
this.gv_checkRes.Tag = "query_a.CHECK_RES";
@@ -1018,7 +1020,7 @@
this.gv_checkQty.AppearanceCell.Options.UseFont = true;
this.gv_checkQty.Caption = "CHECK_QTY ";
this.gv_checkQty.FieldName = "checkQty";
- this.gv_checkQty.MinWidth = 50;
+ this.gv_checkQty.MinWidth = 25;
this.gv_checkQty.Name = "gv_checkQty";
this.gv_checkQty.OptionsColumn.AllowEdit = false;
this.gv_checkQty.Tag = "query_a.CHECK_QTY";
@@ -1030,7 +1032,7 @@
this.gv_mmlist.AppearanceCell.Options.UseFont = true;
this.gv_mmlist.Caption = "MMLIST ";
this.gv_mmlist.FieldName = "mmlist";
- this.gv_mmlist.MinWidth = 50;
+ this.gv_mmlist.MinWidth = 25;
this.gv_mmlist.Name = "gv_mmlist";
this.gv_mmlist.OptionsColumn.AllowEdit = false;
this.gv_mmlist.Tag = "query_a.MMLIST";
@@ -1042,7 +1044,7 @@
this.gv_ebeln.AppearanceCell.Options.UseFont = true;
this.gv_ebeln.Caption = "EBELN ";
this.gv_ebeln.FieldName = "ebeln";
- this.gv_ebeln.MinWidth = 50;
+ this.gv_ebeln.MinWidth = 25;
this.gv_ebeln.Name = "gv_ebeln";
this.gv_ebeln.OptionsColumn.AllowEdit = false;
this.gv_ebeln.Tag = "query_a.EBELN";
@@ -1054,7 +1056,7 @@
this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
this.gv_depotsCode.Caption = "DEPOTS_CODE ";
this.gv_depotsCode.FieldName = "depotsCode";
- this.gv_depotsCode.MinWidth = 50;
+ this.gv_depotsCode.MinWidth = 25;
this.gv_depotsCode.Name = "gv_depotsCode";
this.gv_depotsCode.OptionsColumn.AllowEdit = false;
this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE";
@@ -1066,7 +1068,7 @@
this.gv_transctionNo.AppearanceCell.Options.UseFont = true;
this.gv_transctionNo.Caption = "TRANSCTION_NO ";
this.gv_transctionNo.FieldName = "transctionNo";
- this.gv_transctionNo.MinWidth = 50;
+ this.gv_transctionNo.MinWidth = 25;
this.gv_transctionNo.Name = "gv_transctionNo";
this.gv_transctionNo.OptionsColumn.AllowEdit = false;
this.gv_transctionNo.Tag = "query_a.TRANSCTION_NO";
@@ -1078,7 +1080,7 @@
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
this.gv_suppNo.Caption = "SUPP_NO ";
this.gv_suppNo.FieldName = "suppNo";
- this.gv_suppNo.MinWidth = 50;
+ this.gv_suppNo.MinWidth = 25;
this.gv_suppNo.Name = "gv_suppNo";
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.SUPP_NO";
@@ -1090,7 +1092,7 @@
this.gv_factory.AppearanceCell.Options.UseFont = true;
this.gv_factory.Caption = "FACTORY ";
this.gv_factory.FieldName = "factory";
- this.gv_factory.MinWidth = 50;
+ this.gv_factory.MinWidth = 25;
this.gv_factory.Name = "gv_factory";
this.gv_factory.OptionsColumn.AllowEdit = false;
this.gv_factory.Tag = "query_a.FACTORY";
@@ -1102,7 +1104,7 @@
this.gv_sapstatus.AppearanceCell.Options.UseFont = true;
this.gv_sapstatus.Caption = "SAPSTATUS ";
this.gv_sapstatus.FieldName = "sapstatus";
- this.gv_sapstatus.MinWidth = 50;
+ this.gv_sapstatus.MinWidth = 25;
this.gv_sapstatus.Name = "gv_sapstatus";
this.gv_sapstatus.OptionsColumn.AllowEdit = false;
this.gv_sapstatus.Tag = "query_a.SAPSTATUS";
@@ -1114,7 +1116,7 @@
this.gv_sapno.AppearanceCell.Options.UseFont = true;
this.gv_sapno.Caption = "SAPNO ";
this.gv_sapno.FieldName = "sapno";
- this.gv_sapno.MinWidth = 50;
+ this.gv_sapno.MinWidth = 25;
this.gv_sapno.Name = "gv_sapno";
this.gv_sapno.OptionsColumn.AllowEdit = false;
this.gv_sapno.Tag = "query_a.SAPNO";
@@ -1126,7 +1128,7 @@
this.gv_sapyear.AppearanceCell.Options.UseFont = true;
this.gv_sapyear.Caption = "SAPYEAR ";
this.gv_sapyear.FieldName = "sapyear";
- this.gv_sapyear.MinWidth = 50;
+ this.gv_sapyear.MinWidth = 25;
this.gv_sapyear.Name = "gv_sapyear";
this.gv_sapyear.OptionsColumn.AllowEdit = false;
this.gv_sapyear.Tag = "query_a.SAPYEAR";
@@ -1138,7 +1140,7 @@
this.gv_saptext.AppearanceCell.Options.UseFont = true;
this.gv_saptext.Caption = "SAPTEXT ";
this.gv_saptext.FieldName = "saptext";
- this.gv_saptext.MinWidth = 50;
+ this.gv_saptext.MinWidth = 25;
this.gv_saptext.Name = "gv_saptext";
this.gv_saptext.OptionsColumn.AllowEdit = false;
this.gv_saptext.Tag = "query_a.SAPTEXT";
@@ -1150,7 +1152,7 @@
this.gv_ischeck.AppearanceCell.Options.UseFont = true;
this.gv_ischeck.Caption = "ISCHECK ";
this.gv_ischeck.FieldName = "ischeck";
- this.gv_ischeck.MinWidth = 50;
+ this.gv_ischeck.MinWidth = 25;
this.gv_ischeck.Name = "gv_ischeck";
this.gv_ischeck.OptionsColumn.AllowEdit = false;
this.gv_ischeck.Tag = "query_a.ISCHECK";
@@ -1162,7 +1164,7 @@
this.gv_insby.AppearanceCell.Options.UseFont = true;
this.gv_insby.Caption = "INSBY ";
this.gv_insby.FieldName = "insby";
- this.gv_insby.MinWidth = 50;
+ this.gv_insby.MinWidth = 25;
this.gv_insby.Name = "gv_insby";
this.gv_insby.OptionsColumn.AllowEdit = false;
this.gv_insby.Tag = "query_a.INSBY";
@@ -1174,7 +1176,7 @@
this.gv_isVisual.AppearanceCell.Options.UseFont = true;
this.gv_isVisual.Caption = "IS_VISUAL ";
this.gv_isVisual.FieldName = "isVisual";
- this.gv_isVisual.MinWidth = 50;
+ this.gv_isVisual.MinWidth = 25;
this.gv_isVisual.Name = "gv_isVisual";
this.gv_isVisual.OptionsColumn.AllowEdit = false;
this.gv_isVisual.Tag = "query_a.IS_VISUAL";
@@ -1186,7 +1188,7 @@
this.gv_company.AppearanceCell.Options.UseFont = true;
this.gv_company.Caption = "COMPANY ";
this.gv_company.FieldName = "company";
- this.gv_company.MinWidth = 50;
+ this.gv_company.MinWidth = 25;
this.gv_company.Name = "gv_company";
this.gv_company.OptionsColumn.AllowEdit = false;
this.gv_company.Tag = "query_a.COMPANY";
@@ -1198,7 +1200,7 @@
this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
this.gv_urgentFlag.Caption = "URGENT_FLAG ";
this.gv_urgentFlag.FieldName = "urgentFlag";
- this.gv_urgentFlag.MinWidth = 50;
+ this.gv_urgentFlag.MinWidth = 25;
this.gv_urgentFlag.Name = "gv_urgentFlag";
this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
this.gv_urgentFlag.Tag = "query_a.URGENT_FLAG";
@@ -1210,7 +1212,7 @@
this.gv_lineNo.AppearanceCell.Options.UseFont = true;
this.gv_lineNo.Caption = "LINE_NO ";
this.gv_lineNo.FieldName = "lineNo";
- this.gv_lineNo.MinWidth = 50;
+ this.gv_lineNo.MinWidth = 25;
this.gv_lineNo.Name = "gv_lineNo";
this.gv_lineNo.OptionsColumn.AllowEdit = false;
this.gv_lineNo.Tag = "query_a.LINE_NO";
@@ -1222,7 +1224,7 @@
this.gv_mttransctionNo.AppearanceCell.Options.UseFont = true;
this.gv_mttransctionNo.Caption = "鍐查攢浜嬪姟绫诲瀷缂栫爜 ";
this.gv_mttransctionNo.FieldName = "mttransctionNo";
- this.gv_mttransctionNo.MinWidth = 50;
+ this.gv_mttransctionNo.MinWidth = 25;
this.gv_mttransctionNo.Name = "gv_mttransctionNo";
this.gv_mttransctionNo.OptionsColumn.AllowEdit = false;
this.gv_mttransctionNo.Tag = "query_a.MTTRANSCTION_NO";
@@ -1234,7 +1236,7 @@
this.gv_taskLino.AppearanceCell.Options.UseFont = true;
this.gv_taskLino.Caption = "宸ュ崟琛屽彿 ";
this.gv_taskLino.FieldName = "taskLino";
- this.gv_taskLino.MinWidth = 50;
+ this.gv_taskLino.MinWidth = 25;
this.gv_taskLino.Name = "gv_taskLino";
this.gv_taskLino.OptionsColumn.AllowEdit = false;
this.gv_taskLino.Tag = "query_a.TASK_LINO";
@@ -1246,7 +1248,7 @@
this.gv_fbillno.AppearanceCell.Options.UseFont = true;
this.gv_fbillno.Caption = "鎶曟枡閫氱煡鍗曞崟鍙� ";
this.gv_fbillno.FieldName = "fbillno";
- this.gv_fbillno.MinWidth = 50;
+ this.gv_fbillno.MinWidth = 25;
this.gv_fbillno.Name = "gv_fbillno";
this.gv_fbillno.OptionsColumn.AllowEdit = false;
this.gv_fbillno.Tag = "query_a.FBILLNO";
@@ -1258,7 +1260,7 @@
this.gv_fbillLino.AppearanceCell.Options.UseFont = true;
this.gv_fbillLino.Caption = "鎶曟枡鍗曡鍙� ";
this.gv_fbillLino.FieldName = "fbillLino";
- this.gv_fbillLino.MinWidth = 50;
+ this.gv_fbillLino.MinWidth = 25;
this.gv_fbillLino.Name = "gv_fbillLino";
this.gv_fbillLino.OptionsColumn.AllowEdit = false;
this.gv_fbillLino.Tag = "query_a.FBILL_LINO";
@@ -1270,7 +1272,7 @@
this.gv_custNo.AppearanceCell.Options.UseFont = true;
this.gv_custNo.Caption = "瀹㈡埛缂栧彿 ";
this.gv_custNo.FieldName = "custNo";
- this.gv_custNo.MinWidth = 50;
+ this.gv_custNo.MinWidth = 25;
this.gv_custNo.Name = "gv_custNo";
this.gv_custNo.OptionsColumn.AllowEdit = false;
this.gv_custNo.Tag = "query_a.CUST_NO";
@@ -1282,7 +1284,7 @@
this.gv_custName.AppearanceCell.Options.UseFont = true;
this.gv_custName.Caption = "瀹㈡埛鍚嶇О ";
this.gv_custName.FieldName = "custName";
- this.gv_custName.MinWidth = 50;
+ this.gv_custName.MinWidth = 25;
this.gv_custName.Name = "gv_custName";
this.gv_custName.OptionsColumn.AllowEdit = false;
this.gv_custName.Tag = "query_a.CUST_NAME";
@@ -1294,7 +1296,7 @@
this.gv_iqcReleaseNo.AppearanceCell.Options.UseFont = true;
this.gv_iqcReleaseNo.Caption = "IQC妫�楠屽崟鍙� ";
this.gv_iqcReleaseNo.FieldName = "iqcReleaseNo";
- this.gv_iqcReleaseNo.MinWidth = 50;
+ this.gv_iqcReleaseNo.MinWidth = 25;
this.gv_iqcReleaseNo.Name = "gv_iqcReleaseNo";
this.gv_iqcReleaseNo.OptionsColumn.AllowEdit = false;
this.gv_iqcReleaseNo.Tag = "query_a.IQC_RELEASE_NO";
@@ -1306,7 +1308,7 @@
this.gv_pickIns.AppearanceCell.Options.UseFont = true;
this.gv_pickIns.Caption = "0 鐢宠鍗曪紝1鍏ュ簱鍗曟爣璇� ";
this.gv_pickIns.FieldName = "pickIns";
- this.gv_pickIns.MinWidth = 50;
+ this.gv_pickIns.MinWidth = 25;
this.gv_pickIns.Name = "gv_pickIns";
this.gv_pickIns.OptionsColumn.AllowEdit = false;
this.gv_pickIns.Tag = "query_a.PICK_INS";
@@ -1318,7 +1320,7 @@
this.gv_fcheckUser.AppearanceCell.Options.UseFont = true;
this.gv_fcheckUser.Caption = "鍏ュ簱瀹℃牳浜� ";
this.gv_fcheckUser.FieldName = "fcheckUser";
- this.gv_fcheckUser.MinWidth = 50;
+ this.gv_fcheckUser.MinWidth = 25;
this.gv_fcheckUser.Name = "gv_fcheckUser";
this.gv_fcheckUser.OptionsColumn.AllowEdit = false;
this.gv_fcheckUser.Tag = "query_a.FCHECK_USER";
@@ -1330,7 +1332,7 @@
this.gv_rbillNo.AppearanceCell.Options.UseFont = true;
this.gv_rbillNo.Caption = "浠诲姟姹囨姤鍗�/宸ュ崟鍙凤紙鎴愬搧鍏ュ簱銆侀��鏂欙級 ";
this.gv_rbillNo.FieldName = "rbillNo";
- this.gv_rbillNo.MinWidth = 50;
+ this.gv_rbillNo.MinWidth = 25;
this.gv_rbillNo.Name = "gv_rbillNo";
this.gv_rbillNo.OptionsColumn.AllowEdit = false;
this.gv_rbillNo.Tag = "query_a.RBILL_NO";
@@ -1342,7 +1344,7 @@
this.gv_bgr.AppearanceCell.Options.UseFont = true;
this.gv_bgr.Caption = "鎶ュ伐浜� ";
this.gv_bgr.FieldName = "bgr";
- this.gv_bgr.MinWidth = 50;
+ this.gv_bgr.MinWidth = 25;
this.gv_bgr.Name = "gv_bgr";
this.gv_bgr.OptionsColumn.AllowEdit = false;
this.gv_bgr.Tag = "query_a.BGR";
@@ -1352,10 +1354,10 @@
//
this.gridBand2.Caption = "鍏ュ簱鍗曞彿";
this.gridBand2.Columns.Add(this.gv_billNo);
- this.gridBand2.MinWidth = 180;
+ this.gridBand2.MinWidth = 25;
this.gridBand2.Name = "gridBand2";
this.gridBand2.VisibleIndex = 1;
- this.gridBand2.Width = 180;
+ this.gridBand2.Width = 114;
//
// gv_billNo
//
@@ -1363,7 +1365,7 @@
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍏ュ簱鍗曞彿 ";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 50;
+ this.gv_billNo.MinWidth = 25;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
@@ -1374,10 +1376,10 @@
//
this.gridBand3.Caption = "鍒拌揣鍗曞彿";
this.gridBand3.Columns.Add(this.gv_cbillNo);
- this.gridBand3.MinWidth = 180;
+ this.gridBand3.MinWidth = 25;
this.gridBand3.Name = "gridBand3";
this.gridBand3.VisibleIndex = 2;
- this.gridBand3.Width = 180;
+ this.gridBand3.Width = 114;
//
// gv_cbillNo
//
@@ -1385,43 +1387,21 @@
this.gv_cbillNo.AppearanceCell.Options.UseFont = true;
this.gv_cbillNo.Caption = "鍒拌揣鍗曞彿/鍏跺畠鍏ュ簱鍗曞彿 ";
this.gv_cbillNo.FieldName = "cbillNo";
- this.gv_cbillNo.MinWidth = 50;
+ this.gv_cbillNo.MinWidth = 25;
this.gv_cbillNo.Name = "gv_cbillNo";
this.gv_cbillNo.OptionsColumn.AllowEdit = false;
this.gv_cbillNo.Tag = "query_a.CBILL_NO";
this.gv_cbillNo.Visible = true;
this.gv_cbillNo.Width = 114;
//
- // gridBand4
- //
- this.gridBand4.Caption = "鍒涘缓鏃堕棿";
- this.gridBand4.Columns.Add(this.gv_createDate);
- this.gridBand4.MinWidth = 180;
- this.gridBand4.Name = "gridBand4";
- this.gridBand4.VisibleIndex = 3;
- this.gridBand4.Width = 180;
- //
- // gv_createDate
- //
- this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
- this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 50;
- this.gv_createDate.Name = "gv_createDate";
- this.gv_createDate.OptionsColumn.AllowEdit = false;
- this.gv_createDate.Tag = "query_a.CREATE_DATE";
- this.gv_createDate.Visible = true;
- this.gv_createDate.Width = 146;
- //
// gridBand5
//
this.gridBand5.Caption = "鍒涘缓浜�";
this.gridBand5.Columns.Add(this.gv_createBy);
- this.gridBand5.MinWidth = 80;
+ this.gridBand5.MinWidth = 40;
this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 4;
- this.gridBand5.Width = 80;
+ this.gridBand5.VisibleIndex = 3;
+ this.gridBand5.Width = 66;
//
// gv_createBy
//
@@ -1436,16 +1416,38 @@
this.gv_createBy.Visible = true;
this.gv_createBy.Width = 66;
//
+ // gridBand4
+ //
+ this.gridBand4.Caption = "鍒涘缓鏃堕棿";
+ this.gridBand4.Columns.Add(this.gv_createDate);
+ this.gridBand4.MinWidth = 25;
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.VisibleIndex = 4;
+ this.gridBand4.Width = 146;
+ //
+ // gv_createDate
+ //
+ this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_createDate.AppearanceCell.Options.UseFont = true;
+ this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
+ this.gv_createDate.FieldName = "createDate";
+ this.gv_createDate.MinWidth = 25;
+ this.gv_createDate.Name = "gv_createDate";
+ this.gv_createDate.OptionsColumn.AllowEdit = false;
+ this.gv_createDate.Tag = "query_a.CREATE_DATE";
+ this.gv_createDate.Visible = true;
+ this.gv_createDate.Width = 146;
+ //
// gridBand6
//
this.gridBand6.Caption = "瀹℃牳鏃ユ湡";
this.gridBand6.Columns.Add(this.gv_checkDate);
this.gridBand6.Columns.Add(this.gv_insDate);
this.gridBand6.Columns.Add(this.gv_fcheckDate);
- this.gridBand6.MinWidth = 180;
+ this.gridBand6.MinWidth = 25;
this.gridBand6.Name = "gridBand6";
this.gridBand6.VisibleIndex = 5;
- this.gridBand6.Width = 180;
+ this.gridBand6.Width = 94;
//
// gv_checkDate
//
@@ -1453,7 +1455,7 @@
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "CHECK_DATE ";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 50;
+ this.gv_checkDate.MinWidth = 25;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
@@ -1466,7 +1468,7 @@
this.gv_insDate.AppearanceCell.Options.UseFont = true;
this.gv_insDate.Caption = "insDate瀹℃牳鏃ユ湡";
this.gv_insDate.FieldName = "insDate";
- this.gv_insDate.MinWidth = 50;
+ this.gv_insDate.MinWidth = 25;
this.gv_insDate.Name = "gv_insDate";
this.gv_insDate.OptionsColumn.AllowEdit = false;
this.gv_insDate.Tag = "query_a.INS_DATE";
@@ -1478,7 +1480,7 @@
this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
this.gv_fcheckDate.Caption = "鍏ュ簱瀹℃牳鏃ユ湡 ";
this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 50;
+ this.gv_fcheckDate.MinWidth = 25;
this.gv_fcheckDate.Name = "gv_fcheckDate";
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.FCHECK_DATE";
@@ -1500,7 +1502,7 @@
//
this.gridBand10.Caption = "浠撳簱ID";
this.gridBand10.Columns.Add(this.gv_depotsId);
- this.gridBand10.MinWidth = 50;
+ this.gridBand10.MinWidth = 25;
this.gridBand10.Name = "gridBand10";
this.gridBand10.VisibleIndex = 0;
this.gridBand10.Width = 89;
@@ -1511,7 +1513,7 @@
this.gv_depotsId.AppearanceCell.Options.UseFont = true;
this.gv_depotsId.Caption = "浠撳簱 ";
this.gv_depotsId.FieldName = "depotsId";
- this.gv_depotsId.MinWidth = 50;
+ this.gv_depotsId.MinWidth = 25;
this.gv_depotsId.Name = "gv_depotsId";
this.gv_depotsId.OptionsColumn.AllowEdit = false;
this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
@@ -1522,7 +1524,7 @@
//
this.gridBand9.Caption = "浠撳簱鍚嶇О";
this.gridBand9.Columns.Add(this.bandedGridColumn1);
- this.gridBand9.MinWidth = 80;
+ this.gridBand9.MinWidth = 25;
this.gridBand9.Name = "gridBand9";
this.gridBand9.VisibleIndex = 1;
this.gridBand9.Width = 94;
@@ -1546,13 +1548,13 @@
this.gridBand12});
this.gridBand8.Name = "gridBand8";
this.gridBand8.VisibleIndex = 7;
- this.gridBand8.Width = 189;
+ this.gridBand8.Width = 183;
//
// gridBand11
//
this.gridBand11.Caption = "渚涘簲鍟咺D";
this.gridBand11.Columns.Add(this.gv_suppId);
- this.gridBand11.MinWidth = 50;
+ this.gridBand11.MinWidth = 25;
this.gridBand11.Name = "gridBand11";
this.gridBand11.VisibleIndex = 0;
this.gridBand11.Width = 89;
@@ -1563,7 +1565,7 @@
this.gv_suppId.AppearanceCell.Options.UseFont = true;
this.gv_suppId.Caption = "渚涘簲鍟咺D";
this.gv_suppId.FieldName = "suppId";
- this.gv_suppId.MinWidth = 50;
+ this.gv_suppId.MinWidth = 25;
this.gv_suppId.Name = "gv_suppId";
this.gv_suppId.OptionsColumn.AllowEdit = false;
this.gv_suppId.Tag = "query_a.SUPP_ID";
@@ -1574,10 +1576,10 @@
//
this.gridBand12.Caption = "渚涘簲鍟嗗悕绉�";
this.gridBand12.Columns.Add(this.bandedGridColumn2);
- this.gridBand12.MinWidth = 100;
+ this.gridBand12.MinWidth = 25;
this.gridBand12.Name = "gridBand12";
this.gridBand12.VisibleIndex = 1;
- this.gridBand12.Width = 100;
+ this.gridBand12.Width = 94;
//
// bandedGridColumn2
//
@@ -1592,10 +1594,10 @@
//
this.gridBand13.Caption = "閫佽揣鍗曞彿";
this.gridBand13.Columns.Add(this.gv_paperBillNo);
- this.gridBand13.MinWidth = 120;
+ this.gridBand13.MinWidth = 50;
this.gridBand13.Name = "gridBand13";
this.gridBand13.VisibleIndex = 8;
- this.gridBand13.Width = 120;
+ this.gridBand13.Width = 95;
//
// gv_paperBillNo
//
@@ -1603,7 +1605,7 @@
this.gv_paperBillNo.AppearanceCell.Options.UseFont = true;
this.gv_paperBillNo.Caption = "閫佽揣鍗曞彿 ";
this.gv_paperBillNo.FieldName = "paperBillNo";
- this.gv_paperBillNo.MinWidth = 50;
+ this.gv_paperBillNo.MinWidth = 25;
this.gv_paperBillNo.Name = "gv_paperBillNo";
this.gv_paperBillNo.OptionsColumn.AllowEdit = false;
this.gv_paperBillNo.Tag = "query_a.PAPER_BILL_NO";
@@ -1614,10 +1616,10 @@
//
this.gridBand14.Caption = "澶囨敞淇℃伅";
this.gridBand14.Columns.Add(this.gv_remark);
- this.gridBand14.MinWidth = 120;
+ this.gridBand14.MinWidth = 50;
this.gridBand14.Name = "gridBand14";
this.gridBand14.VisibleIndex = 9;
- this.gridBand14.Width = 120;
+ this.gridBand14.Width = 119;
//
// gv_remark
//
@@ -1769,14 +1771,26 @@
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
//
- // Frm_MesItemQtrk_Rk
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(909, 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 = 6;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
+ // Frm_MesItemQtrkDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1348, 682);
+ this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Name = "Frm_MesItemQtrk_Rk";
+ this.Name = "Frm_MesItemQtrkDj";
this.Text = "鍏跺畠鍏ュ簱鍗�";
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
@@ -1802,6 +1816,7 @@
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -1926,22 +1941,23 @@
private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand8;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand11;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
private UserControl.UcLookSupplier txt_suppId;
private UserControl.UcLookCk txt_depotsId;
private DevExpress.XtraEditors.CheckEdit txt_status;
- }
+ private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand8;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand11;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
+ }
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
similarity index 91%
rename from DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs
rename to DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
index 35143ee..a2d2af2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing DevExpress.RichEdit.Export;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -15,11 +16,11 @@
namespace Gs.DevApp.DevFrm.Rk
{
- public partial class Frm_MesItemQtrk_Rk : DevExpress.XtraEditors.XtraForm
+ public partial class Frm_MesItemQtrkDj : DevExpress.XtraEditors.XtraForm
{
string _webServiceName = "MesItemQtrkDjManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
- public Frm_MesItemQtrk_Rk()
+ public Frm_MesItemQtrkDj()
{
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
@@ -27,7 +28,8 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status2", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -130,7 +132,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
@@ -147,6 +148,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -204,6 +206,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
else
{
@@ -220,6 +223,7 @@
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt2;
gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
}
else
{
@@ -275,12 +279,16 @@
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- if (_rtn.rtnCode > 0)
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ Form parentForm = this.FindForm();
+ UtilityHelper.SetCheckIco(gridView1, "status2", "fcheckUser", "fcheckDate", picCheckBox, parentForm, _inFieldValue.ToString());
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.resx b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.resx
similarity index 100%
rename from DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.resx
rename to DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 5e50eab..1837ea9 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -144,6 +144,8 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -179,8 +181,6 @@
this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -361,6 +361,7 @@
// gridColumn20
//
this.gridColumn20.Caption = "鎶ュ伐鏍囪瘑";
+ this.gridColumn20.FieldName = "isBg";
this.gridColumn20.MaxWidth = 50;
this.gridColumn20.MinWidth = 50;
this.gridColumn20.Name = "gridColumn20";
@@ -1569,6 +1570,26 @@
this.gridColumn2.VisibleIndex = 25;
this.gridColumn2.Width = 94;
//
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "鎺掍骇浜�";
+ this.gridColumn21.FieldName = "pcUser";
+ this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 32;
+ this.gridColumn21.Width = 94;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.Caption = "鎺掍骇鏃堕棿";
+ this.gridColumn22.FieldName = "pcDate";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 33;
+ this.gridColumn22.Width = 94;
+ //
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1967,26 +1988,6 @@
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
- //
- // gridColumn21
- //
- this.gridColumn21.Caption = "鎺掍骇浜�";
- this.gridColumn21.FieldName = "pcUser";
- this.gridColumn21.MinWidth = 25;
- this.gridColumn21.Name = "gridColumn21";
- this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 32;
- this.gridColumn21.Width = 94;
- //
- // gridColumn22
- //
- this.gridColumn22.Caption = "鎺掍骇鏃堕棿";
- this.gridColumn22.FieldName = "pcDate";
- this.gridColumn22.MinWidth = 25;
- this.gridColumn22.Name = "gridColumn22";
- this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 33;
- this.gridColumn22.Width = 94;
//
// Frm_Womdaa
//
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 25a84c6..64a9f49 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -387,11 +387,11 @@
<Compile Include="DevFrm\Rk\Frm_MesItemQtrk.Designer.cs">
<DependentUpon>Frm_MesItemQtrk.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\Rk\Frm_MesItemQtrk_Rk.cs">
+ <Compile Include="DevFrm\Rk\Frm_MesItemQtrkDj.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\Rk\Frm_MesItemQtrk_Rk.Designer.cs">
- <DependentUpon>Frm_MesItemQtrk_Rk.cs</DependentUpon>
+ <Compile Include="DevFrm\Rk\Frm_MesItemQtrkDj.Designer.cs">
+ <DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Rk\Frm_MesItemTbl.cs">
<SubType>Form</SubType>
@@ -992,8 +992,8 @@
<EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrk.resx">
<DependentUpon>Frm_MesItemQtrk.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrk_Rk.resx">
- <DependentUpon>Frm_MesItemQtrk_Rk.cs</DependentUpon>
+ <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrkDj.resx">
+ <DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rk\Frm_MesItemTbl.resx">
<DependentUpon>Frm_MesItemTbl.cs</DependentUpon>
--
Gitblit v1.9.3