From 76ef0f16a086a626c4ed557d6553a355c6c2218f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 28 五月 2025 17:18:33 +0800
Subject: [PATCH] 生产
---
DevApp/Gs.DevApp/UserControl/UcLookDaa.Designer.cs | 89 ++++---
DevApp/Gs.DevApp/UserControl/UcLookDaa.cs | 4
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 7
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 34 +-
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs | 6
DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs | 33 ++
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 19 +
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 5
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs | 45 +--
DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs | 20 +
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 404 ++++++++++++++++++---------------
13 files changed, 385 insertions(+), 287 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index cee2aa3..057f052 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
index 07791de..27bfa61 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
@@ -41,14 +41,12 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
-
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
-
/// <summary>
/// 鍒嗛〉浜嬩欢
@@ -191,6 +189,10 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs
index c687e8b..a904680 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs
@@ -9,6 +9,6 @@
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
index 4aae88f..1c7e66e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
@@ -358,8 +358,6 @@
this.gv_bl019.OptionsColumn.AllowEdit = false;
this.gv_bl019.Tag = "query_a.bl019";
this.gv_bl019.UnboundDataType = typeof(bool);
- this.gv_bl019.Visible = true;
- this.gv_bl019.VisibleIndex = 1;
this.gv_bl019.Width = 50;
//
// gv_blNo
@@ -372,7 +370,7 @@
this.gv_blNo.OptionsColumn.AllowEdit = false;
this.gv_blNo.Tag = "query_a.bl_no";
this.gv_blNo.Visible = true;
- this.gv_blNo.VisibleIndex = 2;
+ this.gv_blNo.VisibleIndex = 1;
this.gv_blNo.Width = 100;
//
// gv_bl001
@@ -385,7 +383,7 @@
this.gv_bl001.OptionsColumn.AllowEdit = false;
this.gv_bl001.Tag = "query_a.bl001";
this.gv_bl001.Visible = true;
- this.gv_bl001.VisibleIndex = 3;
+ this.gv_bl001.VisibleIndex = 2;
this.gv_bl001.Width = 100;
//
// gv_bl013
@@ -398,7 +396,7 @@
this.gv_bl013.OptionsColumn.AllowEdit = false;
this.gv_bl013.Tag = "query_a.bl013";
this.gv_bl013.Visible = true;
- this.gv_bl013.VisibleIndex = 4;
+ this.gv_bl013.VisibleIndex = 3;
this.gv_bl013.Width = 94;
//
// gv_bl002
@@ -411,7 +409,7 @@
this.gv_bl002.OptionsColumn.AllowEdit = false;
this.gv_bl002.Tag = "query_a.bl002";
this.gv_bl002.Visible = true;
- this.gv_bl002.VisibleIndex = 5;
+ this.gv_bl002.VisibleIndex = 4;
this.gv_bl002.Width = 94;
//
// gv_bl014
@@ -424,7 +422,7 @@
this.gv_bl014.OptionsColumn.AllowEdit = false;
this.gv_bl014.Tag = "query_a.bl014";
this.gv_bl014.Visible = true;
- this.gv_bl014.VisibleIndex = 6;
+ this.gv_bl014.VisibleIndex = 5;
this.gv_bl014.Width = 94;
//
// gv_bl015
@@ -437,7 +435,7 @@
this.gv_bl015.OptionsColumn.AllowEdit = false;
this.gv_bl015.Tag = "query_a.bl015";
this.gv_bl015.Visible = true;
- this.gv_bl015.VisibleIndex = 7;
+ this.gv_bl015.VisibleIndex = 6;
this.gv_bl015.Width = 94;
//
// gv_bl007
@@ -450,7 +448,7 @@
this.gv_bl007.OptionsColumn.AllowEdit = false;
this.gv_bl007.Tag = "query_a.bl007";
this.gv_bl007.Visible = true;
- this.gv_bl007.VisibleIndex = 8;
+ this.gv_bl007.VisibleIndex = 7;
this.gv_bl007.Width = 94;
//
// gv_bl009
@@ -463,20 +461,18 @@
this.gv_bl009.OptionsColumn.AllowEdit = false;
this.gv_bl009.Tag = "query_a.bl009";
this.gv_bl009.Visible = true;
- this.gv_bl009.VisibleIndex = 9;
+ this.gv_bl009.VisibleIndex = 8;
this.gv_bl009.Width = 94;
//
// gv_bl010
//
this.gv_bl010.AppearanceCell.Options.UseFont = true;
- this.gv_bl010.Caption = "鍙戞枡浠� ";
+ this.gv_bl010.Caption = "鍙戞枡浠揑D";
this.gv_bl010.FieldName = "bl010";
this.gv_bl010.MinWidth = 50;
this.gv_bl010.Name = "gv_bl010";
this.gv_bl010.OptionsColumn.AllowEdit = false;
this.gv_bl010.Tag = "query_a.bl010";
- this.gv_bl010.Visible = true;
- this.gv_bl010.VisibleIndex = 10;
this.gv_bl010.Width = 94;
//
// gv_bl011
@@ -489,7 +485,7 @@
this.gv_bl011.OptionsColumn.AllowEdit = false;
this.gv_bl011.Tag = "query_a.bl011";
this.gv_bl011.Visible = true;
- this.gv_bl011.VisibleIndex = 11;
+ this.gv_bl011.VisibleIndex = 9;
this.gv_bl011.Width = 94;
//
// gv_bl012
@@ -502,7 +498,7 @@
this.gv_bl012.OptionsColumn.AllowEdit = false;
this.gv_bl012.Tag = "query_a.bl012";
this.gv_bl012.Visible = true;
- this.gv_bl012.VisibleIndex = 12;
+ this.gv_bl012.VisibleIndex = 10;
this.gv_bl012.Width = 94;
//
// gv_bl004
@@ -515,7 +511,7 @@
this.gv_bl004.OptionsColumn.AllowEdit = false;
this.gv_bl004.Tag = "query_a.bl004";
this.gv_bl004.Visible = true;
- this.gv_bl004.VisibleIndex = 13;
+ this.gv_bl004.VisibleIndex = 11;
this.gv_bl004.Width = 94;
//
// gv_bl005
@@ -528,7 +524,7 @@
this.gv_bl005.OptionsColumn.AllowEdit = false;
this.gv_bl005.Tag = "query_a.bl005";
this.gv_bl005.Visible = true;
- this.gv_bl005.VisibleIndex = 14;
+ this.gv_bl005.VisibleIndex = 12;
this.gv_bl005.Width = 94;
//
// gv_bl016
@@ -541,7 +537,7 @@
this.gv_bl016.OptionsColumn.AllowEdit = false;
this.gv_bl016.Tag = "query_a.bl016";
this.gv_bl016.Visible = true;
- this.gv_bl016.VisibleIndex = 15;
+ this.gv_bl016.VisibleIndex = 13;
this.gv_bl016.Width = 94;
//
// gv_bl006
@@ -554,7 +550,7 @@
this.gv_bl006.OptionsColumn.AllowEdit = false;
this.gv_bl006.Tag = "query_a.bl006";
this.gv_bl006.Visible = true;
- this.gv_bl006.VisibleIndex = 16;
+ this.gv_bl006.VisibleIndex = 14;
this.gv_bl006.Width = 94;
//
// gv_wcUser
@@ -567,7 +563,7 @@
this.gv_wcUser.OptionsColumn.AllowEdit = false;
this.gv_wcUser.Tag = "query_a.wc_user";
this.gv_wcUser.Visible = true;
- this.gv_wcUser.VisibleIndex = 17;
+ this.gv_wcUser.VisibleIndex = 15;
this.gv_wcUser.Width = 94;
//
// gv_wcTime
@@ -580,7 +576,7 @@
this.gv_wcTime.OptionsColumn.AllowEdit = false;
this.gv_wcTime.Tag = "query_a.wc_time";
this.gv_wcTime.Visible = true;
- this.gv_wcTime.VisibleIndex = 18;
+ this.gv_wcTime.VisibleIndex = 16;
this.gv_wcTime.Width = 94;
//
// gridColumn9
@@ -591,7 +587,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Tag = "org.Fnamber";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 19;
+ this.gridColumn9.VisibleIndex = 17;
this.gridColumn9.Width = 94;
//
// gridColumn11
@@ -601,7 +597,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 20;
+ this.gridColumn11.VisibleIndex = 18;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -611,7 +607,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 21;
+ this.gridColumn12.VisibleIndex = 19;
this.gridColumn12.Width = 94;
//
// pageBar1
@@ -1402,6 +1398,7 @@
this.gvMx1bld007.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1bld007.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1bld007.Caption = "鐢宠鏁伴噺 ";
+ this.gvMx1bld007.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
this.gvMx1bld007.FieldName = "bld007";
this.gvMx1bld007.MinWidth = 80;
this.gvMx1bld007.Name = "gvMx1bld007";
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index 04912dc..01fde4a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -62,7 +62,7 @@
string orgdId = txt_orgId.GetId();
if (string.IsNullOrEmpty(orgdId)) return;
txt_bl010.getSuppler(orgdId, _ucCk);
- txt_aboutGuid.getSuppler(orgdId, _ucGd);
+ txt_aboutGuid.getSuppler(orgdId, _ucGd, "and ( daa018<>'S:鏆傚仠') and ( daa018<>'W:瀹屽伐')");
};
//璁剧疆浠撳簱閫夋嫨
this.txt_bl010.EditChanged += (s, e) =>
@@ -430,6 +430,11 @@
}
}
+
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 78c4769..3e8cec5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -102,7 +102,7 @@
this.txt_tbl009 = new DevExpress.XtraEditors.TextEdit();
this.txt_tbl010 = new DevExpress.XtraEditors.TextEdit();
this.txt_tbl020 = new DevExpress.XtraEditors.CheckEdit();
- this.txt_daa003 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -225,7 +225,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_tbl009.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl010.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
@@ -658,7 +658,7 @@
this.layoutMx1.Controls.Add(this.txt_tbl009);
this.layoutMx1.Controls.Add(this.txt_tbl010);
this.layoutMx1.Controls.Add(this.txt_tbl020);
- this.layoutMx1.Controls.Add(this.txt_daa003);
+ this.layoutMx1.Controls.Add(this.txt_itemNo);
this.layoutMx1.Controls.Add(this.txt_id);
this.layoutMx1.Controls.Add(this.txt_daa014);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -834,14 +834,14 @@
this.txt_tbl020.TabIndex = 466;
this.txt_tbl020.Tag = "readonly";
//
- // txt_daa003
+ // txt_itemNo
//
- this.txt_daa003.Location = new System.Drawing.Point(355, 43);
- this.txt_daa003.Name = "txt_daa003";
- this.txt_daa003.Size = new System.Drawing.Size(195, 24);
- this.txt_daa003.StyleController = this.layoutMx1;
- this.txt_daa003.TabIndex = 467;
- this.txt_daa003.Tag = "readonly";
+ this.txt_itemNo.Location = new System.Drawing.Point(355, 43);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemNo.StyleController = this.layoutMx1;
+ this.txt_itemNo.TabIndex = 467;
+ this.txt_itemNo.Tag = "readonly";
//
// txt_id
//
@@ -1071,7 +1071,7 @@
//
// layoutControlItem18
//
- this.layoutControlItem18.Control = this.txt_daa003;
+ this.layoutControlItem18.Control = this.txt_itemNo;
this.layoutControlItem18.Location = new System.Drawing.Point(271, 31);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -1179,9 +1179,11 @@
this.layout99.Controls.Add(this.txtQuantity);
this.layout99.Controls.Add(this.txtYdy);
this.layout99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem26});
this.layout99.Location = new System.Drawing.Point(0, 0);
this.layout99.Name = "layout99";
- this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(505, 378, 812, 500);
+ this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(237, 453, 812, 500);
this.layout99.Root = this.layoutControlGroup1;
this.layout99.Size = new System.Drawing.Size(1124, 114);
this.layout99.TabIndex = 0;
@@ -1377,7 +1379,6 @@
this.layoutControlItem23,
this.layoutControlItem24,
this.layoutControlItem25,
- this.layoutControlItem26,
this.layoutControlItem27,
this.layoutControlItem28,
this.layoutControlItem29});
@@ -1488,6 +1489,7 @@
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem26.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem26.Text = "lbMxGuid";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
//
@@ -1499,6 +1501,7 @@
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem27.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem27.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem27.TextVisible = false;
//
@@ -1525,6 +1528,7 @@
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem29.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem29.Text = "鑷姩璁＄畻";
this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem29.TextVisible = false;
//
@@ -1987,7 +1991,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_tbl009.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl010.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
@@ -2113,7 +2117,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraEditors.TextEdit txt_daa003;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraTab.XtraTabControl tabMx;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index bd07800..51b47ef 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -59,7 +59,8 @@
if (string.IsNullOrEmpty(daaId)) return;
txt_rwd.Text = txt_tbl002.GetRwd();
txt_workName.Text = txt_tbl002.GetWorkName();
- txt_itemName.Text = txt_tbl002.GetPrdModel();
+ txt_itemName.Text = txt_tbl002.GetPrdName();
+ txt_itemNo.Text = txt_tbl002.GetPrdNo();
};
//閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
@@ -112,7 +113,7 @@
ucBtnPrint1.guidKey = "";
string rowGuid = lbMxGuid.Text.Trim();
ucBtnPrint1.guidKey = rowGuid;
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim()))
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
txt_iCount_1.Focus();
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs
index 4e42844..7905e80 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs
@@ -30,6 +30,7 @@
{
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -67,6 +68,7 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.colChkInt,
this.gv_guid,
this.gridColumn1,
this.gv_supplierItemCode,
@@ -82,10 +84,18 @@
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsSelection.MultiSelect = true;
- this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // colChkInt
+ //
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.MinWidth = 25;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 94;
//
// gv_guid
//
@@ -103,7 +113,6 @@
//
this.gridColumn1.Caption = "鐗╂枡ID";
this.gridColumn1.FieldName = "itemId";
- this.gridColumn1.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gridColumn1.MinWidth = 80;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
@@ -117,7 +126,6 @@
this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
this.gv_supplierItemCode.FieldName = "itemNo";
- this.gv_supplierItemCode.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gv_supplierItemCode.MinWidth = 100;
this.gv_supplierItemCode.Name = "gv_supplierItemCode";
this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
@@ -211,15 +219,12 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Tag = "erpid";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 10;
this.gridColumn3.Width = 94;
//
// gridColumn2
//
this.gridColumn2.Caption = "宸ュ崟鍙�";
this.gridColumn2.FieldName = "dab001";
- this.gridColumn2.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Tag = "dab001";
@@ -283,5 +288,6 @@
private DevExpress.XtraEditors.SimpleButton btnIn;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs
index ac99e87..a48d481 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.ToolBox;
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -14,22 +15,36 @@
public SelectItemTbl(string _daaGuid)
{
InitializeComponent();
+ this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+ this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
+ this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.colChkInt.OptionsFilter.AllowAutoFilter = false;
+ this.colChkInt.OptionsFilter.AllowFilter = false;
+ this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
+ this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.colChkInt.VisibleIndex = 0;
this.daaGuid = _daaGuid;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
getPageList(1);
btnIn.Click += (s, e) =>
{
+ gridView1.PostEditor();
+ gridView1.UpdateCurrentRow();
var list = new List<string>();
- int[] rows = this.gridView1.GetSelectedRows();//鍏堣幏鍙栭�夋嫨琛岀殑琛屽彿
- DataTable dt = this.gcMain.DataSource as DataTable;//寰楀埌GridControl鐨勬暟鎹簮
- foreach (int idx in rows)
+ DataTable dt = this.gcMain.DataSource as DataTable;
{
- string _guid = dt.Rows[idx]["dabGuid"].ToString();
- list.Add(_guid);
+ foreach (DataRow dr in dt.Rows)
+ {
+ string checkBox = dr["chkInt"].ToString();
+ string _guid = dr["dabGuid"].ToString();
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+ {
+ list.Add(_guid);
+ }
+ }
}
- UpdateParent?.Invoke(this,
- new UpdateParentEventArgs { StringList = list });
- Close();
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); Close();
+
};
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 608a9f9..b5561e3 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -30,45 +30,45 @@
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 columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- 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.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition70 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition71 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition72 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition73 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition34 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition35 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition36 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition37 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition38 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition39 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition74 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition75 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition40 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition76 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition77 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition78 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition79 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition80 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition41 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition42 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition81 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition82 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition83 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition84 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition85 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition86 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition43 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition87 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition88 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition89 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition90 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition91 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition92 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition44 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -135,6 +135,7 @@
this.txt_daa015 = new DevExpress.XtraEditors.TextEdit();
this.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
this.txt_dptNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_isQiTao = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -159,6 +160,7 @@
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem46 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -285,9 +287,9 @@
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -329,6 +331,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dptNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
@@ -353,6 +356,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -559,7 +563,7 @@
//
// gridColumn7
//
- this.gridColumn7.Caption = "鏄惁榻愬";
+ this.gridColumn7.Caption = "澶囨枡榻愬";
this.gridColumn7.FieldName = "isQt";
this.gridColumn7.MaxWidth = 50;
this.gridColumn7.MinWidth = 50;
@@ -1006,6 +1010,7 @@
this.layoutMx1.Controls.Add(this.txt_daa015);
this.layoutMx1.Controls.Add(this.txt_lineNo);
this.layoutMx1.Controls.Add(this.txt_dptNo);
+ this.layoutMx1.Controls.Add(this.txt_isQiTao);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem29,
@@ -1242,6 +1247,15 @@
this.txt_dptNo.StyleController = this.layoutMx1;
this.txt_dptNo.TabIndex = 475;
//
+ // txt_isQiTao
+ //
+ this.txt_isQiTao.Location = new System.Drawing.Point(1218, 124);
+ this.txt_isQiTao.Name = "txt_isQiTao";
+ this.txt_isQiTao.Properties.Caption = "澶囨枡榻愬";
+ this.txt_isQiTao.Size = new System.Drawing.Size(399, 24);
+ this.txt_isQiTao.StyleController = this.layoutMx1;
+ this.txt_isQiTao.TabIndex = 476;
+ //
// layoutControlItem29
//
this.layoutControlItem29.Control = this.lbGuid;
@@ -1301,41 +1315,42 @@
this.layoutControlItem13,
this.layoutControlItem19,
this.layoutControlItem17,
- this.layoutControlItem28});
+ this.layoutControlItem28,
+ this.layoutControlItem46});
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;
+ columnDefinition70.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition70.Width = 100D;
+ columnDefinition71.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition71.Width = 100D;
+ columnDefinition72.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition72.Width = 100D;
+ columnDefinition73.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition73.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;
+ columnDefinition70,
+ columnDefinition71,
+ columnDefinition72,
+ columnDefinition73});
+ rowDefinition34.Height = 100D;
+ rowDefinition34.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition35.Height = 100D;
+ rowDefinition35.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition36.Height = 100D;
+ rowDefinition36.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition37.Height = 100D;
+ rowDefinition37.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition38.Height = 100D;
+ rowDefinition38.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition39.Height = 100D;
+ rowDefinition39.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
+ rowDefinition34,
+ rowDefinition35,
+ rowDefinition36,
+ rowDefinition37,
+ rowDefinition38,
+ rowDefinition39});
this.Root.Size = new System.Drawing.Size(1629, 188);
this.Root.TextVisible = false;
//
@@ -1550,6 +1565,17 @@
this.layoutControlItem28.Size = new System.Drawing.Size(804, 28);
this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem46
+ //
+ this.layoutControlItem46.Control = this.txt_isQiTao;
+ this.layoutControlItem46.Location = new System.Drawing.Point(1206, 112);
+ this.layoutControlItem46.Name = "layoutControlItem46";
+ this.layoutControlItem46.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem46.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem46.Size = new System.Drawing.Size(403, 28);
+ this.layoutControlItem46.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem46.TextVisible = false;
//
// tabMx
//
@@ -1833,11 +1859,13 @@
// gvMx1dab021
//
this.gvMx1dab021.AppearanceCell.Options.UseFont = true;
- this.gvMx1dab021.Caption = "琛ラ鏁伴噺";
- this.gvMx1dab021.FieldName = "dab021";
+ this.gvMx1dab021.Caption = "琛ユ枡鏁伴噺";
+ this.gvMx1dab021.FieldName = "blQty";
this.gvMx1dab021.MinWidth = 50;
this.gvMx1dab021.Name = "gvMx1dab021";
this.gvMx1dab021.Tag = "query_a.dab021";
+ this.gvMx1dab021.Visible = true;
+ this.gvMx1dab021.VisibleIndex = 13;
this.gvMx1dab021.Width = 94;
//
// gvMx1dab010
@@ -1914,10 +1942,12 @@
//
this.gvMx1dab023.AppearanceCell.Options.UseFont = true;
this.gvMx1dab023.Caption = "瓒呴鏁伴噺";
- this.gvMx1dab023.FieldName = "dab023";
+ this.gvMx1dab023.FieldName = "clQty";
this.gvMx1dab023.MinWidth = 50;
this.gvMx1dab023.Name = "gvMx1dab023";
this.gvMx1dab023.Tag = "query_a.dab023";
+ this.gvMx1dab023.Visible = true;
+ this.gvMx1dab023.VisibleIndex = 14;
this.gvMx1dab023.Width = 94;
//
// tabMxPage2
@@ -1971,11 +2001,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";
//
@@ -1984,16 +2014,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;
//
@@ -2006,19 +2036,19 @@
this.layoutControlItem39});
this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup3.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
+ columnDefinition74.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition74.Width = 100D;
+ columnDefinition75.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition75.Width = 100D;
this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition74,
+ columnDefinition75});
+ rowDefinition40.Height = 100D;
+ rowDefinition40.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7});
+ rowDefinition40});
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
@@ -2026,7 +2056,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);
//
@@ -2034,16 +2064,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(976, 10);
+ this.radOut.Location = new System.Drawing.Point(988, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2058,29 +2088,29 @@
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(974, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(986, 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(319, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(323, 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";
@@ -2088,11 +2118,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";
@@ -2103,7 +2133,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";
@@ -2113,7 +2143,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;
//
@@ -2132,30 +2162,30 @@
this.layoutControlItem36});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- 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;
- columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition11.Width = 323D;
+ columnDefinition76.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition76.Width = 100D;
+ columnDefinition77.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition77.Width = 100D;
+ columnDefinition78.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition78.Width = 100D;
+ columnDefinition79.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition79.Width = 100D;
+ columnDefinition80.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition80.Width = 328D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10,
- columnDefinition11});
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition76,
+ columnDefinition77,
+ columnDefinition78,
+ columnDefinition79,
+ columnDefinition80});
+ rowDefinition41.Height = 100D;
+ rowDefinition41.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition42.Height = 100D;
+ rowDefinition42.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8,
- rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
+ rowDefinition41,
+ rowDefinition42});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -2163,23 +2193,23 @@
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.MaxSize = new System.Drawing.Size(240, 28);
this.layoutControlItem35.MinSize = new System.Drawing.Size(240, 28);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem35.Text = "鑷姩璁＄畻";
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
@@ -2190,12 +2220,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(1, 1, 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;
@@ -2208,18 +2238,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);
//
@@ -2229,21 +2259,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;
@@ -2253,7 +2283,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);
//
@@ -2456,10 +2486,10 @@
// rptChongDa
//
this.rptChongDa.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptChongDa.Name = "rptChongDa";
this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2689,29 +2719,29 @@
this.layoutControlItem37});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "Root";
- columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition12.Width = 100D;
- columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition13.Width = 100D;
- columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition14.Width = 100D;
- columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition15.Width = 100D;
- columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition16.Width = 100D;
- columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition17.Width = 100D;
+ columnDefinition81.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition81.Width = 100D;
+ columnDefinition82.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition82.Width = 100D;
+ columnDefinition83.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition83.Width = 100D;
+ columnDefinition84.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition84.Width = 100D;
+ columnDefinition85.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition85.Width = 100D;
+ columnDefinition86.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition86.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition12,
- columnDefinition13,
- columnDefinition14,
- columnDefinition15,
- columnDefinition16,
- columnDefinition17});
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition81,
+ columnDefinition82,
+ columnDefinition83,
+ columnDefinition84,
+ columnDefinition85,
+ columnDefinition86});
+ rowDefinition43.Height = 100D;
+ rowDefinition43.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition10});
+ rowDefinition43});
this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 54);
this.layoutControlGroup2.TextVisible = false;
//
@@ -3003,29 +3033,29 @@
this.layoutControlItem45});
this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup4.Name = "Root";
- columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition18.Width = 100D;
- columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition19.Width = 100D;
- columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition20.Width = 100D;
- columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition21.Width = 100D;
- columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition22.Width = 100D;
- columnDefinition23.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition23.Width = 200D;
+ columnDefinition87.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition87.Width = 100D;
+ columnDefinition88.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition88.Width = 100D;
+ columnDefinition89.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition89.Width = 100D;
+ columnDefinition90.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition90.Width = 100D;
+ columnDefinition91.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition91.Width = 100D;
+ columnDefinition92.SizeType = System.Windows.Forms.SizeType.Absolute;
+ columnDefinition92.Width = 200D;
this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition18,
- columnDefinition19,
- columnDefinition20,
- columnDefinition21,
- columnDefinition22,
- columnDefinition23});
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition87,
+ columnDefinition88,
+ columnDefinition89,
+ columnDefinition90,
+ columnDefinition91,
+ columnDefinition92});
+ rowDefinition44.Height = 100D;
+ rowDefinition44.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition11});
+ rowDefinition44});
this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 56);
this.layoutControlGroup4.TextVisible = false;
//
@@ -3158,6 +3188,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dptNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
@@ -3182,6 +3213,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -3480,5 +3512,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem45;
private DevExpress.XtraTab.XtraTabPage xtraTabPage5;
private UserControl.UcBtnPrint ucBtnPrint101;
+ private DevExpress.XtraEditors.CheckEdit txt_isQiTao;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem46;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 424290c..12c20c2 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2108,6 +2108,25 @@
}
/// <summary>
+ /// 鍒ゆ柇鏄笉鏄竴涓湁鏁堢殑姝ｆ暣鏁�
+ /// </summary>
+ /// <param name="str"></param>
+ /// <returns></returns>
+ public static bool IsNumeric3(string str, string str2)
+ {
+ decimal d1 = 0;
+ decimal d2 = 0;
+ if (!string.IsNullOrEmpty(str))
+ {
+ d1 = decimal.Parse(str);
+ }
+ if (!string.IsNullOrEmpty(str2))
+ {
+ d2 = decimal.Parse(str2);
+ }
+ return (d1 + d2) > 0 ? true : false;
+ }
+ /// <summary>
///
/// </summary>
/// <param name="box1">txt_psnQty_1:姣忓紶鏉＄爜鏁伴噺</param>
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDaa.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookDaa.Designer.cs
index 0a29879..6c632d0 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDaa.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDaa.Designer.cs
@@ -30,15 +30,16 @@
{
this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
this.SuspendLayout();
@@ -59,27 +60,28 @@
// searchLookUpEdit1View
//
this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn5,
+ this.gridColumn8,
this.gridColumn1,
this.gridColumn2,
this.gridColumn3,
this.gridColumn6,
this.gridColumn9,
- this.gridColumn8,
this.gridColumn7,
- this.gridColumn4});
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn10});
this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
//
- // gridColumn5
+ // gridColumn8
//
- this.gridColumn5.Caption = "宸ュ崟鍙�";
- this.gridColumn5.FieldName = "daa001";
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 0;
+ this.gridColumn8.Caption = "浠诲姟鍗曞彿";
+ this.gridColumn8.FieldName = "daa021";
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 0;
//
// gridColumn1
//
@@ -100,26 +102,6 @@
this.gridColumn2.VisibleIndex = 2;
this.gridColumn2.Width = 80;
//
- // gridColumn8
- //
- this.gridColumn8.Caption = "浠诲姟鍗曞彿";
- this.gridColumn8.FieldName = "daa021";
- this.gridColumn8.Name = "gridColumn8";
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "瑙勬牸鍨嬪彿";
- this.gridColumn7.FieldName = "itemModel";
- this.gridColumn7.Name = "gridColumn7";
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "鍗曚綅";
- this.gridColumn6.FieldName = "fnumber";
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 5;
- //
// gridColumn3
//
this.gridColumn3.Caption = "浜у搧缂栫爜";
@@ -130,11 +112,13 @@
this.gridColumn3.VisibleIndex = 3;
this.gridColumn3.Width = 100;
//
- // gridColumn4
+ // gridColumn6
//
- this.gridColumn4.Caption = "guid";
- this.gridColumn4.FieldName = "guid";
- this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn6.Caption = "鍗曚綅";
+ this.gridColumn6.FieldName = "fnumber";
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 4;
//
// gridColumn9
//
@@ -143,6 +127,34 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 5;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn7.FieldName = "itemModel";
+ this.gridColumn7.Name = "gridColumn7";
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "guid";
+ this.gridColumn4.FieldName = "guid";
+ this.gridColumn4.Name = "gridColumn4";
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "宸ュ崟鍙�";
+ this.gridColumn5.FieldName = "daa001";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 6;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "鐘舵��";
+ this.gridColumn10.FieldName = "daa018";
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 7;
//
// UcLookDaa
//
@@ -170,5 +182,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs b/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
index de27c74..fd54ab9 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
@@ -34,12 +34,14 @@
/// 璇诲彇宸ュ崟
/// </summary>
/// <param name="orgId"></param>
- public void getSuppler(string orgId, string _dftVale = "")
+ public void getSuppler(string orgId, string _dftVale = "",string strWhere="")
{
lookSearchSupplier.EditValue = null;
string _keyWhere = "";
if (!string.IsNullOrEmpty(orgId))
_keyWhere = " and a.erp_sczz ='" + orgId + "'";
+ if (!string.IsNullOrEmpty(strWhere))
+ _keyWhere += strWhere;
var pgq = new PageQueryModel(1, 999999, "a.daa001", "asc", "",
" and 1=1" + _keyWhere);
var json = JsonConvert.SerializeObject(pgq);
--
Gitblit v1.9.3