From 8dfc8d054b5b14e3fcde6415dd22cedf10c09915 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 05 十一月 2024 14:13:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs |  428 +++++++++++++++++++++++------------------------------
 1 files changed, 187 insertions(+), 241 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index 19b7d0c..f54c796 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -1,7 +1,7 @@
 /* Create By GS EasyCode */
 namespace Gs.DevApp.DevFrm
 {
-    partial class Frm_MesInvItemArn 
+    partial class Frm_MesInvItemArn
     {
         /// <summary>
         /// Required designer variable.
@@ -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 editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1cgRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -50,7 +50,6 @@
             this.gvMx1checkRes = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1workNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1subQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -64,17 +63,15 @@
             this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_thstatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_fType = new DevExpress.XtraEditors.LabelControl();
-            this.txt_fType = new DevExpress.XtraEditors.TextEdit();
             this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_urgentFlag = new DevExpress.XtraEditors.LabelControl();
-            this.txt_urgentFlag = new DevExpress.XtraEditors.TextEdit();
             this.gv_urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_insby = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_ischeck = new DevExpress.XtraEditors.LabelControl();
             this.gv_ischeck = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_sapstatus = new DevExpress.XtraEditors.LabelControl();
             this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -88,8 +85,6 @@
             this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_status = new DevExpress.XtraEditors.LabelControl();
-            this.txt_status = new DevExpress.XtraEditors.TextEdit();
             this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -102,9 +97,10 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
             this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             this.txt_ischeck = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_sapstatus = new DevExpress.XtraEditors.CheckEdit();
             this.txt_depotsCode = new Gs.DevApp.UserControl.UcLookCk();
             this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
             this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
@@ -118,10 +114,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -132,8 +125,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_sapstatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
             this.SuspendLayout();
             // 
@@ -141,7 +135,7 @@
             // 
             this.gvMx1states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1states.AppearanceCell.Options.UseFont = true;
-            this.gvMx1states.Caption = "鎺ㄩ�佺姸鎬� ";
+            this.gvMx1states.Caption = "鎺ㄩ�佺姸鎬�";
             this.gvMx1states.FieldName = "states";
             this.gvMx1states.MinWidth = 100;
             this.gvMx1states.Name = "gvMx1states";
@@ -155,7 +149,7 @@
             // 
             this.gvMx1returnFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1returnFlag.AppearanceCell.Options.UseFont = true;
-            this.gvMx1returnFlag.Caption = "閫�璐ф爣璇� ";
+            this.gvMx1returnFlag.Caption = "閫�璐ф爣璇�";
             this.gvMx1returnFlag.FieldName = "returnFlag";
             this.gvMx1returnFlag.MinWidth = 100;
             this.gvMx1returnFlag.Name = "gvMx1returnFlag";
@@ -169,7 +163,7 @@
             // 
             this.gvMx1cgRkqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cgRkqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1cgRkqty.Caption = "閲囪喘鍏ュ簱鏁伴噺 ";
+            this.gvMx1cgRkqty.Caption = "閲囪喘鍏ュ簱鏁伴噺";
             this.gvMx1cgRkqty.FieldName = "cgRkqty";
             this.gvMx1cgRkqty.MinWidth = 100;
             this.gvMx1cgRkqty.Name = "gvMx1cgRkqty";
@@ -183,21 +177,21 @@
             // 
             this.gvMx1okRkqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲� ";
+            this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�";
             this.gvMx1okRkqty.FieldName = "okRkqty";
             this.gvMx1okRkqty.MinWidth = 100;
             this.gvMx1okRkqty.Name = "gvMx1okRkqty";
             this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
             this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
             this.gvMx1okRkqty.Visible = true;
-            this.gvMx1okRkqty.VisibleIndex = 9;
+            this.gvMx1okRkqty.VisibleIndex = 10;
             this.gvMx1okRkqty.Width = 100;
             // 
             // gvMx1dha001
             // 
             this.gvMx1dha001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dha001.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dha001.Caption = "鍒拌揣鍗曞彿 ";
+            this.gvMx1dha001.Caption = "鍒拌揣鍗曞彿";
             this.gvMx1dha001.FieldName = "dha001";
             this.gvMx1dha001.MinWidth = 100;
             this.gvMx1dha001.Name = "gvMx1dha001";
@@ -211,7 +205,7 @@
             // 
             this.gvMx1isdepsIn.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1isdepsIn.AppearanceCell.Options.UseFont = true;
-            this.gvMx1isdepsIn.Caption = "鏄惁鍏ュ簱 ";
+            this.gvMx1isdepsIn.Caption = "鏄惁鍏ュ簱";
             this.gvMx1isdepsIn.FieldName = "isdepsIn";
             this.gvMx1isdepsIn.MinWidth = 100;
             this.gvMx1isdepsIn.Name = "gvMx1isdepsIn";
@@ -225,7 +219,7 @@
             // 
             this.gvMx1fType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1fType.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fType.Caption = "0銆侀噰璐崟锛�1銆佸澶栧崟 ";
+            this.gvMx1fType.Caption = "0銆侀噰璐崟锛�1銆佸澶栧崟";
             this.gvMx1fType.FieldName = "fType";
             this.gvMx1fType.MinWidth = 100;
             this.gvMx1fType.Name = "gvMx1fType";
@@ -239,7 +233,7 @@
             // 
             this.gvMx1workLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1workLine.AppearanceCell.Options.UseFont = true;
-            this.gvMx1workLine.Caption = "浠诲姟鍗曡鍙� ";
+            this.gvMx1workLine.Caption = "浠诲姟鍗曡鍙�";
             this.gvMx1workLine.FieldName = "workLine";
             this.gvMx1workLine.MinWidth = 100;
             this.gvMx1workLine.Name = "gvMx1workLine";
@@ -253,35 +247,35 @@
             // 
             this.gvMx1boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
-            this.gvMx1boardStyle.Caption = "浜у搧鍨嬪彿 ";
+            this.gvMx1boardStyle.Caption = "浜у搧鍨嬪彿";
             this.gvMx1boardStyle.FieldName = "boardStyle";
             this.gvMx1boardStyle.MinWidth = 100;
             this.gvMx1boardStyle.Name = "gvMx1boardStyle";
             this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
             this.gvMx1boardStyle.Tag = "query_a.board_style";
             this.gvMx1boardStyle.Visible = true;
-            this.gvMx1boardStyle.VisibleIndex = 4;
+            this.gvMx1boardStyle.VisibleIndex = 5;
             this.gvMx1boardStyle.Width = 100;
             // 
             // gvMx1okQty
             // 
             this.gvMx1okQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1okQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1okQty.Caption = "宸叉敹鏁伴噺 ";
+            this.gvMx1okQty.Caption = "宸叉敹鏁伴噺";
             this.gvMx1okQty.FieldName = "okQty";
             this.gvMx1okQty.MinWidth = 100;
             this.gvMx1okQty.Name = "gvMx1okQty";
             this.gvMx1okQty.OptionsColumn.ReadOnly = true;
             this.gvMx1okQty.Tag = "query_a.ok_qty";
             this.gvMx1okQty.Visible = true;
-            this.gvMx1okQty.VisibleIndex = 8;
+            this.gvMx1okQty.VisibleIndex = 9;
             this.gvMx1okQty.Width = 100;
             // 
             // gvMx1ischeck
             // 
             this.gvMx1ischeck.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1ischeck.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ischeck.Caption = "鏄惁妫�楠� ";
+            this.gvMx1ischeck.Caption = "鏄惁妫�楠�";
             this.gvMx1ischeck.FieldName = "ischeck";
             this.gvMx1ischeck.MinWidth = 100;
             this.gvMx1ischeck.Name = "gvMx1ischeck";
@@ -295,7 +289,7 @@
             // 
             this.gvMx1checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1checkDate.AppearanceCell.Options.UseFont = true;
-            this.gvMx1checkDate.Caption = "妫�楠屾棩鏈� ";
+            this.gvMx1checkDate.Caption = "妫�楠屾棩鏈�";
             this.gvMx1checkDate.FieldName = "checkDate";
             this.gvMx1checkDate.MinWidth = 100;
             this.gvMx1checkDate.Name = "gvMx1checkDate";
@@ -323,7 +317,7 @@
             // 
             this.gvMx1checkRes.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1checkRes.AppearanceCell.Options.UseFont = true;
-            this.gvMx1checkRes.Caption = "妫�楠岀粨鏋� ";
+            this.gvMx1checkRes.Caption = "妫�楠岀粨鏋�";
             this.gvMx1checkRes.FieldName = "checkRes";
             this.gvMx1checkRes.MinWidth = 100;
             this.gvMx1checkRes.Name = "gvMx1checkRes";
@@ -337,7 +331,7 @@
             // 
             this.gvMx1memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1memo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1memo.Caption = "澶囨敞 ";
+            this.gvMx1memo.Caption = "澶囨敞";
             this.gvMx1memo.FieldName = "memo";
             this.gvMx1memo.MinWidth = 100;
             this.gvMx1memo.Name = "gvMx1memo";
@@ -350,7 +344,7 @@
             // 
             this.gvMx1urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
-            this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑 ";
+            this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
             this.gvMx1urgentFlag.FieldName = "urgentFlag";
             this.gvMx1urgentFlag.MinWidth = 100;
             this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
@@ -358,32 +352,18 @@
             this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
             this.gvMx1urgentFlag.Width = 100;
             // 
-            // gvMx1workNo
-            // 
-            this.gvMx1workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1workNo.Caption = "浠诲姟鍗曞彿 ";
-            this.gvMx1workNo.FieldName = "workNo";
-            this.gvMx1workNo.MinWidth = 100;
-            this.gvMx1workNo.Name = "gvMx1workNo";
-            this.gvMx1workNo.OptionsColumn.ReadOnly = true;
-            this.gvMx1workNo.Tag = "query_a.work_no";
-            this.gvMx1workNo.Visible = true;
-            this.gvMx1workNo.VisibleIndex = 10;
-            this.gvMx1workNo.Width = 100;
-            // 
             // gvMx1subQty
             // 
             this.gvMx1subQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1subQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1subQty.Caption = "鏈搴旀敹鏁伴噺 ";
+            this.gvMx1subQty.Caption = "鏈搴旀敹鏁伴噺";
             this.gvMx1subQty.FieldName = "subQty";
             this.gvMx1subQty.MinWidth = 100;
             this.gvMx1subQty.Name = "gvMx1subQty";
             this.gvMx1subQty.OptionsColumn.ReadOnly = true;
             this.gvMx1subQty.Tag = "query_a.sub_qty";
             this.gvMx1subQty.Visible = true;
-            this.gvMx1subQty.VisibleIndex = 7;
+            this.gvMx1subQty.VisibleIndex = 8;
             this.gvMx1subQty.Width = 100;
             // 
             // gvMx1quantity
@@ -394,49 +374,49 @@
             this.gvMx1quantity.AppearanceCell.Options.UseForeColor = true;
             this.gvMx1quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1quantity.Caption = "鏀惰揣鏁伴噺 ";
+            this.gvMx1quantity.Caption = "鏀惰揣鏁伴噺";
             this.gvMx1quantity.FieldName = "quantity";
             this.gvMx1quantity.MinWidth = 100;
             this.gvMx1quantity.Name = "gvMx1quantity";
             this.gvMx1quantity.Tag = "query_a.quantity";
             this.gvMx1quantity.Visible = true;
-            this.gvMx1quantity.VisibleIndex = 6;
+            this.gvMx1quantity.VisibleIndex = 7;
             this.gvMx1quantity.Width = 100;
             // 
             // gvMx1itemNo
             // 
             this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜 ";
+            this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜";
             this.gvMx1itemNo.FieldName = "itemNo";
             this.gvMx1itemNo.MinWidth = 100;
             this.gvMx1itemNo.Name = "gvMx1itemNo";
             this.gvMx1itemNo.OptionsColumn.ReadOnly = true;
             this.gvMx1itemNo.Tag = "query_a.item_no";
             this.gvMx1itemNo.Visible = true;
-            this.gvMx1itemNo.VisibleIndex = 3;
+            this.gvMx1itemNo.VisibleIndex = 4;
             this.gvMx1itemNo.Width = 100;
             // 
             // gvMx1ebelnQty
             // 
             this.gvMx1ebelnQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ebelnQty.Caption = "閲囪喘璁㈠崟鏁伴噺 ";
+            this.gvMx1ebelnQty.Caption = "閲囪喘璁㈠崟鏁伴噺";
             this.gvMx1ebelnQty.FieldName = "ebelnQty";
             this.gvMx1ebelnQty.MinWidth = 100;
             this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
             this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
             this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
             this.gvMx1ebelnQty.Visible = true;
-            this.gvMx1ebelnQty.VisibleIndex = 5;
+            this.gvMx1ebelnQty.VisibleIndex = 6;
             this.gvMx1ebelnQty.Width = 100;
             // 
             // gvMx1ebelnLine
             // 
             this.gvMx1ebelnLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ebelnLine.Caption = "閲囪喘璁㈠崟琛屽彿 ";
-            this.gvMx1ebelnLine.FieldName = "ebelnLine";
+            this.gvMx1ebelnLine.Caption = "ERP琛孖D";
+            this.gvMx1ebelnLine.FieldName = "ebelnK3id";
             this.gvMx1ebelnLine.MinWidth = 100;
             this.gvMx1ebelnLine.Name = "gvMx1ebelnLine";
             this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
@@ -449,7 +429,7 @@
             // 
             this.gvMx1ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ebeln.Caption = "閲囪喘鍗曞彿 ";
+            this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿";
             this.gvMx1ebeln.FieldName = "ebeln";
             this.gvMx1ebeln.MinWidth = 120;
             this.gvMx1ebeln.Name = "gvMx1ebeln";
@@ -499,6 +479,10 @@
             this.gvMxDel,
             this.gvMx1ebeln,
             this.gvMx1ebelnLine,
+            this.gridColumn3,
+            this.gvMx1returnFlag,
+            this.gvMx1urgentFlag,
+            this.gvMx1isdepsIn,
             this.gvMx1itemNo,
             this.gvMx1boardStyle,
             this.gvMx1ebelnQty,
@@ -506,8 +490,6 @@
             this.gvMx1subQty,
             this.gvMx1okQty,
             this.gvMx1okRkqty,
-            this.gvMx1workNo,
-            this.gvMx1urgentFlag,
             this.gvMx1memo,
             this.gvMx1ischeck,
             this.gvMx1checkRes,
@@ -515,16 +497,13 @@
             this.gvMx1checkDate,
             this.gvMx1workLine,
             this.gvMx1fType,
-            this.gvMx1isdepsIn,
             this.gvMx1dha001,
             this.gvMx1cgRkqty,
-            this.gvMx1returnFlag,
             this.gvMx1states});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
-            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
             // 
             // gvAbtGuid
@@ -549,13 +528,23 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, 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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "閲囪喘鏃堕棿";
+            this.gridColumn3.MinWidth = 100;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.OptionsColumn.ReadOnly = true;
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 3;
+            this.gridColumn3.Width = 100;
             // 
             // gv_thstatus
             // 
@@ -569,26 +558,17 @@
             this.gv_thstatus.Tag = "query_a.thstatus";
             this.gv_thstatus.Visible = true;
             this.gv_thstatus.VisibleIndex = 16;
-            this.gv_thstatus.Width = 79;
+            this.gv_thstatus.Width = 106;
             // 
             // lb_fType
             // 
             this.lb_fType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fType.Appearance.Options.UseFont = true;
-            this.lb_fType.Location = new System.Drawing.Point(588, 55);
+            this.lb_fType.Location = new System.Drawing.Point(606, 55);
             this.lb_fType.Name = "lb_fType";
-            this.lb_fType.Size = new System.Drawing.Size(86, 21);
+            this.lb_fType.Size = new System.Drawing.Size(68, 21);
             this.lb_fType.TabIndex = 378;
-            this.lb_fType.Text = "0閲囪喘1濮斿";
-            // 
-            // txt_fType
-            // 
-            this.txt_fType.Location = new System.Drawing.Point(685, 51);
-            this.txt_fType.Name = "txt_fType";
-            this.txt_fType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_fType.Properties.Appearance.Options.UseFont = true;
-            this.txt_fType.Size = new System.Drawing.Size(150, 28);
-            this.txt_fType.TabIndex = 378;
+            this.lb_fType.Text = "濮斿鏍囧織";
             // 
             // gv_fType
             // 
@@ -596,12 +576,13 @@
             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";
             this.gv_fType.OptionsColumn.AllowEdit = false;
             this.gv_fType.Tag = "query_a.f_type";
+            this.gv_fType.UnboundDataType = typeof(bool);
             this.gv_fType.Visible = true;
             this.gv_fType.VisibleIndex = 0;
             this.gv_fType.Width = 50;
@@ -616,20 +597,11 @@
             this.lb_urgentFlag.TabIndex = 343;
             this.lb_urgentFlag.Text = "鎬ユ枡鏍囪瘑";
             // 
-            // txt_urgentFlag
-            // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(685, 14);
-            this.txt_urgentFlag.Name = "txt_urgentFlag";
-            this.txt_urgentFlag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_urgentFlag.Properties.Appearance.Options.UseFont = true;
-            this.txt_urgentFlag.Size = new System.Drawing.Size(150, 28);
-            this.txt_urgentFlag.TabIndex = 343;
-            // 
             // gv_urgentFlag
             // 
             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";
@@ -637,13 +609,13 @@
             this.gv_urgentFlag.Tag = "query_a.urgent_flag";
             this.gv_urgentFlag.Visible = true;
             this.gv_urgentFlag.VisibleIndex = 1;
-            this.gv_urgentFlag.Width = 70;
+            this.gv_urgentFlag.Width = 50;
             // 
             // gv_insby
             // 
             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";
@@ -651,23 +623,23 @@
             this.gv_insby.Tag = "query_a.insby";
             this.gv_insby.Visible = true;
             this.gv_insby.VisibleIndex = 15;
-            this.gv_insby.Width = 70;
+            this.gv_insby.Width = 71;
             // 
             // lb_ischeck
             // 
             this.lb_ischeck.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_ischeck.Appearance.Options.UseFont = true;
-            this.lb_ischeck.Location = new System.Drawing.Point(888, 18);
+            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";
@@ -675,17 +647,7 @@
             this.gv_ischeck.Tag = "query_a.ischeck";
             this.gv_ischeck.Visible = true;
             this.gv_ischeck.VisibleIndex = 14;
-            this.gv_ischeck.Width = 70;
-            // 
-            // lb_sapstatus
-            // 
-            this.lb_sapstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_sapstatus.Appearance.Options.UseFont = true;
-            this.lb_sapstatus.Location = new System.Drawing.Point(842, 55);
-            this.lb_sapstatus.Name = "lb_sapstatus";
-            this.lb_sapstatus.Size = new System.Drawing.Size(114, 21);
-            this.lb_sapstatus.TabIndex = 312;
-            this.lb_sapstatus.Text = "鏄惁宸插洖鍐橲AP";
+            this.gv_ischeck.Width = 71;
             // 
             // gv_fstatus
             // 
@@ -699,13 +661,13 @@
             this.gv_fstatus.Tag = "query_a.fstatus";
             this.gv_fstatus.Visible = true;
             this.gv_fstatus.VisibleIndex = 2;
-            this.gv_fstatus.Width = 70;
+            this.gv_fstatus.Width = 50;
             // 
             // gv_suppNo
             // 
             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";
@@ -713,7 +675,7 @@
             this.gv_suppNo.Tag = "query_a.supp_no";
             this.gv_suppNo.Visible = true;
             this.gv_suppNo.VisibleIndex = 9;
-            this.gv_suppNo.Width = 70;
+            this.gv_suppNo.Width = 71;
             // 
             // gv_depotsCode
             // 
@@ -727,13 +689,13 @@
             this.gv_depotsCode.Tag = "query_a.depots_code";
             this.gv_depotsCode.Visible = true;
             this.gv_depotsCode.VisibleIndex = 8;
-            this.gv_depotsCode.Width = 70;
+            this.gv_depotsCode.Width = 71;
             // 
             // gv_checkQty
             // 
             this.gv_checkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_checkQty.AppearanceCell.Options.UseFont = true;
-            this.gv_checkQty.Caption = "宸叉崱鏁伴噺 ";
+            this.gv_checkQty.Caption = "宸叉崱鏁伴噺";
             this.gv_checkQty.FieldName = "checkQty";
             this.gv_checkQty.MinWidth = 50;
             this.gv_checkQty.Name = "gv_checkQty";
@@ -741,13 +703,13 @@
             this.gv_checkQty.Tag = "query_a.check_qty";
             this.gv_checkQty.Visible = true;
             this.gv_checkQty.VisibleIndex = 13;
-            this.gv_checkQty.Width = 70;
+            this.gv_checkQty.Width = 71;
             // 
             // gv_checkRes
             // 
             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";
@@ -755,27 +717,27 @@
             this.gv_checkRes.Tag = "query_a.check_res";
             this.gv_checkRes.Visible = true;
             this.gv_checkRes.VisibleIndex = 12;
-            this.gv_checkRes.Width = 70;
+            this.gv_checkRes.Width = 71;
             // 
             // gv_checkDate
             // 
             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 = 70;
+            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";
@@ -783,7 +745,7 @@
             this.gv_checkUser.Tag = "query_a.check_user";
             this.gv_checkUser.Visible = true;
             this.gv_checkUser.VisibleIndex = 6;
-            this.gv_checkUser.Width = 70;
+            this.gv_checkUser.Width = 71;
             // 
             // lb_paperBillNo
             // 
@@ -808,7 +770,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";
@@ -816,13 +778,13 @@
             this.gv_paperBillNo.Tag = "query_a.paper_bill_no";
             this.gv_paperBillNo.Visible = true;
             this.gv_paperBillNo.VisibleIndex = 11;
-            this.gv_paperBillNo.Width = 70;
+            this.gv_paperBillNo.Width = 71;
             // 
             // gv_remark
             // 
             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";
@@ -830,27 +792,27 @@
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
             this.gv_remark.VisibleIndex = 10;
-            this.gv_remark.Width = 70;
+            this.gv_remark.Width = 71;
             // 
             // gv_createDate
             // 
             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 = 70;
+            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";
@@ -858,26 +820,7 @@
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
             this.gv_createBy.VisibleIndex = 4;
-            this.gv_createBy.Width = 70;
-            // 
-            // 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(375, 93);
-            this.lb_status.Name = "lb_status";
-            this.lb_status.Size = new System.Drawing.Size(34, 21);
-            this.lb_status.TabIndex = 216;
-            this.lb_status.Text = "鐘舵��";
-            // 
-            // txt_status
-            // 
-            this.txt_status.Location = new System.Drawing.Point(421, 89);
-            this.txt_status.Name = "txt_status";
-            this.txt_status.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_status.Properties.Appearance.Options.UseFont = true;
-            this.txt_status.Size = new System.Drawing.Size(150, 28);
-            this.txt_status.TabIndex = 216;
+            this.gv_createBy.Width = 71;
             // 
             // lb_billNo
             // 
@@ -891,6 +834,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);
@@ -902,29 +846,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 = 130;
             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 = 70;
+            this.gv_billNo.Width = 130;
             // 
             // toolBarMenu1
             // 
-            this.toolBarMenu1.chkParameter = "MES_INV_ITEM_ARN,check_date,fstatus,check_user";
+            this.toolBarMenu1.chkParameter = "0,0,0,0,000chk_iqc_arn_submit";
             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
             // 
@@ -942,6 +886,9 @@
             // 
             this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.AppearancePrint.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.AppearancePrint.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.ColumnPanelRowHeight = 34;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_fType,
             this.gv_urgentFlag,
@@ -1024,9 +971,10 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txt_fType);
+            this.panel1.Controls.Add(this.txt_urgentFlag);
             this.panel1.Controls.Add(this.labelControl2);
             this.panel1.Controls.Add(this.txt_ischeck);
-            this.panel1.Controls.Add(this.txt_sapstatus);
             this.panel1.Controls.Add(this.txt_depotsCode);
             this.panel1.Controls.Add(this.labelControl3);
             this.panel1.Controls.Add(this.btnSelect);
@@ -1035,17 +983,12 @@
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_fType);
-            this.panel1.Controls.Add(this.txt_fType);
             this.panel1.Controls.Add(this.lb_urgentFlag);
-            this.panel1.Controls.Add(this.txt_urgentFlag);
             this.panel1.Controls.Add(this.lb_ischeck);
-            this.panel1.Controls.Add(this.lb_sapstatus);
             this.panel1.Controls.Add(this.lb_paperBillNo);
             this.panel1.Controls.Add(this.txt_paperBillNo);
             this.panel1.Controls.Add(this.lb_remark);
             this.panel1.Controls.Add(this.txt_remark);
-            this.panel1.Controls.Add(this.lb_status);
-            this.panel1.Controls.Add(this.txt_status);
             this.panel1.Controls.Add(this.lb_billNo);
             this.panel1.Controls.Add(this.txt_billNo);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
@@ -1054,6 +997,22 @@
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(1231, 155);
             this.panel1.TabIndex = 1;
+            // 
+            // txt_fType
+            // 
+            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);
+            this.txt_fType.TabIndex = 450;
+            // 
+            // txt_urgentFlag
+            // 
+            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);
+            this.txt_urgentFlag.TabIndex = 449;
             // 
             // labelControl2
             // 
@@ -1065,23 +1024,17 @@
             // 
             // txt_ischeck
             // 
-            this.txt_ischeck.Location = new System.Drawing.Point(978, 16);
+            this.txt_ischeck.Enabled = false;
+            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(27, 24);
+            this.txt_ischeck.Size = new System.Drawing.Size(47, 24);
             this.txt_ischeck.TabIndex = 447;
-            // 
-            // txt_sapstatus
-            // 
-            this.txt_sapstatus.Location = new System.Drawing.Point(978, 53);
-            this.txt_sapstatus.Name = "txt_sapstatus";
-            this.txt_sapstatus.Properties.Caption = "";
-            this.txt_sapstatus.Size = new System.Drawing.Size(27, 24);
-            this.txt_sapstatus.TabIndex = 446;
             // 
             // txt_depotsCode
             // 
-            this.txt_depotsCode.Location = new System.Drawing.Point(98, 86);
+            this.txt_depotsCode.KeyFile = "";
+            this.txt_depotsCode.Location = new System.Drawing.Point(98, 84);
             this.txt_depotsCode.Margin = new System.Windows.Forms.Padding(0);
             this.txt_depotsCode.Name = "txt_depotsCode";
             this.txt_depotsCode.Size = new System.Drawing.Size(215, 34);
@@ -1108,6 +1061,7 @@
             // 
             // txt_suppNo
             // 
+            this.txt_suppNo.KeyFile = "";
             this.txt_suppNo.Location = new System.Drawing.Point(98, 50);
             this.txt_suppNo.Margin = new System.Windows.Forms.Padding(0);
             this.txt_suppNo.Name = "txt_suppNo";
@@ -1174,10 +1128,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -1189,14 +1140,15 @@
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_sapstatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
         #endregion
-      private UserControl.UcToolBarMenu toolBarMenu1;
+        private UserControl.UcToolBarMenu toolBarMenu1;
         private DevExpress.XtraGrid.GridControl gcMain;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
@@ -1206,72 +1158,64 @@
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.LabelControl labelControl11;
-  private DevExpress.XtraTab.XtraTabControl tabMx;
- 
-       //BQCreateConrolObejct
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1states;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1cgRkqty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1dha001;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1isdepsIn;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fType;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1workLine;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1okQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ischeck;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkStates;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkRes;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1workNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1subQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnLine;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_thstatus;
+        private DevExpress.XtraTab.XtraTabControl tabMx;
 
-private DevExpress.XtraEditors.LabelControl lb_fType;
-private DevExpress.XtraEditors.TextEdit txt_fType;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
+        //BQCreateConrolObejct
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1states;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnFlag;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1cgRkqty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dha001;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1isdepsIn;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fType;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1workLine;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1okQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ischeck;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkStates;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkRes;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1subQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnLine;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+        private DevExpress.XtraGrid.GridControl gcMx1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_thstatus;
 
-private DevExpress.XtraEditors.LabelControl lb_urgentFlag;
-private DevExpress.XtraEditors.TextEdit txt_urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gv_insby;
+        private DevExpress.XtraEditors.LabelControl lb_fType;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
 
-private DevExpress.XtraEditors.LabelControl lb_ischeck;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ischeck;
+        private DevExpress.XtraEditors.LabelControl lb_urgentFlag;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_insby;
 
-private DevExpress.XtraEditors.LabelControl lb_sapstatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkRes;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
+        private DevExpress.XtraEditors.LabelControl lb_ischeck;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_ischeck;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkRes;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
 
-private DevExpress.XtraEditors.LabelControl lb_paperBillNo;
-private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_paperBillNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+        private DevExpress.XtraEditors.LabelControl lb_paperBillNo;
+        private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_paperBillNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
 
-private DevExpress.XtraEditors.LabelControl lb_status;
-private DevExpress.XtraEditors.TextEdit txt_status;
-
-private DevExpress.XtraEditors.LabelControl lb_billNo;
-private DevExpress.XtraEditors.TextEdit txt_billNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+        private DevExpress.XtraEditors.LabelControl lb_billNo;
+        private DevExpress.XtraEditors.TextEdit txt_billNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
         private DevExpress.XtraEditors.LabelControl labelControl1;
         private UserControl.UcLookSupplier txt_suppNo;
         private DevExpress.XtraEditors.SimpleButton btnSelect;
@@ -1280,10 +1224,12 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
         private DevExpress.XtraEditors.LabelControl lb_remark;
         private DevExpress.XtraEditors.TextEdit txt_remark;
-        private DevExpress.XtraEditors.CheckEdit txt_sapstatus;
         private DevExpress.XtraEditors.CheckEdit txt_ischeck;
         private DevExpress.XtraEditors.LabelControl labelControl2;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraEditors.CheckEdit txt_fType;
+        private DevExpress.XtraEditors.CheckEdit txt_urgentFlag;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3