From 8f01d83e693ee01e8013ac77874ecd3fa385be16 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期二, 09 九月 2025 17:40:55 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/App.config | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 114 ++++++++++++++--------------
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 33 ++++++++
DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs | 25 +++--
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 52 ++++++++++++
DevApp/Gs.DevApp/UserControl/SelectCk.cs | 7 +
7 files changed, 160 insertions(+), 75 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 3168274..548e44c 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -49,7 +49,7 @@
<add key="AsyncSeconds" value="2" /><!--姘存瓒呮椂鏃堕棿-->
<add key="IsWater" value="0" /><!--鏄惁瑕佹按妫�鍙婂伐浣嶇爜-->
<add key="IqcGetWeight" value="3000" /><!--iqc璇荤О閲嶆椂-->
- <add key="TimingMailInterval" value="10000" />
+ <add key="TimingMailInterval" value="10000" />
</appSettings>
<userSettings>
<Gs.DevApp.Properties.Settings>
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 1703f53..3a9be81 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -79,6 +79,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_wwgys = new Gs.DevApp.UserControl.UcLookSupplier();
this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
this.ucLookHuoZhu1 = new Gs.DevApp.UserControl.UcLookHuoZhu();
@@ -130,6 +131,7 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layItemWwgys = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -225,6 +227,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -581,6 +584,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_wwgys);
this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.ucLookHuoZhu1);
@@ -616,6 +620,15 @@
this.layoutMx1.Size = new System.Drawing.Size(1126, 233);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // txt_wwgys
+ //
+ this.txt_wwgys.IsReadly = false;
+ this.txt_wwgys.Location = new System.Drawing.Point(385, 198);
+ this.txt_wwgys.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_wwgys.Name = "txt_wwgys";
+ this.txt_wwgys.Size = new System.Drawing.Size(165, 24);
+ this.txt_wwgys.TabIndex = 446;
//
// btnCopyXls
//
@@ -916,7 +929,8 @@
this.layoutControlItem24,
this.layoutControlItem12,
this.layoutControlItem1,
- this.layoutControlItem25});
+ this.layoutControlItem25,
+ this.layItemWwgys});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1220,6 +1234,20 @@
this.layoutControlItem25.Text = "蹇嵎褰曞叆";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
+ //
+ // layItemWwgys
+ //
+ this.layItemWwgys.AppearanceItemCaption.ForeColor = System.Drawing.Color.Blue;
+ this.layItemWwgys.AppearanceItemCaption.Options.UseForeColor = true;
+ this.layItemWwgys.Control = this.txt_wwgys;
+ this.layItemWwgys.Location = new System.Drawing.Point(271, 186);
+ this.layItemWwgys.Name = "layItemWwgys";
+ this.layItemWwgys.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layItemWwgys.OptionsTableLayoutItem.RowIndex = 6;
+ this.layItemWwgys.Size = new System.Drawing.Size(271, 31);
+ this.layItemWwgys.Text = "濮斿渚涘簲鍟�";
+ this.layItemWwgys.TextSize = new System.Drawing.Size(90, 18);
+ this.layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
//
// tabMx
//
@@ -1663,6 +1691,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1787,5 +1816,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private UserControl.UcLookSupplier txt_wwgys;
+ private DevExpress.XtraLayout.LayoutControlItem layItemWwgys;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index f368b8f..41a19c8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -21,6 +21,7 @@
string _ucBm = "";//棰嗘枡閮ㄩ棬
string _ucHzlx = "";//璐т富绫诲瀷
string _ucHz = "";//璐т富
+ string _ucGys = "";//渚涘簲鍟�
public Frm_MesItemQt()
{
InitializeComponent();
@@ -90,6 +91,7 @@
return;
txt_qt013.getSuppler(_orgId, _ucKh);
txt_qt009.getSuppler(_orgId, _ucBm);
+ txt_wwgys.getSuppler(_orgId, _ucGys);
};
//閫夋嫨鏉ユ簮鍗曞彿
txt_qt035.ButtonClick += (s, e) =>
@@ -160,6 +162,22 @@
else
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("鎵句笉鍒皒lsCopy.xls鏂囦欢锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ };
+ #endregion
+
+ #region 2025-08-27 澧炲姞濮斿渚涘簲鍟�
+ txt_qtlx.SelectedIndexChanged += (s, e) =>
+ {
+ int idx = txt_qtlx.SelectedIndex;
+ if (idx == 7)
+ {
+ layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+ }
+ else
+ {
+ layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ txt_wwgys.SetIdOrCode("");
}
};
#endregion
@@ -362,6 +380,7 @@
string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬
string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜
string qtlx = txt_qtlx.Text.Trim();//鍚庢潵澧炲姞鐨勭被鍨�
+ string wwgys = txt_wwgys.GetId();
if (string.IsNullOrEmpty(inOrgId))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨搴撳瓨缁勭粐锛�");
@@ -390,10 +409,33 @@
txt_qtlx.Focus();
return;
}
- if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
+ //杩欐槸闈炲澶栫殑闃插憜
+ if (txt_qtlx.SelectedIndex != 7)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
- return;
+ if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
+ return;
+ }
+ if (!string.IsNullOrEmpty(wwgys))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍑哄簱绫诲瀷涓嶄负銆�7:鏃犳簮鍗曞澶栭��鏂欍��,璇蜂笉瑕侀�夋嫨濮斿渚涘簲鍟嗭紒");
+ return;
+ }
+ }
+ //杩欐槸濮斿鐨勯槻鍛�
+ if (txt_qtlx.SelectedIndex == 7)
+ {
+ if (string.IsNullOrEmpty(wwgys))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍑哄簱绫诲瀷涓恒��7:鏃犳簮鍗曞澶栭��鏂欍��,璇烽�夋嫨濮斿渚涘簲鍟嗭紒");
+ return;
+ }
+ if (!string.IsNullOrEmpty(inLyCus))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍑哄簱绫诲瀷涓恒��7:鏃犳簮鍗曞澶栭��鏂欍��,涓嶇敤閫夋嫨瀹㈡埛锛�");
+ return;
+ }
}
var _obj = new
{
@@ -409,6 +451,7 @@
inKcfx = inKcfx,//搴撳瓨鏂瑰悜
inSource = txt_qt035.EditValue,//宸ュ崟鍙�
qtlx = qtlx,
+ wwgys = wwgys,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -551,6 +594,7 @@
_ucBm = dy.qt009;
_ucHzlx = dy.qt025;
_ucHz = dy.qt018;
+ _ucGys = dy.wwgys;//濮斿渚涘簲鍟�
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -559,6 +603,7 @@
_ucBm = "";
_ucHzlx = "";
_ucHz = "";
+ _ucGys = "";
ucLookHuoZhu1.Enabled = isEdit;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -853,6 +898,7 @@
lst = ee.DynamicList;
gvMx1.SetFocusedRowCellValue("depotName", lst[0].name);
gvMx1.SetFocusedRowCellValue("depotId", lst[0].guid);
+ gvMx1.SetFocusedRowCellValue("kcQty", lst[0].kcQty);
gvMx1.BestFitColumns();
};
frm.ShowDialog();
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index e334ef9..f56ce3b 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -34,6 +34,7 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnBaoGaoClick += ToolBarMenu1_btnBaoGaoClick;
this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
@@ -755,6 +756,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
ucUpFileList1.pGuid = lbGuid.Text.Trim();
ucChouJianList1.pGuid = lbGuid.Text.Trim();
if (guid5.Length > 10)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 11ef6a8..7fea474 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -139,6 +139,7 @@
this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
this.txt_xblb = new DevExpress.XtraEditors.MemoEdit();
this.txt_xbsl = new DevExpress.XtraEditors.TextEdit();
+ this.txt_iqcRemark = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -165,6 +166,9 @@
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem39 = 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();
@@ -225,10 +229,6 @@
this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.txt_iqcRemark = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -289,6 +289,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_xblb.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_xbsl.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
@@ -315,6 +316,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -355,10 +359,6 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
this.SuspendLayout();
//
// repositoryItemComboBox1
@@ -1381,6 +1381,14 @@
this.txt_xbsl.TabIndex = 817;
this.txt_xbsl.Tag = "readonly";
//
+ // txt_iqcRemark
+ //
+ this.txt_iqcRemark.Location = new System.Drawing.Point(84, 136);
+ this.txt_iqcRemark.Name = "txt_iqcRemark";
+ this.txt_iqcRemark.Size = new System.Drawing.Size(277, 24);
+ this.txt_iqcRemark.StyleController = this.layoutMx1;
+ this.txt_iqcRemark.TabIndex = 819;
+ //
// layoutControlItem17
//
this.layoutControlItem17.Control = this.lbGuid;
@@ -1725,6 +1733,43 @@
this.layoutControlItem30.Text = "绉伴噸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_remarks;
+ this.layoutControlItem12.Location = new System.Drawing.Point(707, 155);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem12.Size = new System.Drawing.Size(708, 31);
+ this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem39
+ //
+ this.layoutControlItem39.Control = this.txt_iqcRemark;
+ this.layoutControlItem39.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem39.Name = "layoutControlItem39";
+ this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem39.Size = new System.Drawing.Size(353, 31);
+ this.layoutControlItem39.Text = "妫�楠屽娉�";
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.btnYcReport;
+ this.layoutControlItem27.Location = new System.Drawing.Point(707, 186);
+ this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem27.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem27.TextVisible = false;
//
// xtraTabControl2
//
@@ -2423,51 +2468,6 @@
//
this.gridView4.Name = "gridView4";
//
- // txt_iqcRemark
- //
- this.txt_iqcRemark.Location = new System.Drawing.Point(84, 136);
- this.txt_iqcRemark.Name = "txt_iqcRemark";
- this.txt_iqcRemark.Size = new System.Drawing.Size(277, 24);
- this.txt_iqcRemark.StyleController = this.layoutMx1;
- this.txt_iqcRemark.TabIndex = 819;
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(707, 155);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(708, 31);
- this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem39
- //
- this.layoutControlItem39.Control = this.txt_iqcRemark;
- this.layoutControlItem39.Location = new System.Drawing.Point(0, 124);
- this.layoutControlItem39.Name = "layoutControlItem39";
- this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem39.Size = new System.Drawing.Size(353, 31);
- this.layoutControlItem39.Text = "妫�楠屽娉�";
- this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem27
- //
- this.layoutControlItem27.Control = this.btnYcReport;
- this.layoutControlItem27.Location = new System.Drawing.Point(707, 186);
- this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem27.Size = new System.Drawing.Size(354, 31);
- this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem27.TextVisible = false;
- //
// Frm_MesQaItemsDetect01
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2538,6 +2538,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_xblb.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_xbsl.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
@@ -2564,6 +2565,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2604,10 +2608,6 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
index fa83b6e..b2b1d9d 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
@@ -28,11 +28,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -69,9 +69,9 @@
this.gv_operationTable,
this.gv_msg,
this.gv_userName,
- this.gv_Btn,
this.gridColumn1,
- this.gridColumn2});
+ this.gridColumn2,
+ this.gv_Btn});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -132,6 +132,7 @@
//
this.gv_Btn.Caption = "閫夋嫨";
this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gv_Btn.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
this.gv_Btn.MinWidth = 25;
this.gv_Btn.Name = "gv_Btn";
this.gv_Btn.Visible = true;
@@ -141,10 +142,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -161,6 +162,10 @@
//
// gridColumn2
//
+ this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn2.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn2.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn2.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn2.Caption = "Mes/Erp搴撳瓨";
this.gridColumn2.FieldName = "kcQty";
this.gridColumn2.MinWidth = 25;
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
index 31d40d4..b769a17 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
@@ -55,12 +55,12 @@
{
gcMain.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += (" and org.fid='" + _strGuid + "'");
- var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", "", _sbSqlWhere.ToString(),this._itemId);
+ var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", this._itemId, _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
var strReturn =
- UtilityHelper.HttpPost("", "MesDepotsManager/GetListPage", json);
+ UtilityHelper.HttpPost("", "MesDepotsManager/GetListPage2", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -105,7 +105,8 @@
{
guid = mxGuid,
name = mxName,
- });
+ kcQty = dr["kcQty"].ToString()
+ });
UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
Close();
}
--
Gitblit v1.9.3