From 2a8c7b4e3ebe5691fbbe84d8cf285be3f72b7c30 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 09 十二月 2024 13:38:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs | 101
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx | 2
DevApp/Gs.DevApp/ToolBox/UpdateParentEventArgs.cs | 2
DevApp/Gs.DevApp/Resources/cleartablestyle_16x161.png | 0
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs | 20
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 28
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 80
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 20
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 2
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs | 6
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 67
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs | 132
DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs | 147 +-
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs | 28
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 76
DevApp/Gs.DevApp/Gs.DevApp.csproj | 3
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs | 38
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 8
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 44
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 3
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 27
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 59
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 1025 +++++++-------
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 3
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 131
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs | 20
DevApp/Gs.DevApp/Resources/exportfile_16x161.png | 0
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs | 20
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs | 19
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 254 +-
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 94
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 32
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 20
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs | 17
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 58
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs | 14
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 729 +++++-----
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs | 92
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 381 +++-
DevApp/Gs.DevApp/DevFrm/User/User.cs | 6
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs | 17
DevApp/Gs.DevApp/Properties/Resources.resx | 24
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 62
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs | 4
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs | 74
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | 70
50 files changed, 2,228 insertions(+), 1,843 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
index 02735cc..6dedc41 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
@@ -4,7 +4,6 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -22,9 +21,9 @@
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -147,7 +146,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index 29b3e74..648a0da 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -496,7 +496,7 @@
this.gv_prdPack.AppearanceCell.Options.UseFont = true;
this.gv_prdPack.Caption = "鏈�灏忓寘瑁呮暟";
this.gv_prdPack.FieldName = "prdPack";
- this.gv_prdPack.MinWidth = 80;
+ this.gv_prdPack.MinWidth = 50;
this.gv_prdPack.Name = "gv_prdPack";
this.gv_prdPack.OptionsColumn.AllowEdit = false;
this.gv_prdPack.Tag = "query_a.prd_pack";
@@ -531,7 +531,7 @@
this.gv_highLimt.AppearanceCell.Options.UseFont = true;
this.gv_highLimt.Caption = "鏈�澶у簱瀛�";
this.gv_highLimt.FieldName = "highlimit";
- this.gv_highLimt.MinWidth = 80;
+ this.gv_highLimt.MinWidth = 50;
this.gv_highLimt.Name = "gv_highLimt";
this.gv_highLimt.OptionsColumn.AllowEdit = false;
this.gv_highLimt.Tag = "query_a.highLimt";
@@ -566,7 +566,7 @@
this.gv_lowLimt.AppearanceCell.Options.UseFont = true;
this.gv_lowLimt.Caption = "鏈�浣庡簱瀛�";
this.gv_lowLimt.FieldName = "lowlimit";
- this.gv_lowLimt.MinWidth = 80;
+ this.gv_lowLimt.MinWidth = 50;
this.gv_lowLimt.Name = "gv_lowLimt";
this.gv_lowLimt.OptionsColumn.AllowEdit = false;
this.gv_lowLimt.Tag = "query_a.lowlimit";
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
index c5b8c9c..3714c4a 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Data;
using System.Drawing;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
@@ -24,22 +23,9 @@
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- var f = new Font("寰蒋闆呴粦", 16);
- var r = new Rectangle(gridView1.GridControl.Width / 2 - 100,
- e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
- };
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -160,7 +146,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
index 7b95154..d59c893 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
@@ -16,29 +16,15 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesPositionManager/";
-
public Frm_MesPosition()
{
InitializeComponent();
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- var f = new Font("寰蒋闆呴粦", 16);
- var r = new Rectangle(gridView1.GridControl.Width / 2 - 100,
- e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
- };
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -160,7 +146,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
index 9cd9857..660a506 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
@@ -22,22 +21,9 @@
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- var f = new Font("寰蒋闆呴粦", 16);
- var r = new Rectangle(gridView1.GridControl.Width / 2 - 100,
- e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
- };
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -122,7 +108,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "fname", "asc", "",
_sbSqlWhere.ToString());
@@ -158,7 +143,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
/// <summary>
@@ -173,7 +157,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
index 683a9f3..14dac7e 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
@@ -31,9 +31,10 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", "");
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", "");
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -120,8 +121,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date",
"asc", "", _sbSqlWhere.ToString());
@@ -159,7 +158,6 @@
}
}
-
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
@@ -224,11 +222,7 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_departmentname, gridView1, "departmentcode");
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(0);
}
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -246,11 +240,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_departmentname, gridView1, "departmentcode");
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(1);
}
/// <summary>
/// 淇敼浜嬩欢
@@ -267,7 +257,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
getModel(rowGuid, true, 1);
}
@@ -367,5 +356,60 @@
}
}
}
+
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_departmentname, gridView1, "departmentname");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+
+ var _obj = new
+ {
+ guid = rowGuid,
+ ckValue = _inFieldValue,
+ parameter = "SYS_DEPARTMENT,check_date,check_status,check_by"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index dc9154c..2ebd71d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -593,6 +593,7 @@
this.gridColumn1.FieldName = "suppSname";
this.gridColumn1.MinWidth = 100;
this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Tag = "a.supp_sname";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 4;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
index ff7e185..0e02c2e 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
@@ -22,24 +22,15 @@
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- gridView1.CustomDrawRowIndicator +=
- GridView1_CustomDrawRowIndicator;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
Task.Delay(100);
getPageList(1);
- }
-
- private void GridView1_CustomDrawRowIndicator(object sender,
- RowIndicatorCustomDrawEventArgs e)
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
}
/// <summary>
@@ -119,7 +110,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
@@ -155,9 +145,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
-
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
index 171c3c9..a117cb8 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
@@ -72,10 +72,10 @@
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.labelControl1);
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(264, 457);
+ this.panel1.Location = new System.Drawing.Point(230, 457);
this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(270, 276);
+ this.panel1.Size = new System.Drawing.Size(328, 276);
this.panel1.TabIndex = 243;
//
// comOrg
@@ -83,7 +83,7 @@
this.comOrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comOrg.Font = new System.Drawing.Font("Tahoma", 10F);
this.comOrg.FormattingEnabled = true;
- this.comOrg.Location = new System.Drawing.Point(100, 97);
+ this.comOrg.Location = new System.Drawing.Point(138, 97);
this.comOrg.Name = "comOrg";
this.comOrg.Size = new System.Drawing.Size(154, 29);
this.comOrg.TabIndex = 245;
@@ -91,7 +91,7 @@
// txtUser
//
this.txtUser.EditValue = "";
- this.txtUser.Location = new System.Drawing.Point(102, 9);
+ this.txtUser.Location = new System.Drawing.Point(138, 9);
this.txtUser.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtUser.Name = "txtUser";
this.txtUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -102,7 +102,7 @@
//
// ckRemember
//
- this.ckRemember.Location = new System.Drawing.Point(102, 139);
+ this.ckRemember.Location = new System.Drawing.Point(138, 139);
this.ckRemember.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.ckRemember.Name = "ckRemember";
this.ckRemember.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -117,7 +117,7 @@
// txtPwd
//
this.txtPwd.EditValue = "";
- this.txtPwd.Location = new System.Drawing.Point(102, 53);
+ this.txtPwd.Location = new System.Drawing.Point(138, 53);
this.txtPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtPwd.Name = "txtPwd";
this.txtPwd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -134,7 +134,7 @@
this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
- this.btnCancel.Location = new System.Drawing.Point(153, 193);
+ this.btnCancel.Location = new System.Drawing.Point(189, 193);
this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(103, 37);
@@ -150,10 +150,10 @@
this.labelControl3.Appearance.Options.UseTextOptions = true;
this.labelControl3.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
this.labelControl3.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
- this.labelControl3.Location = new System.Drawing.Point(6, 102);
+ this.labelControl3.Location = new System.Drawing.Point(21, 102);
this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl3.Name = "labelControl3";
- this.labelControl3.Size = new System.Drawing.Size(93, 18);
+ this.labelControl3.Size = new System.Drawing.Size(114, 18);
this.labelControl3.TabIndex = 233;
this.labelControl3.Text = "缁勭粐鏈烘瀯锛�";
//
@@ -164,7 +164,7 @@
this.btnLogin.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
this.btnLogin.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnLogin.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnLogin.ImageOptions.Image")));
- this.btnLogin.Location = new System.Drawing.Point(36, 193);
+ this.btnLogin.Location = new System.Drawing.Point(72, 193);
this.btnLogin.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnLogin.Name = "btnLogin";
this.btnLogin.Size = new System.Drawing.Size(102, 37);
@@ -180,10 +180,10 @@
this.labelControl2.Appearance.Options.UseTextOptions = true;
this.labelControl2.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
this.labelControl2.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
- this.labelControl2.Location = new System.Drawing.Point(6, 59);
+ this.labelControl2.Location = new System.Drawing.Point(21, 59);
this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(93, 18);
+ this.labelControl2.Size = new System.Drawing.Size(114, 18);
this.labelControl2.TabIndex = 232;
this.labelControl2.Text = "瀵嗙爜锛�";
//
@@ -196,10 +196,10 @@
this.labelControl1.Appearance.Options.UseTextOptions = true;
this.labelControl1.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
this.labelControl1.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
- this.labelControl1.Location = new System.Drawing.Point(6, 15);
+ this.labelControl1.Location = new System.Drawing.Point(21, 15);
this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(93, 18);
+ this.labelControl1.Size = new System.Drawing.Size(114, 18);
this.labelControl1.TabIndex = 231;
this.labelControl1.Text = "鐧诲綍甯愬彿锛�";
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
index c749a11..b12c257 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
@@ -35,7 +35,6 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1lookupName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lookupValue = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -91,21 +90,8 @@
this.gvMx1lookupName.Name = "gvMx1lookupName";
this.gvMx1lookupName.Tag = "query_a.LOOKUP_NAME";
this.gvMx1lookupName.Visible = true;
- this.gvMx1lookupName.VisibleIndex = 1;
+ this.gvMx1lookupName.VisibleIndex = 0;
this.gvMx1lookupName.Width = 509;
- //
- // gvMx1lookupValue
- //
- this.gvMx1lookupValue.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lookupValue.AppearanceCell.Options.UseFont = true;
- this.gvMx1lookupValue.Caption = "绯荤粺蹇爜鍊�";
- this.gvMx1lookupValue.FieldName = "lookupValue";
- this.gvMx1lookupValue.MinWidth = 50;
- this.gvMx1lookupValue.Name = "gvMx1lookupValue";
- this.gvMx1lookupValue.Tag = "query_a.LOOKUP_VALUE";
- this.gvMx1lookupValue.Visible = true;
- this.gvMx1lookupValue.VisibleIndex = 0;
- this.gvMx1lookupValue.Width = 505;
//
// tabMxPage1
//
@@ -130,7 +116,6 @@
// gvMx1
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx1lookupValue,
this.gvMx1lookupName,
this.gvMxDel,
this.gridColumn2});
@@ -148,7 +133,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 2;
+ this.gvMxDel.VisibleIndex = 1;
this.gvMxDel.Width = 80;
//
// repositoryItemButtonEdit1
@@ -452,7 +437,6 @@
private DevExpress.XtraEditors.LabelControl labelControl11;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1lookupName;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lookupValue;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index cc6f316..e348589 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -33,6 +33,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", "");
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -72,12 +73,7 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_lookupTypeCode, gridView1);
- toolBarMenu1.guidKey = rowGuid;
-
+ _toolCk(0);
}
/// <summary>
@@ -87,11 +83,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_lookupTypeCode, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(1);
}
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -340,5 +332,61 @@
}
}
}
+
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_lookupTypeName, gridView1, "lookupTypeName");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+
+ var _obj = new
+ {
+ guid = rowGuid,
+ ckValue = _inFieldValue,
+ parameter = "MES_SYS_LOOKUP_TYPES,check_date,check_status,check_by"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+
+ }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index a516b15..f5e70ad 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -93,34 +93,64 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
+ this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridColumn13 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fsubmit = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_modify1Flag = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_lotNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_lifnr = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_releaseNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_itemId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_itemNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_boardStyle = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridColumn14 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fbatchQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_ftype = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fcheckResu = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fcovertQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_remarks = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fcheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridColumn15 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fcheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_freceQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_checkQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_lastupdateBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fngHandle = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_releaseNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_itemId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_itemNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_boardStyle = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_lifnr = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_fbatchQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_ftype = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fversion = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_states = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridColumn15 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_fcheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_checkQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_fcheckResu = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_freceQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_iqcDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_lastupdateBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_states = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_fcovertQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand30 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_remarks = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_fngHandle = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -162,36 +192,6 @@
this.lb_modify1Flag = new DevExpress.XtraEditors.LabelControl();
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
- this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand30 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -574,6 +574,7 @@
//
this.gridColumn3.Caption = "椤圭洰";
this.gridColumn3.FieldName = "fcheckItem";
+ this.gridColumn3.MaxWidth = 192;
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
@@ -585,23 +586,25 @@
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
this.gridColumn2.FieldName = "fcheckResu";
+ this.gridColumn2.MaxWidth = 80;
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 158;
+ this.gridColumn2.Width = 80;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn1.FieldName = "fstand";
+ this.gridColumn1.MaxWidth = 80;
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 2;
- this.gridColumn1.Width = 958;
+ this.gridColumn1.Width = 80;
//
// panMsg
//
@@ -863,6 +866,17 @@
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridBand11
+ //
+ this.gridBand11.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand11.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand11.Caption = "鏄惁鎬ユ枡";
+ this.gridBand11.Columns.Add(this.gridColumn13);
+ this.gridBand11.MinWidth = 50;
+ this.gridBand11.Name = "gridBand11";
+ this.gridBand11.VisibleIndex = 0;
+ this.gridBand11.Width = 60;
+ //
// gridColumn13
//
this.gridColumn13.Caption = "鏄惁鎬ユ枡";
@@ -873,6 +887,17 @@
this.gridColumn13.UnboundDataType = typeof(bool);
this.gridColumn13.Visible = true;
this.gridColumn13.Width = 60;
+ //
+ // gridBand12
+ //
+ this.gridBand12.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand12.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand12.Caption = "鎻愪氦鏍囪瘑";
+ this.gridBand12.Columns.Add(this.gv_fsubmit);
+ this.gridBand12.MinWidth = 50;
+ this.gridBand12.Name = "gridBand12";
+ this.gridBand12.VisibleIndex = 1;
+ this.gridBand12.Width = 50;
//
// gv_fsubmit
//
@@ -888,6 +913,17 @@
this.gv_fsubmit.Visible = true;
this.gv_fsubmit.Width = 30;
//
+ // gridBand13
+ //
+ this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand13.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand13.Caption = "瀹℃牳鏍囪瘑";
+ this.gridBand13.Columns.Add(this.gv_modify1Flag);
+ this.gridBand13.MinWidth = 50;
+ this.gridBand13.Name = "gridBand13";
+ this.gridBand13.VisibleIndex = 2;
+ this.gridBand13.Width = 50;
+ //
// gv_modify1Flag
//
this.gv_modify1Flag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -902,6 +938,15 @@
this.gv_modify1Flag.Visible = true;
this.gv_modify1Flag.Width = 30;
//
+ // gridBand14
+ //
+ this.gridBand14.Caption = "閫佹鎵规";
+ this.gridBand14.Columns.Add(this.gv_lotNo);
+ this.gridBand14.MinWidth = 120;
+ this.gridBand14.Name = "gridBand14";
+ this.gridBand14.VisibleIndex = 3;
+ this.gridBand14.Width = 120;
+ //
// gv_lotNo
//
this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -915,18 +960,36 @@
this.gv_lotNo.Visible = true;
this.gv_lotNo.Width = 30;
//
- // gv_lifnr
+ // gridBand1
//
- this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lifnr.AppearanceCell.Options.UseFont = true;
- this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
- this.gv_lifnr.FieldName = "suppName";
- this.gv_lifnr.MinWidth = 30;
- this.gv_lifnr.Name = "gv_lifnr";
- this.gv_lifnr.OptionsColumn.AllowEdit = false;
- this.gv_lifnr.Tag = "query_a.lifnr";
- this.gv_lifnr.Visible = true;
- this.gv_lifnr.Width = 42;
+ this.gridBand1.Caption = "妫�楠屾棩鏈�";
+ this.gridBand1.Columns.Add(this.gv_fcheckDate);
+ this.gridBand1.MinWidth = 180;
+ this.gridBand1.Name = "gridBand1";
+ this.gridBand1.VisibleIndex = 4;
+ this.gridBand1.Width = 180;
+ //
+ // gv_fcheckDate
+ //
+ this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
+ this.gv_fcheckDate.FieldName = "fcheckDate";
+ this.gv_fcheckDate.MinWidth = 30;
+ this.gv_fcheckDate.Name = "gv_fcheckDate";
+ this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
+ this.gv_fcheckDate.Tag = "query_a.fcheck_date";
+ this.gv_fcheckDate.Visible = true;
+ this.gv_fcheckDate.Width = 30;
+ //
+ // gridBand16
+ //
+ this.gridBand16.Caption = "妫�楠屽崟鍙�";
+ this.gridBand16.Columns.Add(this.gv_releaseNo);
+ this.gridBand16.MinWidth = 100;
+ this.gridBand16.Name = "gridBand16";
+ this.gridBand16.VisibleIndex = 5;
+ this.gridBand16.Width = 100;
//
// gv_releaseNo
//
@@ -941,6 +1004,29 @@
this.gv_releaseNo.Visible = true;
this.gv_releaseNo.Width = 31;
//
+ // gridBand18
+ //
+ this.gridBand18.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand18.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand18.Caption = "鐗╂枡淇℃伅";
+ this.gridBand18.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand2,
+ this.gridBand5,
+ this.gridBand3});
+ this.gridBand18.MinWidth = 300;
+ this.gridBand18.Name = "gridBand18";
+ this.gridBand18.VisibleIndex = 6;
+ this.gridBand18.Width = 300;
+ //
+ // gridBand2
+ //
+ this.gridBand2.Caption = "鐗╂枡ID";
+ this.gridBand2.Columns.Add(this.gv_itemId);
+ this.gridBand2.MinWidth = 60;
+ this.gridBand2.Name = "gridBand2";
+ this.gridBand2.VisibleIndex = 0;
+ this.gridBand2.Width = 60;
+ //
// gv_itemId
//
this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -953,6 +1039,15 @@
this.gv_itemId.Tag = "query_a.item_id";
this.gv_itemId.Visible = true;
this.gv_itemId.Width = 30;
+ //
+ // gridBand5
+ //
+ this.gridBand5.Caption = "鐗╂枡缂栫爜";
+ this.gridBand5.Columns.Add(this.gv_itemNo);
+ this.gridBand5.MinWidth = 100;
+ this.gridBand5.Name = "gridBand5";
+ this.gridBand5.VisibleIndex = 1;
+ this.gridBand5.Width = 100;
//
// gv_itemNo
//
@@ -967,6 +1062,15 @@
this.gv_itemNo.Visible = true;
this.gv_itemNo.Width = 30;
//
+ // gridBand3
+ //
+ this.gridBand3.Caption = "鐗╂枡鍚嶇О";
+ this.gridBand3.Columns.Add(this.gv_boardStyle);
+ this.gridBand3.MinWidth = 120;
+ this.gridBand3.Name = "gridBand3";
+ this.gridBand3.VisibleIndex = 2;
+ this.gridBand3.Width = 120;
+ //
// gv_boardStyle
//
this.gv_boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -980,14 +1084,36 @@
this.gv_boardStyle.Visible = true;
this.gv_boardStyle.Width = 30;
//
- // gridColumn14
+ // gridBand19
//
- this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 30;
- this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.OptionsColumn.ReadOnly = true;
- this.gridColumn14.Width = 200;
+ this.gridBand19.Caption = "渚涘簲鍟嗗悕绉�";
+ this.gridBand19.Columns.Add(this.gv_lifnr);
+ this.gridBand19.MinWidth = 200;
+ this.gridBand19.Name = "gridBand19";
+ this.gridBand19.VisibleIndex = 7;
+ this.gridBand19.Width = 200;
+ //
+ // gv_lifnr
+ //
+ this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lifnr.AppearanceCell.Options.UseFont = true;
+ this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
+ this.gv_lifnr.FieldName = "suppName";
+ this.gv_lifnr.MinWidth = 30;
+ this.gv_lifnr.Name = "gv_lifnr";
+ this.gv_lifnr.OptionsColumn.AllowEdit = false;
+ this.gv_lifnr.Tag = "query_a.lifnr";
+ this.gv_lifnr.Visible = true;
+ this.gv_lifnr.Width = 42;
+ //
+ // gridBand20
+ //
+ this.gridBand20.Caption = "閲囪喘鏁伴噺";
+ this.gridBand20.Columns.Add(this.gv_fbatchQty);
+ this.gridBand20.MinWidth = 80;
+ this.gridBand20.Name = "gridBand20";
+ this.gridBand20.VisibleIndex = 8;
+ this.gridBand20.Width = 80;
//
// gv_fbatchQty
//
@@ -1002,6 +1128,17 @@
this.gv_fbatchQty.Visible = true;
this.gv_fbatchQty.Width = 30;
//
+ // gridBand21
+ //
+ this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand21.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand21.Caption = "绫诲瀷(0鏉ユ枡,1鍦ㄥ簱)";
+ this.gridBand21.Columns.Add(this.gv_ftype);
+ this.gridBand21.MinWidth = 60;
+ this.gridBand21.Name = "gridBand21";
+ this.gridBand21.VisibleIndex = 9;
+ this.gridBand21.Width = 60;
+ //
// gv_ftype
//
this.gv_ftype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1015,6 +1152,116 @@
this.gv_ftype.Visible = true;
this.gv_ftype.Width = 30;
//
+ // gridBand4
+ //
+ this.gridBand4.Caption = "鐗堟湰";
+ this.gridBand4.Columns.Add(this.gv_fversion);
+ this.gridBand4.MinWidth = 60;
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.VisibleIndex = 10;
+ this.gridBand4.Width = 60;
+ //
+ // gv_fversion
+ //
+ this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fversion.AppearanceCell.Options.UseFont = true;
+ this.gv_fversion.Caption = "鐗堟湰";
+ this.gv_fversion.FieldName = "fversion";
+ this.gv_fversion.MinWidth = 30;
+ this.gv_fversion.Name = "gv_fversion";
+ this.gv_fversion.OptionsColumn.AllowEdit = false;
+ this.gv_fversion.Tag = "query_a.fversion";
+ this.gv_fversion.Visible = true;
+ this.gv_fversion.Width = 30;
+ //
+ // gridBand8
+ //
+ this.gridBand8.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand8.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand8.Caption = "妫�楠屼俊鎭�";
+ this.gridBand8.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand7,
+ this.gridBand10,
+ this.gridBand6,
+ this.gridBand9,
+ this.gridBand15});
+ this.gridBand8.MinWidth = 300;
+ this.gridBand8.Name = "gridBand8";
+ this.gridBand8.VisibleIndex = 11;
+ this.gridBand8.Width = 330;
+ //
+ // gridBand7
+ //
+ this.gridBand7.Caption = "妫�楠屾棩鏈�";
+ this.gridBand7.Columns.Add(this.gridColumn15);
+ this.gridBand7.MinWidth = 120;
+ this.gridBand7.Name = "gridBand7";
+ this.gridBand7.VisibleIndex = 0;
+ this.gridBand7.Width = 120;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "鎻愪氦妫�楠屾棩鏈�";
+ this.gridColumn15.FieldName = "date01";
+ this.gridColumn15.MinWidth = 30;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.OptionsColumn.ReadOnly = true;
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.Width = 32;
+ //
+ // gridBand10
+ //
+ this.gridBand10.Caption = "妫�楠屼汉鍛�";
+ this.gridBand10.Columns.Add(this.gv_fcheckBy);
+ this.gridBand10.MinWidth = 60;
+ this.gridBand10.Name = "gridBand10";
+ this.gridBand10.VisibleIndex = 1;
+ this.gridBand10.Width = 60;
+ //
+ // gv_fcheckBy
+ //
+ this.gv_fcheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
+ this.gv_fcheckBy.FieldName = "fcheckBy";
+ this.gv_fcheckBy.MinWidth = 30;
+ this.gv_fcheckBy.Name = "gv_fcheckBy";
+ this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
+ this.gv_fcheckBy.Tag = "query_a.fcheck_by";
+ this.gv_fcheckBy.Visible = true;
+ this.gv_fcheckBy.Width = 30;
+ //
+ // gridBand6
+ //
+ this.gridBand6.Caption = "鎶芥鏁伴噺";
+ this.gridBand6.Columns.Add(this.gv_checkQty);
+ this.gridBand6.MinWidth = 50;
+ this.gridBand6.Name = "gridBand6";
+ this.gridBand6.VisibleIndex = 2;
+ this.gridBand6.Width = 50;
+ //
+ // gv_checkQty
+ //
+ this.gv_checkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_checkQty.AppearanceCell.Options.UseFont = true;
+ this.gv_checkQty.Caption = "鎶芥鏁伴噺";
+ this.gv_checkQty.FieldName = "checkQty";
+ this.gv_checkQty.MinWidth = 30;
+ this.gv_checkQty.Name = "gv_checkQty";
+ this.gv_checkQty.OptionsColumn.AllowEdit = false;
+ this.gv_checkQty.Tag = "query_a.check_qty";
+ this.gv_checkQty.Visible = true;
+ this.gv_checkQty.Width = 30;
+ //
+ // gridBand9
+ //
+ this.gridBand9.Caption = "妫�楠岀粨鏋�";
+ this.gridBand9.Columns.Add(this.gv_fcheckResu);
+ this.gridBand9.MinWidth = 50;
+ this.gridBand9.Name = "gridBand9";
+ this.gridBand9.VisibleIndex = 3;
+ this.gridBand9.Width = 50;
+ //
// gv_fcheckResu
//
this.gv_fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1027,6 +1274,135 @@
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
this.gv_fcheckResu.Width = 30;
+ //
+ // gridBand15
+ //
+ this.gridBand15.Caption = "鍒ゅ畾缁撴灉";
+ this.gridBand15.Columns.Add(this.gv_freceQty);
+ this.gridBand15.MinWidth = 50;
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.VisibleIndex = 4;
+ this.gridBand15.Width = 50;
+ //
+ // gv_freceQty
+ //
+ this.gv_freceQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_freceQty.AppearanceCell.Options.UseFont = true;
+ this.gv_freceQty.Caption = "鍒ゅ畾缁撴灉";
+ this.gv_freceQty.FieldName = "freceQty";
+ this.gv_freceQty.MinWidth = 30;
+ this.gv_freceQty.Name = "gv_freceQty";
+ this.gv_freceQty.OptionsColumn.AllowEdit = false;
+ this.gv_freceQty.Tag = "query_a.frece_qty";
+ this.gv_freceQty.Visible = true;
+ this.gv_freceQty.Width = 30;
+ //
+ // gridBand23
+ //
+ this.gridBand23.Caption = "IQC鎻愪氦鏃堕棿";
+ this.gridBand23.Columns.Add(this.gv_iqcDate);
+ this.gridBand23.MinWidth = 120;
+ this.gridBand23.Name = "gridBand23";
+ this.gridBand23.VisibleIndex = 12;
+ this.gridBand23.Width = 120;
+ //
+ // gv_iqcDate
+ //
+ this.gv_iqcDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_iqcDate.AppearanceCell.Options.UseFont = true;
+ this.gv_iqcDate.Caption = "IQC鎻愪氦鏃堕棿";
+ this.gv_iqcDate.FieldName = "iqcDate";
+ this.gv_iqcDate.MinWidth = 30;
+ this.gv_iqcDate.Name = "gv_iqcDate";
+ this.gv_iqcDate.OptionsColumn.AllowEdit = false;
+ this.gv_iqcDate.Tag = "query_a.iqc_date";
+ this.gv_iqcDate.Visible = true;
+ this.gv_iqcDate.Width = 74;
+ //
+ // gridBand26
+ //
+ this.gridBand26.Caption = "鏇存柊浜�";
+ this.gridBand26.Columns.Add(this.gv_lastupdateBy);
+ this.gridBand26.MinWidth = 60;
+ this.gridBand26.Name = "gridBand26";
+ this.gridBand26.VisibleIndex = 13;
+ this.gridBand26.Width = 60;
+ //
+ // gv_lastupdateBy
+ //
+ this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateBy.Caption = "鏇存柊浜�";
+ this.gv_lastupdateBy.FieldName = "lastupdateBy";
+ this.gv_lastupdateBy.MinWidth = 30;
+ this.gv_lastupdateBy.Name = "gv_lastupdateBy";
+ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
+ this.gv_lastupdateBy.Visible = true;
+ this.gv_lastupdateBy.Width = 30;
+ //
+ // gridBand27
+ //
+ this.gridBand27.Caption = "鏇存柊鏃ユ湡";
+ this.gridBand27.Columns.Add(this.gv_lastupdateDate);
+ this.gridBand27.MinWidth = 120;
+ this.gridBand27.Name = "gridBand27";
+ this.gridBand27.VisibleIndex = 14;
+ this.gridBand27.Width = 120;
+ //
+ // gv_lastupdateDate
+ //
+ this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateDate.Caption = "鏇存柊鏃ユ湡";
+ this.gv_lastupdateDate.FieldName = "lastupdateDate";
+ this.gv_lastupdateDate.MinWidth = 30;
+ this.gv_lastupdateDate.Name = "gv_lastupdateDate";
+ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
+ this.gv_lastupdateDate.Visible = true;
+ this.gv_lastupdateDate.Width = 30;
+ //
+ // gridBand28
+ //
+ this.gridBand28.Caption = "鐘舵��";
+ this.gridBand28.Columns.Add(this.gv_states);
+ this.gridBand28.Columns.Add(this.gridColumn14);
+ this.gridBand28.MinWidth = 60;
+ this.gridBand28.Name = "gridBand28";
+ this.gridBand28.VisibleIndex = 15;
+ this.gridBand28.Width = 60;
+ //
+ // gv_states
+ //
+ this.gv_states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_states.AppearanceCell.Options.UseFont = true;
+ this.gv_states.Caption = "鐘舵��";
+ this.gv_states.FieldName = "states";
+ this.gv_states.MinWidth = 30;
+ this.gv_states.Name = "gv_states";
+ this.gv_states.OptionsColumn.AllowEdit = false;
+ this.gv_states.Tag = "query_a.states";
+ this.gv_states.Visible = true;
+ this.gv_states.Width = 30;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn14.FieldName = "itemModel";
+ this.gridColumn14.MinWidth = 30;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.OptionsColumn.ReadOnly = true;
+ this.gridColumn14.Width = 200;
+ //
+ // gridBand29
+ //
+ this.gridBand29.Caption = "杞崲鏁伴噺";
+ this.gridBand29.Columns.Add(this.gv_fcovertQty);
+ this.gridBand29.MinWidth = 60;
+ this.gridBand29.Name = "gridBand29";
+ this.gridBand29.VisibleIndex = 16;
+ this.gridBand29.Width = 60;
//
// gv_fcovertQty
//
@@ -1042,93 +1418,27 @@
this.gv_fcovertQty.Visible = true;
this.gv_fcovertQty.Width = 30;
//
- // gv_remarks
+ // gridBand30
//
- this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_remarks.AppearanceCell.Options.UseFont = true;
- this.gv_remarks.Caption = "涓嶈壇鎻忚堪";
- this.gv_remarks.FieldName = "remarks";
- this.gv_remarks.MinWidth = 30;
- this.gv_remarks.Name = "gv_remarks";
- this.gv_remarks.OptionsColumn.AllowEdit = false;
- this.gv_remarks.Tag = "query_a.remarks";
- this.gv_remarks.Visible = true;
- this.gv_remarks.Width = 30;
+ this.gridBand30.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand30.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand30.Caption = "寤虹珛淇℃伅";
+ this.gridBand30.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand22,
+ this.gridBand17});
+ this.gridBand30.MinWidth = 200;
+ this.gridBand30.Name = "gridBand30";
+ this.gridBand30.VisibleIndex = 17;
+ this.gridBand30.Width = 200;
//
- // gv_createBy
+ // gridBand22
//
- this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 30;
- this.gv_createBy.Name = "gv_createBy";
- this.gv_createBy.OptionsColumn.AllowEdit = false;
- this.gv_createBy.Tag = "query_a.create_by";
- this.gv_createBy.Visible = true;
- this.gv_createBy.Width = 42;
- //
- // gv_fcheckBy
- //
- this.gv_fcheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
- this.gv_fcheckBy.FieldName = "fcheckBy";
- this.gv_fcheckBy.MinWidth = 30;
- this.gv_fcheckBy.Name = "gv_fcheckBy";
- this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
- this.gv_fcheckBy.Tag = "query_a.fcheck_by";
- this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.Width = 30;
- //
- // gridColumn15
- //
- this.gridColumn15.Caption = "鎻愪氦妫�楠屾棩鏈�";
- this.gridColumn15.FieldName = "date01";
- this.gridColumn15.MinWidth = 30;
- this.gridColumn15.Name = "gridColumn15";
- this.gridColumn15.OptionsColumn.ReadOnly = true;
- this.gridColumn15.Visible = true;
- this.gridColumn15.Width = 32;
- //
- // gv_fcheckDate
- //
- this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
- this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 30;
- this.gv_fcheckDate.Name = "gv_fcheckDate";
- this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
- this.gv_fcheckDate.Tag = "query_a.fcheck_date";
- this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.Width = 30;
- //
- // gv_freceQty
- //
- this.gv_freceQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_freceQty.AppearanceCell.Options.UseFont = true;
- this.gv_freceQty.Caption = "鍒ゅ畾缁撴灉";
- this.gv_freceQty.FieldName = "freceQty";
- this.gv_freceQty.MinWidth = 30;
- this.gv_freceQty.Name = "gv_freceQty";
- this.gv_freceQty.OptionsColumn.AllowEdit = false;
- this.gv_freceQty.Tag = "query_a.frece_qty";
- this.gv_freceQty.Visible = true;
- this.gv_freceQty.Width = 30;
- //
- // gv_checkQty
- //
- this.gv_checkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_checkQty.AppearanceCell.Options.UseFont = true;
- this.gv_checkQty.Caption = "鎶芥鏁伴噺";
- this.gv_checkQty.FieldName = "checkQty";
- this.gv_checkQty.MinWidth = 30;
- this.gv_checkQty.Name = "gv_checkQty";
- this.gv_checkQty.OptionsColumn.AllowEdit = false;
- this.gv_checkQty.Tag = "query_a.check_qty";
- this.gv_checkQty.Visible = true;
- this.gv_checkQty.Width = 30;
+ this.gridBand22.Caption = "鏃ユ湡";
+ this.gridBand22.Columns.Add(this.gv_createDate);
+ this.gridBand22.MinWidth = 120;
+ this.gridBand22.Name = "gridBand22";
+ this.gridBand22.VisibleIndex = 0;
+ this.gridBand22.Width = 120;
//
// gv_createDate
//
@@ -1143,31 +1453,58 @@
this.gv_createDate.Visible = true;
this.gv_createDate.Width = 76;
//
- // gv_lastupdateBy
+ // gridBand17
//
- this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateBy.Caption = "鏇存柊浜�";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 30;
- this.gv_lastupdateBy.Name = "gv_lastupdateBy";
- this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
- this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.Width = 30;
+ this.gridBand17.Caption = "寤虹珛鑰�";
+ this.gridBand17.Columns.Add(this.gv_createBy);
+ this.gridBand17.MinWidth = 60;
+ this.gridBand17.Name = "gridBand17";
+ this.gridBand17.VisibleIndex = 1;
+ this.gridBand17.Width = 60;
//
- // gv_lastupdateDate
+ // gv_createBy
//
- this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateDate.Caption = "鏇存柊鏃ユ湡";
- this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 30;
- this.gv_lastupdateDate.Name = "gv_lastupdateDate";
- this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.Width = 30;
+ this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_createBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createBy.Caption = "鍒涘缓浜�";
+ this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 30;
+ this.gv_createBy.Name = "gv_createBy";
+ this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.Tag = "query_a.create_by";
+ this.gv_createBy.Visible = true;
+ this.gv_createBy.Width = 42;
+ //
+ // gridBand24
+ //
+ this.gridBand24.Caption = "涓嶈壇鎻忚堪";
+ this.gridBand24.Columns.Add(this.gv_remarks);
+ this.gridBand24.MinWidth = 100;
+ this.gridBand24.Name = "gridBand24";
+ this.gridBand24.VisibleIndex = 18;
+ this.gridBand24.Width = 100;
+ //
+ // gv_remarks
+ //
+ this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_remarks.AppearanceCell.Options.UseFont = true;
+ this.gv_remarks.Caption = "涓嶈壇鎻忚堪";
+ this.gv_remarks.FieldName = "remarks";
+ this.gv_remarks.MinWidth = 30;
+ this.gv_remarks.Name = "gv_remarks";
+ this.gv_remarks.OptionsColumn.AllowEdit = false;
+ this.gv_remarks.Tag = "query_a.remarks";
+ this.gv_remarks.Visible = true;
+ this.gv_remarks.Width = 30;
+ //
+ // gridBand25
+ //
+ this.gridBand25.Caption = "涓嶈壇澶勭悊鏂规硶";
+ this.gridBand25.Columns.Add(this.gv_fngHandle);
+ this.gridBand25.MinWidth = 100;
+ this.gridBand25.Name = "gridBand25";
+ this.gridBand25.VisibleIndex = 19;
+ this.gridBand25.Width = 100;
//
// gv_fngHandle
//
@@ -1181,45 +1518,6 @@
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
this.gv_fngHandle.Width = 30;
- //
- // gv_fversion
- //
- this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fversion.AppearanceCell.Options.UseFont = true;
- this.gv_fversion.Caption = "鐗堟湰";
- this.gv_fversion.FieldName = "fversion";
- this.gv_fversion.MinWidth = 30;
- this.gv_fversion.Name = "gv_fversion";
- this.gv_fversion.OptionsColumn.AllowEdit = false;
- this.gv_fversion.Tag = "query_a.fversion";
- this.gv_fversion.Visible = true;
- this.gv_fversion.Width = 30;
- //
- // gv_states
- //
- this.gv_states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_states.AppearanceCell.Options.UseFont = true;
- this.gv_states.Caption = "鐘舵��";
- this.gv_states.FieldName = "states";
- this.gv_states.MinWidth = 30;
- this.gv_states.Name = "gv_states";
- this.gv_states.OptionsColumn.AllowEdit = false;
- this.gv_states.Tag = "query_a.states";
- this.gv_states.Visible = true;
- this.gv_states.Width = 30;
- //
- // gv_iqcDate
- //
- this.gv_iqcDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_iqcDate.AppearanceCell.Options.UseFont = true;
- this.gv_iqcDate.Caption = "IQC鎻愪氦鏃堕棿";
- this.gv_iqcDate.FieldName = "iqcDate";
- this.gv_iqcDate.MinWidth = 30;
- this.gv_iqcDate.Name = "gv_iqcDate";
- this.gv_iqcDate.OptionsColumn.AllowEdit = false;
- this.gv_iqcDate.Tag = "query_a.iqc_date";
- this.gv_iqcDate.Visible = true;
- this.gv_iqcDate.Width = 74;
//
// xtraTabControl1
//
@@ -1674,301 +1972,6 @@
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
- //
- // gridBand11
- //
- this.gridBand11.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand11.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand11.Caption = "鏄惁鎬ユ枡";
- this.gridBand11.Columns.Add(this.gridColumn13);
- this.gridBand11.MinWidth = 50;
- this.gridBand11.Name = "gridBand11";
- this.gridBand11.VisibleIndex = 0;
- this.gridBand11.Width = 60;
- //
- // gridBand12
- //
- this.gridBand12.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand12.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand12.Caption = "鎻愪氦鏍囪瘑";
- this.gridBand12.Columns.Add(this.gv_fsubmit);
- this.gridBand12.MinWidth = 50;
- this.gridBand12.Name = "gridBand12";
- this.gridBand12.VisibleIndex = 1;
- this.gridBand12.Width = 50;
- //
- // gridBand13
- //
- this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand13.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand13.Caption = "瀹℃牳鏍囪瘑";
- this.gridBand13.Columns.Add(this.gv_modify1Flag);
- this.gridBand13.MinWidth = 50;
- this.gridBand13.Name = "gridBand13";
- this.gridBand13.VisibleIndex = 2;
- this.gridBand13.Width = 50;
- //
- // gridBand14
- //
- this.gridBand14.Caption = "閫佹鎵规";
- this.gridBand14.Columns.Add(this.gv_lotNo);
- this.gridBand14.MinWidth = 120;
- this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 3;
- this.gridBand14.Width = 120;
- //
- // gridBand1
- //
- this.gridBand1.Caption = "妫�楠屾棩鏈�";
- this.gridBand1.Columns.Add(this.gv_fcheckDate);
- this.gridBand1.MinWidth = 180;
- this.gridBand1.Name = "gridBand1";
- this.gridBand1.VisibleIndex = 4;
- this.gridBand1.Width = 180;
- //
- // gridBand16
- //
- this.gridBand16.Caption = "妫�楠屽崟鍙�";
- this.gridBand16.Columns.Add(this.gv_releaseNo);
- this.gridBand16.MinWidth = 100;
- this.gridBand16.Name = "gridBand16";
- this.gridBand16.VisibleIndex = 5;
- this.gridBand16.Width = 100;
- //
- // gridBand18
- //
- this.gridBand18.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand18.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand18.Caption = "鐗╂枡淇℃伅";
- this.gridBand18.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand2,
- this.gridBand5,
- this.gridBand3});
- this.gridBand18.MinWidth = 300;
- this.gridBand18.Name = "gridBand18";
- this.gridBand18.VisibleIndex = 6;
- this.gridBand18.Width = 300;
- //
- // gridBand2
- //
- this.gridBand2.Caption = "鐗╂枡ID";
- this.gridBand2.Columns.Add(this.gv_itemId);
- this.gridBand2.MinWidth = 60;
- this.gridBand2.Name = "gridBand2";
- this.gridBand2.VisibleIndex = 0;
- this.gridBand2.Width = 60;
- //
- // gridBand5
- //
- this.gridBand5.Caption = "鐗╂枡缂栫爜";
- this.gridBand5.Columns.Add(this.gv_itemNo);
- this.gridBand5.MinWidth = 100;
- this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 1;
- this.gridBand5.Width = 100;
- //
- // gridBand3
- //
- this.gridBand3.Caption = "鐗╂枡鍚嶇О";
- this.gridBand3.Columns.Add(this.gv_boardStyle);
- this.gridBand3.MinWidth = 120;
- this.gridBand3.Name = "gridBand3";
- this.gridBand3.VisibleIndex = 2;
- this.gridBand3.Width = 120;
- //
- // gridBand19
- //
- this.gridBand19.Caption = "渚涘簲鍟嗗悕绉�";
- this.gridBand19.Columns.Add(this.gv_lifnr);
- this.gridBand19.MinWidth = 200;
- this.gridBand19.Name = "gridBand19";
- this.gridBand19.VisibleIndex = 7;
- this.gridBand19.Width = 200;
- //
- // gridBand20
- //
- this.gridBand20.Caption = "閲囪喘鏁伴噺";
- this.gridBand20.Columns.Add(this.gv_fbatchQty);
- this.gridBand20.MinWidth = 80;
- this.gridBand20.Name = "gridBand20";
- this.gridBand20.VisibleIndex = 8;
- this.gridBand20.Width = 80;
- //
- // gridBand21
- //
- this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand21.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand21.Caption = "绫诲瀷(0鏉ユ枡,1鍦ㄥ簱)";
- this.gridBand21.Columns.Add(this.gv_ftype);
- this.gridBand21.MinWidth = 60;
- this.gridBand21.Name = "gridBand21";
- this.gridBand21.VisibleIndex = 9;
- this.gridBand21.Width = 60;
- //
- // gridBand4
- //
- this.gridBand4.Caption = "鐗堟湰";
- this.gridBand4.Columns.Add(this.gv_fversion);
- this.gridBand4.MinWidth = 60;
- this.gridBand4.Name = "gridBand4";
- this.gridBand4.VisibleIndex = 10;
- this.gridBand4.Width = 60;
- //
- // gridBand8
- //
- this.gridBand8.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand8.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand8.Caption = "妫�楠屼俊鎭�";
- this.gridBand8.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand7,
- this.gridBand10,
- this.gridBand6,
- this.gridBand9,
- this.gridBand15});
- this.gridBand8.MinWidth = 300;
- this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 11;
- this.gridBand8.Width = 330;
- //
- // gridBand7
- //
- this.gridBand7.Caption = "妫�楠屾棩鏈�";
- this.gridBand7.Columns.Add(this.gridColumn15);
- this.gridBand7.MinWidth = 120;
- this.gridBand7.Name = "gridBand7";
- this.gridBand7.VisibleIndex = 0;
- this.gridBand7.Width = 120;
- //
- // gridBand10
- //
- this.gridBand10.Caption = "妫�楠屼汉鍛�";
- this.gridBand10.Columns.Add(this.gv_fcheckBy);
- this.gridBand10.MinWidth = 60;
- this.gridBand10.Name = "gridBand10";
- this.gridBand10.VisibleIndex = 1;
- this.gridBand10.Width = 60;
- //
- // gridBand6
- //
- this.gridBand6.Caption = "鎶芥鏁伴噺";
- this.gridBand6.Columns.Add(this.gv_checkQty);
- this.gridBand6.MinWidth = 50;
- this.gridBand6.Name = "gridBand6";
- this.gridBand6.VisibleIndex = 2;
- this.gridBand6.Width = 50;
- //
- // gridBand9
- //
- this.gridBand9.Caption = "妫�楠岀粨鏋�";
- this.gridBand9.Columns.Add(this.gv_fcheckResu);
- this.gridBand9.MinWidth = 50;
- this.gridBand9.Name = "gridBand9";
- this.gridBand9.VisibleIndex = 3;
- this.gridBand9.Width = 50;
- //
- // gridBand15
- //
- this.gridBand15.Caption = "鍒ゅ畾缁撴灉";
- this.gridBand15.Columns.Add(this.gv_freceQty);
- this.gridBand15.MinWidth = 50;
- this.gridBand15.Name = "gridBand15";
- this.gridBand15.VisibleIndex = 4;
- this.gridBand15.Width = 50;
- //
- // gridBand23
- //
- this.gridBand23.Caption = "IQC鎻愪氦鏃堕棿";
- this.gridBand23.Columns.Add(this.gv_iqcDate);
- this.gridBand23.MinWidth = 120;
- this.gridBand23.Name = "gridBand23";
- this.gridBand23.VisibleIndex = 12;
- this.gridBand23.Width = 120;
- //
- // gridBand26
- //
- this.gridBand26.Caption = "鏇存柊浜�";
- this.gridBand26.Columns.Add(this.gv_lastupdateBy);
- this.gridBand26.MinWidth = 60;
- this.gridBand26.Name = "gridBand26";
- this.gridBand26.VisibleIndex = 13;
- this.gridBand26.Width = 60;
- //
- // gridBand27
- //
- this.gridBand27.Caption = "鏇存柊鏃ユ湡";
- this.gridBand27.Columns.Add(this.gv_lastupdateDate);
- this.gridBand27.MinWidth = 120;
- this.gridBand27.Name = "gridBand27";
- this.gridBand27.VisibleIndex = 14;
- this.gridBand27.Width = 120;
- //
- // gridBand28
- //
- this.gridBand28.Caption = "鐘舵��";
- this.gridBand28.Columns.Add(this.gv_states);
- this.gridBand28.Columns.Add(this.gridColumn14);
- this.gridBand28.MinWidth = 60;
- this.gridBand28.Name = "gridBand28";
- this.gridBand28.VisibleIndex = 15;
- this.gridBand28.Width = 60;
- //
- // gridBand29
- //
- this.gridBand29.Caption = "杞崲鏁伴噺";
- this.gridBand29.Columns.Add(this.gv_fcovertQty);
- this.gridBand29.MinWidth = 60;
- this.gridBand29.Name = "gridBand29";
- this.gridBand29.VisibleIndex = 16;
- this.gridBand29.Width = 60;
- //
- // gridBand30
- //
- this.gridBand30.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand30.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand30.Caption = "寤虹珛淇℃伅";
- this.gridBand30.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand22,
- this.gridBand17});
- this.gridBand30.MinWidth = 200;
- this.gridBand30.Name = "gridBand30";
- this.gridBand30.VisibleIndex = 17;
- this.gridBand30.Width = 200;
- //
- // gridBand22
- //
- this.gridBand22.Caption = "鏃ユ湡";
- this.gridBand22.Columns.Add(this.gv_createDate);
- this.gridBand22.MinWidth = 120;
- this.gridBand22.Name = "gridBand22";
- this.gridBand22.VisibleIndex = 0;
- this.gridBand22.Width = 120;
- //
- // gridBand17
- //
- this.gridBand17.Caption = "寤虹珛鑰�";
- this.gridBand17.Columns.Add(this.gv_createBy);
- this.gridBand17.MinWidth = 60;
- this.gridBand17.Name = "gridBand17";
- this.gridBand17.VisibleIndex = 1;
- this.gridBand17.Width = 60;
- //
- // gridBand24
- //
- this.gridBand24.Caption = "涓嶈壇鎻忚堪";
- this.gridBand24.Columns.Add(this.gv_remarks);
- this.gridBand24.MinWidth = 100;
- this.gridBand24.Name = "gridBand24";
- this.gridBand24.VisibleIndex = 18;
- this.gridBand24.Width = 100;
- //
- // gridBand25
- //
- this.gridBand25.Caption = "涓嶈壇澶勭悊鏂规硶";
- this.gridBand25.Columns.Add(this.gv_fngHandle);
- this.gridBand25.MinWidth = 100;
- this.gridBand25.Name = "gridBand25";
- this.gridBand25.VisibleIndex = 19;
- this.gridBand25.Width = 100;
//
// Frm_MesQaItemsDetect01
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 9ff99f4..8e644af 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -38,28 +38,11 @@
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
gcMx1.MouseClick += GcMx1_MouseClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx3);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- this.gvMx1.IndicatorWidth = 50;
- gvMx1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- this.gvMx2.IndicatorWidth = 50;
- gvMx2.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- gvMx2.OptionsFind.ShowSearchNavButtons = false;
- gvMx2.OptionsView.ShowGroupPanel = false;
- gvMx3.OptionsFind.ShowSearchNavButtons = false;
- gvMx3.OptionsView.ShowGroupPanel = false;
txt_itemId.EditChanged += (s, e) =>
{
txt_itemModel.Text = this.txt_itemId.GetModel();
@@ -69,7 +52,7 @@
this.btnLoad.Click += BtnLoad_Click;
ucUpFile1.UpChanged += UcUpFile1_UpChanged;
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
-
+
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -274,7 +257,7 @@
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_releaseNo, gridView1);
+ lbGuid, txt_releaseNo, gridView1, "lotNo");
toolBarMenu1.guidKey = rowGuid;
if (string.IsNullOrEmpty(rowGuid))
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 6a153a8..ea55d79 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -29,22 +29,22 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01Check));
- 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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.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 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();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -142,6 +142,9 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_qualityAudit = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_modify1Flag = new DevExpress.XtraEditors.CheckEdit();
this.lb_qualityAudit = new DevExpress.XtraEditors.LabelControl();
this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
@@ -158,9 +161,6 @@
this.lb_modify1Flag = new DevExpress.XtraEditors.LabelControl();
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_modify1Flag = new DevExpress.XtraEditors.CheckEdit();
- this.txt_qualityAudit = new DevExpress.XtraEditors.CheckEdit();
- this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -197,14 +197,14 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
this.SuspendLayout();
//
// tabMxPage1
@@ -511,6 +511,7 @@
//
this.gridColumn3.Caption = "椤圭洰";
this.gridColumn3.FieldName = "fcheckItem";
+ this.gridColumn3.MaxWidth = 200;
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
@@ -522,23 +523,25 @@
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
this.gridColumn2.FieldName = "fcheckResu";
+ this.gridColumn2.MaxWidth = 80;
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 80;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn1.FieldName = "fstand";
+ this.gridColumn1.MaxWidth = 80;
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 2;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 80;
//
// lb_remarks
//
@@ -1233,7 +1236,7 @@
this.tabMxPage3.Controls.Add(this.gcMx3);
this.tabMxPage3.Controls.Add(this.ucUpFile1);
this.tabMxPage3.Name = "tabMxPage3";
- this.tabMxPage3.Size = new System.Drawing.Size(1340, 448);
+ this.tabMxPage3.Size = new System.Drawing.Size(1340, 460);
this.tabMxPage3.Text = "闄勪欢淇℃伅";
//
// gcMx3
@@ -1246,7 +1249,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2,
this.repositoryItemButtonEdit3});
- this.gcMx3.Size = new System.Drawing.Size(1340, 391);
+ this.gcMx3.Size = new System.Drawing.Size(1340, 403);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1342,10 +1345,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image")));
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ 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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1363,10 +1366,10 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", 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.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
@@ -1384,10 +1387,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.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, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1446,6 +1449,33 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1342, 196);
this.panel1.TabIndex = 1;
+ //
+ // txt_fsubmit
+ //
+ this.txt_fsubmit.Enabled = false;
+ this.txt_fsubmit.Location = new System.Drawing.Point(958, 10);
+ this.txt_fsubmit.Name = "txt_fsubmit";
+ this.txt_fsubmit.Properties.Caption = "";
+ this.txt_fsubmit.Size = new System.Drawing.Size(94, 24);
+ this.txt_fsubmit.TabIndex = 800;
+ //
+ // txt_qualityAudit
+ //
+ this.txt_qualityAudit.Enabled = false;
+ this.txt_qualityAudit.Location = new System.Drawing.Point(1057, 49);
+ this.txt_qualityAudit.Name = "txt_qualityAudit";
+ this.txt_qualityAudit.Properties.Caption = "";
+ this.txt_qualityAudit.Size = new System.Drawing.Size(53, 24);
+ this.txt_qualityAudit.TabIndex = 799;
+ //
+ // txt_modify1Flag
+ //
+ this.txt_modify1Flag.Enabled = false;
+ this.txt_modify1Flag.Location = new System.Drawing.Point(958, 50);
+ this.txt_modify1Flag.Name = "txt_modify1Flag";
+ this.txt_modify1Flag.Properties.Caption = "";
+ this.txt_modify1Flag.Size = new System.Drawing.Size(27, 24);
+ this.txt_modify1Flag.TabIndex = 798;
//
// lb_qualityAudit
//
@@ -1610,33 +1640,6 @@
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
//
- // txt_modify1Flag
- //
- this.txt_modify1Flag.Enabled = false;
- this.txt_modify1Flag.Location = new System.Drawing.Point(958, 50);
- this.txt_modify1Flag.Name = "txt_modify1Flag";
- this.txt_modify1Flag.Properties.Caption = "";
- this.txt_modify1Flag.Size = new System.Drawing.Size(27, 24);
- this.txt_modify1Flag.TabIndex = 798;
- //
- // txt_qualityAudit
- //
- this.txt_qualityAudit.Enabled = false;
- this.txt_qualityAudit.Location = new System.Drawing.Point(1057, 49);
- this.txt_qualityAudit.Name = "txt_qualityAudit";
- this.txt_qualityAudit.Properties.Caption = "";
- this.txt_qualityAudit.Size = new System.Drawing.Size(53, 24);
- this.txt_qualityAudit.TabIndex = 799;
- //
- // txt_fsubmit
- //
- this.txt_fsubmit.Enabled = false;
- this.txt_fsubmit.Location = new System.Drawing.Point(958, 10);
- this.txt_fsubmit.Name = "txt_fsubmit";
- this.txt_fsubmit.Properties.Caption = "";
- this.txt_fsubmit.Size = new System.Drawing.Size(94, 24);
- this.txt_fsubmit.TabIndex = 800;
- //
// Frm_MesQaItemsDetect01Check
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1682,14 +1685,14 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index afcddfe..766169f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -9,6 +9,7 @@
using System.Data;
using System.Drawing;
using System.Net;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
@@ -33,27 +34,13 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
gcMx1.MouseClick += GcMx1_MouseClick;
- getPageList(1, UtilityHelper.GetPageSize());
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx3);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- Font f = new Font("寰蒋闆呴粦", 16);
- Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
- };
//鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷�
- gvMx2.OptionsFind.ShowSearchNavButtons = false;
- gvMx2.OptionsView.ShowGroupPanel = false;
- gvMx3.OptionsFind.ShowSearchNavButtons = false;
- gvMx3.OptionsView.ShowGroupPanel = false;
txt_itemId.EditChanged += (s, e) =>
{
txt_itemModel.Text = this.txt_itemId.GetModel();
@@ -61,6 +48,12 @@
};
ucUpFile1.UpChanged += UcUpFile1_UpChanged;
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
+ }
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
}
private void GcMx1_MouseClick(object sender, MouseEventArgs e)
{
@@ -87,7 +80,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -96,7 +89,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -108,7 +104,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
{
@@ -373,7 +369,16 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
@@ -381,15 +386,11 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
-
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- foreach (FilterEntity itm in _filterList)
- {
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
- }
- PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
+
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
@@ -399,13 +400,18 @@
{
DataTable dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages;//鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.setTxt();
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
index fd7814d..4e430f1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="editorButtonImageOptions4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index 0c142f3..0abedb6 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -325,11 +325,7 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_itemNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(0);
}
/// <summary>
@@ -339,11 +335,61 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
+ _toolCk(1);
+ }
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ };
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_itemNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemName");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+
+ var _obj = new
+ {
+ guid = rowGuid,
+ ckValue = _inFieldValue,
+ parameter = "MES_QA_MJ,CHECK_DATE,STATUS,CHECK_USER"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index ddaa274..8f7cbf9 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -29,16 +29,16 @@
/// </summary>
private void InitializeComponent()
{
- 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.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 editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx2aql1Id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2aql00065 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2aql00040 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -531,10 +531,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions7.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)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -747,10 +747,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions8.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", 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);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index 2aae436..68d0d01 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -35,6 +35,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "foneChecked", "");
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx2);
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -445,12 +446,10 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
-
foreach (var a in _job["rtnData"]["mesQmAql3s"])
{
mesQmAql3s.Add(a);
}
-
DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(mesQmAql3s.ToString());
if (dt1.Rows.Count > 0)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index 11017ee..330edbc 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -34,6 +34,11 @@
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 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();
this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
@@ -60,7 +65,6 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.lb_tname = new DevExpress.XtraEditors.LabelControl();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
- this.lb_isenabled = new DevExpress.XtraEditors.LabelControl();
this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fversion = new DevExpress.XtraEditors.LabelControl();
this.txt_fversion = new DevExpress.XtraEditors.TextEdit();
@@ -99,18 +103,26 @@
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
- this.panel1 = new System.Windows.Forms.Panel();
+ this.xtraTabPageCopy = new DevExpress.XtraTab.XtraTabPage();
+ this.gridControl2 = new DevExpress.XtraGrid.GridControl();
+ this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnSave = new DevExpress.XtraEditors.SimpleButton();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
+ this.panel1 = new System.Windows.Forms.Panel();
this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
this.txt_ItemId = new Gs.DevApp.UserControl.UcLookItems();
- this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
- this.labelCreateDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.labelUserName = new DevExpress.XtraEditors.LabelControl();
- this.txt_userName = new DevExpress.XtraEditors.TextEdit();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
@@ -137,13 +149,16 @@
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
+ this.xtraTabPageCopy.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -188,7 +203,7 @@
this.gvMx1fstand.FieldName = "fstand";
this.gvMx1fstand.MinWidth = 60;
this.gvMx1fstand.Name = "gvMx1fstand";
- this.gvMx1fstand.Tag = "query_a.FSTAND";
+ this.gvMx1fstand.Tag = "yz_quantity_0";
this.gvMx1fstand.Visible = true;
this.gvMx1fstand.VisibleIndex = 10;
this.gvMx1fstand.Width = 150;
@@ -223,7 +238,7 @@
this.gvMx1fdownAllow.FieldName = "fdownAllow";
this.gvMx1fdownAllow.MinWidth = 60;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
- this.gvMx1fdownAllow.Tag = "query_a.FDOWN_ALLOW";
+ this.gvMx1fdownAllow.Tag = "yz_quantity_0";
this.gvMx1fdownAllow.Visible = true;
this.gvMx1fdownAllow.VisibleIndex = 11;
this.gvMx1fdownAllow.Width = 60;
@@ -303,7 +318,7 @@
this.gvMx1fupAllow.FieldName = "fupAllow";
this.gvMx1fupAllow.MinWidth = 60;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
- this.gvMx1fupAllow.Tag = "query_a.FUP_ALLOW";
+ this.gvMx1fupAllow.Tag = "yz_quantity_0";
this.gvMx1fupAllow.Visible = true;
this.gvMx1fupAllow.VisibleIndex = 9;
this.gvMx1fupAllow.Width = 60;
@@ -350,7 +365,7 @@
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1125, 371);
- this.tabMxPage1.Text = "鏄庣粏";
+ this.tabMxPage1.Text = "妫�楠岄」鐩槑缁�";
//
// gcMx1
//
@@ -441,7 +456,7 @@
//
this.lb_tname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tname.Appearance.Options.UseFont = true;
- this.lb_tname.Location = new System.Drawing.Point(9, 59);
+ this.lb_tname.Location = new System.Drawing.Point(9, 54);
this.lb_tname.Name = "lb_tname";
this.lb_tname.Size = new System.Drawing.Size(68, 21);
this.lb_tname.TabIndex = 370;
@@ -450,22 +465,12 @@
// txt_itemNo
//
this.txt_itemNo.Enabled = false;
- this.txt_itemNo.Location = new System.Drawing.Point(85, 55);
+ this.txt_itemNo.Location = new System.Drawing.Point(85, 50);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(266, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(262, 28);
this.txt_itemNo.TabIndex = 370;
- //
- // lb_isenabled
- //
- this.lb_isenabled.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_isenabled.Appearance.Options.UseFont = true;
- this.lb_isenabled.Location = new System.Drawing.Point(989, 96);
- this.lb_isenabled.Name = "lb_isenabled";
- this.lb_isenabled.Size = new System.Drawing.Size(73, 21);
- this.lb_isenabled.TabIndex = 306;
- this.lb_isenabled.Text = "鏄惁鍙敤 ";
//
// gv_isenabled
//
@@ -485,7 +490,7 @@
//
this.lb_fversion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fversion.Appearance.Options.UseFont = true;
- this.lb_fversion.Location = new System.Drawing.Point(389, 139);
+ this.lb_fversion.Location = new System.Drawing.Point(361, 54);
this.lb_fversion.Name = "lb_fversion";
this.lb_fversion.Size = new System.Drawing.Size(39, 21);
this.lb_fversion.TabIndex = 298;
@@ -493,7 +498,8 @@
//
// txt_fversion
//
- this.txt_fversion.Location = new System.Drawing.Point(433, 132);
+ this.txt_fversion.Enabled = false;
+ this.txt_fversion.Location = new System.Drawing.Point(405, 50);
this.txt_fversion.Name = "txt_fversion";
this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fversion.Properties.Appearance.Options.UseFont = true;
@@ -511,14 +517,14 @@
this.gv_fversion.OptionsColumn.AllowEdit = false;
this.gv_fversion.Tag = "query_a.FVERSION";
this.gv_fversion.Visible = true;
- this.gv_fversion.VisibleIndex = 8;
+ this.gv_fversion.VisibleIndex = 4;
this.gv_fversion.Width = 94;
//
// lb_ftwoCheckdate
//
this.lb_ftwoCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoCheckdate.Appearance.Options.UseFont = true;
- this.lb_ftwoCheckdate.Location = new System.Drawing.Point(612, 59);
+ this.lb_ftwoCheckdate.Location = new System.Drawing.Point(612, 54);
this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate";
this.lb_ftwoCheckdate.Size = new System.Drawing.Size(73, 21);
this.lb_ftwoCheckdate.TabIndex = 285;
@@ -527,11 +533,11 @@
// txt_ftwoCheckdate
//
this.txt_ftwoCheckdate.Enabled = false;
- this.txt_ftwoCheckdate.Location = new System.Drawing.Point(685, 55);
+ this.txt_ftwoCheckdate.Location = new System.Drawing.Point(685, 50);
this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckdate.Size = new System.Drawing.Size(158, 28);
+ this.txt_ftwoCheckdate.Size = new System.Drawing.Size(172, 28);
this.txt_ftwoCheckdate.TabIndex = 285;
//
// lb_ftwoCheckor
@@ -551,7 +557,7 @@
this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckor.Size = new System.Drawing.Size(158, 28);
+ this.txt_ftwoCheckor.Size = new System.Drawing.Size(172, 28);
this.txt_ftwoCheckor.TabIndex = 280;
//
// gv_ftwoCheckor
@@ -560,7 +566,7 @@
this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true;
this.gv_ftwoCheckor.Caption = "鎵瑰噯浜�";
this.gv_ftwoCheckor.FieldName = "ftwoCheckor";
- this.gv_ftwoCheckor.MinWidth = 50;
+ this.gv_ftwoCheckor.MinWidth = 80;
this.gv_ftwoCheckor.Name = "gv_ftwoCheckor";
this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
@@ -572,11 +578,11 @@
//
this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoChecked.Appearance.Options.UseFont = true;
- this.lb_ftwoChecked.Location = new System.Drawing.Point(612, 96);
+ this.lb_ftwoChecked.Location = new System.Drawing.Point(361, 86);
this.lb_ftwoChecked.Name = "lb_ftwoChecked";
- this.lb_ftwoChecked.Size = new System.Drawing.Size(73, 21);
+ this.lb_ftwoChecked.Size = new System.Drawing.Size(68, 21);
this.lb_ftwoChecked.TabIndex = 273;
- this.lb_ftwoChecked.Text = "鎵瑰噯鏍囪 ";
+ this.lb_ftwoChecked.Text = "鎵瑰噯鏍囪";
//
// gv_ftwoChecked
//
@@ -596,7 +602,7 @@
//
this.lb_foneCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneCheckdate.Appearance.Options.UseFont = true;
- this.lb_foneCheckdate.Location = new System.Drawing.Point(849, 59);
+ this.lb_foneCheckdate.Location = new System.Drawing.Point(612, 127);
this.lb_foneCheckdate.Name = "lb_foneCheckdate";
this.lb_foneCheckdate.Size = new System.Drawing.Size(73, 21);
this.lb_foneCheckdate.TabIndex = 267;
@@ -605,7 +611,7 @@
// txt_foneCheckdate
//
this.txt_foneCheckdate.Enabled = false;
- this.txt_foneCheckdate.Location = new System.Drawing.Point(928, 55);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(685, 123);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
@@ -630,7 +636,7 @@
//
this.lb_foneCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneCheckor.Appearance.Options.UseFont = true;
- this.lb_foneCheckor.Location = new System.Drawing.Point(866, 20);
+ this.lb_foneCheckor.Location = new System.Drawing.Point(629, 86);
this.lb_foneCheckor.Name = "lb_foneCheckor";
this.lb_foneCheckor.Size = new System.Drawing.Size(56, 21);
this.lb_foneCheckor.TabIndex = 262;
@@ -639,7 +645,7 @@
// txt_foneCheckor
//
this.txt_foneCheckor.Enabled = false;
- this.txt_foneCheckor.Location = new System.Drawing.Point(928, 16);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(685, 86);
this.txt_foneCheckor.Name = "txt_foneCheckor";
this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
@@ -664,11 +670,11 @@
//
this.lb_foneChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneChecked.Appearance.Options.UseFont = true;
- this.lb_foneChecked.Location = new System.Drawing.Point(849, 96);
+ this.lb_foneChecked.Location = new System.Drawing.Point(361, 127);
this.lb_foneChecked.Name = "lb_foneChecked";
- this.lb_foneChecked.Size = new System.Drawing.Size(73, 21);
+ this.lb_foneChecked.Size = new System.Drawing.Size(68, 21);
this.lb_foneChecked.TabIndex = 258;
- this.lb_foneChecked.Text = "瀹℃壒鏍囪 ";
+ this.lb_foneChecked.Text = "瀹℃壒鏍囪";
//
// gv_foneChecked
//
@@ -705,14 +711,14 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_b.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 5;
+ this.gv_itemNo.VisibleIndex = 6;
this.gv_itemNo.Width = 150;
//
// lb_memo
//
this.lb_memo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_memo.Appearance.Options.UseFont = true;
- this.lb_memo.Location = new System.Drawing.Point(389, 96);
+ this.lb_memo.Location = new System.Drawing.Point(361, 20);
this.lb_memo.Name = "lb_memo";
this.lb_memo.Size = new System.Drawing.Size(39, 21);
this.lb_memo.TabIndex = 219;
@@ -720,7 +726,7 @@
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(433, 96);
+ this.txt_memo.Location = new System.Drawing.Point(405, 16);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_memo.Properties.Appearance.Options.UseFont = true;
@@ -743,7 +749,7 @@
//
// toolBarMenu1
//
- this.toolBarMenu1.chkParameter = "MES_QM_CHECKITEM,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mes_CHECKITEM";
+ this.toolBarMenu1.chkParameter = " 0,0,0,0,000chk_mes_CHECKITEM";
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -779,11 +785,11 @@
this.gv_isenabled,
this.gv_foneChecked,
this.gv_ftwoChecked,
+ this.gv_fversion,
this.gridColumn7,
this.gv_itemNo,
this.gridColumn3,
this.gridColumn2,
- this.gv_fversion,
this.gv_foneCheckor,
this.gv_foneCheckdate,
this.gv_ftwoCheckor,
@@ -818,7 +824,7 @@
this.gridColumn7.OptionsColumn.AllowEdit = false;
this.gridColumn7.Tag = "query_a.ITEM_ID";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 4;
+ this.gridColumn7.VisibleIndex = 5;
this.gridColumn7.Width = 94;
//
// gridColumn3
@@ -830,7 +836,7 @@
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Tag = "query_b.item_name";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 6;
+ this.gridColumn3.VisibleIndex = 7;
this.gridColumn3.Width = 250;
//
// gridColumn2
@@ -842,14 +848,14 @@
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Tag = "query_b.item_model";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 7;
+ this.gridColumn2.VisibleIndex = 8;
this.gridColumn2.Width = 100;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍒朵綔浜�";
this.gridColumn1.FieldName = "createBy";
- this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.MinWidth = 80;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Tag = "query_a.CREATE_BY";
@@ -919,26 +925,181 @@
this.tabMx.Size = new System.Drawing.Size(1127, 403);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage1});
+ this.tabMxPage1,
+ this.xtraTabPageCopy});
+ //
+ // xtraTabPageCopy
+ //
+ this.xtraTabPageCopy.Controls.Add(this.gridControl2);
+ this.xtraTabPageCopy.Controls.Add(this.panelControl1);
+ this.xtraTabPageCopy.Name = "xtraTabPageCopy";
+ this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 371);
+ this.xtraTabPageCopy.Text = "澶嶅埗鍒板叾瀹冪墿鏂�";
+ //
+ // gridControl2
+ //
+ this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gridControl2.Location = new System.Drawing.Point(0, 43);
+ this.gridControl2.MainView = this.gridView2;
+ this.gridControl2.Name = "gridControl2";
+ this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit3});
+ this.gridControl2.Size = new System.Drawing.Size(1125, 328);
+ this.gridControl2.TabIndex = 1;
+ this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView2});
+ //
+ // gridView2
+ //
+ this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn11,
+ this.gridColumn12,
+ this.gridColumn13,
+ this.gridColumn14,
+ this.gridColumn15,
+ this.gridColumn6,
+ this.gridColumn9});
+ this.gridView2.GridControl = this.gridControl2;
+ this.gridView2.Name = "gridView2";
+ this.gridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gridView2.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView2.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridColumn11.AppearanceCell.Options.UseFont = true;
+ this.gridColumn11.Caption = "浣跨敤缁勭粐";
+ this.gridColumn11.FieldName = "fSubsidiary";
+ this.gridColumn11.MinWidth = 150;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.OptionsColumn.ReadOnly = true;
+ this.gridColumn11.Tag = "query_a.FCHECK_ITEM";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 0;
+ this.gridColumn11.Width = 150;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "鐗╂枡ID";
+ this.gridColumn12.FieldName = "id";
+ this.gridColumn12.MinWidth = 150;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.OptionsColumn.ReadOnly = true;
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 1;
+ this.gridColumn12.Width = 150;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridColumn13.AppearanceCell.Options.UseFont = true;
+ this.gridColumn13.Caption = "鐗╂枡缂栧彿";
+ this.gridColumn13.FieldName = "itemNo";
+ this.gridColumn13.MinWidth = 150;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.OptionsColumn.ReadOnly = true;
+ this.gridColumn13.Tag = "query_a.MEMO";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 2;
+ this.gridColumn13.Width = 150;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridColumn14.AppearanceCell.Options.UseFont = true;
+ this.gridColumn14.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn14.FieldName = "itemName";
+ this.gridColumn14.MinWidth = 150;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.OptionsColumn.ReadOnly = true;
+ this.gridColumn14.Tag = "query_a.FCHECK_TOOL";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 3;
+ this.gridColumn14.Width = 150;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridColumn15.AppearanceCell.Options.UseFont = true;
+ this.gridColumn15.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn15.FieldName = "itemModel";
+ this.gridColumn15.MinWidth = 150;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.OptionsColumn.ReadOnly = true;
+ this.gridColumn15.Tag = "query_a.SAMPLE_SIZE_NO";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 4;
+ this.gridColumn15.Width = 150;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "绉诲嚭";
+ this.gridColumn6.ColumnEdit = this.repositoryItemButtonEdit3;
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 94;
+ //
+ // repositoryItemButtonEdit3
+ //
+ this.repositoryItemButtonEdit3.AutoHeight = false;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ 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.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
+ this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "gridColumn9";
+ this.gridColumn9.FieldName = "guid";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Width = 94;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnSave);
+ this.panelControl1.Controls.Add(this.btnSelect);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panelControl1.Location = new System.Drawing.Point(0, 0);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(1125, 43);
+ this.panelControl1.TabIndex = 0;
+ //
+ // btnSave
+ //
+ this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x161;
+ this.btnSave.Location = new System.Drawing.Point(139, 6);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(187, 29);
+ this.btnSave.TabIndex = 450;
+ this.btnSave.Text = "淇濆瓨澶嶅埗鐨勭墿鏂欏拰椤圭洰";
+ //
+ // btnSelect
+ //
+ this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.btnSelect.Location = new System.Drawing.Point(10, 6);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(101, 29);
+ this.btnSelect.TabIndex = 449;
+ this.btnSelect.Text = "閫夋嫨鐗╂枡";
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.btnSelect);
this.panel1.Controls.Add(this.txt_itemModel);
this.panel1.Controls.Add(this.txt_ItemId);
- this.panel1.Controls.Add(this.txt_isenabled);
this.panel1.Controls.Add(this.txt_ftwoChecked);
this.panel1.Controls.Add(this.txt_foneChecked);
this.panel1.Controls.Add(this.lb_itemModel);
- this.panel1.Controls.Add(this.labelCreateDate);
- this.panel1.Controls.Add(this.txt_createDate);
- this.panel1.Controls.Add(this.labelUserName);
- this.panel1.Controls.Add(this.txt_userName);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_tname);
this.panel1.Controls.Add(this.txt_itemNo);
- this.panel1.Controls.Add(this.lb_isenabled);
this.panel1.Controls.Add(this.lb_fversion);
this.panel1.Controls.Add(this.txt_fversion);
this.panel1.Controls.Add(this.lb_ftwoCheckdate);
@@ -961,23 +1122,14 @@
this.panel1.Size = new System.Drawing.Size(1127, 167);
this.panel1.TabIndex = 1;
//
- // btnSelect
- //
- this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(612, 131);
- this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(85, 29);
- this.btnSelect.TabIndex = 449;
- this.btnSelect.Text = "鍘诲鍒�";
- //
// txt_itemModel
//
this.txt_itemModel.Enabled = false;
- this.txt_itemModel.Location = new System.Drawing.Point(85, 96);
+ this.txt_itemModel.Location = new System.Drawing.Point(85, 86);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(266, 64);
+ this.txt_itemModel.Size = new System.Drawing.Size(262, 64);
this.txt_itemModel.TabIndex = 381;
this.txt_itemModel.Tag = "itemName";
//
@@ -990,18 +1142,10 @@
this.txt_ItemId.TabIndex = 380;
this.txt_ItemId.Tag = "no";
//
- // txt_isenabled
- //
- this.txt_isenabled.Location = new System.Drawing.Point(1062, 96);
- this.txt_isenabled.Name = "txt_isenabled";
- this.txt_isenabled.Properties.Caption = "";
- this.txt_isenabled.Size = new System.Drawing.Size(27, 24);
- this.txt_isenabled.TabIndex = 379;
- //
// txt_ftwoChecked
//
this.txt_ftwoChecked.Enabled = false;
- this.txt_ftwoChecked.Location = new System.Drawing.Point(685, 96);
+ this.txt_ftwoChecked.Location = new System.Drawing.Point(434, 86);
this.txt_ftwoChecked.Name = "txt_ftwoChecked";
this.txt_ftwoChecked.Properties.Caption = "";
this.txt_ftwoChecked.Size = new System.Drawing.Size(94, 24);
@@ -1010,7 +1154,7 @@
// txt_foneChecked
//
this.txt_foneChecked.Enabled = false;
- this.txt_foneChecked.Location = new System.Drawing.Point(928, 96);
+ this.txt_foneChecked.Location = new System.Drawing.Point(434, 125);
this.txt_foneChecked.Name = "txt_foneChecked";
this.txt_foneChecked.Properties.Caption = "";
this.txt_foneChecked.Size = new System.Drawing.Size(94, 24);
@@ -1020,51 +1164,11 @@
//
this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemModel.Appearance.Options.UseFont = true;
- this.lb_itemModel.Location = new System.Drawing.Point(9, 96);
+ this.lb_itemModel.Location = new System.Drawing.Point(9, 86);
this.lb_itemModel.Name = "lb_itemModel";
this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
this.lb_itemModel.TabIndex = 375;
this.lb_itemModel.Text = "鐗╂枡瑙勬牸";
- //
- // labelCreateDate
- //
- this.labelCreateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelCreateDate.Appearance.Options.UseFont = true;
- this.labelCreateDate.Location = new System.Drawing.Point(360, 59);
- this.labelCreateDate.Name = "labelCreateDate";
- this.labelCreateDate.Size = new System.Drawing.Size(68, 21);
- this.labelCreateDate.TabIndex = 373;
- this.labelCreateDate.Text = "鍒朵綔鏃ユ湡";
- //
- // txt_createDate
- //
- this.txt_createDate.Enabled = false;
- this.txt_createDate.Location = new System.Drawing.Point(433, 55);
- this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(175, 28);
- this.txt_createDate.TabIndex = 374;
- //
- // labelUserName
- //
- this.labelUserName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelUserName.Appearance.Options.UseFont = true;
- this.labelUserName.Location = new System.Drawing.Point(377, 20);
- this.labelUserName.Name = "labelUserName";
- this.labelUserName.Size = new System.Drawing.Size(51, 21);
- this.labelUserName.TabIndex = 371;
- this.labelUserName.Text = "鍒朵綔浜�";
- //
- // txt_userName
- //
- this.txt_userName.Enabled = false;
- this.txt_userName.Location = new System.Drawing.Point(433, 16);
- this.txt_userName.Name = "txt_userName";
- this.txt_userName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_userName.Properties.Appearance.Options.UseFont = true;
- this.txt_userName.Size = new System.Drawing.Size(175, 28);
- this.txt_userName.TabIndex = 372;
//
// lbGuid
//
@@ -1118,14 +1222,17 @@
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
+ this.xtraTabPageCopy.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1161,8 +1268,6 @@
private DevExpress.XtraEditors.LabelControl lb_tname;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
-
-private DevExpress.XtraEditors.LabelControl lb_isenabled;
private DevExpress.XtraGrid.Columns.GridColumn gv_isenabled;
private DevExpress.XtraEditors.LabelControl lb_fversion;
@@ -1202,14 +1307,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn sampleSizeName;
- private DevExpress.XtraEditors.LabelControl labelCreateDate;
- private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.LabelControl labelUserName;
- private DevExpress.XtraEditors.TextEdit txt_userName;
private DevExpress.XtraEditors.LabelControl lb_itemModel;
private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
- private DevExpress.XtraEditors.CheckEdit txt_isenabled;
private UserControl.UcLookItems txt_ItemId;
private DevExpress.XtraEditors.MemoEdit txt_itemModel;
private DevExpress.XtraEditors.SimpleButton btnSelect;
@@ -1223,5 +1323,18 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPageCopy;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraGrid.GridControl gridControl2;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
+ private DevExpress.XtraEditors.SimpleButton btnSave;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 4845ef9..a253ac4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -30,19 +30,20 @@
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
- toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "foneChecked", "");
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷�
_setIno();
+ btnSave.Click += BtnSave_Click;
}
- private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -101,39 +102,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
{
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_itemNo, gridView1);
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "Approval", JsonConvert.SerializeObject(rowGuid));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1);
- }
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- /// <summary>
- /// 鍙嶅鏍�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
- {
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_itemNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(2);
}
/// <summary>
@@ -143,11 +112,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_itemNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(1);
}
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -166,37 +131,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戠殑妫�楠屾爣鍑嗭紝纭畾鍒犻櫎鍚楋紵"))
- return;
- var lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn =
- UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1);
- }
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
+ _toolCk(-1);
}
/// <summary>
@@ -236,6 +171,7 @@
return;
}
getModel(rowGuid, true, 1);
+
}
/// <summary>
@@ -253,6 +189,7 @@
UtilityHelper.CleanValueByControl(panel1.Controls, true,
gridViews);
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ xtraTabPageCopy.PageEnabled = false;
}
/// <summary>
@@ -263,8 +200,8 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string _ItemId = txt_ItemId.GetId()
-; if (string.IsNullOrEmpty(_ItemId))
+ string _ItemId = txt_ItemId.GetId();
+ if (string.IsNullOrEmpty(_ItemId))
{
MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
txt_ItemId.Focus();
@@ -293,14 +230,12 @@
FdownAllow = row["FdownAllow"].ToString(),
});
}
-
var _obj = new MesQmCheckitem
{
Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
ItemId = long.Parse(_ItemId),
Memo = txt_memo.Text.Trim(),
ItemNo = txt_itemNo.Text.Trim(),
- Isenabled = txt_isenabled.Checked,
Ftype = "1",
Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
list = lst
@@ -333,9 +268,8 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
+ private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
"a.create_date", "asc", "", _sbSqlWhere.ToString());
@@ -372,7 +306,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
@@ -382,8 +316,8 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
+ xtraTabPageCopy.PageEnabled = !isEdit;
var _obj = new
{
guid = strGuid //涓诲缓
@@ -408,7 +342,6 @@
var _job = JObject.Parse(strJson);
var array = new JArray();
foreach (var a in _job["rtnData"]["list"]) array.Add(a);
-
var dt =
JsonConvert.DeserializeObject<DataTable>(
array.ToString());
@@ -423,6 +356,8 @@
UtilityHelper.SetDefaultTable(gcMx1,
gvMx1);
}
+ UtilityHelper.SetDefaultTable(gridControl2,
+ gridView2);
}
else
{
@@ -435,59 +370,65 @@
}
}
-
-
- #region 浠ヤ笅涓虹绉嶄笅鎷�
-
- private void getCopyMx(string strGuid)
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
{
- if (string.IsNullOrEmpty(strGuid))
+ string strMsg = "";
+ switch (_inFieldValue)
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺澶嶅埗鐨勮锛�");
+ case -1:
+ strMsg = "鍒犻櫎";
+ break;
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 2:
+ strMsg = "鎵瑰噯";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+
var _obj = new
{
- guid = strGuid
+ guid = rowGuid,
+ inFieldValue = _inFieldValue,
};
try
{
var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "GetModelIQC",
+ _webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
- var _rtn =
- UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
- var dy = _rtn.rtnData;
- var _job = JObject.Parse(strJson);
- var array = new JArray();
- foreach (var a in _job["rtnData"]["list"]) array.Add(a);
- var dt =
- JsonConvert.DeserializeObject<DataTable>(
- array.ToString());
- if (dt.Rows.Count > 0)
- {
- gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = dt;
- gcMx1.ForceInitialize();
- }
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
else
- {
- MsgHelper.Warning("鎻愮ず锛氭病鎵惧埌鐩稿簲鐨勬槑缁嗭紝璇烽�夋嫨鍏跺畠璇曡瘯锛�");
- }
- }
- else
- {
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ getPageList(1);
}
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+
}
+
+ #region 浠ヤ笅涓虹绉嶄笅鎷�
private void _setIno()
{
txt_ItemId.EditChanged += (s, e) =>
@@ -500,10 +441,18 @@
var frm = new SelectCheckDt();
frm.UpdateParent += (ss, ee) =>
{
- var lst = new List<string>();
- lst = ee.StringList;
- getCopyMx(lst[0]);
-
+ var lst = ee.DynamicList;
+ var json = JsonConvert.SerializeObject(lst);
+ DataTable _newTable = (DataTable)JsonConvert.DeserializeObject(json, (typeof(DataTable)));
+ DataTable _oldTable = (DataTable)gridControl2.DataSource;
+ DataRow[] sourceRows = _newTable.Select();
+ for (int i = 0; i < sourceRows.Length; i++)
+ {
+ _oldTable.ImportRow(sourceRows[i]);
+ }
+ gridControl2.BindingContext = new BindingContext();
+ gridControl2.DataSource = _oldTable;
+ gridControl2.ForceInitialize();
};
frm.ShowDialog();
};
@@ -680,6 +629,73 @@
}
}
#endregion
+ /// <summary>
+ /// 鍒犻櫎澶嶅埗椤�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ gridView2.CloseEditor();
+ gridView2.UpdateCurrentRow();
+ var rowhandle = gridView2.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gridView2.GetDataRow(rowhandle);
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ gridView2.DeleteRow(rowhandle);
+ return;
+ }
+ }
+ /// <summary>
+ /// 鎻愪氦鐗╂枡澶嶅埗
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void BtnSave_Click(object sender, EventArgs e)
+ {
+ int _rows = gridView2.RowCount;
+ if (_rows <= 0)
+ {
+ MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
+ return;
+ }
+
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�" + _rows.ToString() + "鏉℃暟鎹紝纭畾淇濆瓨鍚楋紵"))
+ return;
+ System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder();
+ for (var i = 0; i < gridView2.DataRowCount; i++)
+ {
+ var row = gridView2.GetDataRow(i);
+ if (_sbGuids.Length > 0)
+ _sbGuids.Append(",");
+ Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
+ _sbGuids.Append(_guid.ToString());
+ }
+ var _obj = new
+ {
+ sourceGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
+ itemGuids = _sbGuids.ToString()
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ UtilityHelper.SetDefaultTable(gridControl2, gridView2);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
index 540d87e..4fa0376 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
@@ -35,7 +35,6 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1lookupName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lookupValue = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -91,21 +90,8 @@
this.gvMx1lookupName.Name = "gvMx1lookupName";
this.gvMx1lookupName.Tag = "query_a.LOOKUP_NAME";
this.gvMx1lookupName.Visible = true;
- this.gvMx1lookupName.VisibleIndex = 1;
+ this.gvMx1lookupName.VisibleIndex = 0;
this.gvMx1lookupName.Width = 509;
- //
- // gvMx1lookupValue
- //
- this.gvMx1lookupValue.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lookupValue.AppearanceCell.Options.UseFont = true;
- this.gvMx1lookupValue.Caption = "绯荤粺蹇爜鍊�";
- this.gvMx1lookupValue.FieldName = "lookupValue";
- this.gvMx1lookupValue.MinWidth = 50;
- this.gvMx1lookupValue.Name = "gvMx1lookupValue";
- this.gvMx1lookupValue.Tag = "query_a.LOOKUP_VALUE";
- this.gvMx1lookupValue.Visible = true;
- this.gvMx1lookupValue.VisibleIndex = 0;
- this.gvMx1lookupValue.Width = 505;
//
// tabMxPage1
//
@@ -131,7 +117,6 @@
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn2,
- this.gvMx1lookupValue,
this.gvMx1lookupName,
this.gvMxDel});
this.gvMx1.GridControl = this.gcMx1;
@@ -156,7 +141,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 2;
+ this.gvMxDel.VisibleIndex = 1;
this.gvMxDel.Width = 80;
//
// repositoryItemButtonEdit1
@@ -452,7 +437,6 @@
private DevExpress.XtraEditors.LabelControl labelControl11;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1lookupName;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lookupValue;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index 48b848a..5931b1d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -36,6 +36,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", "");
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -74,11 +75,7 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_lookupTypeCode, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(0);
}
/// <summary>
@@ -88,11 +85,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_lookupTypeCode, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(1);
}
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -336,5 +329,59 @@
}
}
}
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_lookupTypeName, gridView1, "lookupTypeName");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+
+ var _obj = new
+ {
+ guid = rowGuid,
+ ckValue = _inFieldValue,
+ parameter = "MES_SYS_LOOKUP_TYPES,check_date,check_status,check_by"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+
+ }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs
index 833f112..ee0ffef 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs
@@ -45,12 +45,6 @@
Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
-
- gvMx1.ValidatingEditor += (sender, e) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.SetValidatingEditor(sender, e);
- };
-
var _obj = new
{
currentPage = 1,
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index ea61269..560814e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -24,10 +24,7 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- gridView1.FocusedRowChanged += (s, e) =>
- {
- UtilityHelper.SetCheckIco(s, picCheckBox, this, "checkStatus", "");
- };
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", "");
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
getTree();
@@ -41,8 +38,6 @@
Txt_flagIncludeDocCode_CheckedChanged;
txt_isSpilit.CheckedChanged +=
Txt_flagIncludeDocCode_CheckedChanged;
-
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
}
/// <summary>
@@ -80,11 +75,7 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_docCode, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(0);
}
/// <summary>
@@ -94,11 +85,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_docCode, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(1);
}
/// <summary>
@@ -120,7 +107,7 @@
{
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_docCode, gridView1);
+ lbGuid, txt_docCode, gridView1, "docCode");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -143,7 +130,6 @@
UtilityHelper.JumpToTab(xtraTabControl1, 0);
getPageList(1);
}
-
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
@@ -417,5 +403,59 @@
{
DoPreviewCode();
}
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_docCode, gridView1, "docCode");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+
+ var _obj = new
+ {
+ guid = rowGuid,
+ ckValue = _inFieldValue,
+ parameter = "SYS_DOC_RULE,check_date,check_status,check_by"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("","General/GeneralCheck",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
index aa4a239..dd0b137 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
@@ -29,6 +29,11 @@
/// </summary>
private void InitializeComponent()
{
+ 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.lb_pageStatus = new DevExpress.XtraEditors.LabelControl();
this.gv_pageStatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_pageIdx = new DevExpress.XtraEditors.LabelControl();
@@ -48,6 +53,8 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -63,6 +70,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_pageView.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -274,6 +282,8 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
+ this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
this.gcMain.Size = new System.Drawing.Size(1126, 531);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -289,13 +299,36 @@
this.gv_icoimg,
this.gv_pageGroup,
this.gv_pageIdx,
- this.gv_pageStatus});
+ this.gv_pageStatus,
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "涓婁紶鍥炬爣";
+ this.gridColumn1.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn1.MaxWidth = 80;
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 6;
+ this.gridColumn1.Width = 60;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.cleartablestyle_16x161;
+ 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, 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);
//
// xtraTabControl1
//
@@ -413,6 +446,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_pageView.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -459,5 +493,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_pageView;
private DevExpress.XtraEditors.CheckEdit txt_pageStatus;
private System.Windows.Forms.NumericUpDown txt_pageIdx;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
index 849a6f0..45256b0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
@@ -218,7 +218,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.setTxt();
}
else
{
@@ -266,5 +265,24 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gridView1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(mxGuid);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("涓婁紶鎴愬姛锛�");
+ getPageList(1, UtilityHelper.GetPageSize());
+ };
+ frm.ShowDialog();
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index e265f2b..65c7192 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -37,7 +37,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
-
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
}
/// <summary>
/// 鏌ヨ鍥炶皟
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
index 714f4e8..abdeef7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
@@ -376,7 +376,6 @@
i++;
}
}
-
txt_icon.Properties.LargeImages = dicImg;
txt_icon.Properties.SmallImages = dicImg;
}
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 80858c5..7a82d68 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -27,8 +27,8 @@
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -243,7 +243,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "CREATE_TIME",
"desc", "", _sbSqlWhere.ToString());
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index 1279dbd..7242d95 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -28,8 +28,8 @@
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -106,7 +106,7 @@
{
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_userName, gridView1);
+ lbGuid, txt_userName, gridView1, "userName");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -174,7 +174,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
getModel(rowGuid, true, 1);
}
@@ -259,7 +258,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "CREATE_TIME",
"asc", "", _sbSqlWhere.ToString());
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 256654e..3214419 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- 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 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();
this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -64,6 +64,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
@@ -133,7 +134,6 @@
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -355,6 +355,7 @@
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gvMx1.OptionsFilter.AllowFilterEditor = false;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
this.gvMx1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
this.gvMx1.OptionsView.ShowGroupPanel = false;
@@ -541,13 +542,23 @@
this.gridColumn7.VisibleIndex = 12;
this.gridColumn7.Width = 94;
//
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "鍙墦鍗版�婚噺";
+ this.gridColumn10.FieldName = "kyPrtQty";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 13;
+ this.gridColumn10.Width = 94;
+ //
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions4.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -588,6 +599,7 @@
this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
this.lbMxGuid.TabIndex = 229;
this.lbMxGuid.Text = "lbMxGuid";
+ this.lbMxGuid.Visible = false;
//
// txt_iCount_1
//
@@ -679,7 +691,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(77, 65);
+ this.txtWlgg.Location = new System.Drawing.Point(90, 65);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
@@ -691,13 +703,13 @@
//
this.labelControl9.Location = new System.Drawing.Point(11, 70);
this.labelControl9.Name = "labelControl9";
- this.labelControl9.Size = new System.Drawing.Size(60, 18);
+ this.labelControl9.Size = new System.Drawing.Size(75, 18);
this.labelControl9.TabIndex = 217;
- this.labelControl9.Text = "鐗╂枡瑙勬牸";
+ this.labelControl9.Text = "鐗╂枡瑙勬牸锛�";
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(77, 34);
+ this.txtWlmc.Location = new System.Drawing.Point(90, 34);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
@@ -709,13 +721,13 @@
//
this.labelControl8.Location = new System.Drawing.Point(11, 39);
this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(60, 18);
+ this.labelControl8.Size = new System.Drawing.Size(75, 18);
this.labelControl8.TabIndex = 215;
- this.labelControl8.Text = "鐗╂枡鍚嶇О";
+ this.labelControl8.Text = "鐗╂枡鍚嶇О锛�";
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(77, 4);
+ this.txtWlid.Location = new System.Drawing.Point(90, 4);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtWlid.Properties.Appearance.Options.UseFont = true;
@@ -727,9 +739,9 @@
//
this.labelControl7.Location = new System.Drawing.Point(25, 9);
this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(46, 18);
+ this.labelControl7.Size = new System.Drawing.Size(61, 18);
this.labelControl7.TabIndex = 213;
- this.labelControl7.Text = "鐗╂枡ID";
+ this.labelControl7.Text = "鐗╂枡ID锛�";
//
// gv_urgentFlag
//
@@ -1298,16 +1310,6 @@
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
this.txt_billNo.Size = new System.Drawing.Size(215, 28);
this.txt_billNo.TabIndex = 211;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "鍙墦鍗版�婚噺";
- this.gridColumn10.FieldName = "kyPrtQty";
- this.gridColumn10.MinWidth = 25;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 13;
- this.gridColumn10.Width = 94;
//
// Frm_ArrivalBarcode
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index f21a0e8..01a4d11 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -1,5 +1,6 @@
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
@@ -7,6 +8,7 @@
using System.Data;
using System.Drawing;
using System.Text;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -23,22 +25,13 @@
toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx2);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- Font f = new Font("寰蒋闆呴粦", 16);
- Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
- };
+ txt_depotsId.getSuppler("");
+ txt_suppId.getSuppler("");
//璁剧疆浠撳簱閫夋嫨
this.txt_depotsId.EditChanged += (s, e) =>
{
@@ -50,6 +43,12 @@
txtSupplierId.Text = this.txt_suppId.GetId();
};
gcMx1.MouseClick += GcMx1_MouseClick;
+ }
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
}
private void GcMx1_MouseClick(object sender, MouseEventArgs e)
{
@@ -85,7 +84,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -94,7 +93,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -106,7 +108,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
{
@@ -166,21 +168,29 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
///
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
- var _sbSqlWhere = new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "create_date",
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
@@ -188,16 +198,27 @@
var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
-
- pageBar1.setTxt();
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
@@ -247,7 +268,6 @@
//{
// list3.Add(a);
//}
-
//DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(list3.ToString());
//if (dt1.Rows.Count > 0)
//{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index c7320dc..bda3c93 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -633,11 +633,11 @@
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(270, 91);
+ this.labelControl2.Location = new System.Drawing.Point(254, 91);
this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(69, 21);
+ this.labelControl2.Size = new System.Drawing.Size(85, 21);
this.labelControl2.TabIndex = 255;
- this.labelControl2.Text = "渚涘簲鍟咺D";
+ this.labelControl2.Text = "渚涘簲鍟嗙紪鍙�";
//
// txt_suppId
//
@@ -657,7 +657,7 @@
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(85, 21);
this.labelControl1.TabIndex = 253;
- this.labelControl1.Text = "渚涘簲鍟嗙紪鍙�";
+ this.labelControl1.Text = "閫夋嫨渚涘簲鍟�";
//
// labelControl11
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
index aafef22..91e4a75 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
@@ -24,27 +24,13 @@
toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- Font f = new Font("寰蒋闆呴粦", 16);
- Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
- };
- //璁剧疆渚涘簲鍟嗛�夋嫨
+ txt_suppNo_1.getSuppler("");
this.txt_suppNo_1.EditChanged += (s, e) =>
{
- txt_suppId.Text = this.txt_suppNo_1.GetId();
+ txt_suppId.Text = this.txt_suppNo_1.GetCode();
};
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
index 6ddf9f9..9a55107 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
@@ -1,7 +1,7 @@
/* Create By GS EasyCode */
namespace Gs.DevApp.DevFrm
{
- partial class Frm_MesDepot
+ partial class Frm_MesDepot
{
/// <summary>
/// Required designer variable.
@@ -276,7 +276,7 @@
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1124, 338);
- this.tabMxPage1.Text = "鏄庣粏1";
+ this.tabMxPage1.Text = "浠撲綅鍒楄〃";
//
// gcMx1
//
@@ -1168,7 +1168,7 @@
}
#endregion
- private UserControl.UcToolBarMenu toolBarMenu1;
+ private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
@@ -1178,89 +1178,89 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl11;
- private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionNamet;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1kbQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1description;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1completenessFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionName;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionNamet;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1kbQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1description;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1completenessFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionName;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-private DevExpress.XtraEditors.LabelControl lb_materialProperti;
-private DevExpress.XtraEditors.TextEdit txt_materialProperti;
+ private DevExpress.XtraEditors.LabelControl lb_materialProperti;
+ private DevExpress.XtraEditors.TextEdit txt_materialProperti;
-private DevExpress.XtraEditors.LabelControl lb_isFkc;
-private DevExpress.XtraEditors.TextEdit txt_isFkc;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isFkc;
+ private DevExpress.XtraEditors.LabelControl lb_isFkc;
+ private DevExpress.XtraEditors.TextEdit txt_isFkc;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_isFkc;
-private DevExpress.XtraEditors.LabelControl lb_zuid;
-private DevExpress.XtraEditors.TextEdit txt_zuid;
- private DevExpress.XtraGrid.Columns.GridColumn gv_zuid;
+ private DevExpress.XtraEditors.LabelControl lb_zuid;
+ private DevExpress.XtraEditors.TextEdit txt_zuid;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_zuid;
-private DevExpress.XtraEditors.LabelControl lb_piType;
-private DevExpress.XtraEditors.TextEdit txt_piType;
+ private DevExpress.XtraEditors.LabelControl lb_piType;
+ private DevExpress.XtraEditors.TextEdit txt_piType;
-private DevExpress.XtraEditors.LabelControl lb_cwhaddress;
-private DevExpress.XtraEditors.TextEdit txt_cwhaddress;
+ private DevExpress.XtraEditors.LabelControl lb_cwhaddress;
+ private DevExpress.XtraEditors.TextEdit txt_cwhaddress;
-private DevExpress.XtraEditors.LabelControl lb_isNg;
-private DevExpress.XtraEditors.TextEdit txt_isNg;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;
+ private DevExpress.XtraEditors.LabelControl lb_isNg;
+ private DevExpress.XtraEditors.TextEdit txt_isNg;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;
-private DevExpress.XtraEditors.LabelControl lb_isWy;
-private DevExpress.XtraEditors.TextEdit txt_isWy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isWy;
+ private DevExpress.XtraEditors.LabelControl lb_isWy;
+ private DevExpress.XtraEditors.TextEdit txt_isWy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_isWy;
-private DevExpress.XtraEditors.LabelControl lb_iconType;
-private DevExpress.XtraEditors.TextEdit txt_iconType;
+ private DevExpress.XtraEditors.LabelControl lb_iconType;
+ private DevExpress.XtraEditors.TextEdit txt_iconType;
-private DevExpress.XtraEditors.LabelControl lb_depottypecode;
-private DevExpress.XtraEditors.TextEdit txt_depottypecode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depottypecode;
+ private DevExpress.XtraEditors.LabelControl lb_depottypecode;
+ private DevExpress.XtraEditors.TextEdit txt_depottypecode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depottypecode;
-private DevExpress.XtraEditors.LabelControl lb_type2;
-private DevExpress.XtraEditors.TextEdit txt_type2;
+ private DevExpress.XtraEditors.LabelControl lb_type2;
+ private DevExpress.XtraEditors.TextEdit txt_type2;
-private DevExpress.XtraEditors.LabelControl lb_type1;
-private DevExpress.XtraEditors.TextEdit txt_type1;
+ private DevExpress.XtraEditors.LabelControl lb_type1;
+ private DevExpress.XtraEditors.TextEdit txt_type1;
-private DevExpress.XtraEditors.LabelControl lb_factory;
-private DevExpress.XtraEditors.TextEdit txt_factory;
+ private DevExpress.XtraEditors.LabelControl lb_factory;
+ private DevExpress.XtraEditors.TextEdit txt_factory;
-private DevExpress.XtraEditors.LabelControl lb_depottype;
-private DevExpress.XtraEditors.TextEdit txt_depottype;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;
+ private DevExpress.XtraEditors.LabelControl lb_depottype;
+ private DevExpress.XtraEditors.TextEdit txt_depottype;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;
-private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
-private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
+ private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
+ private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
-private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
-private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
+ private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
+ private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
-private DevExpress.XtraEditors.LabelControl lb_createDate;
-private DevExpress.XtraEditors.TextEdit txt_createDate;
+ private DevExpress.XtraEditors.LabelControl lb_createDate;
+ private DevExpress.XtraEditors.TextEdit txt_createDate;
-private DevExpress.XtraEditors.LabelControl lb_createBy;
-private DevExpress.XtraEditors.TextEdit txt_createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraEditors.LabelControl lb_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-private DevExpress.XtraEditors.LabelControl lb_description;
-private DevExpress.XtraEditors.TextEdit txt_description;
- private DevExpress.XtraGrid.Columns.GridColumn gv_description;
+ private DevExpress.XtraEditors.LabelControl lb_description;
+ private DevExpress.XtraEditors.TextEdit txt_description;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_description;
-private DevExpress.XtraEditors.LabelControl lb_depotName;
-private DevExpress.XtraEditors.TextEdit txt_depotName;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotName;
+ private DevExpress.XtraEditors.LabelControl lb_depotName;
+ private DevExpress.XtraEditors.TextEdit txt_depotName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotName;
-private DevExpress.XtraEditors.LabelControl lb_depotCode;
-private DevExpress.XtraEditors.TextEdit txt_depotCode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
+ private DevExpress.XtraEditors.LabelControl lb_depotCode;
+ private DevExpress.XtraEditors.TextEdit txt_depotCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
index aadf7a7..85fefd2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
@@ -32,8 +30,9 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", "");
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
@@ -57,7 +56,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
@@ -80,7 +79,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
/// <summary>
@@ -91,11 +90,7 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_depotName, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(0);
}
/// <summary>
@@ -105,11 +100,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_depotName, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(1);
}
/// <summary>
@@ -132,7 +123,7 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
/// <summary>
@@ -195,7 +186,6 @@
CompletenessFlag = Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["completenessFlag"].ToString()),
});
}
-
var _obj = new MesDepots
{
Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
@@ -229,13 +219,10 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
- var _sbSqlWhere = new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "a.depot_code", "asc",
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.depot_code", "asc",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
@@ -251,7 +238,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.setTxt();
}
catch (Exception ex)
{
@@ -351,5 +337,61 @@
}
}
}
+
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_depotName, gridView1, "depotName");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+
+ var _obj = new
+ {
+ guid = rowGuid,
+ ckValue = _inFieldValue,
+ parameter = "MES_DEPOTS,check_date,check_status,check_by"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+
+ }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 3942304..b367970 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -63,6 +63,7 @@
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_erpid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -74,6 +75,7 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
+ this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_paymentParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_transportMethod = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -81,29 +83,57 @@
this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkFalg = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_factory = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_documentStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_documentType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_businessType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_purchaseDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_supplier = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_closeStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_purchaseDept = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_qtyAcceptance = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_purchaser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_qualityReq = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cancellationStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cancellationPerson = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cancellationDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_remarks = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_changereason = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_settlementParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_erpCheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_erpCheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -113,35 +143,6 @@
this.panel1 = new System.Windows.Forms.Panel();
this.lbGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_supplier = new Gs.DevApp.UserControl.UcLookSupplier();
- this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -167,7 +168,7 @@
this.gvMx1demandDocumentLineId.Name = "gvMx1demandDocumentLineId";
this.gvMx1demandDocumentLineId.Tag = "query_a.DEMAND_DOCUMENT_LINE_ID";
this.gvMx1demandDocumentLineId.Visible = true;
- this.gvMx1demandDocumentLineId.VisibleIndex = 33;
+ this.gvMx1demandDocumentLineId.VisibleIndex = 34;
this.gvMx1demandDocumentLineId.Width = 100;
//
// gvMx1demandDocumentId
@@ -180,7 +181,7 @@
this.gvMx1demandDocumentId.Name = "gvMx1demandDocumentId";
this.gvMx1demandDocumentId.Tag = "query_a.DEMAND_DOCUMENT_ID";
this.gvMx1demandDocumentId.Visible = true;
- this.gvMx1demandDocumentId.VisibleIndex = 15;
+ this.gvMx1demandDocumentId.VisibleIndex = 16;
this.gvMx1demandDocumentId.Width = 100;
//
// gvMx1changeFlag
@@ -193,7 +194,7 @@
this.gvMx1changeFlag.Name = "gvMx1changeFlag";
this.gvMx1changeFlag.Tag = "query_a.CHANGE_FLAG";
this.gvMx1changeFlag.Visible = true;
- this.gvMx1changeFlag.VisibleIndex = 32;
+ this.gvMx1changeFlag.VisibleIndex = 33;
this.gvMx1changeFlag.Width = 100;
//
// gvMx1planTrackingId
@@ -206,7 +207,7 @@
this.gvMx1planTrackingId.Name = "gvMx1planTrackingId";
this.gvMx1planTrackingId.Tag = "query_a.PLAN_TRACKING_ID";
this.gvMx1planTrackingId.Visible = true;
- this.gvMx1planTrackingId.VisibleIndex = 31;
+ this.gvMx1planTrackingId.VisibleIndex = 32;
this.gvMx1planTrackingId.Width = 100;
//
// gvMx1sourceDocumentType
@@ -219,7 +220,7 @@
this.gvMx1sourceDocumentType.Name = "gvMx1sourceDocumentType";
this.gvMx1sourceDocumentType.Tag = "query_a.SOURCE_DOCUMENT_TYPE";
this.gvMx1sourceDocumentType.Visible = true;
- this.gvMx1sourceDocumentType.VisibleIndex = 30;
+ this.gvMx1sourceDocumentType.VisibleIndex = 31;
this.gvMx1sourceDocumentType.Width = 100;
//
// gvMx1returnableStoredQty
@@ -232,7 +233,7 @@
this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty";
this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
this.gvMx1returnableStoredQty.Visible = true;
- this.gvMx1returnableStoredQty.VisibleIndex = 29;
+ this.gvMx1returnableStoredQty.VisibleIndex = 30;
this.gvMx1returnableStoredQty.Width = 100;
//
// gvMx1returnableReceivedQty
@@ -245,7 +246,7 @@
this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty";
this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
this.gvMx1returnableReceivedQty.Visible = true;
- this.gvMx1returnableReceivedQty.VisibleIndex = 28;
+ this.gvMx1returnableReceivedQty.VisibleIndex = 29;
this.gvMx1returnableReceivedQty.Width = 100;
//
// gvMx1totalReturnedQty
@@ -258,7 +259,7 @@
this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty";
this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
this.gvMx1totalReturnedQty.Visible = true;
- this.gvMx1totalReturnedQty.VisibleIndex = 27;
+ this.gvMx1totalReturnedQty.VisibleIndex = 28;
this.gvMx1totalReturnedQty.Width = 100;
//
// gvMx1remainingStoredQty
@@ -271,7 +272,7 @@
this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty";
this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
this.gvMx1remainingStoredQty.Visible = true;
- this.gvMx1remainingStoredQty.VisibleIndex = 26;
+ this.gvMx1remainingStoredQty.VisibleIndex = 27;
this.gvMx1remainingStoredQty.Width = 100;
//
// gvMx1totalStoredQty
@@ -284,7 +285,7 @@
this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty";
this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
this.gvMx1totalStoredQty.Visible = true;
- this.gvMx1totalStoredQty.VisibleIndex = 25;
+ this.gvMx1totalStoredQty.VisibleIndex = 26;
this.gvMx1totalStoredQty.Width = 100;
//
// gvMx1remainingReceivedQty
@@ -297,7 +298,7 @@
this.gvMx1remainingReceivedQty.Name = "gvMx1remainingReceivedQty";
this.gvMx1remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY";
this.gvMx1remainingReceivedQty.Visible = true;
- this.gvMx1remainingReceivedQty.VisibleIndex = 13;
+ this.gvMx1remainingReceivedQty.VisibleIndex = 14;
this.gvMx1remainingReceivedQty.Width = 100;
//
// gvMx1totalReceivedQty
@@ -310,7 +311,7 @@
this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty";
this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
this.gvMx1totalReceivedQty.Visible = true;
- this.gvMx1totalReceivedQty.VisibleIndex = 24;
+ this.gvMx1totalReceivedQty.VisibleIndex = 25;
this.gvMx1totalReceivedQty.Width = 100;
//
// gvMx1terminateTime
@@ -323,7 +324,7 @@
this.gvMx1terminateTime.Name = "gvMx1terminateTime";
this.gvMx1terminateTime.Tag = "query_a.TERMINATE_TIME";
this.gvMx1terminateTime.Visible = true;
- this.gvMx1terminateTime.VisibleIndex = 23;
+ this.gvMx1terminateTime.VisibleIndex = 24;
this.gvMx1terminateTime.Width = 100;
//
// gvMx1terminator
@@ -336,7 +337,7 @@
this.gvMx1terminator.Name = "gvMx1terminator";
this.gvMx1terminator.Tag = "query_a.TERMINATOR";
this.gvMx1terminator.Visible = true;
- this.gvMx1terminator.VisibleIndex = 22;
+ this.gvMx1terminator.VisibleIndex = 23;
this.gvMx1terminator.Width = 100;
//
// gvMx1businessTerminate
@@ -349,7 +350,7 @@
this.gvMx1businessTerminate.Name = "gvMx1businessTerminate";
this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
this.gvMx1businessTerminate.Visible = true;
- this.gvMx1businessTerminate.VisibleIndex = 5;
+ this.gvMx1businessTerminate.VisibleIndex = 6;
this.gvMx1businessTerminate.Width = 94;
//
// gvMx1freezeTime
@@ -362,7 +363,7 @@
this.gvMx1freezeTime.Name = "gvMx1freezeTime";
this.gvMx1freezeTime.Tag = "query_a.FREEZE_TIME";
this.gvMx1freezeTime.Visible = true;
- this.gvMx1freezeTime.VisibleIndex = 21;
+ this.gvMx1freezeTime.VisibleIndex = 22;
this.gvMx1freezeTime.Width = 100;
//
// gvMx1freezer
@@ -375,7 +376,7 @@
this.gvMx1freezer.Name = "gvMx1freezer";
this.gvMx1freezer.Tag = "query_a.FREEZER";
this.gvMx1freezer.Visible = true;
- this.gvMx1freezer.VisibleIndex = 20;
+ this.gvMx1freezer.VisibleIndex = 21;
this.gvMx1freezer.Width = 100;
//
// gvMx1businessFreeze
@@ -388,7 +389,7 @@
this.gvMx1businessFreeze.Name = "gvMx1businessFreeze";
this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
this.gvMx1businessFreeze.Visible = true;
- this.gvMx1businessFreeze.VisibleIndex = 19;
+ this.gvMx1businessFreeze.VisibleIndex = 20;
this.gvMx1businessFreeze.Width = 94;
//
// gvMx1businessClose
@@ -401,7 +402,7 @@
this.gvMx1businessClose.Name = "gvMx1businessClose";
this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE";
this.gvMx1businessClose.Visible = true;
- this.gvMx1businessClose.VisibleIndex = 18;
+ this.gvMx1businessClose.VisibleIndex = 19;
this.gvMx1businessClose.Width = 100;
//
// gvMx1remarks
@@ -414,7 +415,7 @@
this.gvMx1remarks.Name = "gvMx1remarks";
this.gvMx1remarks.Tag = "query_a.REMARKS";
this.gvMx1remarks.Visible = true;
- this.gvMx1remarks.VisibleIndex = 17;
+ this.gvMx1remarks.VisibleIndex = 18;
this.gvMx1remarks.Width = 100;
//
// gvMx1isGift
@@ -427,7 +428,7 @@
this.gvMx1isGift.Name = "gvMx1isGift";
this.gvMx1isGift.Tag = "query_a.IS_GIFT";
this.gvMx1isGift.Visible = true;
- this.gvMx1isGift.VisibleIndex = 16;
+ this.gvMx1isGift.VisibleIndex = 17;
this.gvMx1isGift.Width = 100;
//
// gvMx1latestDeliveryDate
@@ -440,7 +441,7 @@
this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate";
this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
this.gvMx1latestDeliveryDate.Visible = true;
- this.gvMx1latestDeliveryDate.VisibleIndex = 10;
+ this.gvMx1latestDeliveryDate.VisibleIndex = 11;
this.gvMx1latestDeliveryDate.Width = 200;
//
// gvMx1earliestDeliveryDate
@@ -453,7 +454,7 @@
this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate";
this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
this.gvMx1earliestDeliveryDate.Visible = true;
- this.gvMx1earliestDeliveryDate.VisibleIndex = 9;
+ this.gvMx1earliestDeliveryDate.VisibleIndex = 10;
this.gvMx1earliestDeliveryDate.Width = 200;
//
// gvMx1deliveryDate
@@ -466,7 +467,7 @@
this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE";
this.gvMx1deliveryDate.Visible = true;
- this.gvMx1deliveryDate.VisibleIndex = 8;
+ this.gvMx1deliveryDate.VisibleIndex = 9;
this.gvMx1deliveryDate.Width = 200;
//
// gvMx1pricingQty
@@ -479,7 +480,7 @@
this.gvMx1pricingQty.Name = "gvMx1pricingQty";
this.gvMx1pricingQty.Tag = "query_a.PRICING_QTY";
this.gvMx1pricingQty.Visible = true;
- this.gvMx1pricingQty.VisibleIndex = 6;
+ this.gvMx1pricingQty.VisibleIndex = 7;
this.gvMx1pricingQty.Width = 100;
//
// gvMx1pricingUnit
@@ -492,7 +493,7 @@
this.gvMx1pricingUnit.Name = "gvMx1pricingUnit";
this.gvMx1pricingUnit.Tag = "query_a.PRICING_UNIT";
this.gvMx1pricingUnit.Visible = true;
- this.gvMx1pricingUnit.VisibleIndex = 7;
+ this.gvMx1pricingUnit.VisibleIndex = 8;
this.gvMx1pricingUnit.Width = 100;
//
// gvMx1inventoryUnit
@@ -505,7 +506,7 @@
this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit";
this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
this.gvMx1inventoryUnit.Visible = true;
- this.gvMx1inventoryUnit.VisibleIndex = 14;
+ this.gvMx1inventoryUnit.VisibleIndex = 15;
this.gvMx1inventoryUnit.Width = 100;
//
// gvMx1purchaseQty
@@ -518,7 +519,7 @@
this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
this.gvMx1purchaseQty.Visible = true;
- this.gvMx1purchaseQty.VisibleIndex = 11;
+ this.gvMx1purchaseQty.VisibleIndex = 12;
this.gvMx1purchaseQty.Width = 100;
//
// gvMx1purchaseUnit
@@ -531,7 +532,7 @@
this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit";
this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gvMx1purchaseUnit.Visible = true;
- this.gvMx1purchaseUnit.VisibleIndex = 12;
+ this.gvMx1purchaseUnit.VisibleIndex = 13;
this.gvMx1purchaseUnit.Width = 100;
//
// gvMx1itemId
@@ -544,7 +545,7 @@
this.gvMx1itemId.Name = "gvMx1itemId";
this.gvMx1itemId.Tag = "query_a.ITEM_ID";
this.gvMx1itemId.Visible = true;
- this.gvMx1itemId.VisibleIndex = 2;
+ this.gvMx1itemId.VisibleIndex = 3;
this.gvMx1itemId.Width = 100;
//
// gvMx1salesOrderId
@@ -557,7 +558,7 @@
this.gvMx1salesOrderId.Name = "gvMx1salesOrderId";
this.gvMx1salesOrderId.Tag = "query_a.SALES_ORDER_ID";
this.gvMx1salesOrderId.Visible = true;
- this.gvMx1salesOrderId.VisibleIndex = 1;
+ this.gvMx1salesOrderId.VisibleIndex = 2;
this.gvMx1salesOrderId.Width = 150;
//
// tabMxPage1
@@ -584,6 +585,7 @@
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gvMx1.ColumnPanelRowHeight = 60;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn3,
this.gv_erpid,
this.gvMx1salesOrderId,
this.gvMx1itemId,
@@ -625,6 +627,16 @@
this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鏀舵枡缁勭粐";
+ this.gridColumn3.FieldName = "receivingOrg";
+ this.gridColumn3.MinWidth = 250;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 0;
+ this.gridColumn3.Width = 250;
+ //
// gv_erpid
//
this.gv_erpid.Caption = "ERP涓ID";
@@ -632,7 +644,7 @@
this.gv_erpid.MinWidth = 100;
this.gv_erpid.Name = "gv_erpid";
this.gv_erpid.Visible = true;
- this.gv_erpid.VisibleIndex = 0;
+ this.gv_erpid.VisibleIndex = 1;
this.gv_erpid.Width = 100;
//
// gridColumn2
@@ -642,7 +654,7 @@
this.gridColumn2.MinWidth = 100;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.VisibleIndex = 4;
this.gridColumn2.Width = 100;
//
// gridColumn1
@@ -652,7 +664,7 @@
this.gridColumn1.MinWidth = 120;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.VisibleIndex = 5;
this.gridColumn1.Width = 120;
//
// lb_supplier
@@ -794,6 +806,22 @@
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridBand29
+ //
+ this.gridBand29.Caption = "鏀舵枡缁勭粐";
+ this.gridBand29.Columns.Add(this.gv_paymentParty);
+ this.gridBand29.Columns.Add(this.gv_transportMethod);
+ this.gridBand29.Columns.Add(this.gv_lastupdateDate);
+ this.gridBand29.Columns.Add(this.gv_lastupdateBy);
+ this.gridBand29.Columns.Add(this.gv_checkDate);
+ this.gridBand29.Columns.Add(this.gv_checkBy);
+ this.gridBand29.Columns.Add(this.gv_checkFalg);
+ this.gridBand29.MinWidth = 250;
+ this.gridBand29.Name = "gridBand29";
+ this.gridBand29.Visible = false;
+ this.gridBand29.VisibleIndex = -1;
+ this.gridBand29.Width = 250;
+ //
// gv_paymentParty
//
this.gv_paymentParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -878,6 +906,15 @@
this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
this.gv_checkFalg.Width = 100;
//
+ // gridBand1
+ //
+ this.gridBand1.Caption = "ERPID鍙�";
+ this.gridBand1.Columns.Add(this.gv_factory);
+ this.gridBand1.MinWidth = 80;
+ this.gridBand1.Name = "gridBand1";
+ this.gridBand1.VisibleIndex = 0;
+ this.gridBand1.Width = 80;
+ //
// gv_factory
//
this.gv_factory.Caption = "ERPID鍙�";
@@ -888,6 +925,15 @@
this.gv_factory.Tag = "query_a.ebelnK3id";
this.gv_factory.Visible = true;
this.gv_factory.Width = 80;
+ //
+ // gridBand2
+ //
+ this.gridBand2.Caption = "閲囪喘鍗曞彿";
+ this.gridBand2.Columns.Add(this.gv_billNo);
+ this.gridBand2.MinWidth = 120;
+ this.gridBand2.Name = "gridBand2";
+ this.gridBand2.VisibleIndex = 1;
+ this.gridBand2.Width = 120;
//
// gv_billNo
//
@@ -902,6 +948,18 @@
this.gv_billNo.Visible = true;
this.gv_billNo.Width = 120;
//
+ // gridBand3
+ //
+ this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand3.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨";
+ this.gridBand3.Columns.Add(this.gv_documentStatus);
+ this.gridBand3.MinWidth = 130;
+ this.gridBand3.Name = "gridBand3";
+ this.gridBand3.RowCount = 2;
+ this.gridBand3.VisibleIndex = 2;
+ this.gridBand3.Width = 130;
+ //
// gv_documentStatus
//
this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -914,6 +972,17 @@
this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
this.gv_documentStatus.Visible = true;
this.gv_documentStatus.Width = 130;
+ //
+ // gridBand4
+ //
+ this.gridBand4.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand4.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand4.Caption = "鍗曟嵁绫诲瀷:1閲囪喘,2濮斿";
+ this.gridBand4.Columns.Add(this.gv_documentType);
+ this.gridBand4.MinWidth = 80;
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.VisibleIndex = 3;
+ this.gridBand4.Width = 80;
//
// gv_documentType
//
@@ -928,6 +997,15 @@
this.gv_documentType.Visible = true;
this.gv_documentType.Width = 80;
//
+ // gridBand5
+ //
+ this.gridBand5.Caption = "涓氬姟绫诲瀷";
+ this.gridBand5.Columns.Add(this.gv_businessType);
+ this.gridBand5.MinWidth = 80;
+ this.gridBand5.Name = "gridBand5";
+ this.gridBand5.VisibleIndex = 4;
+ this.gridBand5.Width = 80;
+ //
// gv_businessType
//
this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -940,6 +1018,15 @@
this.gv_businessType.Tag = "query_a.BUSINESS_TYPE";
this.gv_businessType.Visible = true;
this.gv_businessType.Width = 80;
+ //
+ // gridBand8
+ //
+ this.gridBand8.Caption = "閲囪喘鏃ユ湡";
+ this.gridBand8.Columns.Add(this.gv_purchaseDate);
+ this.gridBand8.MinWidth = 170;
+ this.gridBand8.Name = "gridBand8";
+ this.gridBand8.VisibleIndex = 5;
+ this.gridBand8.Width = 170;
//
// gv_purchaseDate
//
@@ -954,6 +1041,27 @@
this.gv_purchaseDate.Visible = true;
this.gv_purchaseDate.Width = 170;
//
+ // gridBand6
+ //
+ this.gridBand6.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand6.Caption = "渚涘簲鍟�";
+ this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand11,
+ this.gridBand7});
+ this.gridBand6.MinWidth = 200;
+ this.gridBand6.Name = "gridBand6";
+ this.gridBand6.VisibleIndex = 6;
+ this.gridBand6.Width = 200;
+ //
+ // gridBand11
+ //
+ this.gridBand11.Caption = "ID";
+ this.gridBand11.Columns.Add(this.gv_supplier);
+ this.gridBand11.Name = "gridBand11";
+ this.gridBand11.VisibleIndex = 0;
+ this.gridBand11.Width = 66;
+ //
// gv_supplier
//
this.gv_supplier.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -967,6 +1075,15 @@
this.gv_supplier.Visible = true;
this.gv_supplier.Width = 66;
//
+ // gridBand7
+ //
+ this.gridBand7.Caption = "鍚嶇О";
+ this.gridBand7.Columns.Add(this.bandedGridColumn1);
+ this.gridBand7.MinWidth = 100;
+ this.gridBand7.Name = "gridBand7";
+ this.gridBand7.VisibleIndex = 1;
+ this.gridBand7.Width = 134;
+ //
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "渚涘簲鍟嗗悕绉�";
@@ -977,6 +1094,17 @@
this.bandedGridColumn1.Tag = "query_a.suppName";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.Width = 134;
+ //
+ // gridBand9
+ //
+ this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand9.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand9.Caption = "鍏抽棴鏍囪瘑:A鏄�,B鍚�";
+ this.gridBand9.Columns.Add(this.gv_closeStatus);
+ this.gridBand9.MinWidth = 80;
+ this.gridBand9.Name = "gridBand9";
+ this.gridBand9.VisibleIndex = 7;
+ this.gridBand9.Width = 80;
//
// gv_closeStatus
//
@@ -991,6 +1119,28 @@
this.gv_closeStatus.Visible = true;
this.gv_closeStatus.Width = 80;
//
+ // gridBand10
+ //
+ this.gridBand10.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand10.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand10.Caption = "閲囪喘閮ㄩ棬";
+ this.gridBand10.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand12,
+ this.gridBand13});
+ this.gridBand10.MinWidth = 100;
+ this.gridBand10.Name = "gridBand10";
+ this.gridBand10.VisibleIndex = 8;
+ this.gridBand10.Width = 130;
+ //
+ // gridBand12
+ //
+ this.gridBand12.Caption = "缂栧彿";
+ this.gridBand12.Columns.Add(this.gv_purchaseDept);
+ this.gridBand12.MinWidth = 50;
+ this.gridBand12.Name = "gridBand12";
+ this.gridBand12.VisibleIndex = 0;
+ this.gridBand12.Width = 50;
+ //
// gv_purchaseDept
//
this.gv_purchaseDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1004,6 +1154,15 @@
this.gv_purchaseDept.Visible = true;
this.gv_purchaseDept.Width = 50;
//
+ // gridBand13
+ //
+ this.gridBand13.Caption = "鍚嶇О";
+ this.gridBand13.Columns.Add(this.bandedGridColumn2);
+ this.gridBand13.MinWidth = 80;
+ this.gridBand13.Name = "gridBand13";
+ this.gridBand13.VisibleIndex = 1;
+ this.gridBand13.Width = 80;
+ //
// bandedGridColumn2
//
this.bandedGridColumn2.Caption = "閲囪喘閮ㄩ棬鍚嶇О";
@@ -1014,6 +1173,17 @@
this.bandedGridColumn2.Tag = "query_a.departmentname";
this.bandedGridColumn2.Visible = true;
this.bandedGridColumn2.Width = 80;
+ //
+ // gridBand14
+ //
+ this.gridBand14.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand14.Caption = "鏁伴噺楠屾敹";
+ this.gridBand14.Columns.Add(this.gv_qtyAcceptance);
+ this.gridBand14.MinWidth = 50;
+ this.gridBand14.Name = "gridBand14";
+ this.gridBand14.VisibleIndex = 9;
+ this.gridBand14.Width = 50;
//
// gv_qtyAcceptance
//
@@ -1028,6 +1198,15 @@
this.gv_qtyAcceptance.Visible = true;
this.gv_qtyAcceptance.Width = 50;
//
+ // gridBand15
+ //
+ this.gridBand15.Caption = "閲囪喘鍛�";
+ this.gridBand15.Columns.Add(this.gv_purchaser);
+ this.gridBand15.MinWidth = 60;
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.VisibleIndex = 10;
+ this.gridBand15.Width = 60;
+ //
// gv_purchaser
//
this.gv_purchaser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1040,6 +1219,15 @@
this.gv_purchaser.Tag = "query_a.PURCHASER";
this.gv_purchaser.Visible = true;
this.gv_purchaser.Width = 60;
+ //
+ // gridBand16
+ //
+ this.gridBand16.Caption = "璐ㄩ噺瑕佹眰";
+ this.gridBand16.Columns.Add(this.gv_qualityReq);
+ this.gridBand16.MinWidth = 80;
+ this.gridBand16.Name = "gridBand16";
+ this.gridBand16.VisibleIndex = 11;
+ this.gridBand16.Width = 80;
//
// gv_qualityReq
//
@@ -1054,6 +1242,28 @@
this.gv_qualityReq.Visible = true;
this.gv_qualityReq.Width = 80;
//
+ // gridBand17
+ //
+ this.gridBand17.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand17.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand17.Caption = "浣滃簾鐘舵��";
+ this.gridBand17.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand19,
+ this.gridBand18,
+ this.gridBand20});
+ this.gridBand17.Name = "gridBand17";
+ this.gridBand17.VisibleIndex = 12;
+ this.gridBand17.Width = 300;
+ //
+ // gridBand19
+ //
+ this.gridBand19.Caption = "浣滃簾鐘舵��";
+ this.gridBand19.Columns.Add(this.gv_cancellationStatus);
+ this.gridBand19.MinWidth = 60;
+ this.gridBand19.Name = "gridBand19";
+ this.gridBand19.VisibleIndex = 0;
+ this.gridBand19.Width = 60;
+ //
// gv_cancellationStatus
//
this.gv_cancellationStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1066,6 +1276,15 @@
this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
this.gv_cancellationStatus.Visible = true;
this.gv_cancellationStatus.Width = 60;
+ //
+ // gridBand18
+ //
+ this.gridBand18.Caption = "浣滃簾浜�";
+ this.gridBand18.Columns.Add(this.gv_cancellationPerson);
+ this.gridBand18.MinWidth = 60;
+ this.gridBand18.Name = "gridBand18";
+ this.gridBand18.VisibleIndex = 1;
+ this.gridBand18.Width = 60;
//
// gv_cancellationPerson
//
@@ -1080,6 +1299,15 @@
this.gv_cancellationPerson.Visible = true;
this.gv_cancellationPerson.Width = 60;
//
+ // gridBand20
+ //
+ this.gridBand20.Caption = "浣滃簾鏃ユ湡";
+ this.gridBand20.Columns.Add(this.gv_cancellationDate);
+ this.gridBand20.MinWidth = 180;
+ this.gridBand20.Name = "gridBand20";
+ this.gridBand20.VisibleIndex = 2;
+ this.gridBand20.Width = 180;
+ //
// gv_cancellationDate
//
this.gv_cancellationDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1092,6 +1320,27 @@
this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
this.gv_cancellationDate.Visible = true;
this.gv_cancellationDate.Width = 180;
+ //
+ // gridBand21
+ //
+ this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand21.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand21.Caption = "鍒涘缓淇℃伅";
+ this.gridBand21.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand25,
+ this.gridBand22});
+ this.gridBand21.Name = "gridBand21";
+ this.gridBand21.VisibleIndex = 13;
+ this.gridBand21.Width = 260;
+ //
+ // gridBand25
+ //
+ this.gridBand25.Caption = "鍒涘缓浜�";
+ this.gridBand25.Columns.Add(this.gv_createBy);
+ this.gridBand25.MinWidth = 80;
+ this.gridBand25.Name = "gridBand25";
+ this.gridBand25.VisibleIndex = 0;
+ this.gridBand25.Width = 80;
//
// gv_createBy
//
@@ -1106,6 +1355,15 @@
this.gv_createBy.Visible = true;
this.gv_createBy.Width = 80;
//
+ // gridBand22
+ //
+ this.gridBand22.Caption = "鍒涘缓鏃ユ湡";
+ this.gridBand22.Columns.Add(this.gv_createDate);
+ this.gridBand22.MinWidth = 180;
+ this.gridBand22.Name = "gridBand22";
+ this.gridBand22.VisibleIndex = 1;
+ this.gridBand22.Width = 180;
+ //
// gv_createDate
//
this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1118,6 +1376,15 @@
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
this.gv_createDate.Width = 180;
+ //
+ // gridBand23
+ //
+ this.gridBand23.Caption = "澶囨敞";
+ this.gridBand23.Columns.Add(this.gv_remarks);
+ this.gridBand23.MinWidth = 100;
+ this.gridBand23.Name = "gridBand23";
+ this.gridBand23.VisibleIndex = 14;
+ this.gridBand23.Width = 100;
//
// gv_remarks
//
@@ -1132,6 +1399,15 @@
this.gv_remarks.Visible = true;
this.gv_remarks.Width = 100;
//
+ // gridBand24
+ //
+ this.gridBand24.Caption = "鍙樻洿鍘熷洜";
+ this.gridBand24.Columns.Add(this.gv_changereason);
+ this.gridBand24.MinWidth = 100;
+ this.gridBand24.Name = "gridBand24";
+ this.gridBand24.VisibleIndex = 15;
+ this.gridBand24.Width = 100;
+ //
// gv_changereason
//
this.gv_changereason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1144,6 +1420,28 @@
this.gv_changereason.Tag = "query_a.CHANGEREASON";
this.gv_changereason.Visible = true;
this.gv_changereason.Width = 100;
+ //
+ // gridBand28
+ //
+ this.gridBand28.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand28.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand28.Caption = "ERP瀹℃牳淇℃伅";
+ this.gridBand28.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand27,
+ this.gridBand26});
+ this.gridBand28.Name = "gridBand28";
+ this.gridBand28.VisibleIndex = 16;
+ this.gridBand28.Width = 260;
+ //
+ // gridBand27
+ //
+ this.gridBand27.Caption = "瀹℃牳浜�";
+ this.gridBand27.Columns.Add(this.gv_settlementParty);
+ this.gridBand27.Columns.Add(this.gv_erpCheckBy);
+ this.gridBand27.MinWidth = 80;
+ this.gridBand27.Name = "gridBand27";
+ this.gridBand27.VisibleIndex = 0;
+ this.gridBand27.Width = 80;
//
// gv_settlementParty
//
@@ -1169,6 +1467,15 @@
this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
this.gv_erpCheckBy.Visible = true;
this.gv_erpCheckBy.Width = 80;
+ //
+ // gridBand26
+ //
+ this.gridBand26.Caption = "ERP瀹℃牳鏃堕棿";
+ this.gridBand26.Columns.Add(this.gv_erpCheckDate);
+ this.gridBand26.MinWidth = 180;
+ this.gridBand26.Name = "gridBand26";
+ this.gridBand26.VisibleIndex = 1;
+ this.gridBand26.Width = 180;
//
// gv_erpCheckDate
//
@@ -1270,301 +1577,6 @@
this.txt_supplier.Name = "txt_supplier";
this.txt_supplier.Size = new System.Drawing.Size(305, 30);
this.txt_supplier.TabIndex = 227;
- //
- // gridBand29
- //
- this.gridBand29.Caption = "鏀舵枡缁勭粐";
- this.gridBand29.Columns.Add(this.gv_paymentParty);
- this.gridBand29.Columns.Add(this.gv_transportMethod);
- this.gridBand29.Columns.Add(this.gv_lastupdateDate);
- this.gridBand29.Columns.Add(this.gv_lastupdateBy);
- this.gridBand29.Columns.Add(this.gv_checkDate);
- this.gridBand29.Columns.Add(this.gv_checkBy);
- this.gridBand29.Columns.Add(this.gv_checkFalg);
- this.gridBand29.MinWidth = 250;
- this.gridBand29.Name = "gridBand29";
- this.gridBand29.Visible = false;
- this.gridBand29.VisibleIndex = -1;
- this.gridBand29.Width = 250;
- //
- // gridBand1
- //
- this.gridBand1.Caption = "ERPID鍙�";
- this.gridBand1.Columns.Add(this.gv_factory);
- this.gridBand1.MinWidth = 80;
- this.gridBand1.Name = "gridBand1";
- this.gridBand1.VisibleIndex = 0;
- this.gridBand1.Width = 80;
- //
- // gridBand2
- //
- this.gridBand2.Caption = "閲囪喘鍗曞彿";
- this.gridBand2.Columns.Add(this.gv_billNo);
- this.gridBand2.MinWidth = 120;
- this.gridBand2.Name = "gridBand2";
- this.gridBand2.VisibleIndex = 1;
- this.gridBand2.Width = 120;
- //
- // gridBand3
- //
- this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand3.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨";
- this.gridBand3.Columns.Add(this.gv_documentStatus);
- this.gridBand3.MinWidth = 130;
- this.gridBand3.Name = "gridBand3";
- this.gridBand3.RowCount = 2;
- this.gridBand3.VisibleIndex = 2;
- this.gridBand3.Width = 130;
- //
- // gridBand4
- //
- this.gridBand4.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand4.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand4.Caption = "鍗曟嵁绫诲瀷:1閲囪喘,2濮斿";
- this.gridBand4.Columns.Add(this.gv_documentType);
- this.gridBand4.MinWidth = 80;
- this.gridBand4.Name = "gridBand4";
- this.gridBand4.VisibleIndex = 3;
- this.gridBand4.Width = 80;
- //
- // gridBand5
- //
- this.gridBand5.Caption = "涓氬姟绫诲瀷";
- this.gridBand5.Columns.Add(this.gv_businessType);
- this.gridBand5.MinWidth = 80;
- this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 4;
- this.gridBand5.Width = 80;
- //
- // gridBand8
- //
- this.gridBand8.Caption = "閲囪喘鏃ユ湡";
- this.gridBand8.Columns.Add(this.gv_purchaseDate);
- this.gridBand8.MinWidth = 170;
- this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 5;
- this.gridBand8.Width = 170;
- //
- // gridBand6
- //
- this.gridBand6.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand6.Caption = "渚涘簲鍟�";
- this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand11,
- this.gridBand7});
- this.gridBand6.MinWidth = 200;
- this.gridBand6.Name = "gridBand6";
- this.gridBand6.VisibleIndex = 6;
- this.gridBand6.Width = 200;
- //
- // gridBand11
- //
- this.gridBand11.Caption = "ID";
- this.gridBand11.Columns.Add(this.gv_supplier);
- this.gridBand11.Name = "gridBand11";
- this.gridBand11.VisibleIndex = 0;
- this.gridBand11.Width = 66;
- //
- // gridBand7
- //
- this.gridBand7.Caption = "鍚嶇О";
- this.gridBand7.Columns.Add(this.bandedGridColumn1);
- this.gridBand7.MinWidth = 100;
- this.gridBand7.Name = "gridBand7";
- this.gridBand7.VisibleIndex = 1;
- this.gridBand7.Width = 134;
- //
- // gridBand9
- //
- this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand9.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand9.Caption = "鍏抽棴鏍囪瘑:A鏄�,B鍚�";
- this.gridBand9.Columns.Add(this.gv_closeStatus);
- this.gridBand9.MinWidth = 80;
- this.gridBand9.Name = "gridBand9";
- this.gridBand9.VisibleIndex = 7;
- this.gridBand9.Width = 80;
- //
- // gridBand10
- //
- this.gridBand10.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand10.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand10.Caption = "閲囪喘閮ㄩ棬";
- this.gridBand10.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand12,
- this.gridBand13});
- this.gridBand10.MinWidth = 100;
- this.gridBand10.Name = "gridBand10";
- this.gridBand10.VisibleIndex = 8;
- this.gridBand10.Width = 130;
- //
- // gridBand12
- //
- this.gridBand12.Caption = "缂栧彿";
- this.gridBand12.Columns.Add(this.gv_purchaseDept);
- this.gridBand12.MinWidth = 50;
- this.gridBand12.Name = "gridBand12";
- this.gridBand12.VisibleIndex = 0;
- this.gridBand12.Width = 50;
- //
- // gridBand13
- //
- this.gridBand13.Caption = "鍚嶇О";
- this.gridBand13.Columns.Add(this.bandedGridColumn2);
- this.gridBand13.MinWidth = 80;
- this.gridBand13.Name = "gridBand13";
- this.gridBand13.VisibleIndex = 1;
- this.gridBand13.Width = 80;
- //
- // gridBand14
- //
- this.gridBand14.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand14.Caption = "鏁伴噺楠屾敹";
- this.gridBand14.Columns.Add(this.gv_qtyAcceptance);
- this.gridBand14.MinWidth = 50;
- this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 9;
- this.gridBand14.Width = 50;
- //
- // gridBand15
- //
- this.gridBand15.Caption = "閲囪喘鍛�";
- this.gridBand15.Columns.Add(this.gv_purchaser);
- this.gridBand15.MinWidth = 60;
- this.gridBand15.Name = "gridBand15";
- this.gridBand15.VisibleIndex = 10;
- this.gridBand15.Width = 60;
- //
- // gridBand16
- //
- this.gridBand16.Caption = "璐ㄩ噺瑕佹眰";
- this.gridBand16.Columns.Add(this.gv_qualityReq);
- this.gridBand16.MinWidth = 80;
- this.gridBand16.Name = "gridBand16";
- this.gridBand16.VisibleIndex = 11;
- this.gridBand16.Width = 80;
- //
- // gridBand17
- //
- this.gridBand17.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand17.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand17.Caption = "浣滃簾鐘舵��";
- this.gridBand17.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand19,
- this.gridBand18,
- this.gridBand20});
- this.gridBand17.Name = "gridBand17";
- this.gridBand17.VisibleIndex = 12;
- this.gridBand17.Width = 300;
- //
- // gridBand19
- //
- this.gridBand19.Caption = "浣滃簾鐘舵��";
- this.gridBand19.Columns.Add(this.gv_cancellationStatus);
- this.gridBand19.MinWidth = 60;
- this.gridBand19.Name = "gridBand19";
- this.gridBand19.VisibleIndex = 0;
- this.gridBand19.Width = 60;
- //
- // gridBand18
- //
- this.gridBand18.Caption = "浣滃簾浜�";
- this.gridBand18.Columns.Add(this.gv_cancellationPerson);
- this.gridBand18.MinWidth = 60;
- this.gridBand18.Name = "gridBand18";
- this.gridBand18.VisibleIndex = 1;
- this.gridBand18.Width = 60;
- //
- // gridBand20
- //
- this.gridBand20.Caption = "浣滃簾鏃ユ湡";
- this.gridBand20.Columns.Add(this.gv_cancellationDate);
- this.gridBand20.MinWidth = 180;
- this.gridBand20.Name = "gridBand20";
- this.gridBand20.VisibleIndex = 2;
- this.gridBand20.Width = 180;
- //
- // gridBand21
- //
- this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand21.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand21.Caption = "鍒涘缓淇℃伅";
- this.gridBand21.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand25,
- this.gridBand22});
- this.gridBand21.Name = "gridBand21";
- this.gridBand21.VisibleIndex = 13;
- this.gridBand21.Width = 260;
- //
- // gridBand25
- //
- this.gridBand25.Caption = "鍒涘缓浜�";
- this.gridBand25.Columns.Add(this.gv_createBy);
- this.gridBand25.MinWidth = 80;
- this.gridBand25.Name = "gridBand25";
- this.gridBand25.VisibleIndex = 0;
- this.gridBand25.Width = 80;
- //
- // gridBand22
- //
- this.gridBand22.Caption = "鍒涘缓鏃ユ湡";
- this.gridBand22.Columns.Add(this.gv_createDate);
- this.gridBand22.MinWidth = 180;
- this.gridBand22.Name = "gridBand22";
- this.gridBand22.VisibleIndex = 1;
- this.gridBand22.Width = 180;
- //
- // gridBand23
- //
- this.gridBand23.Caption = "澶囨敞";
- this.gridBand23.Columns.Add(this.gv_remarks);
- this.gridBand23.MinWidth = 100;
- this.gridBand23.Name = "gridBand23";
- this.gridBand23.VisibleIndex = 14;
- this.gridBand23.Width = 100;
- //
- // gridBand24
- //
- this.gridBand24.Caption = "鍙樻洿鍘熷洜";
- this.gridBand24.Columns.Add(this.gv_changereason);
- this.gridBand24.MinWidth = 100;
- this.gridBand24.Name = "gridBand24";
- this.gridBand24.VisibleIndex = 15;
- this.gridBand24.Width = 100;
- //
- // gridBand28
- //
- this.gridBand28.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand28.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand28.Caption = "ERP瀹℃牳淇℃伅";
- this.gridBand28.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand27,
- this.gridBand26});
- this.gridBand28.Name = "gridBand28";
- this.gridBand28.VisibleIndex = 16;
- this.gridBand28.Width = 260;
- //
- // gridBand27
- //
- this.gridBand27.Caption = "瀹℃牳浜�";
- this.gridBand27.Columns.Add(this.gv_settlementParty);
- this.gridBand27.Columns.Add(this.gv_erpCheckBy);
- this.gridBand27.MinWidth = 80;
- this.gridBand27.Name = "gridBand27";
- this.gridBand27.VisibleIndex = 0;
- this.gridBand27.Width = 80;
- //
- // gridBand26
- //
- this.gridBand26.Caption = "ERP瀹℃牳鏃堕棿";
- this.gridBand26.Columns.Add(this.gv_erpCheckDate);
- this.gridBand26.MinWidth = 180;
- this.gridBand26.Name = "gridBand26";
- this.gridBand26.VisibleIndex = 1;
- this.gridBand26.Width = 180;
//
// Frm_MesRohIn
//
@@ -1709,5 +1721,6 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand28;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand27;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand26;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index 69b73a2..ec4a34e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -26,9 +26,10 @@
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
txt_supplier.getSuppler("");
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -114,7 +115,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 6007c0c..305379b 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -162,6 +162,7 @@
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
+ <Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
@@ -1058,6 +1059,8 @@
<None Include="Resources\renamedatasource_16x161.png" />
<None Include="Resources\deletelist2_16x16.png" />
<None Include="Resources\reset_16x16.png" />
+ <None Include="Resources\exportfile_16x161.png" />
+ <None Include="Resources\cleartablestyle_16x161.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 69edc3c..b36a6b1 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -433,6 +433,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap cleartablestyle_16x161 {
+ get {
+ object obj = ResourceManager.GetObject("cleartablestyle_16x161", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap close_16x16 {
get {
object obj = ResourceManager.GetObject("close_16x16", resourceCulture);
@@ -763,6 +773,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap exportfile_16x161 {
+ get {
+ object obj = ResourceManager.GetObject("exportfile_16x161", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap exportfile_32x32 {
get {
object obj = ResourceManager.GetObject("exportfile_32x32", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 04b6481..8e2be1d 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -198,6 +198,9 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -292,10 +295,8 @@
<data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\show_16x16.png;System.Drawing.Bitmap,
@@ -457,9 +458,6 @@
<value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap,
@@ -670,6 +668,9 @@
<data name="down_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\down_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="exportfile_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\exportfile_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="filledradarwithoutmarkers_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\filledradarwithoutmarkers_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -707,6 +708,11 @@
</data>
<data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -832,7 +838,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="cleartablestyle_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\cleartablestyle_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/cleartablestyle_16x161.png b/DevApp/Gs.DevApp/Resources/cleartablestyle_16x161.png
new file mode 100644
index 0000000..8868d78
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/cleartablestyle_16x161.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/exportfile_16x161.png b/DevApp/Gs.DevApp/Resources/exportfile_16x161.png
new file mode 100644
index 0000000..a9d2b34
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/exportfile_16x161.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/ToolBox/UpdateParentEventArgs.cs b/DevApp/Gs.DevApp/ToolBox/UpdateParentEventArgs.cs
index 7ca7160..b133217 100644
--- a/DevApp/Gs.DevApp/ToolBox/UpdateParentEventArgs.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UpdateParentEventArgs.cs
@@ -12,5 +12,7 @@
public List<FilterEntity> FilterList { get; set; }
public List<string> StringList { get; set; }
+
+ public List<dynamic> DynamicList { get; set; }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index e88ab78..a7fb76b 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1362,6 +1362,8 @@
/// <param name="icoName">鍥炬爣璺緞</param>
public static void SetGridSear(GridView gridView1, PictureBox btnChkIco = null, Form fm = null, string fileName = "checkStatus", string icoName = "")
{
+ // gridView1.OptionsView.ColumnAutoWidth = false;鑷姩璋冩暣鍒楀
+
foreach (GridColumn column in gridView1.Columns)
{
column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
@@ -1430,6 +1432,24 @@
e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
+ gridView1.ValidatingEditor += (sender, e) =>
+ {
+ //yz_quantity_0
+ GridView view = sender as GridView;
+ if (view.FocusedColumn.Tag != null && view.FocusedColumn.Tag.ToString().StartsWith("yz_"))
+ {
+ string[] _ary = view.FocusedColumn.Tag.ToString().Split('_');
+ if (_ary.Length > 2)
+ {
+ if (_ary[2] == "0")
+ {
+ double price = 0; if (!Double.TryParse(e.Value as String, out price))
+ { e.Valid = false; e.ErrorText = "璇疯緭鍏ユ纭殑鏁板瓧."; }
+ return;
+ }
+ }
+ }
+ };
}
#endregion
@@ -1440,29 +1460,7 @@
return regex.IsMatch(str);
}
- /// <summary>
- /// yz_quantity_0锛寉z_瀛楁_绫诲瀷
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- public static void SetValidatingEditor(object sender, BaseContainerValidateEditorEventArgs e)
- {
- //yz_quantity_0
- GridView view = sender as GridView;
- if (view.FocusedColumn.Tag != null && view.FocusedColumn.Tag.ToString().StartsWith("yz_"))
- {
- string[] _ary = view.FocusedColumn.Tag.ToString().Split('_');
- if (_ary.Length > 2)
- {
- if (_ary[2] == "0")
- {
- double price = 0; if (!Double.TryParse(e.Value as String, out price))
- { e.Valid = false; e.ErrorText = "璇疯緭鍏ユ纭殑鏁板瓧."; }
- return;
- }
- }
- }
- }
+
}
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index b92206a..26d836c 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -32,6 +32,7 @@
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -53,6 +54,7 @@
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -95,7 +97,9 @@
this.gridColumn9,
this.gv_purchaseUnit,
this.gv_inventoryUnit,
- this.gv_remarks});
+ this.gv_remarks,
+ this.gridColumn10,
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -112,6 +116,16 @@
this.gv_chk.Visible = true;
this.gv_chk.VisibleIndex = 0;
this.gv_chk.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鏀舵枡缁勭粐";
+ this.gridColumn2.FieldName = "fSubsidiary";
+ this.gridColumn2.MinWidth = 250;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 17;
+ this.gridColumn2.Width = 250;
//
// gv_guid
//
@@ -370,6 +384,16 @@
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "渚涘簲鍟�";
+ this.gridColumn10.FieldName = "gysName";
+ this.gridColumn10.MinWidth = 125;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 16;
+ this.gridColumn10.Width = 125;
+ //
// SelectCgMx
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -418,5 +442,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs
index 4f0360b..2ce22ea 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs
@@ -31,16 +31,17 @@
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.鏄惁鍙敤 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_purchaseQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -57,7 +58,7 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(941, 607);
+ this.gcMain.Size = new System.Drawing.Size(1112, 609);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -68,12 +69,12 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_guid,
- this.鏄惁鍙敤,
+ this.gv_chk,
+ this.gridColumn1,
+ this.gv2,
this.gv_salesOrderId,
this.gv_orderLineId,
- this.gv_itemId,
- this.gv_purchaseUnit,
- this.gv_purchaseQty});
+ this.gv_itemId});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -93,89 +94,83 @@
this.gv_guid.Tag = "query_a.guid";
this.gv_guid.Width = 94;
//
- // 鏄惁鍙敤
+ // gv_chk
//
- this.鏄惁鍙敤.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.鏄惁鍙敤.AppearanceCell.Options.UseFont = true;
- this.鏄惁鍙敤.Caption = "閲囪喘鍗曞彿 ";
- this.鏄惁鍙敤.FieldName = "isEnabled";
- this.鏄惁鍙敤.MinWidth = 100;
- this.鏄惁鍙敤.Name = "鏄惁鍙敤";
- this.鏄惁鍙敤.OptionsColumn.AllowEdit = false;
- this.鏄惁鍙敤.Tag = "query_a.BILL_NO";
- this.鏄惁鍙敤.Visible = true;
- this.鏄惁鍙敤.VisibleIndex = 0;
- this.鏄惁鍙敤.Width = 100;
+ this.gv_chk.Caption = "閫夋嫨";
+ this.gv_chk.FieldName = "gvChk";
+ this.gv_chk.MaxWidth = 40;
+ this.gv_chk.MinWidth = 40;
+ this.gv_chk.Name = "gv_chk";
+ this.gv_chk.Visible = true;
+ this.gv_chk.VisibleIndex = 0;
+ this.gv_chk.Width = 40;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "浣跨敤缁勭粐";
+ this.gridColumn1.FieldName = "fSubsidiary";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Tag = "org.FNumber";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 1;
+ this.gridColumn1.Width = 94;
+ //
+ // gv2
+ //
+ this.gv2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv2.AppearanceCell.Options.UseFont = true;
+ this.gv2.Caption = "鐗╂枡ID";
+ this.gv2.FieldName = "id";
+ this.gv2.MinWidth = 100;
+ this.gv2.Name = "gv2";
+ this.gv2.OptionsColumn.AllowEdit = false;
+ this.gv2.Tag = "query_a.id";
+ this.gv2.Visible = true;
+ this.gv2.VisibleIndex = 2;
+ this.gv2.Width = 100;
//
// gv_salesOrderId
//
this.gv_salesOrderId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_salesOrderId.AppearanceCell.Options.UseFont = true;
- this.gv_salesOrderId.Caption = "瀹℃壒鏍囧織";
- this.gv_salesOrderId.FieldName = "fOneChecked";
+ this.gv_salesOrderId.Caption = "鐗╂枡缂栧彿";
+ this.gv_salesOrderId.FieldName = "itemNo";
this.gv_salesOrderId.MinWidth = 100;
this.gv_salesOrderId.Name = "gv_salesOrderId";
this.gv_salesOrderId.OptionsColumn.AllowEdit = false;
- this.gv_salesOrderId.Tag = "query_a.SALES_ORDER_ID";
+ this.gv_salesOrderId.Tag = "query_a.itemNo";
this.gv_salesOrderId.Visible = true;
- this.gv_salesOrderId.VisibleIndex = 1;
+ this.gv_salesOrderId.VisibleIndex = 3;
this.gv_salesOrderId.Width = 100;
//
// gv_orderLineId
//
this.gv_orderLineId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_orderLineId.AppearanceCell.Options.UseFont = true;
- this.gv_orderLineId.Caption = "鎵瑰噯鏍囪";
- this.gv_orderLineId.FieldName = "fTwoChecked";
+ this.gv_orderLineId.Caption = "鐗╂枡鍚嶇О";
+ this.gv_orderLineId.FieldName = "itemName";
this.gv_orderLineId.MinWidth = 100;
this.gv_orderLineId.Name = "gv_orderLineId";
this.gv_orderLineId.OptionsColumn.AllowEdit = false;
- this.gv_orderLineId.Tag = "query_a.ORDER_LINE_ID";
+ this.gv_orderLineId.Tag = "query_a.itemName";
this.gv_orderLineId.Visible = true;
- this.gv_orderLineId.VisibleIndex = 2;
+ this.gv_orderLineId.VisibleIndex = 4;
this.gv_orderLineId.Width = 100;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemId.AppearanceCell.Options.UseFont = true;
- this.gv_itemId.Caption = "鐗╂枡缂栫爜 ";
- this.gv_itemId.FieldName = "itemNo";
+ this.gv_itemId.Caption = "鐗╂枡瑙勬牸";
+ this.gv_itemId.FieldName = "itemModel";
this.gv_itemId.MinWidth = 100;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
- this.gv_itemId.Tag = "query_a.ITEM_ID";
+ this.gv_itemId.Tag = "query_a.itemModel";
this.gv_itemId.Visible = true;
- this.gv_itemId.VisibleIndex = 3;
+ this.gv_itemId.VisibleIndex = 5;
this.gv_itemId.Width = 100;
- //
- // gv_purchaseUnit
- //
- this.gv_purchaseUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
- this.gv_purchaseUnit.Caption = "鐗╂枡鍚嶇О";
- this.gv_purchaseUnit.FieldName = "itemName";
- this.gv_purchaseUnit.MinWidth = 100;
- this.gv_purchaseUnit.Name = "gv_purchaseUnit";
- this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
- this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
- this.gv_purchaseUnit.Visible = true;
- this.gv_purchaseUnit.VisibleIndex = 4;
- this.gv_purchaseUnit.Width = 100;
- //
- // gv_purchaseQty
- //
- this.gv_purchaseQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_purchaseQty.AppearanceCell.Options.UseFont = true;
- this.gv_purchaseQty.Caption = "鐗╂枡瑙勬牸";
- this.gv_purchaseQty.FieldName = "itemModel";
- this.gv_purchaseQty.MinWidth = 100;
- this.gv_purchaseQty.Name = "gv_purchaseQty";
- this.gv_purchaseQty.OptionsColumn.AllowEdit = false;
- this.gv_purchaseQty.Tag = "query_a.PURCHASE_QTY";
- this.gv_purchaseQty.Visible = true;
- this.gv_purchaseQty.VisibleIndex = 5;
- this.gv_purchaseQty.Width = 100;
//
// xtraTabControl1
//
@@ -183,7 +178,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(943, 682);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1114, 682);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1});
@@ -193,35 +188,46 @@
this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Controls.Add(this.panelControl1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(941, 650);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1112, 650);
this.xtraTabPage1.Text = "璇烽�夋嫨闇�瑕佸鍏ョ殑鏁版嵁";
//
// panelControl1
//
+ this.panelControl1.Controls.Add(this.btnIn);
this.panelControl1.Controls.Add(this.pageBar1);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelControl1.Location = new System.Drawing.Point(0, 607);
+ this.panelControl1.Location = new System.Drawing.Point(0, 609);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(941, 43);
+ this.panelControl1.Size = new System.Drawing.Size(1112, 41);
this.panelControl1.TabIndex = 4;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
- this.pageBar1.Location = new System.Drawing.Point(-45, 2);
+ this.pageBar1.Location = new System.Drawing.Point(126, 2);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(984, 39);
+ this.pageBar1.Size = new System.Drawing.Size(984, 37);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
+ //
+ // btnIn
+ //
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
+ this.btnIn.Location = new System.Drawing.Point(2, 2);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(94, 37);
+ this.btnIn.TabIndex = 6;
+ this.btnIn.Text = "纭畾瀵煎叆";
//
// SelectCheckDt
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(943, 682);
+ this.ClientSize = new System.Drawing.Size(1114, 682);
this.Controls.Add(this.xtraTabControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
@@ -246,13 +252,14 @@
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private UserControls.Data.UcPageBar pageBar1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
- private DevExpress.XtraGrid.Columns.GridColumn 鏄惁鍙敤;
+ private DevExpress.XtraGrid.Columns.GridColumn gv2;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs b/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
index cc7f795..d635452 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
@@ -1,8 +1,8 @@
锘縰sing System;
using System.Collections.Generic;
-using System.Text;
+using System.Data;
+using System.Threading.Tasks;
using System.Windows.Forms;
-using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -11,42 +11,43 @@
{
public partial class SelectCheckDt : DevExpress.XtraEditors.XtraForm
{
- private readonly List<FilterEntity> _filterList =
- new List<FilterEntity>();
-
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesQmCheckitemManager/";
public SelectCheckDt()
{
InitializeComponent();
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
- gridView1.IndicatorWidth = 50;
- gridView1.CustomDrawRowIndicator += (s, e) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ btnIn.Click += (s, e) =>
{
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ var list = new List<dynamic>();
+ for (var i = 0; i < gridView1.DataRowCount; i++)
+ {
+ var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk");
+ if (checkBox == "Checked")
+ {
+ list.Add(new
+ {
+ guid = gridView1.GetRowCellValue(i, "guid").ToString(),
+ fSubsidiary = gridView1.GetRowCellValue(i, "fSubsidiary").ToString(),
+ id = gridView1.GetRowCellValue(i, "id").ToString(),
+ itemNo = gridView1.GetRowCellValue(i, "itemNo").ToString(),
+ itemName = gridView1.GetRowCellValue(i, "itemName").ToString(),
+ itemModel = gridView1.GetRowCellValue(i, "itemModel").ToString(),
+ });
+ }
+ }
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
+ Close();
};
-
}
- /// <summary>
- /// 鍙屽嚮浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- var rowGuid =
- UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (string.IsNullOrEmpty(rowGuid))
- return;
- var list = new List<string>();
- list.Add(rowGuid);
- UpdateParent?.Invoke(this,
- new UpdateParentEventArgs { StringList = list });
- Close();
-
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
}
/// <summary>
@@ -61,36 +62,44 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
- var _sbSqlWhere = new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc",
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "GetListPage", json);
+ var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.setTxt();
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 7b54fb9..a80ba14 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -178,52 +178,19 @@
private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnFChkClick != null)
+ {
btnFChkClick(this, e);
- else
- return;
-
- if (string.IsNullOrEmpty(guidKey))
- {
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
}
- else
- {
- if (string.IsNullOrEmpty(chkParameter))
- {
- MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍙嶅鏍稿悧锛�"))
- return;
- _ckService(0.ToString());
- }
+ return;
}
private void BtnChk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnChkClick != null)
+ {
btnChkClick(this, e);
- else
- return;
-
- if (string.IsNullOrEmpty(chkParameter))
- {
- //MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
}
- else
- {
- if (string.IsNullOrEmpty(guidKey))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾瀹℃牳鍚楋紵"))
- return;
- _ckService(1.ToString());
- }
+ return;
}
private void BtnFjieAn_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -782,23 +749,7 @@
}
return false;
}
-
- private void _ckService(string _ckValue)
- {
- var _obj = new
- {
- guid = guidKey,
- parameter = chkParameter,
- ckValue = _ckValue
- };
- var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData["outMsg"].ToString());
- if (_rtn.rtnCode > 0)
- {
- }
- }
+
#region 鍏叡浜嬩欢
--
Gitblit v1.9.3