From fd94e95ef93cc6608e9c6ecfe8552d3f8dd9b880 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 17 八月 2025 22:53:49 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs | 48 +
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 138 +++---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 286 ++++++------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs | 16
DevApp/Gs.DevApp/App.config | 6
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs | 452 +++++++++---------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 5
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 380 +++++++++-------
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 2
DevApp/Gs.DevApp/XtraForm2.Designer.cs | 15
10 files changed, 714 insertions(+), 634 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 552c822..0989387 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -44,9 +44,9 @@
<add key="Version" value="0.1" />
<add key="IsAutoUpdater" value="0" />
<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" />
+ <add key="ToastSeconds" value="5" /><!--鎻愮ず妗嗘椂闂�-->
+ <add key="AsyncSeconds" value="2" /><!--姘存瓒呮椂鏃堕棿-->
+ <add key="IsWater" value="0" /><!--鏄惁瑕佹按妫�-->
</appSettings>
<userSettings>
<Gs.DevApp.Properties.Settings>
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
index 1ffb78a..7484e98 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
@@ -85,7 +85,7 @@
_row["itemName"] = dym.itemName;
_row["itemModel"] = dym.itemModel;
_row["dwName"] = dym.dwName;
- // _row["sqNum"] = "";
+ // _row["sqNum"] = "";
_row["ysNum"] = "0";
_row["remark"] = "";
_Table.Rows.Add(_row);
@@ -201,7 +201,7 @@
lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -219,18 +219,19 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
if (xtraTabControl1.SelectedTabPageIndex == 0)
{ }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -269,7 +270,7 @@
lbGuid, txt_billNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -310,19 +311,19 @@
string _orgId = txt_thOrgId.GetId();
if (string.IsNullOrEmpty(_orgId))
{
- MsgHelper.Warning("璇烽�夋嫨缁勭粐锛�");
+ MsgHelper.ShowError("璇烽�夋嫨缁勭粐锛�");
txt_thOrgId.Focus();
return;
}
if (string.IsNullOrEmpty(_ckId))
{
- MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+ MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�");
txt_depotId.Focus();
return;
}
if (txt_returnType.TextTxt.Length <= 0)
{
- MsgHelper.Warning("璇烽�夋嫨閫�鏂欏師鍥狅紒");
+ MsgHelper.ShowError("璇烽�夋嫨閫�搴撳師鍥狅紒");
txt_returnType.Focus();
return;
}
@@ -376,9 +377,9 @@
_webServiceName + "EditModel",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData.outGuid;
txt_billNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
@@ -388,10 +389,12 @@
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -402,7 +405,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -485,11 +488,11 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -507,7 +510,8 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
- };
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
@@ -529,9 +533,9 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -540,10 +544,12 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "status", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
@@ -578,13 +584,15 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ getModel(lbGuid.Text);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
index 2bd4b88..de39ac9 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
@@ -91,23 +91,14 @@
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -134,6 +125,15 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -174,23 +174,14 @@
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage2.SuspendLayout();
@@ -200,6 +191,15 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -213,7 +213,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1348, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1469, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -224,7 +224,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1348, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1469, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -234,12 +234,13 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1346, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1467, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -252,8 +253,9 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1346, 570);
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Size = new System.Drawing.Size(1467, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
@@ -263,7 +265,7 @@
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1346, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1467, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -342,7 +344,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 2;
+ this.gv_createBy.VisibleIndex = 9;
this.gv_createBy.Width = 80;
//
// gv_createDate
@@ -354,7 +356,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 3;
+ this.gv_createDate.VisibleIndex = 10;
this.gv_createDate.Width = 180;
//
// gv_lastupdateBy
@@ -366,7 +368,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 4;
+ this.gv_lastupdateBy.VisibleIndex = 11;
this.gv_lastupdateBy.Width = 94;
//
// gv_lastupdateDate
@@ -378,7 +380,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 5;
+ this.gv_lastupdateDate.VisibleIndex = 12;
this.gv_lastupdateDate.Width = 94;
//
// gv_checkUser
@@ -390,7 +392,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 6;
+ this.gv_checkUser.VisibleIndex = 13;
this.gv_checkUser.Width = 60;
//
// gv_checkDate
@@ -402,7 +404,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 7;
+ this.gv_checkDate.VisibleIndex = 14;
this.gv_checkDate.Width = 180;
//
// gv_taskNo
@@ -414,7 +416,7 @@
this.gv_taskNo.OptionsColumn.AllowEdit = false;
this.gv_taskNo.Tag = "query_a.TASK_NO";
this.gv_taskNo.Visible = true;
- this.gv_taskNo.VisibleIndex = 8;
+ this.gv_taskNo.VisibleIndex = 3;
this.gv_taskNo.Width = 94;
//
// gridColumn8
@@ -424,7 +426,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 9;
+ this.gridColumn8.VisibleIndex = 2;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -434,7 +436,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 10;
+ this.gridColumn9.VisibleIndex = 4;
this.gridColumn9.Width = 94;
//
// bandedGridColumn1
@@ -443,7 +445,7 @@
this.bandedGridColumn1.FieldName = "depotCode";
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 11;
+ this.bandedGridColumn1.VisibleIndex = 8;
this.bandedGridColumn1.Width = 100;
//
// gv_depotsId
@@ -455,7 +457,7 @@
this.gv_depotsId.OptionsColumn.AllowEdit = false;
this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
this.gv_depotsId.Visible = true;
- this.gv_depotsId.VisibleIndex = 12;
+ this.gv_depotsId.VisibleIndex = 7;
this.gv_depotsId.Width = 100;
//
// bandedGridColumn2
@@ -465,7 +467,7 @@
this.bandedGridColumn2.Name = "bandedGridColumn2";
this.bandedGridColumn2.Tag = "org.fnamber";
this.bandedGridColumn2.Visible = true;
- this.bandedGridColumn2.VisibleIndex = 13;
+ this.bandedGridColumn2.VisibleIndex = 15;
this.bandedGridColumn2.Width = 250;
//
// bandedGridColumn3
@@ -475,7 +477,7 @@
this.bandedGridColumn3.MinWidth = 25;
this.bandedGridColumn3.Name = "bandedGridColumn3";
this.bandedGridColumn3.Visible = true;
- this.bandedGridColumn3.VisibleIndex = 14;
+ this.bandedGridColumn3.VisibleIndex = 16;
this.bandedGridColumn3.Width = 94;
//
// bandedGridColumn4
@@ -485,7 +487,7 @@
this.bandedGridColumn4.MinWidth = 25;
this.bandedGridColumn4.Name = "bandedGridColumn4";
this.bandedGridColumn4.Visible = true;
- this.bandedGridColumn4.VisibleIndex = 15;
+ this.bandedGridColumn4.VisibleIndex = 5;
this.bandedGridColumn4.Width = 94;
//
// bandedGridColumn5
@@ -495,7 +497,7 @@
this.bandedGridColumn5.MinWidth = 25;
this.bandedGridColumn5.Name = "bandedGridColumn5";
this.bandedGridColumn5.Visible = true;
- this.bandedGridColumn5.VisibleIndex = 16;
+ this.bandedGridColumn5.VisibleIndex = 6;
this.bandedGridColumn5.Width = 94;
//
// bandedGridColumn6
@@ -526,7 +528,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1346, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1467, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -534,7 +536,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1346, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1467, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -542,7 +544,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -553,7 +555,8 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
- this.splitMx1.Size = new System.Drawing.Size(1346, 570);
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Size = new System.Drawing.Size(1467, 570);
this.splitMx1.SplitterPosition = 172;
this.splitMx1.TabIndex = 0;
//
@@ -579,47 +582,50 @@
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_tldh);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem17,
+ this.layoutControlItem18});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(843, 270, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(486, 477, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1346, 172);
+ this.layoutMx1.Size = new System.Drawing.Size(1467, 172);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1005, 102);
+ this.lbGuid.Location = new System.Drawing.Point(1097, 102);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(329, 26);
+ this.lbGuid.Size = new System.Drawing.Size(358, 26);
this.lbGuid.TabIndex = 607;
this.lbGuid.Text = "lbGuid";
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(415, 72);
+ this.txt_dptName.Location = new System.Drawing.Point(807, 42);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(255, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(286, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 605;
this.txt_dptName.Tag = "readonly";
//
// txt_fcheckUser
//
- this.txt_fcheckUser.Location = new System.Drawing.Point(1077, 12);
+ this.txt_fcheckUser.Location = new System.Drawing.Point(1169, 72);
this.txt_fcheckUser.Name = "txt_fcheckUser";
this.txt_fcheckUser.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckUser.Size = new System.Drawing.Size(257, 24);
+ this.txt_fcheckUser.Size = new System.Drawing.Size(286, 24);
this.txt_fcheckUser.StyleController = this.layoutMx1;
this.txt_fcheckUser.TabIndex = 595;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1077, 42);
+ this.txt_checkDate.Location = new System.Drawing.Point(1169, 102);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(257, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(286, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 587;
//
@@ -628,27 +634,27 @@
this.txt_itemName.Location = new System.Drawing.Point(84, 102);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(255, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(285, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 599;
this.txt_itemName.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(415, 102);
+ this.txt_itemNo.Location = new System.Drawing.Point(445, 102);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(255, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(286, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 597;
this.txt_itemNo.Tag = "readonly";
//
// txt_scOrg
//
- this.txt_scOrg.Location = new System.Drawing.Point(415, 42);
+ this.txt_scOrg.Location = new System.Drawing.Point(807, 12);
this.txt_scOrg.Name = "txt_scOrg";
this.txt_scOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_scOrg.Size = new System.Drawing.Size(255, 24);
+ this.txt_scOrg.Size = new System.Drawing.Size(286, 24);
this.txt_scOrg.StyleController = this.layoutMx1;
this.txt_scOrg.TabIndex = 603;
this.txt_scOrg.Tag = "readonly";
@@ -658,16 +664,16 @@
this.txt_remark.Location = new System.Drawing.Point(84, 132);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(586, 24);
+ this.txt_remark.Size = new System.Drawing.Size(647, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(746, 102);
+ this.txt_itemModel.Location = new System.Drawing.Point(445, 72);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(255, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(286, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 601;
this.txt_itemModel.Tag = "readonly";
@@ -677,44 +683,44 @@
this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(255, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(285, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_rkOrg
//
- this.txt_rkOrg.Location = new System.Drawing.Point(415, 12);
+ this.txt_rkOrg.Location = new System.Drawing.Point(445, 12);
this.txt_rkOrg.Name = "txt_rkOrg";
this.txt_rkOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_rkOrg.Size = new System.Drawing.Size(255, 24);
+ this.txt_rkOrg.Size = new System.Drawing.Size(286, 24);
this.txt_rkOrg.StyleController = this.layoutMx1;
this.txt_rkOrg.TabIndex = 592;
this.txt_rkOrg.Tag = "readonly";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(746, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(1169, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(255, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(286, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 219;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(746, 42);
+ this.txt_createDate.Location = new System.Drawing.Point(1169, 42);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(255, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(286, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 222;
//
// txt_depotName
//
- this.txt_depotName.Location = new System.Drawing.Point(746, 72);
+ this.txt_depotName.Location = new System.Drawing.Point(807, 72);
this.txt_depotName.Name = "txt_depotName";
this.txt_depotName.Properties.Appearance.Options.UseFont = true;
- this.txt_depotName.Size = new System.Drawing.Size(255, 24);
+ this.txt_depotName.Size = new System.Drawing.Size(286, 24);
this.txt_depotName.StyleController = this.layoutMx1;
this.txt_depotName.TabIndex = 593;
this.txt_depotName.Tag = "readonly";
@@ -724,7 +730,7 @@
this.txt_cbillNo.Location = new System.Drawing.Point(84, 42);
this.txt_cbillNo.Name = "txt_cbillNo";
this.txt_cbillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_cbillNo.Size = new System.Drawing.Size(255, 24);
+ this.txt_cbillNo.Size = new System.Drawing.Size(285, 24);
this.txt_cbillNo.StyleController = this.layoutMx1;
this.txt_cbillNo.TabIndex = 507;
//
@@ -733,32 +739,32 @@
this.txt_workNo.Location = new System.Drawing.Point(84, 72);
this.txt_workNo.Name = "txt_workNo";
this.txt_workNo.Properties.Appearance.Options.UseFont = true;
- this.txt_workNo.Size = new System.Drawing.Size(255, 24);
+ this.txt_workNo.Size = new System.Drawing.Size(285, 24);
this.txt_workNo.StyleController = this.layoutMx1;
this.txt_workNo.TabIndex = 243;
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(1005, 72);
+ this.txt_fstatus.Location = new System.Drawing.Point(1097, 132);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_fstatus.Size = new System.Drawing.Size(329, 24);
+ this.txt_fstatus.Size = new System.Drawing.Size(358, 24);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 606;
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(1077, 132);
+ this.txt_guid.Location = new System.Drawing.Point(1169, 132);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(257, 24);
+ this.txt_guid.Size = new System.Drawing.Size(286, 24);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 608;
//
// txt_tldh
//
- this.txt_tldh.Location = new System.Drawing.Point(746, 132);
+ this.txt_tldh.Location = new System.Drawing.Point(445, 42);
this.txt_tldh.Name = "txt_tldh";
- this.txt_tldh.Size = new System.Drawing.Size(255, 24);
+ this.txt_tldh.Size = new System.Drawing.Size(286, 24);
this.txt_tldh.StyleController = this.layoutMx1;
this.txt_tldh.TabIndex = 609;
//
@@ -769,23 +775,21 @@
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
this.layoutControlItem2,
- this.layoutControlItem3,
- this.layoutControlItem4,
this.layoutControlItem5,
- this.layoutControlItem6,
this.layoutControlItem7,
- this.layoutControlItem8,
this.layoutControlItem9,
- this.layoutControlItem10,
this.layoutControlItem11,
this.layoutControlItem12,
this.layoutControlItem13,
- this.layoutControlItem14,
- this.layoutControlItem15,
this.layoutControlItem16,
- this.layoutControlItem17,
- this.layoutControlItem18,
- this.layoutControlItem19});
+ this.layoutControlItem15,
+ this.layoutControlItem14,
+ this.layoutControlItem3,
+ this.layoutControlItem4,
+ this.layoutControlItem8,
+ this.layoutControlItem19,
+ this.layoutControlItem10,
+ this.layoutControlItem6});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -817,7 +821,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1346, 172);
+ this.Root.Size = new System.Drawing.Size(1467, 172);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -825,62 +829,30 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem1.Size = new System.Drawing.Size(361, 30);
this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_rkOrg;
- this.layoutControlItem2.Location = new System.Drawing.Point(331, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(361, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem2.Size = new System.Drawing.Size(362, 30);
this.layoutControlItem2.Text = "鍏ュ簱缁勭粐";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(662, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(331, 30);
- this.layoutControlItem3.Text = "鍒涘缓浜�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_createDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(662, 30);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(331, 30);
- this.layoutControlItem4.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_depotName;
- this.layoutControlItem5.Location = new System.Drawing.Point(662, 60);
+ this.layoutControlItem5.Location = new System.Drawing.Point(723, 60);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem5.Size = new System.Drawing.Size(362, 30);
this.layoutControlItem5.Text = "浠撳簱鍚嶇О";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(662, 90);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(331, 30);
- this.layoutControlItem6.Text = "瑙勬牸鍨嬪彿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
@@ -888,20 +860,9 @@
this.layoutControlItem7.Location = new System.Drawing.Point(0, 30);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem7.Size = new System.Drawing.Size(361, 30);
this.layoutControlItem7.Text = "宸ュ崟鍗曞彿";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_scOrg;
- this.layoutControlItem8.Location = new System.Drawing.Point(331, 30);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(331, 30);
- this.layoutControlItem8.Text = "鐢熶骇缁勭粐";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
@@ -909,20 +870,9 @@
this.layoutControlItem9.Location = new System.Drawing.Point(0, 60);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem9.Size = new System.Drawing.Size(361, 30);
this.layoutControlItem9.Text = "浠诲姟鍗曞彿";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_dptName;
- this.layoutControlItem10.Location = new System.Drawing.Point(331, 60);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(331, 30);
- this.layoutControlItem10.Text = "鐢熶骇杞﹂棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
@@ -930,18 +880,18 @@
this.layoutControlItem11.Location = new System.Drawing.Point(0, 90);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem11.Size = new System.Drawing.Size(361, 30);
this.layoutControlItem11.Text = "浜у搧缂栫爜";
this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_itemNo;
- this.layoutControlItem12.Location = new System.Drawing.Point(331, 90);
+ this.layoutControlItem12.Location = new System.Drawing.Point(361, 90);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem12.Size = new System.Drawing.Size(362, 30);
this.layoutControlItem12.Text = "浜у搧鍚嶇О";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
@@ -952,51 +902,18 @@
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(662, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(723, 32);
this.layoutControlItem13.Text = "澶囨敞";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_fcheckUser;
- this.layoutControlItem14.Location = new System.Drawing.Point(993, 0);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(333, 30);
- this.layoutControlItem14.Text = "瀹℃牳浜�";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_checkDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(993, 30);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(333, 30);
- this.layoutControlItem15.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_fstatus;
- this.layoutControlItem16.Location = new System.Drawing.Point(993, 60);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(333, 30);
- this.layoutControlItem16.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.lbGuid;
- this.layoutControlItem17.Location = new System.Drawing.Point(993, 90);
+ this.layoutControlItem17.Location = new System.Drawing.Point(1085, 90);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(333, 30);
+ this.layoutControlItem17.Size = new System.Drawing.Size(362, 30);
this.layoutControlItem17.Text = "lbGuid";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
@@ -1004,24 +921,13 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_guid;
- this.layoutControlItem18.Location = new System.Drawing.Point(993, 120);
+ this.layoutControlItem18.Location = new System.Drawing.Point(1085, 120);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(333, 32);
+ this.layoutControlItem18.Size = new System.Drawing.Size(362, 32);
this.layoutControlItem18.Text = "涓婚敭Guid";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_tldh;
- this.layoutControlItem19.Location = new System.Drawing.Point(662, 120);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(331, 32);
- this.layoutControlItem19.Text = "鎶曟枡鍗曞彿";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -1029,7 +935,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage2;
- this.tabMx.Size = new System.Drawing.Size(1346, 386);
+ this.tabMx.Size = new System.Drawing.Size(1467, 386);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage2,
@@ -1039,7 +945,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx1);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1344, 354);
+ this.tabMxPage2.Size = new System.Drawing.Size(1465, 354);
this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
//
// gcMx1
@@ -1048,7 +954,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(1344, 354);
+ this.gcMx1.Size = new System.Drawing.Size(1465, 354);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1298,11 +1204,109 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_fstatus;
+ this.layoutControlItem16.Location = new System.Drawing.Point(1085, 120);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem16.Size = new System.Drawing.Size(362, 32);
+ this.layoutControlItem16.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_checkDate;
+ this.layoutControlItem15.Location = new System.Drawing.Point(1085, 90);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(362, 30);
+ this.layoutControlItem15.Text = "瀹℃牳鏃堕棿";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_fcheckUser;
+ this.layoutControlItem14.Location = new System.Drawing.Point(1085, 60);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(362, 30);
+ this.layoutControlItem14.Text = "瀹℃牳浜�";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_createBy;
+ this.layoutControlItem3.Location = new System.Drawing.Point(1085, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem3.Size = new System.Drawing.Size(362, 30);
+ this.layoutControlItem3.Text = "鍒涘缓浜�";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_createDate;
+ this.layoutControlItem4.Location = new System.Drawing.Point(1085, 30);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(362, 30);
+ this.layoutControlItem4.Text = "鍒涘缓鏃堕棿";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_scOrg;
+ this.layoutControlItem8.Location = new System.Drawing.Point(723, 0);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(362, 30);
+ this.layoutControlItem8.Text = "鐢熶骇缁勭粐";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_tldh;
+ this.layoutControlItem19.Location = new System.Drawing.Point(361, 30);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem19.Size = new System.Drawing.Size(362, 30);
+ this.layoutControlItem19.Text = "鎶曟枡鍗曞彿";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_dptName;
+ this.layoutControlItem10.Location = new System.Drawing.Point(723, 30);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem10.Size = new System.Drawing.Size(362, 30);
+ this.layoutControlItem10.Text = "鐢熶骇杞﹂棿";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_itemModel;
+ this.layoutControlItem6.Location = new System.Drawing.Point(361, 60);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(362, 30);
+ this.layoutControlItem6.Text = "瑙勬牸鍨嬪彿";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ //
// Frm_MesScrkDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1348, 682);
+ this.ClientSize = new System.Drawing.Size(1469, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
@@ -1348,23 +1352,14 @@
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage2.ResumeLayout(false);
@@ -1374,6 +1369,15 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
this.ResumeLayout(false);
}
@@ -1406,21 +1410,13 @@
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraEditors.CheckEdit txt_fstatus;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraTab.XtraTabControl tabMx;
@@ -1471,7 +1467,15 @@
private DevExpress.XtraEditors.TextEdit txt_guid;
private DevExpress.XtraEditors.TextEdit txt_tldh;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
index 18a3f5e..a6fa338 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
@@ -177,7 +177,7 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
private void getModel(string strGuid)
@@ -187,7 +187,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -246,11 +246,11 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -267,7 +267,7 @@
toolBarMenu1.guidKey = rowGuid;
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵"))
@@ -281,9 +281,9 @@
{
var strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -292,10 +292,12 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index b14409c..493f7d2 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -30,17 +30,17 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ 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.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -441,7 +441,7 @@
this.gv_caa001.OptionsColumn.AllowEdit = false;
this.gv_caa001.Tag = "query_a.CAA001";
this.gv_caa001.Visible = true;
- this.gv_caa001.VisibleIndex = 1;
+ this.gv_caa001.VisibleIndex = 2;
this.gv_caa001.Width = 100;
//
// gridColumn1
@@ -452,7 +452,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 2;
+ this.gridColumn1.VisibleIndex = 3;
this.gridColumn1.Width = 80;
//
// gridColumn9
@@ -463,7 +463,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 3;
+ this.gridColumn9.VisibleIndex = 4;
this.gridColumn9.Width = 60;
//
// gv_caa020
@@ -476,7 +476,7 @@
this.gv_caa020.OptionsColumn.AllowEdit = false;
this.gv_caa020.Tag = "query_a.CAA020";
this.gv_caa020.Visible = true;
- this.gv_caa020.VisibleIndex = 4;
+ this.gv_caa020.VisibleIndex = 1;
this.gv_caa020.Width = 100;
//
// gv_caa006
@@ -1329,41 +1329,41 @@
this.layoutControlItem23});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8,
- rowDefinition9,
- rowDefinition10,
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7});
this.Root.Size = new System.Drawing.Size(1464, 216);
this.Root.TextVisible = false;
//
@@ -1763,7 +1763,7 @@
this.gvMx1cab003.Name = "gvMx1cab003";
this.gvMx1cab003.Tag = "query_a.CAB003";
this.gvMx1cab003.Visible = true;
- this.gvMx1cab003.VisibleIndex = 3;
+ this.gvMx1cab003.VisibleIndex = 2;
this.gvMx1cab003.Width = 94;
//
// gridColumn14
@@ -1773,7 +1773,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 4;
+ this.gridColumn14.VisibleIndex = 3;
this.gridColumn14.Width = 94;
//
// gridColumn10
@@ -1783,7 +1783,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 5;
+ this.gridColumn10.VisibleIndex = 4;
this.gridColumn10.Width = 94;
//
// gvMx1cab012
@@ -1795,7 +1795,7 @@
this.gvMx1cab012.Name = "gvMx1cab012";
this.gvMx1cab012.Tag = "query_a.CAB012";
this.gvMx1cab012.Visible = true;
- this.gvMx1cab012.VisibleIndex = 6;
+ this.gvMx1cab012.VisibleIndex = 5;
this.gvMx1cab012.Width = 94;
//
// gvMx1cab006
@@ -1807,7 +1807,7 @@
this.gvMx1cab006.Name = "gvMx1cab006";
this.gvMx1cab006.Tag = "query_a.CAB006";
this.gvMx1cab006.Visible = true;
- this.gvMx1cab006.VisibleIndex = 7;
+ this.gvMx1cab006.VisibleIndex = 6;
this.gvMx1cab006.Width = 94;
//
// gvMx1cab009
@@ -1819,7 +1819,7 @@
this.gvMx1cab009.Name = "gvMx1cab009";
this.gvMx1cab009.Tag = "query_a.CAB009";
this.gvMx1cab009.Visible = true;
- this.gvMx1cab009.VisibleIndex = 8;
+ this.gvMx1cab009.VisibleIndex = 7;
this.gvMx1cab009.Width = 94;
//
// gvMx1cab007
@@ -1831,7 +1831,7 @@
this.gvMx1cab007.Name = "gvMx1cab007";
this.gvMx1cab007.Tag = "query_a.CAB007";
this.gvMx1cab007.Visible = true;
- this.gvMx1cab007.VisibleIndex = 9;
+ this.gvMx1cab007.VisibleIndex = 8;
this.gvMx1cab007.Width = 94;
//
// gvMx1cab014
@@ -1843,7 +1843,7 @@
this.gvMx1cab014.Name = "gvMx1cab014";
this.gvMx1cab014.Tag = "query_a.CAB014";
this.gvMx1cab014.Visible = true;
- this.gvMx1cab014.VisibleIndex = 10;
+ this.gvMx1cab014.VisibleIndex = 9;
this.gvMx1cab014.Width = 94;
//
// gridColumn11
@@ -1853,7 +1853,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 20;
+ this.gridColumn11.VisibleIndex = 19;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -1863,7 +1863,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 21;
+ this.gridColumn12.VisibleIndex = 20;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -1873,7 +1873,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 22;
+ this.gridColumn13.VisibleIndex = 21;
this.gridColumn13.Width = 94;
//
// gvMx1mtono
@@ -1895,7 +1895,7 @@
this.gvMx1numerator.Name = "gvMx1numerator";
this.gvMx1numerator.Tag = "query_a.NUMERATOR";
this.gvMx1numerator.Visible = true;
- this.gvMx1numerator.VisibleIndex = 11;
+ this.gvMx1numerator.VisibleIndex = 10;
this.gvMx1numerator.Width = 94;
//
// gvMx1denominator
@@ -1907,7 +1907,7 @@
this.gvMx1denominator.Name = "gvMx1denominator";
this.gvMx1denominator.Tag = "query_a.DENOMINATOR";
this.gvMx1denominator.Visible = true;
- this.gvMx1denominator.VisibleIndex = 12;
+ this.gvMx1denominator.VisibleIndex = 11;
this.gvMx1denominator.Width = 94;
//
// gvMx1depotCode
@@ -1919,7 +1919,7 @@
this.gvMx1depotCode.Name = "gvMx1depotCode";
this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx1depotCode.Visible = true;
- this.gvMx1depotCode.VisibleIndex = 13;
+ this.gvMx1depotCode.VisibleIndex = 12;
this.gvMx1depotCode.Width = 94;
//
// gridColumn15
@@ -1929,7 +1929,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 14;
+ this.gridColumn15.VisibleIndex = 13;
this.gridColumn15.Width = 94;
//
// gvMx1issueType
@@ -1941,7 +1941,7 @@
this.gvMx1issueType.Name = "gvMx1issueType";
this.gvMx1issueType.Tag = "query_a.ISSUE_TYPE";
this.gvMx1issueType.Visible = true;
- this.gvMx1issueType.VisibleIndex = 15;
+ this.gvMx1issueType.VisibleIndex = 14;
this.gvMx1issueType.Width = 94;
//
// gridColumn16
@@ -1951,7 +1951,7 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 16;
+ this.gridColumn16.VisibleIndex = 15;
this.gridColumn16.Width = 94;
//
// gvMx1scraprate
@@ -1963,7 +1963,7 @@
this.gvMx1scraprate.Name = "gvMx1scraprate";
this.gvMx1scraprate.Tag = "query_a.SCRAPRATE";
this.gvMx1scraprate.Visible = true;
- this.gvMx1scraprate.VisibleIndex = 17;
+ this.gvMx1scraprate.VisibleIndex = 16;
this.gvMx1scraprate.Width = 94;
//
// gvMx1scrapqty
@@ -1975,7 +1975,7 @@
this.gvMx1scrapqty.Name = "gvMx1scrapqty";
this.gvMx1scrapqty.Tag = "query_a.SCRAPQTY";
this.gvMx1scrapqty.Visible = true;
- this.gvMx1scrapqty.VisibleIndex = 18;
+ this.gvMx1scrapqty.VisibleIndex = 17;
this.gvMx1scrapqty.Width = 94;
//
// gridColumn17
@@ -1985,7 +1985,7 @@
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 19;
+ this.gridColumn17.VisibleIndex = 18;
this.gridColumn17.Width = 94;
//
// gridColumn29
@@ -1995,7 +1995,7 @@
this.gridColumn29.MinWidth = 25;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.Visible = true;
- this.gridColumn29.VisibleIndex = 23;
+ this.gridColumn29.VisibleIndex = 22;
this.gridColumn29.Width = 94;
//
// gridColumn18
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 0a1750f..1d9a7de 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -142,6 +142,7 @@
this.txt_isQiTao = new DevExpress.XtraEditors.CheckEdit();
this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
this.txt_daa025 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_daa021 = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -159,16 +160,17 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.txt_daa015label = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem46 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem48 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem49 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -201,6 +203,7 @@
this.gvMx1dab020 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab022 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab023 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx6 = new DevExpress.XtraGrid.GridControl();
this.gvMx6 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -304,6 +307,7 @@
this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
@@ -335,7 +339,6 @@
this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -379,6 +382,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa025.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa021.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
@@ -396,16 +400,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa015label)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem49)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -686,7 +691,7 @@
this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 19;
+ this.gridColumn27.VisibleIndex = 20;
this.gridColumn27.Width = 94;
//
// gv_daa018
@@ -746,7 +751,7 @@
this.gridColumn3.MinWidth = 50;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 10;
+ this.gridColumn3.VisibleIndex = 11;
this.gridColumn3.Width = 94;
//
// gv_daa003
@@ -759,7 +764,7 @@
this.gv_daa003.OptionsColumn.AllowEdit = false;
this.gv_daa003.Tag = "query_a.daa003";
this.gv_daa003.Visible = true;
- this.gv_daa003.VisibleIndex = 11;
+ this.gv_daa003.VisibleIndex = 12;
this.gv_daa003.Width = 150;
//
// gv_daa004
@@ -772,7 +777,7 @@
this.gv_daa004.OptionsColumn.AllowEdit = false;
this.gv_daa004.Tag = "query_a.daa004";
this.gv_daa004.Visible = true;
- this.gv_daa004.VisibleIndex = 12;
+ this.gv_daa004.VisibleIndex = 13;
this.gv_daa004.Width = 150;
//
// gv_daa008
@@ -786,7 +791,7 @@
this.gv_daa008.OptionsColumn.AllowEdit = false;
this.gv_daa008.Tag = "query_a.daa008";
this.gv_daa008.Visible = true;
- this.gv_daa008.VisibleIndex = 13;
+ this.gv_daa008.VisibleIndex = 14;
this.gv_daa008.Width = 50;
//
// gv_daa011
@@ -800,7 +805,7 @@
this.gv_daa011.OptionsColumn.AllowEdit = false;
this.gv_daa011.Tag = "query_a.daa011";
this.gv_daa011.Visible = true;
- this.gv_daa011.VisibleIndex = 14;
+ this.gv_daa011.VisibleIndex = 15;
this.gv_daa011.Width = 50;
//
// gridColumn4
@@ -815,7 +820,7 @@
this.gridColumn4.MinWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 15;
+ this.gridColumn4.VisibleIndex = 16;
this.gridColumn4.Width = 50;
//
// gv_daa010
@@ -829,7 +834,7 @@
this.gv_daa010.OptionsColumn.AllowEdit = false;
this.gv_daa010.Tag = "query_a.daa010";
this.gv_daa010.Visible = true;
- this.gv_daa010.VisibleIndex = 17;
+ this.gv_daa010.VisibleIndex = 18;
this.gv_daa010.Width = 50;
//
// gv_daa005
@@ -843,7 +848,7 @@
this.gv_daa005.OptionsColumn.AllowEdit = false;
this.gv_daa005.Tag = "query_a.daa005";
this.gv_daa005.Visible = true;
- this.gv_daa005.VisibleIndex = 18;
+ this.gv_daa005.VisibleIndex = 19;
this.gv_daa005.Width = 50;
//
// gv_cust
@@ -864,7 +869,7 @@
this.gridColumn1.MinWidth = 50;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 20;
+ this.gridColumn1.VisibleIndex = 21;
this.gridColumn1.Width = 94;
//
// gv_daa015
@@ -877,7 +882,7 @@
this.gv_daa015.OptionsColumn.AllowEdit = false;
this.gv_daa015.Tag = "query_a.daa015";
this.gv_daa015.Visible = true;
- this.gv_daa015.VisibleIndex = 8;
+ this.gv_daa015.VisibleIndex = 9;
this.gv_daa015.Width = 94;
//
// gv_daa009
@@ -890,7 +895,7 @@
this.gv_daa009.OptionsColumn.AllowEdit = false;
this.gv_daa009.Tag = "query_a.daa009";
this.gv_daa009.Visible = true;
- this.gv_daa009.VisibleIndex = 16;
+ this.gv_daa009.VisibleIndex = 17;
this.gv_daa009.Width = 94;
//
// gv_prepareTime
@@ -925,7 +930,7 @@
this.gv_daa016.OptionsColumn.AllowEdit = false;
this.gv_daa016.Tag = "query_a.daa016";
this.gv_daa016.Visible = true;
- this.gv_daa016.VisibleIndex = 21;
+ this.gv_daa016.VisibleIndex = 22;
this.gv_daa016.Width = 180;
//
// gv_daa017
@@ -938,7 +943,7 @@
this.gv_daa017.OptionsColumn.AllowEdit = false;
this.gv_daa017.Tag = "query_a.daa017";
this.gv_daa017.Visible = true;
- this.gv_daa017.VisibleIndex = 22;
+ this.gv_daa017.VisibleIndex = 23;
this.gv_daa017.Width = 180;
//
// gv_mesStartProd
@@ -951,7 +956,7 @@
this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
this.gv_mesStartProd.Visible = true;
- this.gv_mesStartProd.VisibleIndex = 23;
+ this.gv_mesStartProd.VisibleIndex = 24;
this.gv_mesStartProd.Width = 180;
//
// gv_mesEndProd
@@ -964,7 +969,7 @@
this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
this.gv_mesEndProd.Visible = true;
- this.gv_mesEndProd.VisibleIndex = 24;
+ this.gv_mesEndProd.VisibleIndex = 25;
this.gv_mesEndProd.Width = 180;
//
// gridColumn21
@@ -974,7 +979,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 25;
+ this.gridColumn21.VisibleIndex = 26;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -984,7 +989,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 26;
+ this.gridColumn22.VisibleIndex = 27;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -1002,7 +1007,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 27;
+ this.gridColumn24.VisibleIndex = 28;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -1012,7 +1017,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 28;
+ this.gridColumn25.VisibleIndex = 8;
this.gridColumn25.Width = 94;
//
// gridColumn52
@@ -1022,7 +1027,7 @@
this.gridColumn52.MinWidth = 25;
this.gridColumn52.Name = "gridColumn52";
this.gridColumn52.Visible = true;
- this.gridColumn52.VisibleIndex = 9;
+ this.gridColumn52.VisibleIndex = 10;
this.gridColumn52.Width = 94;
//
// pageBar1
@@ -1093,6 +1098,7 @@
this.layoutMx1.Controls.Add(this.txt_isQiTao);
this.layoutMx1.Controls.Add(this.txt_daa018);
this.layoutMx1.Controls.Add(this.txt_daa025);
+ this.layoutMx1.Controls.Add(this.txt_daa021);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem29,
@@ -1100,7 +1106,7 @@
this.layoutControlItem41});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1059, 277, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(797, 526, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1650, 192);
this.layoutMx1.TabIndex = 0;
@@ -1125,10 +1131,10 @@
//
// txt_daa009
//
- this.txt_daa009.Location = new System.Drawing.Point(114, 155);
+ this.txt_daa009.Location = new System.Drawing.Point(521, 155);
this.txt_daa009.Name = "txt_daa009";
this.txt_daa009.Properties.Appearance.Options.UseFont = true;
- this.txt_daa009.Size = new System.Drawing.Size(708, 24);
+ this.txt_daa009.Size = new System.Drawing.Size(301, 24);
this.txt_daa009.StyleController = this.layoutMx1;
this.txt_daa009.TabIndex = 240;
this.txt_daa009.Tag = "";
@@ -1255,7 +1261,7 @@
//
// txt_daa029
//
- this.txt_daa029.Location = new System.Drawing.Point(114, 68);
+ this.txt_daa029.Location = new System.Drawing.Point(114, 97);
this.txt_daa029.Name = "txt_daa029";
this.txt_daa029.Properties.Appearance.Options.UseFont = true;
this.txt_daa029.Size = new System.Drawing.Size(301, 24);
@@ -1285,7 +1291,7 @@
//
// txt_daa003
//
- this.txt_daa003.Location = new System.Drawing.Point(114, 97);
+ this.txt_daa003.Location = new System.Drawing.Point(114, 126);
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Properties.Appearance.Options.UseFont = true;
this.txt_daa003.Size = new System.Drawing.Size(301, 24);
@@ -1305,7 +1311,7 @@
//
// txt_daa004
//
- this.txt_daa004.Location = new System.Drawing.Point(114, 126);
+ this.txt_daa004.Location = new System.Drawing.Point(114, 155);
this.txt_daa004.Name = "txt_daa004";
this.txt_daa004.Properties.Appearance.Options.UseFont = true;
this.txt_daa004.Size = new System.Drawing.Size(301, 24);
@@ -1368,6 +1374,15 @@
this.txt_daa025.StyleController = this.layoutMx1;
this.txt_daa025.TabIndex = 479;
//
+ // txt_daa021
+ //
+ this.txt_daa021.Location = new System.Drawing.Point(114, 68);
+ this.txt_daa021.Name = "txt_daa021";
+ this.txt_daa021.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa021.StyleController = this.layoutMx1;
+ this.txt_daa021.TabIndex = 480;
+ this.txt_daa021.Tag = "readonly";
+ //
// layoutControlItem29
//
this.layoutControlItem29.Control = this.lbGuid;
@@ -1421,16 +1436,17 @@
this.layoutControlItem12,
this.layoutControlItem16,
this.layoutControlItem9,
- this.layoutControlItem13,
- this.layoutControlItem19,
- this.layoutControlItem17,
- this.layoutControlItem28,
this.txt_daa015label,
this.layoutControlItem14,
this.layoutControlItem46,
this.layoutControlItem48,
this.layoutControlItem40,
- this.layoutControlItem27});
+ this.layoutControlItem27,
+ this.layoutControlItem28,
+ this.layoutControlItem17,
+ this.layoutControlItem19,
+ this.layoutControlItem13,
+ this.layoutControlItem49});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1606,47 +1622,6 @@
this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_daa029;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(407, 29);
- this.layoutControlItem13.Text = "浜у搧缂栫爜";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_daa003;
- this.layoutControlItem19.Location = new System.Drawing.Point(0, 85);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(407, 29);
- this.layoutControlItem19.Text = "浜у搧鍚嶇О";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_daa004;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 114);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(407, 29);
- this.layoutControlItem17.Text = "浜у搧瑙勬牸";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem28
- //
- this.layoutControlItem28.Control = this.txt_daa009;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 143);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem28.Size = new System.Drawing.Size(814, 29);
- this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
- //
// txt_daa015label
//
this.txt_daa015label.Control = this.txt_daa015;
@@ -1713,6 +1688,57 @@
this.layoutControlItem27.Size = new System.Drawing.Size(409, 29);
this.layoutControlItem27.Text = "鐢熶骇绫诲瀷";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem28
+ //
+ this.layoutControlItem28.Control = this.txt_daa009;
+ this.layoutControlItem28.Location = new System.Drawing.Point(407, 143);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem28.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_daa004;
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 143);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem17.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem17.Text = "浜у搧瑙勬牸";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_daa003;
+ this.layoutControlItem19.Location = new System.Drawing.Point(0, 114);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem19.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem19.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_daa029;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 85);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem13.Text = "浜у搧缂栫爜";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem49
+ //
+ this.layoutControlItem49.Control = this.txt_daa021;
+ this.layoutControlItem49.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem49.Name = "layoutControlItem49";
+ this.layoutControlItem49.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem49.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem49.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem49.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1785,7 +1811,8 @@
this.gvMx1dab019,
this.gvMx1dab020,
this.gvMx1dab022,
- this.gvMx1dab023});
+ this.gvMx1dab023,
+ this.gridColumn58});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1808,7 +1835,7 @@
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 89;
//
// gvMx1dab001
//
@@ -1820,7 +1847,7 @@
this.gvMx1dab001.Tag = "query_a.dab001";
this.gvMx1dab001.Visible = true;
this.gvMx1dab001.VisibleIndex = 1;
- this.gvMx1dab001.Width = 94;
+ this.gvMx1dab001.Width = 89;
//
// gvMx1dab003
//
@@ -1832,7 +1859,7 @@
this.gvMx1dab003.Tag = "query_a.dab003";
this.gvMx1dab003.Visible = true;
this.gvMx1dab003.VisibleIndex = 2;
- this.gvMx1dab003.Width = 94;
+ this.gvMx1dab003.Width = 89;
//
// gvMx1dab004
//
@@ -1844,7 +1871,7 @@
this.gvMx1dab004.Tag = "query_a.dab004";
this.gvMx1dab004.Visible = true;
this.gvMx1dab004.VisibleIndex = 3;
- this.gvMx1dab004.Width = 94;
+ this.gvMx1dab004.Width = 89;
//
// gvMx1dab005
//
@@ -1856,7 +1883,7 @@
this.gvMx1dab005.Tag = "query_a.dab005";
this.gvMx1dab005.Visible = true;
this.gvMx1dab005.VisibleIndex = 4;
- this.gvMx1dab005.Width = 94;
+ this.gvMx1dab005.Width = 89;
//
// gvMx1dab006
//
@@ -1867,8 +1894,8 @@
this.gvMx1dab006.Name = "gvMx1dab006";
this.gvMx1dab006.Tag = "query_a.dab006";
this.gvMx1dab006.Visible = true;
- this.gvMx1dab006.VisibleIndex = 5;
- this.gvMx1dab006.Width = 94;
+ this.gvMx1dab006.VisibleIndex = 6;
+ this.gvMx1dab006.Width = 89;
//
// gvMx1dab007
//
@@ -1879,8 +1906,8 @@
this.gvMx1dab007.Name = "gvMx1dab007";
this.gvMx1dab007.Tag = "query_a.dab007";
this.gvMx1dab007.Visible = true;
- this.gvMx1dab007.VisibleIndex = 6;
- this.gvMx1dab007.Width = 94;
+ this.gvMx1dab007.VisibleIndex = 7;
+ this.gvMx1dab007.Width = 89;
//
// gridColumn14
//
@@ -1889,8 +1916,8 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 7;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.VisibleIndex = 8;
+ this.gridColumn14.Width = 89;
//
// gvMx1dab014
//
@@ -1901,8 +1928,8 @@
this.gvMx1dab014.Name = "gvMx1dab014";
this.gvMx1dab014.Tag = "query_a.dab014";
this.gvMx1dab014.Visible = true;
- this.gvMx1dab014.VisibleIndex = 8;
- this.gvMx1dab014.Width = 94;
+ this.gvMx1dab014.VisibleIndex = 9;
+ this.gvMx1dab014.Width = 89;
//
// gridColumn15
//
@@ -1911,8 +1938,8 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 9;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.VisibleIndex = 10;
+ this.gridColumn15.Width = 89;
//
// gridColumn16
//
@@ -1921,8 +1948,8 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 10;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.VisibleIndex = 11;
+ this.gridColumn16.Width = 89;
//
// gvMx1dab012
//
@@ -1933,8 +1960,8 @@
this.gvMx1dab012.Name = "gvMx1dab012";
this.gvMx1dab012.Tag = "query_a.dab012";
this.gvMx1dab012.Visible = true;
- this.gvMx1dab012.VisibleIndex = 11;
- this.gvMx1dab012.Width = 94;
+ this.gvMx1dab012.VisibleIndex = 12;
+ this.gvMx1dab012.Width = 89;
//
// gvMx1dab009
//
@@ -1945,8 +1972,8 @@
this.gvMx1dab009.Name = "gvMx1dab009";
this.gvMx1dab009.Tag = "query_a.dab009";
this.gvMx1dab009.Visible = true;
- this.gvMx1dab009.VisibleIndex = 12;
- this.gvMx1dab009.Width = 94;
+ this.gvMx1dab009.VisibleIndex = 13;
+ this.gvMx1dab009.Width = 246;
//
// gvMx1scrapqty
//
@@ -1977,8 +2004,8 @@
this.gvMx1zyBl.Name = "gvMx1zyBl";
this.gvMx1zyBl.Tag = "query_a.zy_bl";
this.gvMx1zyBl.Visible = true;
- this.gvMx1zyBl.VisibleIndex = 17;
- this.gvMx1zyBl.Width = 94;
+ this.gvMx1zyBl.VisibleIndex = 18;
+ this.gvMx1zyBl.Width = 72;
//
// gvMx1llBl
//
@@ -1989,8 +2016,8 @@
this.gvMx1llBl.Name = "gvMx1llBl";
this.gvMx1llBl.Tag = "query_a.ll_bl";
this.gvMx1llBl.Visible = true;
- this.gvMx1llBl.VisibleIndex = 15;
- this.gvMx1llBl.Width = 94;
+ this.gvMx1llBl.VisibleIndex = 16;
+ this.gvMx1llBl.Width = 58;
//
// gvMx1lpTl
//
@@ -2001,8 +2028,8 @@
this.gvMx1lpTl.Name = "gvMx1lpTl";
this.gvMx1lpTl.Tag = "query_a.lp_tl";
this.gvMx1lpTl.Visible = true;
- this.gvMx1lpTl.VisibleIndex = 16;
- this.gvMx1lpTl.Width = 94;
+ this.gvMx1lpTl.VisibleIndex = 17;
+ this.gvMx1lpTl.Width = 58;
//
// gvMx1dab021
//
@@ -2013,8 +2040,8 @@
this.gvMx1dab021.Name = "gvMx1dab021";
this.gvMx1dab021.Tag = "query_a.dab021";
this.gvMx1dab021.Visible = true;
- this.gvMx1dab021.VisibleIndex = 13;
- this.gvMx1dab021.Width = 94;
+ this.gvMx1dab021.VisibleIndex = 14;
+ this.gvMx1dab021.Width = 58;
//
// gvMx1dab010
//
@@ -2095,8 +2122,18 @@
this.gvMx1dab023.Name = "gvMx1dab023";
this.gvMx1dab023.Tag = "query_a.dab023";
this.gvMx1dab023.Visible = true;
- this.gvMx1dab023.VisibleIndex = 14;
- this.gvMx1dab023.Width = 94;
+ this.gvMx1dab023.VisibleIndex = 15;
+ this.gvMx1dab023.Width = 58;
+ //
+ // gridColumn58
+ //
+ this.gridColumn58.Caption = "棰嗘枡杩涘害";
+ this.gridColumn58.FieldName = "barbl";
+ this.gridColumn58.MinWidth = 25;
+ this.gridColumn58.Name = "gridColumn58";
+ this.gridColumn58.Visible = true;
+ this.gridColumn58.VisibleIndex = 5;
+ this.gridColumn58.Width = 94;
//
// xtraTabPage6
//
@@ -2563,11 +2600,11 @@
//
this.layShuLiang.Controls.Add(this.txt_iCount_1);
this.layShuLiang.Controls.Add(this.txt_yuliang_1);
- this.layShuLiang.Location = new System.Drawing.Point(654, 44);
+ this.layShuLiang.Location = new System.Drawing.Point(662, 44);
this.layShuLiang.Name = "layShuLiang";
this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
this.layShuLiang.Root = this.layoutControlGroup3;
- this.layShuLiang.Size = new System.Drawing.Size(317, 28);
+ this.layShuLiang.Size = new System.Drawing.Size(321, 28);
this.layShuLiang.TabIndex = 475;
this.layShuLiang.Text = "dataLayoutControl1";
//
@@ -2576,16 +2613,16 @@
this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(67, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
this.txt_iCount_1.StyleController = this.layShuLiang;
this.txt_iCount_1.TabIndex = 5;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(247, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(249, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24);
this.txt_yuliang_1.StyleController = this.layShuLiang;
this.txt_yuliang_1.TabIndex = 6;
//
@@ -2610,7 +2647,7 @@
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
+ this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem25
@@ -2618,7 +2655,7 @@
this.layoutControlItem25.Control = this.txt_iCount_1;
this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.Size = new System.Drawing.Size(158, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(160, 28);
this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2626,16 +2663,16 @@
//
this.layoutControlItem39.Control = this.txt_yuliang_1;
this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
- this.layoutControlItem39.Location = new System.Drawing.Point(158, 0);
+ this.layoutControlItem39.Location = new System.Drawing.Point(160, 0);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem39.Size = new System.Drawing.Size(159, 28);
+ this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(973, 10);
+ this.radOut.Location = new System.Drawing.Point(985, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2644,7 +2681,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(321, 32);
+ this.radOut.Size = new System.Drawing.Size(325, 32);
this.radOut.StyleController = this.layoutMx99;
this.radOut.TabIndex = 473;
//
@@ -2652,29 +2689,29 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(973, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(985, 42);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(321, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(749, 12);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(230, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
this.txt_psnQty_1.StyleController = this.layoutMx99;
this.txt_psnQty_1.TabIndex = 330;
this.txt_psnQty_1.Tag = "readOnly-1";
//
// txt_printRemark
//
- this.txt_printRemark.Location = new System.Drawing.Point(420, 44);
+ this.txt_printRemark.Location = new System.Drawing.Point(424, 44);
this.txt_printRemark.Name = "txt_printRemark";
this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(230, 24);
+ this.txt_printRemark.Size = new System.Drawing.Size(234, 24);
this.txt_printRemark.StyleController = this.layoutMx99;
this.txt_printRemark.TabIndex = 334;
this.txt_printRemark.Tag = "readOnly-1";
@@ -2682,11 +2719,11 @@
// txt_kQty
//
this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(420, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(424, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(234, 24);
this.txt_kQty.StyleController = this.layoutMx99;
this.txt_kQty.TabIndex = 472;
this.txt_kQty.Tag = "readonly";
@@ -2697,7 +2734,7 @@
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(234, 24);
this.txt_yQty.StyleController = this.layoutMx99;
this.txt_yQty.TabIndex = 470;
this.txt_yQty.Tag = "readonly";
@@ -2707,7 +2744,7 @@
this.txt_zQty.Location = new System.Drawing.Point(99, 12);
this.txt_zQty.Name = "txt_zQty";
this.txt_zQty.Properties.ReadOnly = true;
- this.txt_zQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_zQty.Size = new System.Drawing.Size(234, 24);
this.txt_zQty.StyleController = this.layoutMx99;
this.txt_zQty.TabIndex = 474;
//
@@ -2735,7 +2772,7 @@
columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition10.Width = 100D;
columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition11.Width = 323D;
+ columnDefinition11.Width = 328D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition7,
columnDefinition8,
@@ -2749,7 +2786,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition8,
rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -2757,21 +2794,21 @@
this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem23.Control = this.txt_kQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(321, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(325, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.radOut;
- this.layoutControlItem35.Location = new System.Drawing.Point(963, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(975, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem35.Text = "鑷姩璁＄畻";
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem35.TextVisible = false;
@@ -2781,12 +2818,12 @@
this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem26.Control = this.ucBtnPrint1;
- this.layoutControlItem26.Location = new System.Drawing.Point(963, 32);
+ this.layoutControlItem26.Location = new System.Drawing.Point(975, 32);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -2799,18 +2836,18 @@
this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(321, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(325, 32);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2820,21 +2857,21 @@
this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem24.Control = this.txt_psnQty_1;
this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.Location = new System.Drawing.Point(642, 0);
+ this.layoutControlItem24.Location = new System.Drawing.Point(650, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem24.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.layShuLiang;
- this.layoutControlItem38.Location = new System.Drawing.Point(642, 32);
+ this.layoutControlItem38.Location = new System.Drawing.Point(650, 32);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem38.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -2844,7 +2881,7 @@
this.layoutControlItem36.Control = this.txt_zQty;
this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem36.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
@@ -3386,6 +3423,16 @@
this.gridColumn35.VisibleIndex = 5;
this.gridColumn35.Width = 94;
//
+ // gridColumn55
+ //
+ this.gridColumn55.Caption = "鏁版嵁鐘舵��";
+ this.gridColumn55.FieldName = "bRemark";
+ this.gridColumn55.MinWidth = 25;
+ this.gridColumn55.Name = "gridColumn55";
+ this.gridColumn55.Visible = true;
+ this.gridColumn55.VisibleIndex = 6;
+ this.gridColumn55.Width = 94;
+ //
// xtraTabPage4
//
this.xtraTabPage4.Controls.Add(this.splitMx100);
@@ -3766,16 +3813,6 @@
this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
this.ucBtnPrint101.TabIndex = 0;
//
- // gridColumn55
- //
- this.gridColumn55.Caption = "鏁版嵁鐘舵��";
- this.gridColumn55.FieldName = "bRemark";
- this.gridColumn55.MinWidth = 25;
- this.gridColumn55.Name = "gridColumn55";
- this.gridColumn55.Visible = true;
- this.gridColumn55.VisibleIndex = 6;
- this.gridColumn55.Width = 94;
- //
// Frm_Womdaa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -3828,6 +3865,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa025.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa021.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
@@ -3845,16 +3883,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa015label)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem49)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -4146,10 +4185,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
private DevExpress.XtraDataLayout.DataLayoutControl layMx100;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
private DevExpress.XtraEditors.SimpleButton btnIn;
@@ -4218,5 +4253,12 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptTuoBanNbz;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
+ private DevExpress.XtraEditors.TextEdit txt_daa021;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem49;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index eb74041..ce4f47a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,3 +1,4 @@
+using DevExpress.Utils;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.DevFrm.WOM;
@@ -9,6 +10,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -39,6 +41,9 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
this.toolBarMenu1.btnGxClick += ToolBarMenu1_btnGxClick;
this.toolBarMenu1.getXmlConfig();
+ gvMx1.Columns["barbl"].DisplayFormat.FormatType = FormatType.Numeric;
+ gvMx1.Columns["barbl"].DisplayFormat.FormatString = "p0";
+ Gs.DevApp.ToolBox.UtilityHelper.CustomProgressBarColumn(gvMx1, "barbl", 90, Brushes.OrangeRed, Brushes.DodgerBlue);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index d959c87..8a46553 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -29,16 +29,16 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- 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.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition33 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition34 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition35 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition36 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition49 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition50 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition51 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition52 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition53 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition54 = new DevExpress.XtraLayout.RowDefinition();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -60,6 +60,7 @@
this.btnGood = new DevExpress.XtraEditors.SimpleButton();
this.btnBad = new DevExpress.XtraEditors.SimpleButton();
this.txt_dianJianPath = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -77,7 +78,7 @@
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.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
@@ -133,7 +134,6 @@
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
- this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
this.splitMx1.Panel1.SuspendLayout();
@@ -163,6 +163,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -180,7 +181,7 @@
((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.layDianJian)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
@@ -194,7 +195,6 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
this.SuspendLayout();
//
// splitMx1
@@ -215,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 = 221;
+ this.splitMx1.SplitterPosition = 229;
this.splitMx1.TabIndex = 0;
//
// splitTop1
@@ -244,7 +244,7 @@
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, 221);
+ this.splitTop1.Size = new System.Drawing.Size(1367, 229);
this.splitTop1.SplitterPosition = 527;
this.splitTop1.TabIndex = 0;
//
@@ -275,7 +275,7 @@
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, 221);
+ this.layoutMx1.Size = new System.Drawing.Size(828, 229);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -299,7 +299,7 @@
//
// txt_gx
//
- this.txt_gx.Location = new System.Drawing.Point(111, 45);
+ this.txt_gx.Location = new System.Drawing.Point(111, 46);
this.txt_gx.Name = "txt_gx";
this.txt_gx.Properties.ReadOnly = true;
this.txt_gx.Size = new System.Drawing.Size(99, 24);
@@ -308,7 +308,7 @@
//
// txt_collectBy
//
- this.txt_collectBy.Location = new System.Drawing.Point(111, 78);
+ this.txt_collectBy.Location = new System.Drawing.Point(111, 81);
this.txt_collectBy.Name = "txt_collectBy";
this.txt_collectBy.Properties.ReadOnly = true;
this.txt_collectBy.Size = new System.Drawing.Size(99, 24);
@@ -317,7 +317,7 @@
//
// txt_barCode
//
- this.txt_barCode.Location = new System.Drawing.Point(111, 111);
+ this.txt_barCode.Location = new System.Drawing.Point(111, 116);
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)))));
@@ -329,7 +329,7 @@
//
// txt_currentBarCode
//
- this.txt_currentBarCode.Location = new System.Drawing.Point(111, 144);
+ this.txt_currentBarCode.Location = new System.Drawing.Point(111, 151);
this.txt_currentBarCode.Name = "txt_currentBarCode";
this.txt_currentBarCode.Properties.ReadOnly = true;
this.txt_currentBarCode.Size = new System.Drawing.Size(301, 24);
@@ -338,7 +338,7 @@
//
// txt_gongWei
//
- this.txt_gongWei.Location = new System.Drawing.Point(111, 177);
+ this.txt_gongWei.Location = new System.Drawing.Point(111, 186);
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)))));
@@ -359,7 +359,7 @@
//
// txt_bc
//
- this.txt_bc.Location = new System.Drawing.Point(313, 45);
+ this.txt_bc.Location = new System.Drawing.Point(313, 46);
this.txt_bc.Name = "txt_bc";
this.txt_bc.Properties.ReadOnly = true;
this.txt_bc.Size = new System.Drawing.Size(99, 24);
@@ -368,7 +368,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(515, 45);
+ this.txt_itemName.Location = new System.Drawing.Point(515, 46);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.ReadOnly = true;
this.txt_itemName.Size = new System.Drawing.Size(99, 24);
@@ -386,7 +386,7 @@
//
// txt_sbNo
//
- this.txt_sbNo.Location = new System.Drawing.Point(313, 78);
+ this.txt_sbNo.Location = new System.Drawing.Point(313, 81);
this.txt_sbNo.Name = "txt_sbNo";
this.txt_sbNo.Properties.ReadOnly = true;
this.txt_sbNo.Size = new System.Drawing.Size(99, 24);
@@ -395,7 +395,7 @@
//
// txt_sjXt
//
- this.txt_sjXt.Location = new System.Drawing.Point(515, 78);
+ this.txt_sjXt.Location = new System.Drawing.Point(515, 81);
this.txt_sjXt.Name = "txt_sjXt";
this.txt_sjXt.Properties.ReadOnly = true;
this.txt_sjXt.Size = new System.Drawing.Size(99, 24);
@@ -404,7 +404,7 @@
//
// txt_yjDate
//
- this.txt_yjDate.Location = new System.Drawing.Point(717, 45);
+ this.txt_yjDate.Location = new System.Drawing.Point(717, 46);
this.txt_yjDate.Name = "txt_yjDate";
this.txt_yjDate.Properties.ReadOnly = true;
this.txt_yjDate.Size = new System.Drawing.Size(99, 24);
@@ -413,7 +413,7 @@
//
// txt_sjDate
//
- this.txt_sjDate.Location = new System.Drawing.Point(717, 78);
+ this.txt_sjDate.Location = new System.Drawing.Point(717, 81);
this.txt_sjDate.Name = "txt_sjDate";
this.txt_sjDate.Properties.ReadOnly = true;
this.txt_sjDate.Size = new System.Drawing.Size(99, 24);
@@ -424,7 +424,7 @@
//
this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
this.btnGood.Appearance.Options.UseBackColor = true;
- this.btnGood.Location = new System.Drawing.Point(416, 111);
+ this.btnGood.Location = new System.Drawing.Point(416, 116);
this.btnGood.Name = "btnGood";
this.btnGood.Size = new System.Drawing.Size(198, 96);
this.btnGood.StyleController = this.layoutMx1;
@@ -435,7 +435,7 @@
//
this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
this.btnBad.Appearance.Options.UseBackColor = true;
- this.btnBad.Location = new System.Drawing.Point(618, 111);
+ this.btnBad.Location = new System.Drawing.Point(618, 116);
this.btnBad.Name = "btnBad";
this.btnBad.Size = new System.Drawing.Size(198, 96);
this.btnBad.StyleController = this.layoutMx1;
@@ -444,12 +444,24 @@
//
// txt_dianJianPath
//
- this.txt_dianJianPath.Location = new System.Drawing.Point(313, 177);
+ this.txt_dianJianPath.Location = new System.Drawing.Point(313, 186);
this.txt_dianJianPath.Name = "txt_dianJianPath";
this.txt_dianJianPath.Properties.ReadOnly = true;
this.txt_dianJianPath.Size = new System.Drawing.Size(99, 24);
this.txt_dianJianPath.StyleController = this.layoutMx1;
this.txt_dianJianPath.TabIndex = 21;
+ //
+ // 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 = "閲囬泦琛実uid";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem6.TextVisible = false;
//
// Root
//
@@ -475,39 +487,39 @@
this.layDianJian});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition33.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition33.Width = 100D;
+ columnDefinition34.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition34.Width = 100D;
+ columnDefinition35.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition35.Width = 100D;
+ columnDefinition36.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition36.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition33,
+ columnDefinition34,
+ columnDefinition35,
+ columnDefinition36});
+ rowDefinition49.Height = 100D;
+ rowDefinition49.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition50.Height = 100D;
+ rowDefinition50.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition51.Height = 100D;
+ rowDefinition51.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition52.Height = 100D;
+ rowDefinition52.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition53.Height = 100D;
+ rowDefinition53.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition54.Height = 100D;
+ rowDefinition54.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(828, 221);
+ rowDefinition49,
+ rowDefinition50,
+ rowDefinition51,
+ rowDefinition52,
+ rowDefinition53,
+ rowDefinition54});
+ this.Root.Size = new System.Drawing.Size(828, 229);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -515,17 +527,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, 33);
+ this.layoutControlItem1.Size = new System.Drawing.Size(202, 34);
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, 33);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 34);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem2.Size = new System.Drawing.Size(202, 35);
this.layoutControlItem2.Text = "褰撳墠宸ュ簭";
this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
//
@@ -533,21 +545,21 @@
//
this.layoutControlItem3.Control = this.txt_collectBy;
this.layoutControlItem3.CustomizationFormText = "鎿嶄綔鍛樺伐";
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 66);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 69);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem3.Size = new System.Drawing.Size(202, 35);
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, 99);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 104);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(404, 33);
+ this.layoutControlItem4.Size = new System.Drawing.Size(404, 35);
this.layoutControlItem4.Text = "鎵拷婧爜";
this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
//
@@ -557,53 +569,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, 33);
+ this.layoutControlItem7.Size = new System.Drawing.Size(202, 34);
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, 33);
+ this.layoutControlItem8.Location = new System.Drawing.Point(202, 34);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem8.Size = new System.Drawing.Size(202, 35);
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, 132);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 139);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem5.Size = new System.Drawing.Size(404, 33);
+ this.layoutControlItem5.Size = new System.Drawing.Size(404, 35);
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, 165);
+ this.layShuiJian.Location = new System.Drawing.Point(0, 174);
this.layShuiJian.Name = "layShuiJian";
this.layShuiJian.OptionsTableLayoutItem.RowIndex = 5;
- this.layShuiJian.Size = new System.Drawing.Size(202, 36);
+ this.layShuiJian.Size = new System.Drawing.Size(202, 35);
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, 99);
+ this.layoutControlItem16.Location = new System.Drawing.Point(404, 104);
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, 102);
+ this.layoutControlItem16.Size = new System.Drawing.Size(202, 105);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "鑹搧鎸夐挳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -612,14 +624,14 @@
// layoutControlItem17
//
this.layoutControlItem17.Control = this.btnBad;
- this.layoutControlItem17.Location = new System.Drawing.Point(606, 99);
+ this.layoutControlItem17.Location = new System.Drawing.Point(606, 104);
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, 102);
+ this.layoutControlItem17.Size = new System.Drawing.Size(202, 105);
this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem17.Text = "涓嶈壇鍝佹寜閽�";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
@@ -628,33 +640,33 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_sbNo;
- this.layoutControlItem12.Location = new System.Drawing.Point(202, 66);
+ this.layoutControlItem12.Location = new System.Drawing.Point(202, 69);
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.Size = new System.Drawing.Size(202, 35);
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.Location = new System.Drawing.Point(606, 69);
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.Size = new System.Drawing.Size(202, 35);
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.Location = new System.Drawing.Point(606, 34);
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.Size = new System.Drawing.Size(202, 35);
this.layoutControlItem14.Text = "Mes璁″垝寮�宸�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18);
//
@@ -662,22 +674,22 @@
//
this.layoutControlItem13.Control = this.txt_sjXt;
this.layoutControlItem13.CustomizationFormText = "鐢熶骇绾垮埆";
- this.layoutControlItem13.Location = new System.Drawing.Point(404, 66);
+ this.layoutControlItem13.Location = new System.Drawing.Point(404, 69);
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.Size = new System.Drawing.Size(202, 35);
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.Location = new System.Drawing.Point(404, 34);
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.Size = new System.Drawing.Size(202, 35);
this.layoutControlItem10.Text = "浜у搧鍚嶇О";
this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
//
@@ -688,29 +700,28 @@
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.Size = new System.Drawing.Size(404, 34);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
//
- // layoutControlItem6
+ // layDianJian
//
- 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 = "閲囬泦琛実uid";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem6.TextVisible = false;
+ this.layDianJian.Control = this.txt_dianJianPath;
+ this.layDianJian.Location = new System.Drawing.Point(202, 174);
+ this.layDianJian.Name = "layDianJian";
+ this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
+ this.layDianJian.Size = new System.Drawing.Size(202, 35);
+ this.layDianJian.Text = "鐢垫璺緞";
+ this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
//
// simpleButton7
//
this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton7.Appearance.Options.UseBackColor = true;
- this.simpleButton7.Location = new System.Drawing.Point(122, 126);
+ this.simpleButton7.Location = new System.Drawing.Point(122, 154);
this.simpleButton7.Name = "simpleButton7";
- this.simpleButton7.Size = new System.Drawing.Size(86, 50);
+ this.simpleButton7.Size = new System.Drawing.Size(86, 56);
this.simpleButton7.TabIndex = 10;
this.simpleButton7.Text = "璁惧";
//
@@ -718,9 +729,9 @@
//
this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton6.Appearance.Options.UseBackColor = true;
- this.simpleButton6.Location = new System.Drawing.Point(425, 126);
+ this.simpleButton6.Location = new System.Drawing.Point(425, 154);
this.simpleButton6.Name = "simpleButton6";
- this.simpleButton6.Size = new System.Drawing.Size(86, 50);
+ this.simpleButton6.Size = new System.Drawing.Size(86, 56);
this.simpleButton6.TabIndex = 9;
this.simpleButton6.Text = "鍙栨秷";
//
@@ -728,9 +739,9 @@
//
this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton5.Appearance.Options.UseBackColor = true;
- this.simpleButton5.Location = new System.Drawing.Point(223, 126);
+ this.simpleButton5.Location = new System.Drawing.Point(223, 154);
this.simpleButton5.Name = "simpleButton5";
- this.simpleButton5.Size = new System.Drawing.Size(86, 50);
+ this.simpleButton5.Size = new System.Drawing.Size(86, 56);
this.simpleButton5.TabIndex = 8;
this.simpleButton5.Text = "鍝佽川";
//
@@ -738,9 +749,9 @@
//
this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton4.Appearance.Options.UseBackColor = true;
- this.simpleButton4.Location = new System.Drawing.Point(324, 126);
+ this.simpleButton4.Location = new System.Drawing.Point(324, 154);
this.simpleButton4.Name = "simpleButton4";
- this.simpleButton4.Size = new System.Drawing.Size(86, 50);
+ this.simpleButton4.Size = new System.Drawing.Size(86, 56);
this.simpleButton4.TabIndex = 7;
this.simpleButton4.Text = "鍏跺畠";
//
@@ -748,34 +759,35 @@
//
this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton3.Appearance.Options.UseBackColor = true;
- this.simpleButton3.Location = new System.Drawing.Point(21, 126);
+ this.simpleButton3.Location = new System.Drawing.Point(21, 154);
this.simpleButton3.Name = "simpleButton3";
- this.simpleButton3.Size = new System.Drawing.Size(86, 50);
+ this.simpleButton3.Size = new System.Drawing.Size(86, 56);
this.simpleButton3.TabIndex = 6;
this.simpleButton3.Text = "鐗╂枡";
//
// prog1
//
- this.prog1.Location = new System.Drawing.Point(21, 88);
+ this.prog1.Location = new System.Drawing.Point(22, 110);
this.prog1.Name = "prog1";
this.prog1.Properties.ShowTitle = true;
- this.prog1.Size = new System.Drawing.Size(489, 22);
+ this.prog1.Size = new System.Drawing.Size(489, 26);
this.prog1.TabIndex = 5;
//
// panel3
//
- this.panel3.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ this.panel3.BackColor = System.Drawing.SystemColors.Highlight;
this.panel3.Controls.Add(this.lbSum4);
this.panel3.Controls.Add(this.label6);
+ this.panel3.ForeColor = System.Drawing.Color.White;
this.panel3.Location = new System.Drawing.Point(411, 7);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(99, 71);
+ this.panel3.Size = new System.Drawing.Size(99, 89);
this.panel3.TabIndex = 4;
//
// lbSum4
//
this.lbSum4.AutoSize = true;
- this.lbSum4.Location = new System.Drawing.Point(45, 46);
+ this.lbSum4.Location = new System.Drawing.Point(45, 54);
this.lbSum4.Name = "lbSum4";
this.lbSum4.Size = new System.Drawing.Size(16, 18);
this.lbSum4.TabIndex = 1;
@@ -792,18 +804,19 @@
//
// panel2
//
- this.panel2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ this.panel2.BackColor = System.Drawing.SystemColors.Highlight;
this.panel2.Controls.Add(this.lbSum3);
this.panel2.Controls.Add(this.label4);
+ this.panel2.ForeColor = System.Drawing.Color.White;
this.panel2.Location = new System.Drawing.Point(281, 7);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(99, 71);
+ this.panel2.Size = new System.Drawing.Size(99, 89);
this.panel2.TabIndex = 3;
//
// lbSum3
//
this.lbSum3.AutoSize = true;
- this.lbSum3.Location = new System.Drawing.Point(45, 46);
+ this.lbSum3.Location = new System.Drawing.Point(45, 54);
this.lbSum3.Name = "lbSum3";
this.lbSum3.Size = new System.Drawing.Size(16, 18);
this.lbSum3.TabIndex = 1;
@@ -820,18 +833,19 @@
//
// panel4
//
- this.panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ this.panel4.BackColor = System.Drawing.SystemColors.Highlight;
this.panel4.Controls.Add(this.lbSum2);
this.panel4.Controls.Add(this.label8);
+ this.panel4.ForeColor = System.Drawing.Color.White;
this.panel4.Location = new System.Drawing.Point(143, 7);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(110, 71);
+ this.panel4.Size = new System.Drawing.Size(110, 89);
this.panel4.TabIndex = 2;
//
// lbSum2
//
this.lbSum2.AutoSize = true;
- this.lbSum2.Location = new System.Drawing.Point(45, 46);
+ this.lbSum2.Location = new System.Drawing.Point(45, 54);
this.lbSum2.Name = "lbSum2";
this.lbSum2.Size = new System.Drawing.Size(16, 18);
this.lbSum2.TabIndex = 1;
@@ -848,18 +862,19 @@
//
// panel1
//
- this.panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ this.panel1.BackColor = System.Drawing.SystemColors.Highlight;
this.panel1.Controls.Add(this.lbSum1);
this.panel1.Controls.Add(this.label1);
+ this.panel1.ForeColor = System.Drawing.Color.White;
this.panel1.Location = new System.Drawing.Point(21, 7);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(99, 71);
+ this.panel1.Size = new System.Drawing.Size(99, 89);
this.panel1.TabIndex = 0;
//
// lbSum1
//
this.lbSum1.AutoSize = true;
- this.lbSum1.Location = new System.Drawing.Point(45, 46);
+ this.lbSum1.Location = new System.Drawing.Point(45, 54);
this.lbSum1.Name = "lbSum1";
this.lbSum1.Size = new System.Drawing.Size(16, 18);
this.lbSum1.TabIndex = 1;
@@ -880,7 +895,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, 386);
+ this.tabMx.Size = new System.Drawing.Size(1367, 378);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -890,7 +905,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1365, 354);
+ this.tabMxPage1.Size = new System.Drawing.Size(1365, 346);
this.tabMxPage1.Text = "鑹搧鍚嶇О";
//
// gcMx1
@@ -899,7 +914,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, 354);
+ this.gcMx1.Size = new System.Drawing.Size(1365, 346);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1288,17 +1303,6 @@
this.gridColumn25.VisibleIndex = 12;
this.gridColumn25.Width = 94;
//
- // layDianJian
- //
- 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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1340,6 +1344,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1357,7 +1362,7 @@
((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.layDianJian)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
@@ -1375,7 +1380,6 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 55dc9e3..9b74e45 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -27,7 +27,7 @@
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";
- bool isCleanDianJian = false;
+ bool isCleanDianJian = true;
string _webServiceName = "WorkCollect/";
string dianJianPath = "";//鐢垫鍙栧�艰矾寰�
string goodTag = "鈭�";
diff --git a/DevApp/Gs.DevApp/XtraForm2.Designer.cs b/DevApp/Gs.DevApp/XtraForm2.Designer.cs
index ebf3f00..7ab1c9d 100644
--- a/DevApp/Gs.DevApp/XtraForm2.Designer.cs
+++ b/DevApp/Gs.DevApp/XtraForm2.Designer.cs
@@ -28,19 +28,34 @@
/// </summary>
private void InitializeComponent()
{
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.SuspendLayout();
+ //
+ // labelControl1
+ //
+ this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.labelControl1.Appearance.Options.UseFont = true;
+ this.labelControl1.Location = new System.Drawing.Point(144, 46);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(102, 18);
+ this.labelControl1.TabIndex = 0;
+ this.labelControl1.Text = "labelControl1";
//
// XtraForm2
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(613, 369);
+ this.Controls.Add(this.labelControl1);
this.Name = "XtraForm2";
this.Text = "XtraForm2";
this.ResumeLayout(false);
+ this.PerformLayout();
}
#endregion
+
+ private DevExpress.XtraEditors.LabelControl labelControl1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3