From fdebc0e6cb9c3ef1dbf33933cdc77e5b90032b5a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 29 十月 2024 16:51:52 +0800
Subject: [PATCH] 整体细微优化
---
DevApp/Gs.DevApp/UserControl/UcLookItems.cs | 6 +
DevApp/Gs.DevApp/UserControl/UcLookCk.cs | 6 +
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 83 ++++++++--------
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 7 +
DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs | 9 +
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs | 6 +
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 132 +++++++++++++-------------
DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs | 29 +++--
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 15 +-
9 files changed, 160 insertions(+), 133 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index d515f67..2c3e602 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -29,11 +29,11 @@
/// </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 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.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1cgRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -452,8 +452,6 @@
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Visible = true;
- this.gvMx1guid.VisibleIndex = 0;
this.gvMx1guid.Width = 100;
//
// tabMxPage1
@@ -518,8 +516,6 @@
this.gvAbtGuid.MinWidth = 50;
this.gvAbtGuid.Name = "gvAbtGuid";
this.gvAbtGuid.OptionsColumn.ReadOnly = true;
- this.gvAbtGuid.Visible = true;
- this.gvAbtGuid.VisibleIndex = 1;
this.gvAbtGuid.Width = 94;
//
// gvMxDel
@@ -529,16 +525,16 @@
this.gvMxDel.MinWidth = 80;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 2;
+ this.gvMxDel.VisibleIndex = 0;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.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, 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, 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);
@@ -582,7 +578,7 @@
this.gv_fType.AppearanceCell.Options.UseFont = true;
this.gv_fType.AppearanceHeader.Options.UseTextOptions = true;
this.gv_fType.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gv_fType.Caption = "鏄惁濮斿 ";
+ this.gv_fType.Caption = "鏄惁濮斿";
this.gv_fType.FieldName = "fType";
this.gv_fType.MinWidth = 50;
this.gv_fType.Name = "gv_fType";
@@ -607,7 +603,7 @@
//
this.gv_urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
- this.gv_urgentFlag.Caption = "鏄惁鎬ユ枡 ";
+ this.gv_urgentFlag.Caption = "鏄惁鎬ユ枡";
this.gv_urgentFlag.FieldName = "urgentFlag";
this.gv_urgentFlag.MinWidth = 50;
this.gv_urgentFlag.Name = "gv_urgentFlag";
@@ -621,7 +617,7 @@
//
this.gv_insby.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_insby.AppearanceCell.Options.UseFont = true;
- this.gv_insby.Caption = "瀹℃牳鍏ュ簱浜� ";
+ this.gv_insby.Caption = "瀹℃牳鍏ュ簱浜�";
this.gv_insby.FieldName = "insby";
this.gv_insby.MinWidth = 50;
this.gv_insby.Name = "gv_insby";
@@ -637,15 +633,15 @@
this.lb_ischeck.Appearance.Options.UseFont = true;
this.lb_ischeck.Location = new System.Drawing.Point(606, 91);
this.lb_ischeck.Name = "lb_ischeck";
- this.lb_ischeck.Size = new System.Drawing.Size(68, 21);
+ this.lb_ischeck.Size = new System.Drawing.Size(102, 21);
this.lb_ischeck.TabIndex = 319;
- this.lb_ischeck.Text = "妫�楠屾爣蹇�";
+ this.lb_ischeck.Text = "鏄惁鎻愪氦妫�楠�";
//
// gv_ischeck
//
this.gv_ischeck.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_ischeck.AppearanceCell.Options.UseFont = true;
- this.gv_ischeck.Caption = "鏄惁妫�楠� ";
+ this.gv_ischeck.Caption = "鏄惁妫�楠�";
this.gv_ischeck.FieldName = "ischeck";
this.gv_ischeck.MinWidth = 50;
this.gv_ischeck.Name = "gv_ischeck";
@@ -673,7 +669,7 @@
//
this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
- this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮� ";
+ this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
this.gv_suppNo.FieldName = "suppNo";
this.gv_suppNo.MinWidth = 50;
this.gv_suppNo.Name = "gv_suppNo";
@@ -701,7 +697,7 @@
//
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.Caption = "宸叉崱鏁伴噺";
this.gv_checkQty.FieldName = "checkQty";
this.gv_checkQty.MinWidth = 50;
this.gv_checkQty.Name = "gv_checkQty";
@@ -715,7 +711,7 @@
//
this.gv_checkRes.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkRes.AppearanceCell.Options.UseFont = true;
- this.gv_checkRes.Caption = "妫�楠岀粨鏋� ";
+ this.gv_checkRes.Caption = "妫�楠岀粨鏋�";
this.gv_checkRes.FieldName = "checkRes";
this.gv_checkRes.MinWidth = 50;
this.gv_checkRes.Name = "gv_checkRes";
@@ -729,21 +725,21 @@
//
this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
- this.gv_checkDate.Caption = "鎻愪氦鏃ユ湡 ";
+ this.gv_checkDate.Caption = "鎻愪氦鏃ユ湡";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 50;
+ this.gv_checkDate.MinWidth = 200;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 7;
- this.gv_checkDate.Width = 71;
+ this.gv_checkDate.Width = 200;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
- this.gv_checkUser.Caption = "鎻愪氦浜� ";
+ this.gv_checkUser.Caption = "鎻愪氦浜�";
this.gv_checkUser.FieldName = "checkUser";
this.gv_checkUser.MinWidth = 50;
this.gv_checkUser.Name = "gv_checkUser";
@@ -776,7 +772,7 @@
//
this.gv_paperBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_paperBillNo.AppearanceCell.Options.UseFont = true;
- this.gv_paperBillNo.Caption = "閫佽揣鍗曞彿 ";
+ this.gv_paperBillNo.Caption = "閫佽揣鍗曞彿";
this.gv_paperBillNo.FieldName = "paperBillNo";
this.gv_paperBillNo.MinWidth = 50;
this.gv_paperBillNo.Name = "gv_paperBillNo";
@@ -790,7 +786,7 @@
//
this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_remark.AppearanceCell.Options.UseFont = true;
- this.gv_remark.Caption = "澶囨敞 ";
+ this.gv_remark.Caption = "澶囨敞";
this.gv_remark.FieldName = "remark";
this.gv_remark.MinWidth = 50;
this.gv_remark.Name = "gv_remark";
@@ -804,21 +800,21 @@
//
this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
+ this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 50;
+ this.gv_createDate.MinWidth = 200;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 5;
- this.gv_createDate.Width = 71;
+ this.gv_createDate.Width = 200;
//
// gv_createBy
//
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.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
this.gv_createBy.MinWidth = 50;
this.gv_createBy.Name = "gv_createBy";
@@ -859,6 +855,7 @@
//
// txt_billNo
//
+ this.txt_billNo.Enabled = false;
this.txt_billNo.Location = new System.Drawing.Point(98, 14);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -870,29 +867,29 @@
//
this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_billNo.AppearanceCell.Options.UseFont = true;
- this.gv_billNo.Caption = "鍒拌揣鍗曞彿 ";
+ this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 50;
+ this.gv_billNo.MinWidth = 110;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 3;
- this.gv_billNo.Width = 71;
+ this.gv_billNo.Width = 110;
//
// toolBarMenu1
//
- this.toolBarMenu1.chkParameter = "MES_INV_ITEM_ARN,check_date,fstatus,check_user";
+ this.toolBarMenu1.chkParameter = "MES_INV_ITEM_ARN,check_date,fstatus,check_user,chk_mesInviArn";
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
- this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.rptParameter = "rpt_InvItem{}";
this.toolBarMenu1.Size = new System.Drawing.Size(1233, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
- this.toolBarMenu1.xlsOutParameter = null;
+ this.toolBarMenu1.xlsOutParameter = "xlsOut_InvItem{}";
//
// gcMain
//
@@ -1026,7 +1023,7 @@
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(685, 53);
+ this.txt_fType.Location = new System.Drawing.Point(714, 53);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "";
this.txt_fType.Size = new System.Drawing.Size(35, 24);
@@ -1034,7 +1031,7 @@
//
// txt_urgentFlag
//
- this.txt_urgentFlag.Location = new System.Drawing.Point(685, 16);
+ this.txt_urgentFlag.Location = new System.Drawing.Point(714, 16);
this.txt_urgentFlag.Name = "txt_urgentFlag";
this.txt_urgentFlag.Properties.Caption = "";
this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
@@ -1051,10 +1048,10 @@
// txt_ischeck
//
this.txt_ischeck.Enabled = false;
- this.txt_ischeck.Location = new System.Drawing.Point(685, 89);
+ this.txt_ischeck.Location = new System.Drawing.Point(714, 89);
this.txt_ischeck.Name = "txt_ischeck";
- this.txt_ischeck.Properties.Caption = "鏄惁鎻愪氦妫�楠�";
- this.txt_ischeck.Size = new System.Drawing.Size(118, 24);
+ this.txt_ischeck.Properties.Caption = "";
+ this.txt_ischeck.Size = new System.Drawing.Size(47, 24);
this.txt_ischeck.TabIndex = 447;
//
// txt_depotsCode
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 55cbb39..7d516ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Data;
using System.Drawing;
-using System.Security.Cryptography;
using System.Text;
using System.Windows.Forms;
using DevExpress.DataAccess.DataFederation;
@@ -56,9 +55,15 @@
};
this.txt_depotsCode.KeyFile = "depotCode";
this.txt_suppNo.KeyFile = "suppNo";
+ //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
{
- var frm = new SelectCgMx();
+ if (string.IsNullOrEmpty(this.txt_suppNo.GetId()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紝鎵嶈兘閫夋嫨鏉ユ枡鏄庣粏锛�");
+ return;
+ }
+ var frm = new SelectCgMx(this.txt_suppNo.GetCode());
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<string>();
@@ -82,12 +87,6 @@
frm.ShowDialog();
};
}
-
- private void ToolBarMenu1_btnFjianYanClick1(object sender, EventArgs e)
- {
- throw new NotImplementedException();
- }
-
/// <summary>
/// 鍙嶆楠�
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index b61db81..16613db 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -74,7 +74,6 @@
this.txt_changereason = new DevExpress.XtraEditors.TextEdit();
this.gv_changereason = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_checkFalg = new DevExpress.XtraEditors.LabelControl();
- this.txt_checkFalg = new DevExpress.XtraEditors.TextEdit();
this.gv_checkFalg = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -168,13 +167,13 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_checkFalg = new DevExpress.XtraEditors.CheckEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_changereason.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkFalg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ebelnK3id.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit();
@@ -212,6 +211,7 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkFalg.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx1demandDocumentLineId
@@ -710,7 +710,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1361, 291);
+ this.tabMxPage1.Size = new System.Drawing.Size(1361, 317);
this.tabMxPage1.Text = "閲囪喘鍗曟槑缁�";
//
// gcMx1
@@ -719,7 +719,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1361, 291);
+ this.gcMx1.Size = new System.Drawing.Size(1361, 317);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -795,7 +795,7 @@
//
this.gv_changereason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_changereason.AppearanceCell.Options.UseFont = true;
- this.gv_changereason.Caption = "鍙樻洿鍘熷洜 ";
+ this.gv_changereason.Caption = "鍙樻洿鍘熷洜";
this.gv_changereason.FieldName = "changereason";
this.gv_changereason.MinWidth = 100;
this.gv_changereason.Name = "gv_changereason";
@@ -809,28 +809,19 @@
//
this.lb_checkFalg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_checkFalg.Appearance.Options.UseFont = true;
- this.lb_checkFalg.Location = new System.Drawing.Point(1029, 212);
+ this.lb_checkFalg.Location = new System.Drawing.Point(789, 183);
this.lb_checkFalg.Name = "lb_checkFalg";
this.lb_checkFalg.Size = new System.Drawing.Size(73, 21);
this.lb_checkFalg.TabIndex = 387;
this.lb_checkFalg.Text = "瀹℃牳鏍囪瘑 ";
//
- // txt_checkFalg
- //
- this.txt_checkFalg.Location = new System.Drawing.Point(1109, 208);
- this.txt_checkFalg.Name = "txt_checkFalg";
- this.txt_checkFalg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkFalg.Properties.Appearance.Options.UseFont = true;
- this.txt_checkFalg.Size = new System.Drawing.Size(174, 28);
- this.txt_checkFalg.TabIndex = 387;
- //
// gv_checkFalg
//
this.gv_checkFalg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkFalg.AppearanceCell.Options.UseFont = true;
- this.gv_checkFalg.Caption = "瀹℃牳鏍囪瘑 ";
+ this.gv_checkFalg.Caption = "瀹℃牳鏍囪瘑";
this.gv_checkFalg.FieldName = "checkFalg";
- this.gv_checkFalg.MinWidth = 100;
+ this.gv_checkFalg.MinWidth = 80;
this.gv_checkFalg.Name = "gv_checkFalg";
this.gv_checkFalg.OptionsColumn.AllowEdit = false;
this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
@@ -842,7 +833,7 @@
//
this.gv_checkBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkBy.AppearanceCell.Options.UseFont = true;
- this.gv_checkBy.Caption = "瀹℃牳浜� ";
+ this.gv_checkBy.Caption = "瀹℃牳浜�";
this.gv_checkBy.FieldName = "checkBy";
this.gv_checkBy.MinWidth = 100;
this.gv_checkBy.Name = "gv_checkBy";
@@ -856,15 +847,15 @@
//
this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
- this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
+ this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 100;
+ this.gv_checkDate.MinWidth = 120;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 25;
- this.gv_checkDate.Width = 100;
+ this.gv_checkDate.Width = 120;
//
// lb_ebelnK3id
//
@@ -908,15 +899,15 @@
//
this.gv_erpCheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_erpCheckDate.AppearanceCell.Options.UseFont = true;
- this.gv_erpCheckDate.Caption = "瀹℃牳鏃堕棿 ";
+ this.gv_erpCheckDate.Caption = "瀹℃牳鏃堕棿";
this.gv_erpCheckDate.FieldName = "erpCheckDate";
- this.gv_erpCheckDate.MinWidth = 100;
+ this.gv_erpCheckDate.MinWidth = 200;
this.gv_erpCheckDate.Name = "gv_erpCheckDate";
this.gv_erpCheckDate.OptionsColumn.AllowEdit = false;
this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE";
this.gv_erpCheckDate.Visible = true;
this.gv_erpCheckDate.VisibleIndex = 24;
- this.gv_erpCheckDate.Width = 100;
+ this.gv_erpCheckDate.Width = 200;
//
// lb_erpCheckBy
//
@@ -941,7 +932,7 @@
//
this.gv_erpCheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_erpCheckBy.AppearanceCell.Options.UseFont = true;
- this.gv_erpCheckBy.Caption = "瀹℃牳浜� ";
+ this.gv_erpCheckBy.Caption = "瀹℃牳浜�";
this.gv_erpCheckBy.FieldName = "erpCheckBy";
this.gv_erpCheckBy.MinWidth = 100;
this.gv_erpCheckBy.Name = "gv_erpCheckBy";
@@ -974,7 +965,7 @@
//
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.Caption = "鏈�鍚庝慨鏀逛汉";
this.gv_lastupdateBy.FieldName = "lastupdateBy";
this.gv_lastupdateBy.MinWidth = 100;
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
@@ -1007,15 +998,15 @@
//
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.Caption = "鏈�鍚庝慨鏀规椂闂�";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 100;
+ this.gv_lastupdateDate.MinWidth = 200;
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.VisibleIndex = 21;
- this.gv_lastupdateDate.Width = 100;
+ this.gv_lastupdateDate.Width = 200;
//
// lb_createDate
//
@@ -1040,7 +1031,7 @@
//
this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "鍒涘缓鏃ユ湡 ";
+ this.gv_createDate.Caption = "鍒涘缓鏃ユ湡";
this.gv_createDate.FieldName = "createDate";
this.gv_createDate.MinWidth = 200;
this.gv_createDate.Name = "gv_createDate";
@@ -1073,7 +1064,7 @@
//
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.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
this.gv_createBy.MinWidth = 100;
this.gv_createBy.Name = "gv_createBy";
@@ -1106,15 +1097,15 @@
//
this.gv_cancellationDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_cancellationDate.AppearanceCell.Options.UseFont = true;
- this.gv_cancellationDate.Caption = "浣滃簾鏃ユ湡 ";
+ this.gv_cancellationDate.Caption = "浣滃簾鏃ユ湡";
this.gv_cancellationDate.FieldName = "cancellationDate";
- this.gv_cancellationDate.MinWidth = 100;
+ this.gv_cancellationDate.MinWidth = 200;
this.gv_cancellationDate.Name = "gv_cancellationDate";
this.gv_cancellationDate.OptionsColumn.AllowEdit = false;
this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
this.gv_cancellationDate.Visible = true;
this.gv_cancellationDate.VisibleIndex = 18;
- this.gv_cancellationDate.Width = 100;
+ this.gv_cancellationDate.Width = 200;
//
// lb_cancellationPerson
//
@@ -1139,7 +1130,7 @@
//
this.gv_cancellationPerson.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_cancellationPerson.AppearanceCell.Options.UseFont = true;
- this.gv_cancellationPerson.Caption = "浣滃簾浜� ";
+ this.gv_cancellationPerson.Caption = "浣滃簾浜�";
this.gv_cancellationPerson.FieldName = "cancellationPerson";
this.gv_cancellationPerson.MinWidth = 100;
this.gv_cancellationPerson.Name = "gv_cancellationPerson";
@@ -1172,7 +1163,7 @@
//
this.gv_cancellationStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_cancellationStatus.AppearanceCell.Options.UseFont = true;
- this.gv_cancellationStatus.Caption = "浣滃簾鐘舵�� ";
+ this.gv_cancellationStatus.Caption = "浣滃簾鐘舵��";
this.gv_cancellationStatus.FieldName = "cancellationStatus";
this.gv_cancellationStatus.MinWidth = 50;
this.gv_cancellationStatus.Name = "gv_cancellationStatus";
@@ -1205,7 +1196,7 @@
//
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.Caption = "澶囨敞";
this.gv_remarks.FieldName = "remarks";
this.gv_remarks.MinWidth = 100;
this.gv_remarks.Name = "gv_remarks";
@@ -1238,7 +1229,7 @@
//
this.gv_transportMethod.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_transportMethod.AppearanceCell.Options.UseFont = true;
- this.gv_transportMethod.Caption = "杩愯緭鏂瑰紡 ";
+ this.gv_transportMethod.Caption = "杩愯緭鏂瑰紡";
this.gv_transportMethod.FieldName = "transportMethod";
this.gv_transportMethod.MinWidth = 100;
this.gv_transportMethod.Name = "gv_transportMethod";
@@ -1290,7 +1281,7 @@
//
this.gv_paymentParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_paymentParty.AppearanceCell.Options.UseFont = true;
- this.gv_paymentParty.Caption = "鏀舵鏂� ";
+ this.gv_paymentParty.Caption = "鏀舵鏂�";
this.gv_paymentParty.FieldName = "paymentParty";
this.gv_paymentParty.MinWidth = 100;
this.gv_paymentParty.Name = "gv_paymentParty";
@@ -1323,7 +1314,7 @@
//
this.gv_settlementParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_settlementParty.AppearanceCell.Options.UseFont = true;
- this.gv_settlementParty.Caption = "缁撶畻鏂� ";
+ this.gv_settlementParty.Caption = "缁撶畻鏂�";
this.gv_settlementParty.FieldName = "settlementParty";
this.gv_settlementParty.MinWidth = 100;
this.gv_settlementParty.Name = "gv_settlementParty";
@@ -1356,7 +1347,7 @@
//
this.gv_qualityReq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_qualityReq.AppearanceCell.Options.UseFont = true;
- this.gv_qualityReq.Caption = "璐ㄩ噺瑕佹眰 ";
+ this.gv_qualityReq.Caption = "璐ㄩ噺瑕佹眰";
this.gv_qualityReq.FieldName = "qualityReq";
this.gv_qualityReq.MinWidth = 100;
this.gv_qualityReq.Name = "gv_qualityReq";
@@ -1389,7 +1380,7 @@
//
this.gv_purchaser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_purchaser.AppearanceCell.Options.UseFont = true;
- this.gv_purchaser.Caption = "閲囪喘鍛� ";
+ this.gv_purchaser.Caption = "閲囪喘鍛�";
this.gv_purchaser.FieldName = "purchaser";
this.gv_purchaser.MinWidth = 100;
this.gv_purchaser.Name = "gv_purchaser";
@@ -1422,15 +1413,15 @@
//
this.gv_qtyAcceptance.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_qtyAcceptance.AppearanceCell.Options.UseFont = true;
- this.gv_qtyAcceptance.Caption = "鏁伴噺楠屾敹 ";
+ this.gv_qtyAcceptance.Caption = "鏁伴噺楠屾敹";
this.gv_qtyAcceptance.FieldName = "qtyAcceptance";
- this.gv_qtyAcceptance.MinWidth = 50;
+ this.gv_qtyAcceptance.MinWidth = 100;
this.gv_qtyAcceptance.Name = "gv_qtyAcceptance";
this.gv_qtyAcceptance.OptionsColumn.AllowEdit = false;
this.gv_qtyAcceptance.Tag = "query_a.QTY_ACCEPTANCE";
this.gv_qtyAcceptance.Visible = true;
this.gv_qtyAcceptance.VisibleIndex = 9;
- this.gv_qtyAcceptance.Width = 50;
+ this.gv_qtyAcceptance.Width = 100;
//
// lb_purchaseGroup
//
@@ -1474,7 +1465,7 @@
//
this.gv_purchaseDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_purchaseDept.AppearanceCell.Options.UseFont = true;
- this.gv_purchaseDept.Caption = "閲囪喘閮ㄩ棬 ";
+ this.gv_purchaseDept.Caption = "閲囪喘閮ㄩ棬";
this.gv_purchaseDept.FieldName = "purchaseDept";
this.gv_purchaseDept.MinWidth = 110;
this.gv_purchaseDept.Name = "gv_purchaseDept";
@@ -1526,7 +1517,7 @@
//
this.gv_closeStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_closeStatus.AppearanceCell.Options.UseFont = true;
- this.gv_closeStatus.Caption = "鍏抽棴鐘舵�� ";
+ this.gv_closeStatus.Caption = "鍏抽棴鐘舵��";
this.gv_closeStatus.FieldName = "closeStatus";
this.gv_closeStatus.MinWidth = 100;
this.gv_closeStatus.Name = "gv_closeStatus";
@@ -1559,7 +1550,7 @@
//
this.gv_supplier.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_supplier.AppearanceCell.Options.UseFont = true;
- this.gv_supplier.Caption = "渚涘簲鍟� ";
+ this.gv_supplier.Caption = "渚涘簲鍟�";
this.gv_supplier.FieldName = "supplier";
this.gv_supplier.MinWidth = 110;
this.gv_supplier.Name = "gv_supplier";
@@ -1592,7 +1583,7 @@
//
this.gv_purchaseDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_purchaseDate.AppearanceCell.Options.UseFont = true;
- this.gv_purchaseDate.Caption = "閲囪喘鏃ユ湡 ";
+ this.gv_purchaseDate.Caption = "閲囪喘鏃ユ湡";
this.gv_purchaseDate.FieldName = "purchaseDate";
this.gv_purchaseDate.MinWidth = 200;
this.gv_purchaseDate.Name = "gv_purchaseDate";
@@ -1625,7 +1616,7 @@
//
this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_businessType.AppearanceCell.Options.UseFont = true;
- this.gv_businessType.Caption = "涓氬姟绫诲瀷 ";
+ this.gv_businessType.Caption = "涓氬姟绫诲瀷";
this.gv_businessType.FieldName = "businessType";
this.gv_businessType.MinWidth = 100;
this.gv_businessType.Name = "gv_businessType";
@@ -1658,7 +1649,7 @@
//
this.gv_documentType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_documentType.AppearanceCell.Options.UseFont = true;
- this.gv_documentType.Caption = "鍗曟嵁绫诲瀷 ";
+ this.gv_documentType.Caption = "鍗曟嵁绫诲瀷";
this.gv_documentType.FieldName = "documentType";
this.gv_documentType.MinWidth = 110;
this.gv_documentType.Name = "gv_documentType";
@@ -1691,7 +1682,7 @@
//
this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_documentStatus.AppearanceCell.Options.UseFont = true;
- this.gv_documentStatus.Caption = "鍗曟嵁鐘舵�� ";
+ this.gv_documentStatus.Caption = "鍗曟嵁鐘舵��";
this.gv_documentStatus.FieldName = "documentStatus";
this.gv_documentStatus.MinWidth = 100;
this.gv_documentStatus.Name = "gv_documentStatus";
@@ -1724,7 +1715,7 @@
//
this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_billNo.AppearanceCell.Options.UseFont = true;
- this.gv_billNo.Caption = "閲囪喘鍗曞彿 ";
+ this.gv_billNo.Caption = "閲囪喘鍗曞彿";
this.gv_billNo.FieldName = "billNo";
this.gv_billNo.MinWidth = 120;
this.gv_billNo.Name = "gv_billNo";
@@ -1755,7 +1746,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(1328, 531);
+ this.gcMain.Size = new System.Drawing.Size(1363, 531);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -1805,11 +1796,12 @@
//
this.gv_factory.Caption = "宸ュ巶";
this.gv_factory.FieldName = "factory";
- this.gv_factory.MinWidth = 25;
+ this.gv_factory.MinWidth = 60;
this.gv_factory.Name = "gv_factory";
+ this.gv_factory.OptionsColumn.AllowEdit = false;
this.gv_factory.Visible = true;
this.gv_factory.VisibleIndex = 0;
- this.gv_factory.Width = 25;
+ this.gv_factory.Width = 60;
//
// xtraTabControl1
//
@@ -1828,7 +1820,7 @@
this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1328, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1363, 570);
this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
//
// pageBar1
@@ -1840,7 +1832,7 @@
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
this.pageBar1.RowsCount = 50;
- this.pageBar1.Size = new System.Drawing.Size(1328, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1363, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
@@ -1856,10 +1848,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 247);
+ this.tabMx.Location = new System.Drawing.Point(0, 221);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1363, 323);
+ this.tabMx.Size = new System.Drawing.Size(1363, 349);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1867,12 +1859,12 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_checkFalg);
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_changereason);
this.panel1.Controls.Add(this.txt_changereason);
this.panel1.Controls.Add(this.lb_checkFalg);
- this.panel1.Controls.Add(this.txt_checkFalg);
this.panel1.Controls.Add(this.lb_ebelnK3id);
this.panel1.Controls.Add(this.txt_ebelnK3id);
this.panel1.Controls.Add(this.lb_erpCheckDate);
@@ -1933,12 +1925,20 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1363, 247);
+ this.panel1.Size = new System.Drawing.Size(1363, 221);
this.panel1.TabIndex = 1;
+ //
+ // txt_checkFalg
+ //
+ this.txt_checkFalg.Location = new System.Drawing.Point(871, 182);
+ this.txt_checkFalg.Name = "txt_checkFalg";
+ this.txt_checkFalg.Properties.Caption = "";
+ this.txt_checkFalg.Size = new System.Drawing.Size(94, 24);
+ this.txt_checkFalg.TabIndex = 451;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(823, 189);
+ this.labelControl11.Location = new System.Drawing.Point(920, 185);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -1949,7 +1949,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(874, 189);
+ this.lbGuid.Location = new System.Drawing.Point(971, 185);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -1967,7 +1967,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_changereason.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkFalg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ebelnK3id.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit();
@@ -2006,6 +2005,7 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkFalg.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -2068,7 +2068,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_changereason;
private DevExpress.XtraEditors.LabelControl lb_checkFalg;
- private DevExpress.XtraEditors.TextEdit txt_checkFalg;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkFalg;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
@@ -2181,5 +2180,6 @@
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
+ private DevExpress.XtraEditors.CheckEdit txt_checkFalg;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index 7c4b7a5..24f7db5 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -16,7 +16,11 @@
private readonly string _webServiceName = "MesRohInDataManager/";
- public SelectCgMx()
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鍙�
+ /// </summary>
+ /// <param name="supp_no"></param>
+ public SelectCgMx(string supp_no)
{
InitializeComponent();
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -40,7 +44,6 @@
list.Add(_guid);
}
}
-
UpdateParent?.Invoke(this,
new UpdateParentEventArgs { StringList = list });
Close();
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
index 79a5162..61000ab 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
@@ -68,35 +68,40 @@
//
this.gridColumn1.Caption = "浠撳簱ID";
this.gridColumn1.FieldName = "depotId";
+ this.gridColumn1.MaxWidth = 100;
+ this.gridColumn1.MinWidth = 80;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.UnboundDataType = typeof(short);
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.Width = 80;
//
// gridColumn2
//
this.gridColumn2.Caption = "浠撳簱缂栧彿";
this.gridColumn2.FieldName = "depotCode";
+ this.gridColumn2.MinWidth = 80;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.UnboundDataType = typeof(string);
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 80;
//
// gridColumn3
//
this.gridColumn3.Caption = "浠撳簱鍚嶇О";
this.gridColumn3.FieldName = "depotName";
+ this.gridColumn3.MinWidth = 100;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 100;
//
// gridColumn4
//
this.gridColumn4.Caption = "guid";
this.gridColumn4.FieldName = "guid";
this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 3;
//
// UcLookCk
//
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
index 0488a2b..e5db0e4 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
@@ -12,6 +12,7 @@
public UcLookCk()
{
InitializeComponent();
+ lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
@@ -88,6 +89,11 @@
public void SetIdOrCode(string Code)
{
+ if (Code == "-1")
+ {
+ lookSearchSupplier.EditValue = null;
+ return;
+ }
if (KeyFile == "depotId")
lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim()));
else
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
index 805d7c9..8bc9d49 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -19,6 +19,7 @@
public UcLookItems()
{
InitializeComponent();
+ lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
@@ -104,6 +105,11 @@
public void SetIdOrCode(string Code)
{
+ if (Code == "-1")
+ {
+ lookSearchSupplier.EditValue = null;
+ return;
+ }
if (KeyFile == "id")
lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim()));
else
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
index 0b78d49..57311de 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
@@ -30,9 +30,9 @@
{
this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
@@ -63,38 +63,43 @@
this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "渚涘簲鍟咺D";
+ this.gridColumn1.FieldName = "id";
+ this.gridColumn1.MaxWidth = 100;
+ this.gridColumn1.MinWidth = 80;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.UnboundDataType = typeof(short);
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.Width = 100;
+ //
// gridColumn2
//
this.gridColumn2.Caption = "渚涘簲鍟嗙紪鍙�";
this.gridColumn2.FieldName = "suppNo";
+ this.gridColumn2.MinWidth = 80;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 80;
//
// gridColumn3
//
this.gridColumn3.Caption = "渚涘簲鍟嗗悕绉�";
this.gridColumn3.FieldName = "suppName";
+ this.gridColumn3.MinWidth = 100;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "渚涘簲鍟咺D";
- this.gridColumn1.FieldName = "id";
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.UnboundDataType = typeof(short);
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn3.Width = 100;
//
// gridColumn4
//
this.gridColumn4.Caption = "guid";
this.gridColumn4.FieldName = "guid";
this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 3;
//
// UcLookSupplier
//
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
index 325dddd..0f2f795 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
@@ -13,6 +13,7 @@
public UcLookSupplier()
{
InitializeComponent();
+ lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
getSuppler();
@@ -89,6 +90,11 @@
public void SetIdOrCode(string Code)
{
+ if (Code == "-1")
+ {
+ lookSearchSupplier.EditValue = null;
+ return;
+ }
if (KeyFile == "id")
lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim()));
else
--
Gitblit v1.9.3