From b270773b9ea1da070a7a4de571cc6eed9d597334 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 19 六月 2025 15:43:57 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 12 +
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 69 ++++----
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 9
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs | 35 ++-
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs | 342 +++++++++++++++++++++++++-----------------
5 files changed, 273 insertions(+), 194 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 633c470..7e9005c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -327,6 +327,8 @@
gridViews.Add(gvMx1);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ //澧炲姞鏃讹紝榛樿缁勭粐
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_receiveOrgId);
}
/// <summary>
@@ -341,13 +343,13 @@
string _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
if (string.IsNullOrEmpty(_orgId))
{
- MsgHelper.Warning("璇烽�夋嫨鏀舵枡缁勭粐锛�");
+ MsgHelper.ShowError("璇烽�夋嫨鏀舵枡缁勭粐锛�");
txt_receiveOrgId.Focus();
return;
}
if (string.IsNullOrEmpty(_gysId))
{
- MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
+ MsgHelper.ShowError("璇烽�夋嫨渚涘簲鍟嗭紒");
txt_suppId.Focus();
return;
}
@@ -397,9 +399,9 @@
_webServiceName + "EditModel",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData.outGuid;
txt_billNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
@@ -409,10 +411,12 @@
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 745da68..35f0759 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -120,7 +120,6 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -180,6 +179,7 @@
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -233,7 +233,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -268,6 +267,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -659,7 +659,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 136);
+ this.btnSelect.Location = new System.Drawing.Point(12, 131);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(96, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -669,7 +669,7 @@
// txt_tbl023
//
this.txt_tbl023.IsReadly = false;
- this.txt_tbl023.Location = new System.Drawing.Point(84, 43);
+ this.txt_tbl023.Location = new System.Drawing.Point(84, 38);
this.txt_tbl023.Name = "txt_tbl023";
this.txt_tbl023.Size = new System.Drawing.Size(195, 24);
this.txt_tbl023.TabIndex = 462;
@@ -677,7 +677,7 @@
// txt_tbl005
//
this.txt_tbl005.EditValue = "-璇烽�夋嫨-";
- this.txt_tbl005.Location = new System.Drawing.Point(84, 105);
+ this.txt_tbl005.Location = new System.Drawing.Point(84, 100);
this.txt_tbl005.Name = "txt_tbl005";
this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -693,10 +693,10 @@
//
// txt_tbl006
//
- this.txt_tbl006.Location = new System.Drawing.Point(355, 105);
+ this.txt_tbl006.Location = new System.Drawing.Point(355, 100);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl006.Size = new System.Drawing.Size(466, 24);
+ this.txt_tbl006.Size = new System.Drawing.Size(195, 24);
this.txt_tbl006.StyleController = this.layoutMx1;
this.txt_tbl006.TabIndex = 226;
//
@@ -704,14 +704,14 @@
//
this.txt_tbl002.category = null;
this.txt_tbl002.IsReadly = false;
- this.txt_tbl002.Location = new System.Drawing.Point(84, 74);
+ this.txt_tbl002.Location = new System.Drawing.Point(84, 69);
this.txt_tbl002.Name = "txt_tbl002";
this.txt_tbl002.Size = new System.Drawing.Size(195, 24);
this.txt_tbl002.TabIndex = 458;
//
// txt_workName
//
- this.txt_workName.Location = new System.Drawing.Point(355, 43);
+ this.txt_workName.Location = new System.Drawing.Point(355, 38);
this.txt_workName.Name = "txt_workName";
this.txt_workName.Properties.Appearance.Options.UseFont = true;
this.txt_workName.Size = new System.Drawing.Size(195, 24);
@@ -721,7 +721,7 @@
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(897, 43);
+ this.txt_tbl012.Location = new System.Drawing.Point(897, 38);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
this.txt_tbl012.Size = new System.Drawing.Size(196, 24);
@@ -731,7 +731,7 @@
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(84, 7);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
this.txt_billNo.Size = new System.Drawing.Size(195, 24);
@@ -741,7 +741,7 @@
//
// txt_rwd
//
- this.txt_rwd.Location = new System.Drawing.Point(355, 12);
+ this.txt_rwd.Location = new System.Drawing.Point(355, 7);
this.txt_rwd.Name = "txt_rwd";
this.txt_rwd.Properties.Appearance.Options.UseFont = true;
this.txt_rwd.Size = new System.Drawing.Size(195, 24);
@@ -751,7 +751,7 @@
//
// txt_tbl011
//
- this.txt_tbl011.Location = new System.Drawing.Point(897, 12);
+ this.txt_tbl011.Location = new System.Drawing.Point(897, 7);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
this.txt_tbl011.Size = new System.Drawing.Size(196, 24);
@@ -761,7 +761,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(355, 74);
+ this.txt_itemName.Location = new System.Drawing.Point(355, 69);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(195, 24);
@@ -771,7 +771,7 @@
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(825, 74);
+ this.txt_tbl013.Location = new System.Drawing.Point(825, 69);
this.txt_tbl013.Name = "txt_tbl013";
this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_tbl013.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -782,7 +782,7 @@
//
// txt_tbl009
//
- this.txt_tbl009.Location = new System.Drawing.Point(626, 12);
+ this.txt_tbl009.Location = new System.Drawing.Point(626, 7);
this.txt_tbl009.Name = "txt_tbl009";
this.txt_tbl009.Size = new System.Drawing.Size(195, 24);
this.txt_tbl009.StyleController = this.layoutMx1;
@@ -791,7 +791,7 @@
//
// txt_tbl010
//
- this.txt_tbl010.Location = new System.Drawing.Point(626, 43);
+ this.txt_tbl010.Location = new System.Drawing.Point(626, 38);
this.txt_tbl010.Name = "txt_tbl010";
this.txt_tbl010.Size = new System.Drawing.Size(195, 24);
this.txt_tbl010.StyleController = this.layoutMx1;
@@ -800,7 +800,7 @@
//
// txt_tbl020
//
- this.txt_tbl020.Location = new System.Drawing.Point(825, 105);
+ this.txt_tbl020.Location = new System.Drawing.Point(825, 100);
this.txt_tbl020.Name = "txt_tbl020";
this.txt_tbl020.Properties.Caption = "瀹岀粨鏍囪瘑";
this.txt_tbl020.Size = new System.Drawing.Size(268, 24);
@@ -810,7 +810,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(626, 74);
+ this.txt_itemNo.Location = new System.Drawing.Point(626, 69);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
@@ -828,7 +828,7 @@
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(355, 136);
+ this.txt_daa014.Location = new System.Drawing.Point(626, 100);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Size = new System.Drawing.Size(195, 24);
this.txt_daa014.StyleController = this.layoutMx1;
@@ -1018,9 +1018,8 @@
this.layoutControlItem15.Location = new System.Drawing.Point(271, 93);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(542, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem15.Text = "澶囨敞璇存槑";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1087,17 +1086,6 @@
this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "浠诲姟鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // lab_daa014
- //
- this.lab_daa014.Control = this.txt_daa014;
- this.lab_daa014.Location = new System.Drawing.Point(271, 124);
- this.lab_daa014.Name = "lab_daa014";
- this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 1;
- this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4;
- this.lab_daa014.Size = new System.Drawing.Size(271, 31);
- this.lab_daa014.Text = "鎶曟枡鍗曞彿";
- this.lab_daa014.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -1793,6 +1781,17 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // lab_daa014
+ //
+ this.lab_daa014.Control = this.txt_daa014;
+ this.lab_daa014.Location = new System.Drawing.Point(542, 93);
+ this.lab_daa014.Name = "lab_daa014";
+ this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.lab_daa014.OptionsTableLayoutItem.RowIndex = 3;
+ this.lab_daa014.Size = new System.Drawing.Size(271, 31);
+ this.lab_daa014.Text = "鎶曟枡鍗曞彿";
+ this.lab_daa014.TextSize = new System.Drawing.Size(60, 18);
+ //
// Frm_MesItemTbl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1856,7 +1855,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1891,6 +1889,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();
this.ResumeLayout(false);
}
@@ -2013,12 +2012,12 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem lab_daa014;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraLayout.LayoutControlItem lab_daa014;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 4805548..0a19330 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -323,6 +323,8 @@
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ //澧炲姞鏃讹紝榛樿缁勭粐
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_tbl023);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -401,9 +403,10 @@
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+
if (_rtn.rtnCode > 0)
{
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData.outGuid;
txt_billNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
@@ -414,10 +417,12 @@
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs
index 32c6c47..e13b21b 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs
@@ -29,36 +29,36 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
- 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.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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 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.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ 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.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -93,6 +93,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_rkCkId = new Gs.DevApp.UserControl.UcLookCk();
this.txt_fngDesc = new Gs.DevApp.UserControl.UcDictionary();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
@@ -113,6 +114,7 @@
this.txt_checkStates = new DevExpress.XtraEditors.TextEdit();
this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
this.txt_aboutGuid = new DevExpress.XtraEditors.TextEdit();
+ this.txt_tlOrg = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -134,6 +136,8 @@
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -234,6 +238,7 @@
this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -272,6 +277,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tlOrg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
@@ -293,6 +299,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -360,13 +368,22 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
this.SuspendLayout();
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+ this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
// repositoryItemComboBox1
//
@@ -799,6 +816,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_rkCkId);
this.layoutMx1.Controls.Add(this.txt_fngDesc);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_remarks);
@@ -819,6 +837,7 @@
this.layoutMx1.Controls.Add(this.txt_checkStates);
this.layoutMx1.Controls.Add(this.txt_freceQty);
this.layoutMx1.Controls.Add(this.txt_aboutGuid);
+ this.layoutMx1.Controls.Add(this.txt_tlOrg);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
@@ -833,6 +852,15 @@
this.layoutMx1.Size = new System.Drawing.Size(1342, 185);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // txt_rkCkId
+ //
+ this.txt_rkCkId.IsReadly = false;
+ this.txt_rkCkId.Location = new System.Drawing.Point(734, 124);
+ this.txt_rkCkId.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_rkCkId.Name = "txt_rkCkId";
+ this.txt_rkCkId.Size = new System.Drawing.Size(249, 24);
+ this.txt_rkCkId.TabIndex = 817;
//
// txt_fngDesc
//
@@ -1029,6 +1057,15 @@
this.txt_aboutGuid.StyleController = this.layoutMx1;
this.txt_aboutGuid.TabIndex = 816;
//
+ // txt_tlOrg
+ //
+ this.txt_tlOrg.Location = new System.Drawing.Point(734, 152);
+ this.txt_tlOrg.Name = "txt_tlOrg";
+ this.txt_tlOrg.Size = new System.Drawing.Size(249, 24);
+ this.txt_tlOrg.StyleController = this.layoutMx1;
+ this.txt_tlOrg.TabIndex = 818;
+ this.txt_tlOrg.Tag = "readonly";
+ //
// layoutControlItem17
//
this.layoutControlItem17.Control = this.lbGuid;
@@ -1103,41 +1140,43 @@
this.layoutControlItem9,
this.layoutControlItem6,
this.layoutControlItem12,
- this.layoutControlItem28});
+ this.layoutControlItem28,
+ this.layoutControlItem25,
+ this.layoutControlItem27});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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;
- columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition18.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition15,
- columnDefinition16,
- columnDefinition17,
- columnDefinition18});
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition16.Height = 100D;
- rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14,
- rowDefinition15,
- rowDefinition16});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(1321, 188);
this.Root.TextVisible = false;
//
@@ -1301,6 +1340,28 @@
this.layoutControlItem28.Text = "寮傚父澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.txt_rkCkId;
+ this.layoutControlItem25.Location = new System.Drawing.Point(650, 112);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem25.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem25.Text = "鍏ュ簱浠撳簱";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.txt_tlOrg;
+ this.layoutControlItem27.Location = new System.Drawing.Point(650, 140);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem27.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem27.Text = "閫�鏂欑粍缁�";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(60, 18);
//
// xtraTabControl2
//
@@ -1879,23 +1940,23 @@
this.layoutControlItem19});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition25.Width = 100D;
- columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition26.Width = 100D;
- columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition27.Width = 100D;
- columnDefinition28.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition28.Width = 110D;
+ 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.AutoSize;
+ columnDefinition8.Width = 110D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition25,
- columnDefinition26,
- columnDefinition27,
- columnDefinition28});
- rowDefinition20.Height = 100D;
- rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition20});
+ rowDefinition7});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
this.layoutControlGroup1.TextVisible = false;
@@ -2001,7 +2062,7 @@
this.layoutControlItem26});
this.layout99.Location = new System.Drawing.Point(0, 0);
this.layout99.Name = "layout99";
- this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(237, 453, 812, 500);
+ this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(256, 645, 812, 500);
this.layout99.Root = this.layoutControlGroup3;
this.layout99.Size = new System.Drawing.Size(1340, 103);
this.layout99.TabIndex = 0;
@@ -2011,10 +2072,10 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(352, 47);
+ this.layoutControl1.Location = new System.Drawing.Point(352, 53);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 31);
+ this.layoutControl1.Size = new System.Drawing.Size(336, 38);
this.layoutControl1.TabIndex = 475;
this.layoutControl1.Text = "layoutControl1";
//
@@ -2046,19 +2107,19 @@
this.layoutControlItem31});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition19.Width = 100D;
- columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition20.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition19,
- columnDefinition20});
- rowDefinition17.Height = 100D;
- rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9,
+ columnDefinition10});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition17});
+ rowDefinition8});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 31);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 38);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem30
@@ -2066,7 +2127,7 @@
this.layoutControlItem30.Control = this.txt_iCount_1;
this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem30.Name = "layoutControlItem30";
- this.layoutControlItem30.Size = new System.Drawing.Size(168, 31);
+ this.layoutControlItem30.Size = new System.Drawing.Size(168, 38);
this.layoutControlItem30.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
@@ -2076,13 +2137,13 @@
this.layoutControlItem31.Location = new System.Drawing.Point(168, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(168, 31);
+ this.layoutControlItem31.Size = new System.Drawing.Size(168, 38);
this.layoutControlItem31.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1033, 10);
+ this.radOut.Location = new System.Drawing.Point(1030, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2090,18 +2151,20 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
- this.radOut.Size = new System.Drawing.Size(227, 28);
+ this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
+ this.radOut.Size = new System.Drawing.Size(340, 41);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 474;
//
// ucBtnPrint1
//
+ this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 47);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 53);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(336, 31);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(336, 38);
this.ucBtnPrint1.TabIndex = 231;
//
// lbMxGuid
@@ -2116,7 +2179,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 47);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 53);
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(234, 24);
@@ -2181,27 +2244,27 @@
this.layoutControlItem24});
this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup3.Name = "Root";
- 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.Percent;
- columnDefinition23.Width = 100D;
- columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition24.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ 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;
this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition21,
- columnDefinition22,
- columnDefinition23,
- columnDefinition24});
- rowDefinition18.Height = 100D;
- rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition19.Height = 100D;
- rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11,
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14});
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition18,
- rowDefinition19});
- this.layoutControlGroup3.Size = new System.Drawing.Size(1380, 90);
+ rowDefinition9,
+ rowDefinition10});
+ this.layoutControlGroup3.Size = new System.Drawing.Size(1380, 103);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem29
@@ -2210,29 +2273,29 @@
this.layoutControlItem29.Location = new System.Drawing.Point(680, 0);
this.layoutControlItem29.Name = "layoutControlItem24";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem29.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem29.Size = new System.Drawing.Size(340, 41);
this.layoutControlItem29.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_psnQty_1;
- this.layoutControlItem32.Location = new System.Drawing.Point(680, 35);
+ this.layoutControlItem32.Location = new System.Drawing.Point(680, 41);
this.layoutControlItem32.Name = "layoutControlItem25";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem32.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem32.Size = new System.Drawing.Size(340, 42);
this.layoutControlItem32.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.ucBtnPrint1;
- this.layoutControlItem33.Location = new System.Drawing.Point(1020, 35);
+ this.layoutControlItem33.Location = new System.Drawing.Point(1020, 41);
this.layoutControlItem33.Name = "layoutControlItem27";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem33.Size = new System.Drawing.Size(340, 42);
this.layoutControlItem33.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem33.TextVisible = false;
@@ -2240,14 +2303,12 @@
// layoutControlItem34
//
this.layoutControlItem34.Control = this.radOut;
+ this.layoutControlItem34.CustomizationFormText = "鑷姩璁＄畻鎸夐挳";
this.layoutControlItem34.Location = new System.Drawing.Point(1020, 0);
- this.layoutControlItem34.MaxSize = new System.Drawing.Size(230, 28);
- this.layoutControlItem34.MinSize = new System.Drawing.Size(230, 28);
this.layoutControlItem34.Name = "layoutControlItem28";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
- this.layoutControlItem34.Size = new System.Drawing.Size(340, 35);
- this.layoutControlItem34.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ this.layoutControlItem34.Size = new System.Drawing.Size(340, 41);
this.layoutControlItem34.Text = "鑷姩璁＄畻";
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
@@ -2257,7 +2318,7 @@
this.layoutControlItem13.Control = this.txtQuantity;
this.layoutControlItem13.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem13.Size = new System.Drawing.Size(340, 41);
this.layoutControlItem13.Text = "鐢宠鎬婚噺";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
@@ -2267,18 +2328,18 @@
this.layoutControlItem18.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem18.Size = new System.Drawing.Size(340, 41);
this.layoutControlItem18.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.layoutControl1;
- this.layoutControlItem24.Location = new System.Drawing.Point(340, 35);
- this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.Location = new System.Drawing.Point(340, 41);
+ this.layoutControlItem24.Name = "item0";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 42);
this.layoutControlItem24.Text = "鑷姩璁＄畻";
this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem24.TextVisible = false;
@@ -2459,14 +2520,7 @@
// gvBtnAlawys
//
this.gvBtnAlawys.Caption = "绉诲嚭";
- repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
- repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.gvBtnAlawys.ColumnEdit = repositoryItemButtonEdit2;
+ this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
this.gvBtnAlawys.MinWidth = 25;
this.gvBtnAlawys.Name = "gvBtnAlawys";
this.gvBtnAlawys.Visible = true;
@@ -2516,6 +2570,7 @@
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_RkDetect01";
this.Text = "鍏ュ簱妫�楠�";
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
@@ -2554,6 +2609,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tlOrg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
@@ -2575,6 +2631,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2642,7 +2700,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
@@ -2827,5 +2884,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+ private UserControl.UcLookCk txt_rkCkId;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraEditors.TextEdit txt_tlOrg;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs
index 568b9ca..da41d3c 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs
@@ -6,9 +6,7 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
-using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -17,7 +15,7 @@
public partial class Frm_RkDetect01 : DevExpress.XtraEditors.XtraForm
{
string _strTag = "N:涓嶅悎鏍�";
-
+
List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_RkDetect01()
{
@@ -298,7 +296,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -359,9 +357,17 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
+ string rkckid = txt_rkCkId.GetId();
+ if (string.IsNullOrEmpty(rkckid))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�");
+ txt_rkCkId.Focus();
+ return;
+ }
+
if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
txt_fngDesc.Focus();
return;
}
@@ -369,26 +375,29 @@
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
fngDesc = txt_fngDesc.TextTxt.Trim(),
+ ckId= rkckid
};
try
{
string strJson = UtilityHelper.HttpPost("", "MesQaItemsDetect01Manager/EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+
if (_rtn.rtnCode > 0)
{
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
this.setEable(false);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
-
}
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -456,7 +465,7 @@
};
try
{
- string strJson = UtilityHelper.HttpPost("","RkqcManager/GetModel", JsonConvert.SerializeObject(_obj));
+ string strJson = UtilityHelper.HttpPost("", "RkqcManager/GetModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
@@ -465,6 +474,8 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ string strCk = dy.rkCkId;
+ txt_rkCkId.getSuppler(txt_tlOrg.Text.Trim(), strCk);
setEable(isEdit);
txtQuantity.Text = dy["fbatchQty"].ToString();
txt_kQty.Text = dy["kdy"].ToString();
@@ -500,8 +511,6 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
-
-
JArray array8 = new JArray();
foreach (var a in _job["rtnData"]["barCodeList"])
{
@@ -519,7 +528,7 @@
}
else
{
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx8, gvMx8);
}
}
else
@@ -558,7 +567,7 @@
};
try
{
- var strJson = UtilityHelper.HttpPost("", "MesQaItemsDetect01Manager/GetModel12", JsonConvert.SerializeObject(_obj));
+ var strJson = UtilityHelper.HttpPost("", "MesQaItemsDetect01Manager/GetModel12", JsonConvert.SerializeObject(_obj));
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
--
Gitblit v1.9.3