From 7130d19980021b2f8b056bbc7e71e85ecbf93c3b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 03 一月 2025 15:30:18 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 38 +++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs | 17 +
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 1
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs | 22 +-
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | 198 +++++++++++++--------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs | 139 +++++++++-----
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 123 +++++++------
8 files changed, 332 insertions(+), 208 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
index 7b3ae7a..9189a28 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.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 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();
this.gvMx1orderNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1isFinish = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -90,6 +90,8 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_org = new Gs.DevApp.UserControl.UcLookOrg();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.txt_isFinish = new DevExpress.XtraEditors.CheckEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
@@ -101,6 +103,7 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -164,7 +167,7 @@
this.gvMx1remark.FieldName = "remark";
this.gvMx1remark.MinWidth = 50;
this.gvMx1remark.Name = "gvMx1remark";
- this.gvMx1remark.Tag = "query_a.REMARK";
+ this.gvMx1remark.Tag = "edit";
this.gvMx1remark.Visible = true;
this.gvMx1remark.VisibleIndex = 8;
this.gvMx1remark.Width = 94;
@@ -194,7 +197,7 @@
this.gvMx1sqNum.FieldName = "sqNum";
this.gvMx1sqNum.MinWidth = 50;
this.gvMx1sqNum.Name = "gvMx1sqNum";
- this.gvMx1sqNum.Tag = "query_a.SQ_NUM";
+ this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
this.gvMx1sqNum.Visible = true;
this.gvMx1sqNum.VisibleIndex = 6;
this.gvMx1sqNum.Width = 94;
@@ -303,7 +306,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 348);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 344);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
@@ -314,7 +317,7 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 348);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 344);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -341,7 +344,6 @@
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// rkmxGuid
@@ -365,10 +367,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions6.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, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", 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);
@@ -377,39 +379,40 @@
//
this.lb_isOut.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isOut.Appearance.Options.UseFont = true;
- this.lb_isOut.Location = new System.Drawing.Point(326, 92);
+ this.lb_isOut.Location = new System.Drawing.Point(324, 87);
this.lb_isOut.Name = "lb_isOut";
- this.lb_isOut.Size = new System.Drawing.Size(73, 21);
+ this.lb_isOut.Size = new System.Drawing.Size(68, 21);
this.lb_isOut.TabIndex = 258;
- this.lb_isOut.Text = "濮斿鏍囪瘑 ";
+ this.lb_isOut.Text = "濮斿鏍囪瘑";
//
// gv_isOut
//
this.gv_isOut.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_isOut.AppearanceCell.Options.UseFont = true;
- this.gv_isOut.Caption = "濮斿鏍囪瘑 ";
+ this.gv_isOut.Caption = "濮斿鏍囪瘑";
this.gv_isOut.FieldName = "isOut";
+ this.gv_isOut.MaxWidth = 50;
this.gv_isOut.MinWidth = 50;
this.gv_isOut.Name = "gv_isOut";
this.gv_isOut.OptionsColumn.AllowEdit = false;
this.gv_isOut.Tag = "query_a.IS_OUT";
this.gv_isOut.Visible = true;
- this.gv_isOut.VisibleIndex = 2;
- this.gv_isOut.Width = 94;
+ this.gv_isOut.VisibleIndex = 3;
+ this.gv_isOut.Width = 50;
//
// lb_remark
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(60, 129);
+ this.lb_remark.Location = new System.Drawing.Point(358, 121);
this.lb_remark.Name = "lb_remark";
- this.lb_remark.Size = new System.Drawing.Size(39, 21);
+ this.lb_remark.Size = new System.Drawing.Size(34, 21);
this.lb_remark.TabIndex = 252;
- this.lb_remark.Text = "澶囨敞 ";
+ this.lb_remark.Text = "澶囨敞";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(107, 125);
+ this.txt_remark.Location = new System.Drawing.Point(398, 117);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
@@ -434,31 +437,31 @@
//
this.lb_suppId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_suppId.Appearance.Options.UseFont = true;
- this.lb_suppId.Location = new System.Drawing.Point(14, 92);
+ this.lb_suppId.Location = new System.Drawing.Point(31, 121);
this.lb_suppId.Name = "lb_suppId";
- this.lb_suppId.Size = new System.Drawing.Size(85, 21);
+ this.lb_suppId.Size = new System.Drawing.Size(68, 21);
this.lb_suppId.TabIndex = 247;
- this.lb_suppId.Text = "閫夋嫨渚涘簲鍟�";
+ this.lb_suppId.Text = "閫変緵搴斿晢";
//
// gv_suppId
//
this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_suppId.AppearanceCell.Options.UseFont = true;
- this.gv_suppId.Caption = "渚涘簲鍟唅d ";
- this.gv_suppId.FieldName = "suppId";
+ this.gv_suppId.Caption = "渚涘簲鍟�";
+ this.gv_suppId.FieldName = "supName";
this.gv_suppId.MinWidth = 50;
this.gv_suppId.Name = "gv_suppId";
this.gv_suppId.OptionsColumn.AllowEdit = false;
this.gv_suppId.Tag = "query_a.SUPP_ID";
this.gv_suppId.Visible = true;
- this.gv_suppId.VisibleIndex = 11;
+ this.gv_suppId.VisibleIndex = 12;
this.gv_suppId.Width = 94;
//
// lb_depotId
//
this.lb_depotId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_depotId.Appearance.Options.UseFont = true;
- this.lb_depotId.Location = new System.Drawing.Point(31, 55);
+ this.lb_depotId.Location = new System.Drawing.Point(31, 87);
this.lb_depotId.Name = "lb_depotId";
this.lb_depotId.Size = new System.Drawing.Size(68, 21);
this.lb_depotId.TabIndex = 243;
@@ -468,25 +471,25 @@
//
this.gv_depotId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_depotId.AppearanceCell.Options.UseFont = true;
- this.gv_depotId.Caption = "浠撳簱id ";
- this.gv_depotId.FieldName = "depotId";
+ this.gv_depotId.Caption = "浠撳簱";
+ this.gv_depotId.FieldName = "dptName";
this.gv_depotId.MinWidth = 50;
this.gv_depotId.Name = "gv_depotId";
this.gv_depotId.OptionsColumn.AllowEdit = false;
this.gv_depotId.Tag = "query_a.DEPOT_ID";
this.gv_depotId.Visible = true;
- this.gv_depotId.VisibleIndex = 10;
+ this.gv_depotId.VisibleIndex = 11;
this.gv_depotId.Width = 94;
//
// lb_returnType
//
this.lb_returnType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_returnType.Appearance.Options.UseFont = true;
- this.lb_returnType.Location = new System.Drawing.Point(316, 55);
+ this.lb_returnType.Location = new System.Drawing.Point(324, 54);
this.lb_returnType.Name = "lb_returnType";
- this.lb_returnType.Size = new System.Drawing.Size(73, 21);
+ this.lb_returnType.Size = new System.Drawing.Size(68, 21);
this.lb_returnType.TabIndex = 240;
- this.lb_returnType.Text = "閫�鏂欑被鍨� ";
+ this.lb_returnType.Text = "閫�鏂欏師鍥�";
//
// gv_returnType
//
@@ -506,11 +509,11 @@
//
this.lb_returnMethod.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_returnMethod.Appearance.Options.UseFont = true;
- this.lb_returnMethod.Location = new System.Drawing.Point(316, 20);
+ this.lb_returnMethod.Location = new System.Drawing.Point(324, 20);
this.lb_returnMethod.Name = "lb_returnMethod";
- this.lb_returnMethod.Size = new System.Drawing.Size(73, 21);
+ this.lb_returnMethod.Size = new System.Drawing.Size(68, 21);
this.lb_returnMethod.TabIndex = 235;
- this.lb_returnMethod.Text = "閫�鏂欐柟寮� ";
+ this.lb_returnMethod.Text = "閫�鏂欐柟寮�";
//
// gv_returnMethod
//
@@ -530,7 +533,7 @@
//
this.lb_isFinish.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isFinish.Appearance.Options.UseFont = true;
- this.lb_isFinish.Location = new System.Drawing.Point(446, 92);
+ this.lb_isFinish.Location = new System.Drawing.Point(455, 87);
this.lb_isFinish.Name = "lb_isFinish";
this.lb_isFinish.Size = new System.Drawing.Size(73, 21);
this.lb_isFinish.TabIndex = 231;
@@ -540,59 +543,61 @@
//
this.gv_isFinish.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_isFinish.AppearanceCell.Options.UseFont = true;
- this.gv_isFinish.Caption = "鏄惁瀹屾垚 ";
+ this.gv_isFinish.Caption = "鏄惁瀹屾垚";
this.gv_isFinish.FieldName = "isFinish";
+ this.gv_isFinish.MaxWidth = 50;
this.gv_isFinish.MinWidth = 50;
this.gv_isFinish.Name = "gv_isFinish";
this.gv_isFinish.OptionsColumn.AllowEdit = false;
this.gv_isFinish.Tag = "query_a.IS_FINISH";
this.gv_isFinish.Visible = true;
- this.gv_isFinish.VisibleIndex = 1;
- this.gv_isFinish.Width = 94;
+ this.gv_isFinish.VisibleIndex = 2;
+ this.gv_isFinish.Width = 50;
//
// lb_status
//
this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_status.Appearance.Options.UseFont = true;
- this.lb_status.Location = new System.Drawing.Point(590, 92);
+ this.lb_status.Location = new System.Drawing.Point(593, 87);
this.lb_status.Name = "lb_status";
- this.lb_status.Size = new System.Drawing.Size(73, 21);
+ this.lb_status.Size = new System.Drawing.Size(68, 21);
this.lb_status.TabIndex = 228;
- this.lb_status.Text = "瀹℃牳鐘舵�� ";
+ this.lb_status.Text = "瀹℃牳鐘舵��";
//
// gv_status
//
this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_status.AppearanceCell.Options.UseFont = true;
- this.gv_status.Caption = "瀹℃牳鐘舵�� ";
+ this.gv_status.Caption = "瀹℃牳鐘舵��";
this.gv_status.FieldName = "status";
+ this.gv_status.MaxWidth = 50;
this.gv_status.MinWidth = 50;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.STATUS";
this.gv_status.Visible = true;
- this.gv_status.VisibleIndex = 0;
- this.gv_status.Width = 94;
+ this.gv_status.VisibleIndex = 1;
+ this.gv_status.Width = 50;
//
// lb_checkDate
//
this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_checkDate.Appearance.Options.UseFont = true;
- this.lb_checkDate.Location = new System.Drawing.Point(590, 55);
+ this.lb_checkDate.Location = new System.Drawing.Point(593, 54);
this.lb_checkDate.Name = "lb_checkDate";
- this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
+ this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
this.lb_checkDate.TabIndex = 226;
- this.lb_checkDate.Text = "瀹℃牳鏃堕棿 ";
+ this.lb_checkDate.Text = "瀹℃牳鏃堕棿";
//
// txt_checkDate
//
- this.txt_checkDate.Enabled = false;
- this.txt_checkDate.Location = new System.Drawing.Point(667, 51);
+ this.txt_checkDate.Location = new System.Drawing.Point(667, 50);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(171, 28);
this.txt_checkDate.TabIndex = 226;
+ this.txt_checkDate.Tag = "readonly";
//
// gv_checkDate
//
@@ -612,21 +617,21 @@
//
this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_checkUser.Appearance.Options.UseFont = true;
- this.lb_checkUser.Location = new System.Drawing.Point(607, 20);
+ this.lb_checkUser.Location = new System.Drawing.Point(610, 20);
this.lb_checkUser.Name = "lb_checkUser";
- this.lb_checkUser.Size = new System.Drawing.Size(56, 21);
+ this.lb_checkUser.Size = new System.Drawing.Size(51, 21);
this.lb_checkUser.TabIndex = 222;
- this.lb_checkUser.Text = "瀹℃牳浜� ";
+ this.lb_checkUser.Text = "瀹℃牳浜�";
//
// txt_checkUser
//
- this.txt_checkUser.Enabled = false;
this.txt_checkUser.Location = new System.Drawing.Point(667, 16);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(150, 28);
+ this.txt_checkUser.Size = new System.Drawing.Size(171, 28);
this.txt_checkUser.TabIndex = 222;
+ this.txt_checkUser.Tag = "readonly";
//
// gv_checkUser
//
@@ -682,26 +687,26 @@
//
// txt_billNo
//
- this.txt_billNo.Enabled = false;
this.txt_billNo.Location = new System.Drawing.Point(107, 16);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(193, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(211, 28);
this.txt_billNo.TabIndex = 211;
+ this.txt_billNo.Tag = "readonly";
//
// gv_billNo
//
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.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.VisibleIndex = 4;
this.gv_billNo.Width = 94;
//
// toolBarMenu1
@@ -733,9 +738,13 @@
//
// gridView1
//
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn1,
this.gv_status,
this.gv_isFinish,
this.gv_isOut,
@@ -800,10 +809,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 190);
+ this.tabMx.Location = new System.Drawing.Point(0, 194);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 380);
+ this.tabMx.Size = new System.Drawing.Size(1126, 376);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -811,6 +820,8 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.labelControl1);
+ this.panel1.Controls.Add(this.txt_org);
this.panel1.Controls.Add(this.btnSelect);
this.panel1.Controls.Add(this.txt_isFinish);
this.panel1.Controls.Add(this.txt_status);
@@ -840,8 +851,26 @@
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(1126, 190);
+ this.panel1.Size = new System.Drawing.Size(1126, 194);
this.panel1.TabIndex = 1;
+ //
+ // labelControl1
+ //
+ this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl1.Appearance.Options.UseFont = true;
+ this.labelControl1.Location = new System.Drawing.Point(31, 54);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(68, 21);
+ this.labelControl1.TabIndex = 527;
+ this.labelControl1.Text = "閫夋嫨缁勭粐";
+ //
+ // txt_org
+ //
+ this.txt_org.IsReadly = false;
+ this.txt_org.Location = new System.Drawing.Point(107, 50);
+ this.txt_org.Name = "txt_org";
+ this.txt_org.Size = new System.Drawing.Size(211, 28);
+ this.txt_org.TabIndex = 526;
//
// btnSelect
//
@@ -850,21 +879,21 @@
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(128, 29);
this.btnSelect.TabIndex = 525;
- this.btnSelect.Text = "鍘婚�夋嫨鏉ユ枡鏄庣粏";
+ this.btnSelect.Text = "閫夋嫨閫�璐ф槑缁�";
//
// txt_isFinish
//
this.txt_isFinish.Enabled = false;
- this.txt_isFinish.Location = new System.Drawing.Point(525, 90);
+ this.txt_isFinish.Location = new System.Drawing.Point(530, 85);
this.txt_isFinish.Name = "txt_isFinish";
this.txt_isFinish.Properties.Caption = "";
- this.txt_isFinish.Size = new System.Drawing.Size(31, 24);
+ this.txt_isFinish.Size = new System.Drawing.Size(18, 24);
this.txt_isFinish.TabIndex = 524;
//
// txt_status
//
this.txt_status.Enabled = false;
- this.txt_status.Location = new System.Drawing.Point(667, 90);
+ this.txt_status.Location = new System.Drawing.Point(667, 85);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "";
this.txt_status.Size = new System.Drawing.Size(28, 24);
@@ -872,7 +901,7 @@
//
// txt_isOut
//
- this.txt_isOut.Location = new System.Drawing.Point(405, 90);
+ this.txt_isOut.Location = new System.Drawing.Point(398, 85);
this.txt_isOut.Name = "txt_isOut";
this.txt_isOut.Properties.Caption = "";
this.txt_isOut.Size = new System.Drawing.Size(31, 24);
@@ -880,7 +909,7 @@
//
// txt_returnType
//
- this.txt_returnType.Location = new System.Drawing.Point(398, 53);
+ this.txt_returnType.Location = new System.Drawing.Point(398, 52);
this.txt_returnType.Name = "txt_returnType";
this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -908,19 +937,19 @@
// txt_depotId
//
this.txt_depotId.IsReadly = false;
- this.txt_depotId.Location = new System.Drawing.Point(107, 51);
+ this.txt_depotId.Location = new System.Drawing.Point(107, 83);
this.txt_depotId.Margin = new System.Windows.Forms.Padding(0);
this.txt_depotId.Name = "txt_depotId";
- this.txt_depotId.Size = new System.Drawing.Size(193, 28);
+ this.txt_depotId.Size = new System.Drawing.Size(211, 28);
this.txt_depotId.TabIndex = 260;
//
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(107, 88);
+ this.txt_suppId.Location = new System.Drawing.Point(107, 117);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(193, 28);
+ this.txt_suppId.Size = new System.Drawing.Size(211, 28);
this.txt_suppId.TabIndex = 259;
//
// labelControl11
@@ -953,6 +982,17 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "閫�璐х粍缁�";
+ this.gridColumn1.FieldName = "receivingOrg";
+ this.gridColumn1.MinWidth = 250;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Tag = "org.fnamber";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.Width = 250;
+ //
// Frm_MesCgthSq
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -962,6 +1002,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesCgthSq";
+ this.Text = "閲囪喘閫�璐х敵璇�";
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
@@ -1069,5 +1110,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn rkmxGuid;
+ private UserControl.UcLookOrg txt_org;
+ private DevExpress.XtraEditors.LabelControl labelControl1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index edd4f5b..3056435 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -43,6 +43,14 @@
pageBar1.PagerEvent += PageBar1_PagerEvent;
txt_depotId.getSuppler("");
txt_suppId.getSuppler("");
+ txt_org.EditChanged += (s, e) =>
+ {
+ var orgId = txt_org.GetId();
+ if (string.IsNullOrEmpty(orgId))
+ return;
+ txt_suppId.getSuppler(orgId);
+ txt_depotId.getSuppler(orgId);
+ };
//閫夋嫨闇�瑕佺殑鏄庣粏
btnSelect.Click += (s, e) =>
{
@@ -83,6 +91,8 @@
frm.ShowDialog();
};
}
+
+
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
@@ -150,7 +160,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
/// <summary>
@@ -225,16 +235,23 @@
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "blNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ {
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ }
}
/// <summary>
/// 鏂板浜嬩欢
@@ -260,6 +277,13 @@
toolBarMenu1.isSetBtn = false;
var _ckId = txt_depotId.GetId(); //浠撳簱缂栧彿 depots_code
var _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
+ string _orgId = txt_org.GetId();
+ if (string.IsNullOrEmpty(_orgId))
+ {
+ MsgHelper.Warning("璇烽�夋嫨缁勭粐锛�");
+ txt_org.Focus();
+ return;
+ }
if (string.IsNullOrEmpty(_gysId))
{
MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
@@ -280,7 +304,7 @@
}
if (string.IsNullOrEmpty(txt_returnType.Text.Trim()))
{
- MsgHelper.Warning("璇烽�夋嫨閫�鏂欑被鍨嬶紒");
+ MsgHelper.Warning("璇烽�夋嫨閫�鏂欏師鍥狅紒");
txt_returnType.Focus();
return;
}
@@ -292,7 +316,7 @@
DepotId = int.Parse(_ckId),//浠撳簱
FType = txt_isOut.Checked == true ? 1 : 0, //0=閲囪喘锛�1=濮斿
Fmrmode = txt_returnMethod.Text,//閫�鏂欐柟寮�
- Reason = txt_returnType.Text,//閫�鏂欑被鍨�
+ Reason = txt_returnType.Text,//閫�鏂欏師鍥�
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 73c1753..5ad17e4 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 editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01Check));
- 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();
+ 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();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -209,7 +209,7 @@
//
this.tabMxPage1.Controls.Add(this.splitContainerControl1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1340, 472);
+ this.tabMxPage1.Size = new System.Drawing.Size(1340, 478);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitContainerControl1
@@ -228,7 +228,7 @@
//
this.splitContainerControl1.Panel2.Controls.Add(this.groupControl1);
this.splitContainerControl1.Panel2.Text = "Panel2";
- this.splitContainerControl1.Size = new System.Drawing.Size(1340, 472);
+ this.splitContainerControl1.Size = new System.Drawing.Size(1340, 478);
this.splitContainerControl1.SplitterPosition = 160;
this.splitContainerControl1.TabIndex = 3;
//
@@ -501,7 +501,7 @@
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(1340, 300);
+ this.groupControl1.Size = new System.Drawing.Size(1340, 306);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "鎶芥牱缁撴灉";
//
@@ -511,7 +511,7 @@
this.gcMx2.Location = new System.Drawing.Point(2, 28);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1336, 270);
+ this.gcMx2.Size = new System.Drawing.Size(1336, 276);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -565,7 +565,7 @@
//
this.lb_remarks.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remarks.Appearance.Options.UseFont = true;
- this.lb_remarks.Location = new System.Drawing.Point(627, 121);
+ this.lb_remarks.Location = new System.Drawing.Point(627, 111);
this.lb_remarks.Name = "lb_remarks";
this.lb_remarks.Size = new System.Drawing.Size(73, 21);
this.lb_remarks.TabIndex = 786;
@@ -573,19 +573,19 @@
//
// txt_fngDesc
//
- this.txt_fngDesc.Enabled = false;
- this.txt_fngDesc.Location = new System.Drawing.Point(706, 117);
+ this.txt_fngDesc.Location = new System.Drawing.Point(706, 111);
this.txt_fngDesc.Name = "txt_fngDesc";
this.txt_fngDesc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fngDesc.Properties.Appearance.Options.UseFont = true;
- this.txt_fngDesc.Size = new System.Drawing.Size(150, 28);
+ this.txt_fngDesc.Size = new System.Drawing.Size(165, 28);
this.txt_fngDesc.TabIndex = 786;
+ this.txt_fngDesc.Tag = "readonly";
//
// lb_lifnr
//
this.lb_lifnr.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lifnr.Appearance.Options.UseFont = true;
- this.lb_lifnr.Location = new System.Drawing.Point(394, 114);
+ this.lb_lifnr.Location = new System.Drawing.Point(394, 111);
this.lb_lifnr.Name = "lb_lifnr";
this.lb_lifnr.Size = new System.Drawing.Size(56, 21);
this.lb_lifnr.TabIndex = 642;
@@ -613,13 +613,13 @@
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Enabled = false;
this.txt_fcheckResu.Location = new System.Drawing.Point(706, 77);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckResu.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckResu.Size = new System.Drawing.Size(150, 28);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(165, 28);
this.txt_fcheckResu.TabIndex = 235;
+ this.txt_fcheckResu.Tag = "readonly";
//
// lb_fbatchQty
//
@@ -633,13 +633,14 @@
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Enabled = false;
+ this.txt_fbatchQty.EnterMoveNextControl = true;
this.txt_fbatchQty.Location = new System.Drawing.Point(452, 10);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
this.txt_fbatchQty.Size = new System.Drawing.Size(150, 28);
this.txt_fbatchQty.TabIndex = 222;
+ this.txt_fbatchQty.Tag = "readonly";
//
// lb_fcheckBy
//
@@ -653,13 +654,13 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Enabled = false;
this.txt_fcheckBy.Location = new System.Drawing.Point(706, 10);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckBy.Size = new System.Drawing.Size(150, 28);
+ this.txt_fcheckBy.Size = new System.Drawing.Size(165, 28);
this.txt_fcheckBy.TabIndex = 217;
+ this.txt_fcheckBy.Tag = "readonly";
//
// lb_fcheckDate
//
@@ -673,13 +674,13 @@
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Enabled = false;
this.txt_fcheckDate.Location = new System.Drawing.Point(706, 44);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(165, 28);
this.txt_fcheckDate.TabIndex = 216;
+ this.txt_fcheckDate.Tag = "readonly";
//
// lb_releaseNo
//
@@ -693,13 +694,14 @@
//
// txt_releaseNo
//
- this.txt_releaseNo.Enabled = false;
+ this.txt_releaseNo.EnterMoveNextControl = true;
this.txt_releaseNo.Location = new System.Drawing.Point(94, 10);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
this.txt_releaseNo.Size = new System.Drawing.Size(266, 28);
this.txt_releaseNo.TabIndex = 213;
+ this.txt_releaseNo.Tag = "readonly";
//
// toolBarMenu1
//
@@ -1159,10 +1161,10 @@
// xtraTabControl2
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl2.Location = new System.Drawing.Point(0, 184);
+ this.xtraTabControl2.Location = new System.Drawing.Point(0, 178);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1342, 504);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1342, 510);
this.xtraTabControl2.TabIndex = 2;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1282,10 +1284,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image")));
+ editorButtonImageOptions4.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", 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);
@@ -1303,10 +1305,10 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
+ editorButtonImageOptions5.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, 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, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", 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);
@@ -1324,10 +1326,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", 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);
@@ -1382,7 +1384,7 @@
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(1342, 184);
+ this.panel1.Size = new System.Drawing.Size(1342, 178);
this.panel1.TabIndex = 1;
//
// txt_qualityAudit
@@ -1435,35 +1437,38 @@
//
// txt_fcovertQty
//
- this.txt_fcovertQty.Enabled = false;
+ this.txt_fcovertQty.EnterMoveNextControl = true;
this.txt_fcovertQty.Location = new System.Drawing.Point(452, 77);
this.txt_fcovertQty.Name = "txt_fcovertQty";
this.txt_fcovertQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcovertQty.Properties.Appearance.Options.UseFont = true;
this.txt_fcovertQty.Size = new System.Drawing.Size(150, 28);
this.txt_fcovertQty.TabIndex = 804;
+ this.txt_fcovertQty.Tag = "readonly";
//
// txt_suppName
//
- this.txt_suppName.Enabled = false;
- this.txt_suppName.Location = new System.Drawing.Point(452, 117);
+ this.txt_suppName.EnterMoveNextControl = true;
+ this.txt_suppName.Location = new System.Drawing.Point(452, 111);
this.txt_suppName.Name = "txt_suppName";
this.txt_suppName.Size = new System.Drawing.Size(150, 24);
this.txt_suppName.TabIndex = 802;
+ this.txt_suppName.Tag = "readonly";
//
// txt_itemName
//
- this.txt_itemName.Enabled = false;
+ this.txt_itemName.EnterMoveNextControl = true;
this.txt_itemName.Location = new System.Drawing.Point(94, 44);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(266, 28);
this.txt_itemName.TabIndex = 801;
+ this.txt_itemName.Tag = "readonly";
//
// txt_fmrmode
//
- this.txt_fmrmode.Location = new System.Drawing.Point(958, 119);
+ this.txt_fmrmode.Location = new System.Drawing.Point(958, 111);
this.txt_fmrmode.Name = "txt_fmrmode";
this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1477,7 +1482,7 @@
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(876, 121);
+ this.labelControl2.Location = new System.Drawing.Point(876, 111);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(68, 21);
this.labelControl2.TabIndex = 794;
@@ -1497,20 +1502,20 @@
//
// txt_itemModel
//
- this.txt_itemModel.Enabled = false;
- this.txt_itemModel.Location = new System.Drawing.Point(94, 114);
+ this.txt_itemModel.EnterMoveNextControl = true;
+ this.txt_itemModel.Location = new System.Drawing.Point(94, 111);
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, 62);
this.txt_itemModel.TabIndex = 792;
- this.txt_itemModel.Tag = "itemName";
+ this.txt_itemModel.Tag = "readonly";
//
// lb_itemModel
//
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(20, 114);
+ this.lb_itemModel.Location = new System.Drawing.Point(20, 111);
this.lb_itemModel.Name = "lb_itemModel";
this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
this.lb_itemModel.TabIndex = 790;
@@ -1528,13 +1533,14 @@
//
// txt_itemNo
//
- this.txt_itemNo.Enabled = false;
+ this.txt_itemNo.EnterMoveNextControl = true;
this.txt_itemNo.Location = new System.Drawing.Point(94, 77);
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.TabIndex = 789;
+ this.txt_itemNo.Tag = "readonly";
//
// labelControl1
//
@@ -1548,7 +1554,7 @@
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(405, 152);
+ this.labelControl11.Location = new System.Drawing.Point(405, 149);
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);
@@ -1559,7 +1565,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(456, 152);
+ this.lbGuid.Location = new System.Drawing.Point(456, 149);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -1577,13 +1583,14 @@
//
// txt_lotNo
//
- this.txt_lotNo.Enabled = false;
+ this.txt_lotNo.EnterMoveNextControl = true;
this.txt_lotNo.Location = new System.Drawing.Point(452, 44);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
+ this.txt_lotNo.Tag = "readonly";
//
// picCheckBox
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
index 4e430f1..fd7814d 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="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="editorButtonImageOptions4.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/Rk/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
index 762dfd0..47f1ca3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -65,7 +65,6 @@
this.gv_lastupdateBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_userNoBack = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_taskNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkRes = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -91,8 +90,9 @@
this.gv_bgr = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_cbillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_insDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_fcheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -128,16 +128,19 @@
this.panel1 = new System.Windows.Forms.Panel();
this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
- this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
@@ -170,7 +173,7 @@
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
@@ -503,10 +506,12 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
this.gridBand1,
+ this.gridBand16,
this.gridBand2,
this.gridBand3,
this.gridBand5,
this.gridBand4,
+ this.gridBand15,
this.gridBand6,
this.gridBand7,
this.gridBand8,
@@ -556,7 +561,8 @@
this.gv_suppId,
this.bandedGridColumn1,
this.gv_suppNo,
- this.gv_depotsId});
+ this.gv_depotsId,
+ this.bandedGridColumn2});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -576,7 +582,7 @@
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.FSTATUS";
this.gv_fstatus.Visible = true;
- this.gv_fstatus.Width = 94;
+ this.gv_fstatus.Width = 50;
//
// gv_guid
//
@@ -637,18 +643,6 @@
this.gv_userNoBack.OptionsColumn.AllowEdit = false;
this.gv_userNoBack.Tag = "query_a.USER_NO_BACK";
this.gv_userNoBack.Width = 94;
- //
- // 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.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 50;
- this.gv_checkUser.Name = "gv_checkUser";
- this.gv_checkUser.OptionsColumn.AllowEdit = false;
- this.gv_checkUser.Tag = "query_a.CHECK_USER";
- this.gv_checkUser.Width = 94;
//
// gv_taskNo
//
@@ -952,6 +946,19 @@
this.gv_cbillNo.Visible = true;
this.gv_cbillNo.Width = 180;
//
+ // 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.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 50;
+ 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 = 80;
+ //
// gv_createDate
//
this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -965,18 +972,18 @@
this.gv_createDate.Visible = true;
this.gv_createDate.Width = 180;
//
- // gv_createBy
+ // gv_checkUser
//
- 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 = 50;
- 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 = 80;
+ 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.FieldName = "checkUser";
+ this.gv_checkUser.MinWidth = 60;
+ this.gv_checkUser.Name = "gv_checkUser";
+ this.gv_checkUser.OptionsColumn.AllowEdit = false;
+ this.gv_checkUser.Tag = "query_a.CHECK_USER";
+ this.gv_checkUser.Visible = true;
+ this.gv_checkUser.Width = 60;
//
// gv_checkDate
//
@@ -1037,7 +1044,7 @@
this.gv_depotsId.OptionsColumn.AllowEdit = false;
this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
this.gv_depotsId.Visible = true;
- this.gv_depotsId.Width = 134;
+ this.gv_depotsId.Width = 100;
//
// gv_depotsCode
//
@@ -1381,7 +1388,7 @@
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.txt_dptName);
this.panel1.Controls.Add(this.txt_suppName);
- this.panel1.Controls.Add(this.txt_status);
+ this.panel1.Controls.Add(this.txt_fstatus);
this.panel1.Controls.Add(this.txt_checkDate);
this.panel1.Controls.Add(this.labelControl1);
this.panel1.Controls.Add(this.lbGuid);
@@ -1427,13 +1434,13 @@
this.txt_suppName.TabIndex = 592;
this.txt_suppName.Tag = "readonly";
//
- // txt_status
+ // txt_fstatus
//
- this.txt_status.Location = new System.Drawing.Point(891, 21);
- this.txt_status.Name = "txt_status";
- this.txt_status.Properties.Caption = "";
- this.txt_status.Size = new System.Drawing.Size(48, 24);
- this.txt_status.TabIndex = 591;
+ this.txt_fstatus.Location = new System.Drawing.Point(891, 21);
+ this.txt_fstatus.Name = "txt_fstatus";
+ this.txt_fstatus.Properties.Caption = "";
+ this.txt_fstatus.Size = new System.Drawing.Size(48, 24);
+ this.txt_fstatus.TabIndex = 591;
//
// txt_checkDate
//
@@ -1474,6 +1481,16 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // bandedGridColumn2
+ //
+ this.bandedGridColumn2.Caption = "鏀舵枡缁勭粐";
+ this.bandedGridColumn2.FieldName = "receivingOrg";
+ this.bandedGridColumn2.MinWidth = 250;
+ this.bandedGridColumn2.Name = "bandedGridColumn2";
+ this.bandedGridColumn2.Tag = "org.fnamber";
+ this.bandedGridColumn2.Visible = true;
+ this.bandedGridColumn2.Width = 250;
+ //
// gridBand1
//
this.gridBand1.AppearanceHeader.Options.UseTextOptions = true;
@@ -1485,7 +1502,6 @@
this.gridBand1.Columns.Add(this.gv_lastupdateBy);
this.gridBand1.Columns.Add(this.gv_lastupdateDate);
this.gridBand1.Columns.Add(this.gv_userNoBack);
- this.gridBand1.Columns.Add(this.gv_checkUser);
this.gridBand1.Columns.Add(this.gv_taskNo);
this.gridBand1.Columns.Add(this.gv_checkRes);
this.gridBand1.Columns.Add(this.gv_checkQty);
@@ -1512,7 +1528,15 @@
this.gridBand1.MinWidth = 50;
this.gridBand1.Name = "gridBand1";
this.gridBand1.VisibleIndex = 0;
- this.gridBand1.Width = 94;
+ this.gridBand1.Width = 50;
+ //
+ // gridBand16
+ //
+ this.gridBand16.Caption = "鏀舵枡缁勭粐";
+ this.gridBand16.Columns.Add(this.bandedGridColumn2);
+ this.gridBand16.Name = "gridBand16";
+ this.gridBand16.VisibleIndex = 1;
+ this.gridBand16.Width = 250;
//
// gridBand2
//
@@ -1520,7 +1544,7 @@
this.gridBand2.Columns.Add(this.gv_billNo);
this.gridBand2.MinWidth = 180;
this.gridBand2.Name = "gridBand2";
- this.gridBand2.VisibleIndex = 1;
+ this.gridBand2.VisibleIndex = 2;
this.gridBand2.Width = 180;
//
// gridBand3
@@ -1529,7 +1553,7 @@
this.gridBand3.Columns.Add(this.gv_cbillNo);
this.gridBand3.MinWidth = 180;
this.gridBand3.Name = "gridBand3";
- this.gridBand3.VisibleIndex = 2;
+ this.gridBand3.VisibleIndex = 3;
this.gridBand3.Width = 180;
//
// gridBand5
@@ -1538,7 +1562,7 @@
this.gridBand5.Columns.Add(this.gv_createBy);
this.gridBand5.MinWidth = 80;
this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 3;
+ this.gridBand5.VisibleIndex = 4;
this.gridBand5.Width = 80;
//
// gridBand4
@@ -1547,8 +1571,16 @@
this.gridBand4.Columns.Add(this.gv_createDate);
this.gridBand4.MinWidth = 180;
this.gridBand4.Name = "gridBand4";
- this.gridBand4.VisibleIndex = 4;
+ this.gridBand4.VisibleIndex = 5;
this.gridBand4.Width = 180;
+ //
+ // gridBand15
+ //
+ this.gridBand15.Caption = "瀹℃牳浜�";
+ this.gridBand15.Columns.Add(this.gv_checkUser);
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.VisibleIndex = 6;
+ this.gridBand15.Width = 60;
//
// gridBand6
//
@@ -1558,7 +1590,7 @@
this.gridBand6.Columns.Add(this.gv_fcheckDate);
this.gridBand6.MinWidth = 180;
this.gridBand6.Name = "gridBand6";
- this.gridBand6.VisibleIndex = 5;
+ this.gridBand6.VisibleIndex = 7;
this.gridBand6.Width = 180;
//
// gridBand7
@@ -1570,8 +1602,8 @@
this.gridBand10,
this.gridBand9});
this.gridBand7.Name = "gridBand7";
- this.gridBand7.VisibleIndex = 6;
- this.gridBand7.Width = 234;
+ this.gridBand7.VisibleIndex = 8;
+ this.gridBand7.Width = 200;
//
// gridBand10
//
@@ -1590,7 +1622,7 @@
this.gridBand9.MinWidth = 80;
this.gridBand9.Name = "gridBand9";
this.gridBand9.VisibleIndex = 1;
- this.gridBand9.Width = 134;
+ this.gridBand9.Width = 100;
//
// gridBand8
//
@@ -1601,7 +1633,7 @@
this.gridBand11,
this.gridBand12});
this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 7;
+ this.gridBand8.VisibleIndex = 9;
this.gridBand8.Width = 250;
//
// gridBand11
@@ -1628,7 +1660,7 @@
this.gridBand13.Columns.Add(this.gv_paperBillNo);
this.gridBand13.MinWidth = 120;
this.gridBand13.Name = "gridBand13";
- this.gridBand13.VisibleIndex = 8;
+ this.gridBand13.VisibleIndex = 10;
this.gridBand13.Width = 120;
//
// gridBand14
@@ -1637,7 +1669,7 @@
this.gridBand14.Columns.Add(this.gv_remark);
this.gridBand14.MinWidth = 120;
this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 9;
+ this.gridBand14.VisibleIndex = 11;
this.gridBand14.Width = 120;
//
// Frm_MesInvItemIns
@@ -1674,7 +1706,7 @@
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1771,7 +1803,7 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_suppId;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.LabelControl labelControl1;
- private DevExpress.XtraEditors.CheckEdit txt_status;
+ private DevExpress.XtraEditors.CheckEdit txt_fstatus;
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
private DevExpress.XtraEditors.TextEdit txt_suppName;
@@ -1793,11 +1825,14 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotCode;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnK3id;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand16;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
index 99f6c78..3c64a72 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -22,6 +22,7 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
@@ -77,7 +78,19 @@
_filterList = e.FilterList;
getPageList(1);
}
-
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -262,7 +275,7 @@
{
var strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 0cb3b02..ba25866 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -339,6 +339,7 @@
dataTable.Rows.Add("DBSQ(璋冩嫧鐢宠鍗�)");//V
dataTable.Rows.Add("GDPC(宸ュ崟鎺掍骇)");//V
dataTable.Rows.Add("WWPC(濮斿鎺掍骇)");//V
+ dataTable.Rows.Add("CKSQ(鍑哄簱鐢宠)");//V
dataTable.Rows.Add("TL(閫�鏂欏崟)");
dataTable.Rows.Add("IN(鍏ュ簱鍗�)");
dataTable.Rows.Add("SC(鐢熶骇宸ュ崟)");
diff --git a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
index 91ce2be..d681a41 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
@@ -129,7 +129,7 @@
this.gv_billNo.OptionsColumn.ReadOnly = true;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 2;
+ this.gv_billNo.VisibleIndex = 1;
this.gv_billNo.Width = 110;
//
// gridColumn1
@@ -140,7 +140,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 5;
+ this.gridColumn1.VisibleIndex = 2;
this.gridColumn1.Width = 94;
//
// gv_supplierItemCode
@@ -155,7 +155,7 @@
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
- this.gv_supplierItemCode.VisibleIndex = 6;
+ this.gv_supplierItemCode.VisibleIndex = 3;
this.gv_supplierItemCode.Width = 100;
//
// gv_supplierItemName
@@ -170,7 +170,7 @@
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
- this.gv_supplierItemName.VisibleIndex = 7;
+ this.gv_supplierItemName.VisibleIndex = 5;
this.gv_supplierItemName.Width = 120;
//
// gridColumn5
@@ -181,7 +181,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 8;
+ this.gridColumn5.VisibleIndex = 7;
this.gridColumn5.Width = 250;
//
// gridColumn6
@@ -192,7 +192,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 6;
+ this.gridColumn6.VisibleIndex = 4;
this.gridColumn6.Width = 100;
//
// gridColumn7
@@ -203,7 +203,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 7;
+ this.gridColumn7.VisibleIndex = 6;
this.gridColumn7.Width = 100;
//
// gridColumn9
@@ -239,7 +239,7 @@
this.gridColumn10.MinWidth = 125;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 16;
+ this.gridColumn10.VisibleIndex = 10;
this.gridColumn10.Width = 125;
//
// gridColumn2
@@ -249,7 +249,7 @@
this.gridColumn2.MinWidth = 250;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 17;
+ this.gridColumn2.VisibleIndex = 11;
this.gridColumn2.Width = 250;
//
// xtraTabControl1
@@ -269,7 +269,7 @@
this.xtraTabPage1.Controls.Add(this.panelControl1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 650);
- this.xtraTabPage1.Text = "璇烽�夋嫨閲囬渶瑕佸叆搴撶殑鏁版嵁";
+ this.xtraTabPage1.Text = "璇烽�夋嫨閲囬渶瑕侀��璐х殑鏄庣粏";
//
// panelControl1
//
@@ -314,7 +314,7 @@
this.MinimizeBox = false;
this.Name = "SelectMesCgthSq";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏";
+ this.Text = "閫夋嫨閫�璐ф槑缁�";
this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
--
Gitblit v1.9.3