From 9c38dbf93ea5b7dea6b34b03cb3143812b20147d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 02 七月 2025 23:05:41 +0800
Subject: [PATCH] BUG
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs | 215 +++++++-----
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs | 69 ++-
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs | 454 ++++++--------------------
DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs | 9
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 236 +++++++------
5 files changed, 418 insertions(+), 565 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 3e0ca04..3d36ed3 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -29,6 +29,7 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -302,111 +303,12 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_releaseNo, gridView1, "releaseNo");
- toolBarMenu1.guidKey = rowGuid;
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎻愪氦妫�楠屽悧锛�"))
- return;
- if (txt_fcheckResu.Text.Trim() == _strTag)
- {
- if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim()))
- {
- MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欒繚瑙勪俊鎭紒");
- return;
- }
- string _txt_fngHandle = txt_fngHandle.Text.Trim();
- string _txt_fmrmode = txt_fmrmode.GetCode();
- string _txt_fzrId = txt_fzrId.GetId();
- string _txt_workNo = txt_workNo.Text.Trim();
- string _txt_msg = txt_msg.TextTxt;
- string _txt_zrType = txt_zrType.Text.Trim();
- if (txt_fngHandle.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭疆缁撴灉锛�");
- txt_fngHandle.Focus();
- return;
- }
- if (txt_zrType.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐ｄ换鍒ゅ畾锛�");
- txt_zrType.Focus();
- return;
- }
- if (_txt_fzrId.Length <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐ｄ换浜猴紒");
- txt_fzrId.Focus();
- return;
- }
- //褰撳缃粨鏋滀负鍙嶅伐鏃讹紝瑕侀�夋嫨宸ュ簭鍜屽弽宸ョ紪鍙�
- if (txt_fngHandle.SelectedIndex == 1)
- {
- if (string.IsNullOrEmpty(_txt_workNo))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇峰～鍐欏弽宸ュ崟鍙凤紒");
- txt_workNo.Focus();
- return;
- }
- if (string.IsNullOrEmpty(_txt_fmrmode))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇峰～閫夋嫨鍙嶅伐宸ュ簭锛�");
- txt_fmrmode.Focus();
- return;
- }
- }
- else
- {
- if (!string.IsNullOrEmpty(_txt_workNo))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("涓嶉渶瑕佸～鍐欏弽宸ュ崟鍙凤紒");
- txt_workNo.Focus();
- return;
- }
- if (!string.IsNullOrEmpty(_txt_fmrmode))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("涓嶉渶瑕侀�夋嫨鍙嶅伐宸ュ簭锛�");
- txt_fmrmode.Focus();
- return;
- }
- }
- };
-
- var _obj = new
- {
- guid = rowGuid,
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "EditModelSubmit",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
- if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- {
- getModel(lbGuid.Text.Trim(), "0");
- }
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
- gridView1.FocusedRowHandle = rowHandle;
- int _inFieldValue = 1;
- UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString());
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
+ _toolCk(1);
}
-
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ _toolCk(0);
+ }
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
@@ -968,5 +870,131 @@
};
frm.ShowDialog();
}
+
+
+ /// <summary>
+ /// 妫�楠屽拰鍙嶆楠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_releaseNo, gridView1, "releaseNo");
+ toolBarMenu1.guidKey = rowGuid;
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+ if (_inFieldValue == 1)
+ {
+ if (txt_fcheckResu.Text.Trim() == _strTag)
+ {
+ if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim()))
+ {
+ MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欒繚瑙勪俊鎭紒");
+ return;
+ }
+ string _txt_fngHandle = txt_fngHandle.Text.Trim();
+ string _txt_fmrmode = txt_fmrmode.GetCode();
+ string _txt_fzrId = txt_fzrId.GetId();
+ string _txt_workNo = txt_workNo.Text.Trim();
+ string _txt_msg = txt_msg.TextTxt;
+ string _txt_zrType = txt_zrType.Text.Trim();
+ if (txt_fngHandle.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭疆缁撴灉锛�");
+ txt_fngHandle.Focus();
+ return;
+ }
+ if (txt_zrType.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐ｄ换鍒ゅ畾锛�");
+ txt_zrType.Focus();
+ return;
+ }
+ if (_txt_fzrId.Length <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐ｄ换浜猴紒");
+ txt_fzrId.Focus();
+ return;
+ }
+ //褰撳缃粨鏋滀负鍙嶅伐鏃讹紝瑕侀�夋嫨宸ュ簭鍜屽弽宸ョ紪鍙�
+ if (txt_fngHandle.SelectedIndex == 1)
+ {
+ if (string.IsNullOrEmpty(_txt_workNo))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇峰～鍐欏弽宸ュ崟鍙凤紒");
+ txt_workNo.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_txt_fmrmode))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇峰～閫夋嫨鍙嶅伐宸ュ簭锛�");
+ txt_fmrmode.Focus();
+ return;
+ }
+ }
+ else
+ {
+ if (!string.IsNullOrEmpty(_txt_workNo))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("涓嶉渶瑕佸～鍐欏弽宸ュ崟鍙凤紒");
+ txt_workNo.Focus();
+ return;
+ }
+ if (!string.IsNullOrEmpty(_txt_fmrmode))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("涓嶉渶瑕侀�夋嫨鍙嶅伐宸ュ簭锛�");
+ txt_fmrmode.Focus();
+ return;
+ }
+ }
+ };
+ }
+
+ var _obj = new
+ {
+ guid = rowGuid,
+ inFieldValue = _inFieldValue,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModelSubmit",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim(), "0");
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
index e96b3f4..ff324f8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
@@ -36,13 +36,6 @@
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.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.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -63,6 +56,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
@@ -75,7 +69,7 @@
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
this.txt_erpCheckBy = new DevExpress.XtraEditors.TextEdit();
this.btnZsm = new DevExpress.XtraEditors.SimpleButton();
- this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_aboutGuid = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -102,21 +96,6 @@
this.gvMx1pricingUnit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1purchaseQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
- this.layoutMx100 = new DevExpress.XtraLayout.LayoutControl();
- this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
- this.txt_zQty98 = new DevExpress.XtraEditors.TextEdit();
- this.txt_yQty98 = new DevExpress.XtraEditors.TextEdit();
- this.txt_kQty98 = new DevExpress.XtraEditors.TextEdit();
- this.txt_iCount_98 = new DevExpress.XtraEditors.TextEdit();
- this.txt_printRemark98 = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem44 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -131,7 +110,9 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -161,7 +142,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -182,28 +163,9 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
this.tabMxPage2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
- this.splitMx98.Panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).BeginInit();
- this.splitMx98.Panel2.SuspendLayout();
- this.splitMx98.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.layoutMx100)).BeginInit();
- this.layoutMx100.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -460,11 +422,12 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1363, 570);
- this.splitMx1.SplitterPosition = 111;
+ this.splitMx1.SplitterPosition = 122;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.ucBtnPrint98);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_releaseNo);
this.layoutMx1.Controls.Add(this.txt_guid);
@@ -477,18 +440,30 @@
this.layoutMx1.Controls.Add(this.txt_itemModel);
this.layoutMx1.Controls.Add(this.txt_erpCheckBy);
this.layoutMx1.Controls.Add(this.btnZsm);
- this.layoutMx1.Controls.Add(this.txt_daa001);
+ this.layoutMx1.Controls.Add(this.txt_aboutGuid);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem3,
- this.layoutControlItem4});
+ this.layoutControlItem4,
+ this.txt_daa00111111});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(656, 429, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1363, 111);
+ this.layoutMx1.Size = new System.Drawing.Size(1363, 122);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // ucBtnPrint98
+ //
+ this.ucBtnPrint98.allClickKey = null;
+ this.ucBtnPrint98.guidKey = null;
+ this.ucBtnPrint98.Location = new System.Drawing.Point(683, 80);
+ this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrint98.Name = "ucBtnPrint98";
+ this.ucBtnPrint98.rptParameter = null;
+ this.ucBtnPrint98.Size = new System.Drawing.Size(332, 30);
+ this.ucBtnPrint98.TabIndex = 9;
//
// lbGuid
//
@@ -503,7 +478,7 @@
this.txt_releaseNo.Location = new System.Drawing.Point(99, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(239, 24);
+ this.txt_releaseNo.Size = new System.Drawing.Size(244, 24);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
//
@@ -517,85 +492,85 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(759, 12);
+ this.txt_itemName.Location = new System.Drawing.Point(770, 12);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(239, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(245, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 231;
//
// txt_itemNo2
//
- this.txt_itemNo2.Location = new System.Drawing.Point(429, 12);
+ this.txt_itemNo2.Location = new System.Drawing.Point(434, 12);
this.txt_itemNo2.Name = "txt_itemNo2";
- this.txt_itemNo2.Size = new System.Drawing.Size(239, 24);
+ this.txt_itemNo2.Size = new System.Drawing.Size(245, 24);
this.txt_itemNo2.StyleController = this.layoutMx1;
this.txt_itemNo2.TabIndex = 232;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(759, 43);
+ this.txt_createBy.Location = new System.Drawing.Point(770, 46);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(239, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(245, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 233;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1089, 43);
+ this.txt_createDate.Location = new System.Drawing.Point(1106, 46);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(241, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(245, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 234;
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(99, 43);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(99, 46);
this.txt_fbatchQty.Name = "txt_fbatchQty";
- this.txt_fbatchQty.Size = new System.Drawing.Size(239, 24);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(244, 24);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 236;
//
// txt_mrmodeTxt
//
- this.txt_mrmodeTxt.Location = new System.Drawing.Point(429, 43);
+ this.txt_mrmodeTxt.Location = new System.Drawing.Point(434, 46);
this.txt_mrmodeTxt.Name = "txt_mrmodeTxt";
- this.txt_mrmodeTxt.Size = new System.Drawing.Size(239, 24);
+ this.txt_mrmodeTxt.Size = new System.Drawing.Size(245, 24);
this.txt_mrmodeTxt.StyleController = this.layoutMx1;
this.txt_mrmodeTxt.TabIndex = 237;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(1089, 12);
+ this.txt_itemModel.Location = new System.Drawing.Point(1106, 12);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(241, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(245, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 238;
//
// txt_erpCheckBy
//
- this.txt_erpCheckBy.Location = new System.Drawing.Point(99, 74);
+ this.txt_erpCheckBy.Location = new System.Drawing.Point(99, 80);
this.txt_erpCheckBy.Name = "txt_erpCheckBy";
- this.txt_erpCheckBy.Size = new System.Drawing.Size(239, 24);
+ this.txt_erpCheckBy.Size = new System.Drawing.Size(244, 24);
this.txt_erpCheckBy.StyleController = this.layoutMx1;
this.txt_erpCheckBy.TabIndex = 241;
//
// btnZsm
//
this.btnZsm.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.insert_16x16;
- this.btnZsm.Location = new System.Drawing.Point(342, 74);
+ this.btnZsm.Location = new System.Drawing.Point(347, 80);
this.btnZsm.Name = "btnZsm";
this.btnZsm.Size = new System.Drawing.Size(116, 27);
this.btnZsm.StyleController = this.layoutMx1;
this.btnZsm.TabIndex = 242;
this.btnZsm.Text = "鐢熸垚杩芥函鐮�";
//
- // txt_daa001
+ // txt_aboutGuid
//
- this.txt_daa001.Location = new System.Drawing.Point(759, 74);
- this.txt_daa001.Name = "txt_daa001";
- this.txt_daa001.Size = new System.Drawing.Size(239, 24);
- this.txt_daa001.StyleController = this.layoutMx1;
- this.txt_daa001.TabIndex = 243;
+ this.txt_aboutGuid.Location = new System.Drawing.Point(770, 80);
+ this.txt_aboutGuid.Name = "txt_aboutGuid";
+ this.txt_aboutGuid.Size = new System.Drawing.Size(245, 24);
+ this.txt_aboutGuid.StyleController = this.layoutMx1;
+ this.txt_aboutGuid.TabIndex = 243;
//
// layoutControlItem3
//
@@ -633,7 +608,7 @@
this.layoutControlItem11,
this.layoutControlItem14,
this.layoutControlItem8,
- this.txt_daa00111111});
+ this.layoutControlItem13});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -659,7 +634,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1342, 113);
+ this.Root.Size = new System.Drawing.Size(1363, 122);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -667,103 +642,103 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(335, 34);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo2;
- this.layoutControlItem5.Location = new System.Drawing.Point(330, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(336, 34);
this.layoutControlItem5.Text = "浜у搧缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_itemName;
- this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(336, 34);
this.layoutControlItem2.Text = "浜у搧鍚嶇О";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_createBy;
- this.layoutControlItem6.Location = new System.Drawing.Point(660, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(671, 34);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(336, 34);
this.layoutControlItem6.Text = "寮�鍗曚汉";
this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 34);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(335, 34);
this.layoutControlItem9.Text = "闇�杩斿伐鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_mrmodeTxt;
- this.layoutControlItem10.Location = new System.Drawing.Point(330, 31);
+ this.layoutControlItem10.Location = new System.Drawing.Point(335, 34);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(336, 34);
this.layoutControlItem10.Text = "杩斿伐宸ュ簭";
this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(990, 31);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1007, 34);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(332, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(336, 34);
this.layoutControlItem7.Text = "寮�鍗曟棩鏈�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(990, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(332, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(336, 34);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_erpCheckBy;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 68);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(335, 34);
this.layoutControlItem14.Text = "宸茶繑宸ユ暟閲�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.btnZsm;
- this.layoutControlItem8.Location = new System.Drawing.Point(330, 62);
+ this.layoutControlItem8.Location = new System.Drawing.Point(335, 68);
this.layoutControlItem8.MaxSize = new System.Drawing.Size(120, 31);
this.layoutControlItem8.MinSize = new System.Drawing.Size(86, 31);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(336, 34);
this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem8.Text = "鐢熸垚杩芥函鐮�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
@@ -771,12 +746,12 @@
//
// txt_daa00111111
//
- this.txt_daa00111111.Control = this.txt_daa001;
- this.txt_daa00111111.Location = new System.Drawing.Point(660, 62);
+ this.txt_daa00111111.Control = this.txt_aboutGuid;
+ this.txt_daa00111111.Location = new System.Drawing.Point(671, 68);
this.txt_daa00111111.Name = "txt_daa00111111";
this.txt_daa00111111.OptionsTableLayoutItem.ColumnIndex = 2;
this.txt_daa00111111.OptionsTableLayoutItem.RowIndex = 2;
- this.txt_daa00111111.Size = new System.Drawing.Size(330, 31);
+ this.txt_daa00111111.Size = new System.Drawing.Size(336, 34);
this.txt_daa00111111.Text = "宸ュ崟Guid";
this.txt_daa00111111.TextSize = new System.Drawing.Size(75, 18);
//
@@ -786,7 +761,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(1363, 447);
+ this.tabMx.Size = new System.Drawing.Size(1363, 436);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -796,7 +771,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1361, 415);
+ this.tabMxPage1.Size = new System.Drawing.Size(1361, 404);
this.tabMxPage1.Text = "鍗℃澘鏄庣粏";
//
// gcMx1
@@ -805,7 +780,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(1361, 415);
+ this.gcMx1.Size = new System.Drawing.Size(1361, 404);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -903,209 +878,10 @@
//
// tabMxPage2
//
- this.tabMxPage2.Controls.Add(this.splitMx98);
+ this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1361, 403);
+ this.tabMxPage2.Size = new System.Drawing.Size(1361, 415);
this.tabMxPage2.Text = "杩芥函鐮佹槑缁�";
- //
- // splitMx98
- //
- this.splitMx98.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitMx98.Horizontal = false;
- this.splitMx98.Location = new System.Drawing.Point(0, 0);
- this.splitMx98.Name = "splitMx98";
- //
- // splitMx98.Panel1
- //
- this.splitMx98.Panel1.Controls.Add(this.layoutMx100);
- this.splitMx98.Panel1.Text = "Panel1";
- //
- // splitMx98.Panel2
- //
- this.splitMx98.Panel2.Controls.Add(this.gcMx2);
- this.splitMx98.Panel2.Text = "Panel2";
- this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx98.Size = new System.Drawing.Size(1361, 403);
- this.splitMx98.SplitterPosition = 56;
- this.splitMx98.TabIndex = 2;
- //
- // layoutMx100
- //
- this.layoutMx100.Controls.Add(this.ucBtnPrint98);
- this.layoutMx100.Controls.Add(this.txt_zQty98);
- this.layoutMx100.Controls.Add(this.txt_yQty98);
- this.layoutMx100.Controls.Add(this.txt_kQty98);
- this.layoutMx100.Controls.Add(this.txt_iCount_98);
- this.layoutMx100.Controls.Add(this.txt_printRemark98);
- this.layoutMx100.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layoutMx100.Location = new System.Drawing.Point(0, 0);
- this.layoutMx100.Name = "layoutMx100";
- this.layoutMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(454, 530, 812, 500);
- this.layoutMx100.Root = this.layoutControlGroup1;
- this.layoutMx100.Size = new System.Drawing.Size(1361, 56);
- this.layoutMx100.TabIndex = 0;
- this.layoutMx100.Text = "layoutControl1";
- //
- // ucBtnPrint98
- //
- this.ucBtnPrint98.allClickKey = null;
- this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(1127, 12);
- this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
- this.ucBtnPrint98.Name = "ucBtnPrint98";
- this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(222, 32);
- this.ucBtnPrint98.TabIndex = 9;
- //
- // txt_zQty98
- //
- this.txt_zQty98.Location = new System.Drawing.Point(114, 12);
- this.txt_zQty98.Name = "txt_zQty98";
- this.txt_zQty98.Properties.ReadOnly = true;
- this.txt_zQty98.Size = new System.Drawing.Size(117, 24);
- this.txt_zQty98.StyleController = this.layoutMx100;
- this.txt_zQty98.TabIndex = 4;
- //
- // txt_yQty98
- //
- this.txt_yQty98.Location = new System.Drawing.Point(337, 12);
- this.txt_yQty98.Name = "txt_yQty98";
- this.txt_yQty98.Properties.ReadOnly = true;
- this.txt_yQty98.Size = new System.Drawing.Size(117, 24);
- this.txt_yQty98.StyleController = this.layoutMx100;
- this.txt_yQty98.TabIndex = 5;
- //
- // txt_kQty98
- //
- this.txt_kQty98.Location = new System.Drawing.Point(560, 12);
- this.txt_kQty98.Name = "txt_kQty98";
- this.txt_kQty98.Properties.ReadOnly = true;
- this.txt_kQty98.Size = new System.Drawing.Size(117, 24);
- this.txt_kQty98.StyleController = this.layoutMx100;
- this.txt_kQty98.TabIndex = 6;
- //
- // txt_iCount_98
- //
- this.txt_iCount_98.Location = new System.Drawing.Point(1006, 12);
- this.txt_iCount_98.Name = "txt_iCount_98";
- this.txt_iCount_98.Size = new System.Drawing.Size(117, 24);
- this.txt_iCount_98.StyleController = this.layoutMx100;
- this.txt_iCount_98.TabIndex = 7;
- //
- // txt_printRemark98
- //
- this.txt_printRemark98.Location = new System.Drawing.Point(783, 12);
- this.txt_printRemark98.Name = "txt_printRemark98";
- this.txt_printRemark98.Size = new System.Drawing.Size(117, 24);
- this.txt_printRemark98.StyleController = this.layoutMx100;
- this.txt_printRemark98.TabIndex = 10;
- //
- // layoutControlGroup1
- //
- this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- this.layoutControlGroup1.GroupBordersVisible = false;
- this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem42,
- this.layoutControlItem43,
- this.layoutControlItem44,
- this.layoutControlItem45,
- this.layoutControlItem13,
- this.layoutControlItem12});
- this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
- this.layoutControlGroup1.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;
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
- this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10});
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition4});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1361, 56);
- this.layoutControlGroup1.TextVisible = false;
- //
- // layoutControlItem42
- //
- this.layoutControlItem42.Control = this.txt_zQty98;
- this.layoutControlItem42.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem42.CustomizationFormText = "宸ュ崟鎬婚噺";
- this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem42.Name = "layoutControlItem42";
- this.layoutControlItem42.Size = new System.Drawing.Size(223, 36);
- this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
- this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem43
- //
- this.layoutControlItem43.Control = this.txt_yQty98;
- this.layoutControlItem43.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem43.CustomizationFormText = "宸叉墦鍗版暟";
- this.layoutControlItem43.Location = new System.Drawing.Point(223, 0);
- this.layoutControlItem43.Name = "layoutControlItem43";
- this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem43.Size = new System.Drawing.Size(223, 36);
- this.layoutControlItem43.Text = "宸叉墦鍗版暟";
- this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem44
- //
- this.layoutControlItem44.Control = this.txt_kQty98;
- this.layoutControlItem44.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
- this.layoutControlItem44.Location = new System.Drawing.Point(446, 0);
- this.layoutControlItem44.Name = "layoutControlItem44";
- this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem44.Size = new System.Drawing.Size(223, 36);
- this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
- this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem45
- //
- this.layoutControlItem45.Control = this.txt_iCount_98;
- this.layoutControlItem45.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem45.CustomizationFormText = "鏈鎵撳嵃寮犳暟";
- this.layoutControlItem45.Location = new System.Drawing.Point(892, 0);
- this.layoutControlItem45.Name = "layoutControlItem45";
- this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem45.Size = new System.Drawing.Size(223, 36);
- this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
- this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.ucBtnPrint98;
- this.layoutControlItem13.Location = new System.Drawing.Point(1115, 0);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 5;
- this.layoutControlItem13.Size = new System.Drawing.Size(226, 36);
- this.layoutControlItem13.Text = "鎵撳嵃鎸夐挳";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem13.TextVisible = false;
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_printRemark98;
- this.layoutControlItem12.Location = new System.Drawing.Point(669, 0);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(223, 36);
- this.layoutControlItem12.Text = "鎵撳嵃澶囨敞";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// gcMx2
//
@@ -1113,8 +889,8 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1361, 335);
- this.gcMx2.TabIndex = 1;
+ this.gcMx2.Size = new System.Drawing.Size(1361, 415);
+ this.gcMx2.TabIndex = 2;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
//
@@ -1135,7 +911,8 @@
this.gridColumn5,
this.gridColumn6,
this.gridColumn7,
- this.gridColumn8});
+ this.gridColumn8,
+ this.gridColumn9});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1261,6 +1038,28 @@
this.gridColumn8.VisibleIndex = 10;
this.gridColumn8.Width = 156;
//
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鐘舵��";
+ this.gridColumn9.FieldName = "barCodeStatus";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 11;
+ this.gridColumn9.Width = 94;
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.ucBtnPrint98;
+ this.layoutControlItem13.Location = new System.Drawing.Point(671, 68);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem13.Text = "纭畾鎵撳嵃";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
+ //
// Frm_WomFanGong
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1299,7 +1098,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1320,28 +1119,9 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
this.tabMxPage2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
- this.splitMx98.Panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).EndInit();
- this.splitMx98.Panel2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).EndInit();
- this.splitMx98.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.layoutMx100)).EndInit();
- this.layoutMx100.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
this.ResumeLayout(false);
}
@@ -1401,9 +1181,15 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraEditors.TextEdit txt_erpCheckBy;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraEditors.SimpleButton btnZsm;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private UserControl.UcBtnPrint ucBtnPrint98;
+ private DevExpress.XtraEditors.TextEdit txt_aboutGuid;
+ private DevExpress.XtraLayout.LayoutControlItem txt_daa00111111;
private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
@@ -1411,29 +1197,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
- private DevExpress.XtraEditors.SimpleButton btnZsm;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraEditors.SplitContainerControl splitMx98;
- private DevExpress.XtraLayout.LayoutControl layoutMx100;
- private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
- private DevExpress.XtraEditors.TextEdit txt_zQty98;
- private DevExpress.XtraEditors.TextEdit txt_yQty98;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem42;
- private DevExpress.XtraEditors.TextEdit txt_kQty98;
- private DevExpress.XtraEditors.TextEdit txt_iCount_98;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem43;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem44;
- private UserControl.UcBtnPrint ucBtnPrint98;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraEditors.TextEdit txt_daa001;
- private DevExpress.XtraLayout.LayoutControlItem txt_daa00111111;
- private DevExpress.XtraEditors.TextEdit txt_printRemark98;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem45;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
index 387ee36..3853c87 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
@@ -1,6 +1,7 @@
锘縰sing DevExpress.Utils.MVVM.Services;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout.Customization;
+using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -68,11 +69,48 @@
}
};
- //杩欐槸杩芥函鐮�
+ //杩欐槸鎵撳嵃锛岃繖鍜屽叾瀹冮〉闈㈡槸涓嶄竴鏍风殑锛屼笉鑳藉鍒惰繖閲�
+ this.ucBtnPrint98.SetPlButton(false);
this.ucBtnPrint98.btnPrintClick += (s, e) =>
{
- _print98();
+ string rowGuid = txt_aboutGuid.Text.Trim();
+ if (rowGuid.Length < 36)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�");
+ this.ucBtnPrint98.rptParameter = "return false";
+ return;
+ }
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "杩芥函鐮�", lbGuid.Text.Trim());
+ string strCodeList = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+ try
+ {
+ string rptParameter = "rpt_trace{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
};
+
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -259,33 +297,6 @@
}
}
- /// <summary>
- /// 杩欐槸杩芥函鐮�
- /// </summary>
- private void _print98()
- {
- string rowGuid = txt_daa001.Text.Trim();
- if (rowGuid.Length < 36)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�");
- this.ucBtnPrint98.rptParameter = "return false";
- return;
- }
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_98.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
- txt_iCount_98.Focus();
- this.ucBtnPrint98.rptParameter = "return false";
- return;
- }
- this.ucBtnPrint98.rptParameter = "rpt_trace{"
- + ""
- + "," + txt_printRemark98.Text.Trim()
- + "," + ""
- + "," + txt_iCount_98.Text.Trim()
- + "," + 1
- + "}";
- }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
index efc7fef..e9069b3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
@@ -30,13 +30,13 @@
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.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 rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -84,9 +84,12 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_isTbm = new DevExpress.XtraEditors.CheckEdit();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -129,8 +132,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isTbm.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -216,7 +221,8 @@
this.gv_createBy,
this.gv_createDate,
this.gv_lastUpdateBy,
- this.gv_lastUpdateDate});
+ this.gv_lastUpdateDate,
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -284,17 +290,17 @@
this.gv_isBack.OptionsColumn.AllowEdit = false;
this.gv_isBack.Tag = "query_a.isBack";
this.gv_isBack.Visible = true;
- this.gv_isBack.VisibleIndex = 4;
+ this.gv_isBack.VisibleIndex = 3;
this.gv_isBack.Width = 94;
//
// gridColumn1
//
- this.gridColumn1.Caption = "鏄惁鎵撳嵃杩芥函鐮�";
+ this.gridColumn1.Caption = "鏄惁鍙嶈拷婧爜";
this.gridColumn1.FieldName = "isZsm";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.VisibleIndex = 4;
this.gridColumn1.Width = 94;
//
// gv_isStatus
@@ -307,7 +313,7 @@
this.gv_isStatus.OptionsColumn.AllowEdit = false;
this.gv_isStatus.Tag = "query_a.isStatus";
this.gv_isStatus.Visible = true;
- this.gv_isStatus.VisibleIndex = 5;
+ this.gv_isStatus.VisibleIndex = 6;
this.gv_isStatus.Width = 94;
//
// gv_description
@@ -320,7 +326,7 @@
this.gv_description.OptionsColumn.AllowEdit = false;
this.gv_description.Tag = "query_a.description";
this.gv_description.Visible = true;
- this.gv_description.VisibleIndex = 6;
+ this.gv_description.VisibleIndex = 7;
this.gv_description.Width = 94;
//
// gv_createBy
@@ -333,7 +339,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.createBy";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 7;
+ this.gv_createBy.VisibleIndex = 8;
this.gv_createBy.Width = 94;
//
// gv_createDate
@@ -346,7 +352,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.createDate";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 8;
+ this.gv_createDate.VisibleIndex = 9;
this.gv_createDate.Width = 94;
//
// gv_lastUpdateBy
@@ -359,7 +365,7 @@
this.gv_lastUpdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateBy.Tag = "query_a.lastUpdateBy";
this.gv_lastUpdateBy.Visible = true;
- this.gv_lastUpdateBy.VisibleIndex = 9;
+ this.gv_lastUpdateBy.VisibleIndex = 10;
this.gv_lastUpdateBy.Width = 94;
//
// gv_lastUpdateDate
@@ -372,7 +378,7 @@
this.gv_lastUpdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateDate.Tag = "query_a.lastUpdateDate";
this.gv_lastUpdateDate.Visible = true;
- this.gv_lastUpdateDate.VisibleIndex = 10;
+ this.gv_lastUpdateDate.VisibleIndex = 11;
this.gv_lastUpdateDate.Width = 94;
//
// pageBar1
@@ -411,7 +417,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 159;
+ this.splitMx1.SplitterPosition = 173;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -429,15 +435,16 @@
this.layoutMx1.Controls.Add(this.txt_isBack);
this.layoutMx1.Controls.Add(this.txt_isStatus);
this.layoutMx1.Controls.Add(this.txt_isZsm);
+ this.layoutMx1.Controls.Add(this.txt_isTbm);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem12,
this.layoutControlItem1});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(534, 435, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 159);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 173);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -451,7 +458,7 @@
//
// txt_description
//
- this.txt_description.Location = new System.Drawing.Point(84, 104);
+ this.txt_description.Location = new System.Drawing.Point(84, 114);
this.txt_description.Name = "txt_description";
this.txt_description.Properties.Appearance.Options.UseFont = true;
this.txt_description.Size = new System.Drawing.Size(200, 24);
@@ -460,7 +467,7 @@
//
// txt_lastUpdateDate
//
- this.txt_lastUpdateDate.Location = new System.Drawing.Point(912, 58);
+ this.txt_lastUpdateDate.Location = new System.Drawing.Point(912, 63);
this.txt_lastUpdateDate.Name = "txt_lastUpdateDate";
this.txt_lastUpdateDate.Properties.Appearance.Options.UseFont = true;
this.txt_lastUpdateDate.Size = new System.Drawing.Size(202, 24);
@@ -470,10 +477,10 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(636, 104);
+ this.txt_remark.Location = new System.Drawing.Point(636, 114);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(478, 24);
+ this.txt_remark.Size = new System.Drawing.Size(200, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 216;
//
@@ -508,7 +515,7 @@
//
// txt_processName
//
- this.txt_processName.Location = new System.Drawing.Point(84, 58);
+ this.txt_processName.Location = new System.Drawing.Point(84, 63);
this.txt_processName.Name = "txt_processName";
this.txt_processName.Properties.Appearance.Options.UseFont = true;
this.txt_processName.Size = new System.Drawing.Size(200, 24);
@@ -517,7 +524,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(636, 58);
+ this.txt_createDate.Location = new System.Drawing.Point(636, 63);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
this.txt_createDate.Size = new System.Drawing.Size(200, 24);
@@ -545,18 +552,18 @@
//
// txt_isStatus
//
- this.txt_isStatus.Location = new System.Drawing.Point(288, 104);
+ this.txt_isStatus.Location = new System.Drawing.Point(840, 114);
this.txt_isStatus.Name = "txt_isStatus";
this.txt_isStatus.Properties.Caption = "浣跨敤鐘舵��";
- this.txt_isStatus.Size = new System.Drawing.Size(272, 24);
+ this.txt_isStatus.Size = new System.Drawing.Size(274, 24);
this.txt_isStatus.StyleController = this.layoutMx1;
this.txt_isStatus.TabIndex = 237;
//
// txt_isZsm
//
- this.txt_isZsm.Location = new System.Drawing.Point(288, 58);
+ this.txt_isZsm.Location = new System.Drawing.Point(288, 63);
this.txt_isZsm.Name = "txt_isZsm";
- this.txt_isZsm.Properties.Caption = "鏄惁鎵撳嵃杩芥函鐮�";
+ this.txt_isZsm.Properties.Caption = "鏄惁鍙嶈拷婧爜";
this.txt_isZsm.Size = new System.Drawing.Size(272, 24);
this.txt_isZsm.StyleController = this.layoutMx1;
this.txt_isZsm.TabIndex = 238;
@@ -598,44 +605,45 @@
this.layoutControlItem4,
this.layoutControlItem9,
this.layoutControlItem11,
+ this.layoutControlItem13,
this.layoutControlItem5,
- this.layoutControlItem13});
+ this.layoutControlItem14});
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;
+ 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;
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;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ 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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1126, 159);
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
+ this.Root.Size = new System.Drawing.Size(1126, 173);
this.Root.TextVisible = false;
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createDate;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 46);
+ this.layoutControlItem3.Location = new System.Drawing.Point(552, 51);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 46);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 51);
this.layoutControlItem3.Text = "寤虹珛鏃堕棿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -645,7 +653,7 @@
this.layoutControlItem6.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 46);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 51);
this.layoutControlItem6.Text = "寤虹珛浜哄憳";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
@@ -656,28 +664,28 @@
this.layoutControlItem7.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(278, 46);
+ this.layoutControlItem7.Size = new System.Drawing.Size(278, 51);
this.layoutControlItem7.Text = "鏇存柊浜哄憳";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_lastUpdateDate;
- this.layoutControlItem8.Location = new System.Drawing.Point(828, 46);
+ this.layoutControlItem8.Location = new System.Drawing.Point(828, 51);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(278, 46);
+ this.layoutControlItem8.Size = new System.Drawing.Size(278, 51);
this.layoutControlItem8.Text = "鏇存柊鏃堕棿";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_description;
- this.layoutControlItem10.Location = new System.Drawing.Point(0, 92);
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 102);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(276, 47);
+ this.layoutControlItem10.Size = new System.Drawing.Size(276, 51);
this.layoutControlItem10.Text = "宸ュ簭鎻忚堪";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
@@ -687,7 +695,7 @@
this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 46);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 51);
this.layoutControlItem2.Text = "鏄惁杩斿伐";
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem2.TextVisible = false;
@@ -697,54 +705,84 @@
this.layoutControlItem4.Control = this.txt_processNo;
this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 46);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 51);
this.layoutControlItem4.Text = "宸ュ簭浠ｇ爜";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_processName;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 46);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 51);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(276, 46);
+ this.layoutControlItem9.Size = new System.Drawing.Size(276, 51);
this.layoutControlItem9.Text = "宸ュ簭鍚嶇О";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_remark;
- this.layoutControlItem11.Location = new System.Drawing.Point(552, 92);
+ this.layoutControlItem11.Location = new System.Drawing.Point(552, 102);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(554, 47);
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 51);
this.layoutControlItem11.Text = "宸ュ簭澶囨敞";
this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_isStatus;
- this.layoutControlItem5.Location = new System.Drawing.Point(276, 92);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 47);
- this.layoutControlItem5.Text = "鐘舵��";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem5.TextVisible = false;
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_isZsm;
- this.layoutControlItem13.Location = new System.Drawing.Point(276, 46);
+ this.layoutControlItem13.Location = new System.Drawing.Point(276, 51);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 46);
+ this.layoutControlItem13.Size = new System.Drawing.Size(276, 51);
+ this.layoutControlItem13.Text = "鏄惁鍙嶈拷婧爜";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鏄惁鍙嶆墭鏉跨爜";
+ this.gridColumn2.FieldName = "isTbm";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 5;
+ this.gridColumn2.Width = 94;
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_isStatus;
+ this.layoutControlItem5.Location = new System.Drawing.Point(828, 102);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem5.Size = new System.Drawing.Size(278, 51);
+ this.layoutControlItem5.Text = "鐘舵��";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem5.TextVisible = false;
+ //
+ // txt_isTbm
+ //
+ this.txt_isTbm.Location = new System.Drawing.Point(288, 114);
+ this.txt_isTbm.Name = "txt_isTbm";
+ this.txt_isTbm.Properties.Caption = "鏄惁鍙嶆墭鏉跨爜";
+ this.txt_isTbm.Size = new System.Drawing.Size(272, 24);
+ this.txt_isTbm.StyleController = this.layoutMx1;
+ this.txt_isTbm.TabIndex = 239;
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_isTbm;
+ this.layoutControlItem14.Location = new System.Drawing.Point(276, 102);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 51);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem14.TextVisible = false;
//
// Frm_WorkProcesses
//
@@ -797,8 +835,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isTbm.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
this.ResumeLayout(false);
}
@@ -851,7 +891,10 @@
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.CheckEdit txt_isZsm;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraEditors.CheckEdit txt_isTbm;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
index 5feff55..cfc26e9 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
@@ -16,11 +16,14 @@
private readonly string _webServiceName = "VArrivalBarcodeManager/";
private string aboutGuid = "";
private string aboutType = "";//鍚庣洊鐮�
+
/// <summary>
- /// 鐖朵翰guid
+ ///
/// </summary>
- /// <param name="_aboutGuid"></param>
- public SelectDeleteBar(string _aboutGuid, string _aboutType)
+ /// <param name="_aboutGuid">鐖朵翰guid</param>
+ /// <param name="_aboutType">绫诲埆锛堝悗鐩栫爜锛岃拷婧爜锛屽彈鎵樺叆搴撶瓑锛�</param>
+ /// <param name="_qcGuid">qcGuid锛屽湪杩斿伐閲嶆潯鐨勬椂鍊�</param>
+ public SelectDeleteBar(string _aboutGuid, string _aboutType,string _qcGuid="")
{
InitializeComponent();
this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
--
Gitblit v1.9.3