From cb054ad80cfe66befdba09f544916bed9b67d8a8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 22 三月 2025 16:40:41 +0800
Subject: [PATCH] 1

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs |  115 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 100 insertions(+), 15 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index a9187e1..ead2e7a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -69,6 +69,7 @@
             this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -89,7 +90,9 @@
             this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
             this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -132,8 +135,11 @@
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
@@ -167,7 +173,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -282,7 +290,8 @@
             this.gridColumn4,
             this.gv_suppNo,
             this.gridColumn5,
-            this.gv_remark});
+            this.gv_remark,
+            this.gridColumn11});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -310,7 +319,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.Name = "gv_fType";
             this.gv_fType.OptionsColumn.AllowEdit = false;
@@ -324,7 +333,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.Name = "gv_urgentFlag";
             this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
@@ -338,7 +347,7 @@
             // 
             this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fstatus.AppearanceCell.Options.UseFont = true;
-            this.gv_fstatus.Caption = "鎻愪氦妫�楠�";
+            this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
             this.gv_fstatus.FieldName = "fstatus";
             this.gv_fstatus.Name = "gv_fstatus";
             this.gv_fstatus.OptionsColumn.AllowEdit = false;
@@ -484,6 +493,14 @@
             this.gv_remark.VisibleIndex = 14;
             this.gv_remark.Width = 90;
             // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "涓婚敭GUID";
+            this.gridColumn11.FieldName = "guid";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Width = 94;
+            // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
@@ -541,9 +558,11 @@
             this.layoutMx1.Controls.Add(this.txt_checkUser);
             this.layoutMx1.Controls.Add(this.txt_checkDate);
             this.layoutMx1.Controls.Add(this.txt_paperBillNo);
+            this.layoutMx1.Controls.Add(this.txt_guid);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem18});
+            this.layoutControlItem18,
+            this.layoutControlItem9});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1007, 106, 812, 500);
@@ -569,7 +588,7 @@
             this.btnSelect.Size = new System.Drawing.Size(116, 27);
             this.btnSelect.StyleController = this.layoutMx1;
             this.btnSelect.TabIndex = 443;
-            this.btnSelect.Text = "閫夊緟鍏ヤ粨鐗╂枡 ";
+            this.btnSelect.Text = "閫夋嫨鐗╂枡 ";
             // 
             // txtDepotsCode
             // 
@@ -647,7 +666,7 @@
             // 
             this.txt_fstatus.Location = new System.Drawing.Point(903, 76);
             this.txt_fstatus.Name = "txt_fstatus";
-            this.txt_fstatus.Properties.Caption = "鎻愪氦妫�楠屾爣璇�";
+            this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑";
             this.txt_fstatus.Size = new System.Drawing.Size(295, 24);
             this.txt_fstatus.StyleController = this.layoutMx1;
             this.txt_fstatus.TabIndex = 458;
@@ -661,6 +680,7 @@
             this.txt_fType.Size = new System.Drawing.Size(293, 24);
             this.txt_fType.StyleController = this.layoutMx1;
             this.txt_fType.TabIndex = 459;
+            this.txt_fType.Tag = "readOnly";
             // 
             // txt_createBy
             // 
@@ -706,6 +726,15 @@
             this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 465;
             // 
+            // txt_guid
+            // 
+            this.txt_guid.Location = new System.Drawing.Point(411, 140);
+            this.txt_guid.Name = "txt_guid";
+            this.txt_guid.Size = new System.Drawing.Size(191, 24);
+            this.txt_guid.StyleController = this.layoutMx1;
+            this.txt_guid.TabIndex = 466;
+            this.txt_guid.Tag = "readOnly";
+            // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.lbGuid;
@@ -717,6 +746,17 @@
             this.layoutControlItem18.Text = "lbGuid";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem18.TextVisible = false;
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txt_guid;
+            this.layoutControlItem9.Location = new System.Drawing.Point(297, 128);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem9.Size = new System.Drawing.Size(297, 32);
+            this.layoutControlItem9.Text = "涓婚敭GUID";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
             // 
             // Root
             // 
@@ -992,6 +1032,9 @@
             this.gridColumn9,
             this.gridColumn7,
             this.gvMx1memo,
+            this.gridColumn10,
+            this.gridColumn12,
+            this.gridColumn13,
             this.gvBtnAlawys,
             this.gvMxDel});
             this.gvMx1.GridControl = this.gcMx1;
@@ -1003,7 +1046,7 @@
             // 
             // gvAbtGuid
             // 
-            this.gvAbtGuid.Caption = "abtGuid涓嶈兘鍒犻櫎";
+            this.gvAbtGuid.Caption = "閲囪喘鏄庣粏GUID";
             this.gvAbtGuid.FieldName = "aboutGuid";
             this.gvAbtGuid.MinWidth = 50;
             this.gvAbtGuid.Name = "gvAbtGuid";
@@ -1014,7 +1057,7 @@
             // 
             this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
+            this.gvMx1guid.Caption = "涓婚敭GUID";
             this.gvMx1guid.FieldName = "guid";
             this.gvMx1guid.MinWidth = 70;
             this.gvMx1guid.Name = "gvMx1guid";
@@ -1273,37 +1316,71 @@
             // gvMx1memo
             // 
             this.gvMx1memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1memo.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1memo.AppearanceCell.Options.UseFont = true;
+            this.gvMx1memo.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1memo.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1memo.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1memo.Caption = "澶囨敞";
             this.gvMx1memo.FieldName = "memo";
             this.gvMx1memo.MinWidth = 50;
             this.gvMx1memo.Name = "gvMx1memo";
             this.gvMx1memo.OptionsColumn.ReadOnly = true;
-            this.gvMx1memo.Tag = "query_a.memo";
+            this.gvMx1memo.Tag = "edit";
             this.gvMx1memo.Visible = true;
             this.gvMx1memo.VisibleIndex = 15;
             this.gvMx1memo.Width = 180;
             // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "娆″簭";
+            this.gridColumn10.FieldName = "workLine";
+            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 16;
+            this.gridColumn10.Width = 94;
+            // 
             // gvBtnAlawys
             // 
-            this.gvBtnAlawys.Caption = "鎿嶄綔";
+            this.gvBtnAlawys.Caption = "閫�鏂�";
             this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
             this.gvBtnAlawys.MinWidth = 80;
             this.gvBtnAlawys.Name = "gvBtnAlawys";
             this.gvBtnAlawys.Visible = true;
-            this.gvBtnAlawys.VisibleIndex = 16;
+            this.gvBtnAlawys.VisibleIndex = 19;
             this.gvBtnAlawys.Width = 80;
             // 
             // repositoryItemButtonEdit2
             // 
             this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.reset_16x16;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
             editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�璐�", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�鏂�", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
             this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "閫�l鏂欐椂闂�";
+            this.gridColumn12.FieldName = "returnDate";
+            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 17;
+            this.gridColumn12.Width = 94;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "閫�鏂欎汉";
+            this.gridColumn13.FieldName = "returnBy";
+            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 18;
+            this.gridColumn13.Width = 94;
             // 
             // gvMxDel
             // 
@@ -1312,7 +1389,7 @@
             this.gvMxDel.MinWidth = 80;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 17;
+            this.gvMxDel.VisibleIndex = 20;
             this.gvMxDel.Width = 80;
             // 
             // repositoryItemButtonEdit1
@@ -1377,7 +1454,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1495,5 +1574,11 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
         private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
         private DevExpress.XtraLayout.LayoutControlItem lab_paperBillNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraEditors.TextEdit txt_guid;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3