lu
2024-12-27 6004ecbc69453a135da56d982b6c78d6d5c03d2a
委外工单
已修改9个文件
已删除3个文件
2970 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs 139 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs 149 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemMoves.Designer.cs 1958 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemMoves.cs 438 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemMoves.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -41,11 +41,7 @@
            this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
            this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
            this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -69,11 +65,13 @@
            this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
            this.lbGuid = new System.Windows.Forms.Label();
            this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
            this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -84,6 +82,8 @@
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txtGysNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
@@ -91,7 +91,7 @@
            // 
            this.lb_suppNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_suppNo.Appearance.Options.UseFont = true;
            this.lb_suppNo.Location = new System.Drawing.Point(358, 12);
            this.lb_suppNo.Location = new System.Drawing.Point(27, 88);
            this.lb_suppNo.Name = "lb_suppNo";
            this.lb_suppNo.Size = new System.Drawing.Size(68, 21);
            this.lb_suppNo.TabIndex = 235;
@@ -115,7 +115,7 @@
            // 
            this.lb_itemId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemId.Appearance.Options.UseFont = true;
            this.lb_itemId.Location = new System.Drawing.Point(12, 12);
            this.lb_itemId.Location = new System.Drawing.Point(27, 12);
            this.lb_itemId.Name = "lb_itemId";
            this.lb_itemId.Size = new System.Drawing.Size(68, 21);
            this.lb_itemId.TabIndex = 231;
@@ -139,7 +139,7 @@
            // 
            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(681, 87);
            this.lb_status.Location = new System.Drawing.Point(358, 88);
            this.lb_status.Name = "lb_status";
            this.lb_status.Size = new System.Drawing.Size(68, 21);
            this.lb_status.TabIndex = 228;
@@ -164,7 +164,7 @@
            // 
            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(681, 50);
            this.lb_checkDate.Location = new System.Drawing.Point(358, 50);
            this.lb_checkDate.Name = "lb_checkDate";
            this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
            this.lb_checkDate.TabIndex = 226;
@@ -173,7 +173,7 @@
            // txt_checkDate
            // 
            this.txt_checkDate.Enabled = false;
            this.txt_checkDate.Location = new System.Drawing.Point(754, 46);
            this.txt_checkDate.Location = new System.Drawing.Point(431, 46);
            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;
@@ -198,7 +198,7 @@
            // 
            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(698, 12);
            this.lb_checkUser.Location = new System.Drawing.Point(375, 12);
            this.lb_checkUser.Name = "lb_checkUser";
            this.lb_checkUser.Size = new System.Drawing.Size(51, 21);
            this.lb_checkUser.TabIndex = 222;
@@ -207,7 +207,7 @@
            // txt_checkUser
            // 
            this.txt_checkUser.Enabled = false;
            this.txt_checkUser.Location = new System.Drawing.Point(754, 8);
            this.txt_checkUser.Location = new System.Drawing.Point(431, 8);
            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;
@@ -228,26 +228,6 @@
            this.gv_checkUser.VisibleIndex = 11;
            this.gv_checkUser.Width = 94;
            // 
            // lb_lastupdateDate
            //
            this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdateDate.Appearance.Options.UseFont = true;
            this.lb_lastupdateDate.Location = new System.Drawing.Point(922, 50);
            this.lb_lastupdateDate.Name = "lb_lastupdateDate";
            this.lb_lastupdateDate.Size = new System.Drawing.Size(68, 21);
            this.lb_lastupdateDate.TabIndex = 219;
            this.lb_lastupdateDate.Text = "更新时间";
            //
            // txt_lastupdateDate
            //
            this.txt_lastupdateDate.Enabled = false;
            this.txt_lastupdateDate.Location = new System.Drawing.Point(995, 46);
            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateDate.Size = new System.Drawing.Size(157, 28);
            this.txt_lastupdateDate.TabIndex = 219;
            //
            // gv_lastupdateDate
            // 
            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -261,26 +241,6 @@
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 10;
            this.gv_lastupdateDate.Width = 180;
            //
            // lb_lastupdateBy
            //
            this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdateBy.Appearance.Options.UseFont = true;
            this.lb_lastupdateBy.Location = new System.Drawing.Point(939, 12);
            this.lb_lastupdateBy.Name = "lb_lastupdateBy";
            this.lb_lastupdateBy.Size = new System.Drawing.Size(51, 21);
            this.lb_lastupdateBy.TabIndex = 217;
            this.lb_lastupdateBy.Text = "更新人";
            //
            // txt_lastupdateBy
            //
            this.txt_lastupdateBy.Enabled = false;
            this.txt_lastupdateBy.Location = new System.Drawing.Point(995, 8);
            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateBy.Size = new System.Drawing.Size(157, 28);
            this.txt_lastupdateBy.TabIndex = 217;
            // 
            // gv_lastupdateBy
            // 
@@ -328,7 +288,7 @@
            // 
            this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemNo.Appearance.Options.UseFont = true;
            this.lb_itemNo.Location = new System.Drawing.Point(12, 50);
            this.lb_itemNo.Location = new System.Drawing.Point(27, 50);
            this.lb_itemNo.Name = "lb_itemNo";
            this.lb_itemNo.Size = new System.Drawing.Size(68, 21);
            this.lb_itemNo.TabIndex = 211;
@@ -337,7 +297,7 @@
            // txt_itemNo
            // 
            this.txt_itemNo.Enabled = false;
            this.txt_itemNo.Location = new System.Drawing.Point(90, 46);
            this.txt_itemNo.Location = new System.Drawing.Point(100, 46);
            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;
@@ -510,14 +470,14 @@
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(23, 20);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1163, 196);
            this.panel1.Size = new System.Drawing.Size(897, 213);
            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(341, 50);
            this.labelControl1.Location = new System.Drawing.Point(10, 126);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(85, 21);
            this.labelControl1.TabIndex = 239;
@@ -526,7 +486,7 @@
            // txtGysNo
            // 
            this.txtGysNo.Enabled = false;
            this.txtGysNo.Location = new System.Drawing.Point(429, 46);
            this.txtGysNo.Location = new System.Drawing.Point(100, 122);
            this.txtGysNo.Name = "txtGysNo";
            this.txtGysNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txtGysNo.Properties.Appearance.Options.UseFont = true;
@@ -536,7 +496,7 @@
            // txt_suppId
            // 
            this.txt_suppId.IsReadly = false;
            this.txt_suppId.Location = new System.Drawing.Point(429, 7);
            this.txt_suppId.Location = new System.Drawing.Point(100, 83);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Size = new System.Drawing.Size(239, 30);
@@ -545,7 +505,7 @@
            // txt_itemId
            // 
            this.txt_itemId.IsReadly = false;
            this.txt_itemId.Location = new System.Drawing.Point(90, 6);
            this.txt_itemId.Location = new System.Drawing.Point(100, 6);
            this.txt_itemId.Name = "txt_itemId";
            this.txt_itemId.Size = new System.Drawing.Size(239, 33);
            this.txt_itemId.TabIndex = 237;
@@ -554,7 +514,7 @@
            // txt_status
            // 
            this.txt_status.Enabled = false;
            this.txt_status.Location = new System.Drawing.Point(754, 85);
            this.txt_status.Location = new System.Drawing.Point(431, 86);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "";
            this.txt_status.Size = new System.Drawing.Size(94, 24);
@@ -563,11 +523,51 @@
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(29, 115);
            this.lbGuid.Location = new System.Drawing.Point(29, 110);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            //
            // lb_lastupdateDate
            //
            this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdateDate.Appearance.Options.UseFont = true;
            this.lb_lastupdateDate.Location = new System.Drawing.Point(622, 50);
            this.lb_lastupdateDate.Name = "lb_lastupdateDate";
            this.lb_lastupdateDate.Size = new System.Drawing.Size(68, 21);
            this.lb_lastupdateDate.TabIndex = 219;
            this.lb_lastupdateDate.Text = "更新时间";
            //
            // txt_lastupdateDate
            //
            this.txt_lastupdateDate.Enabled = false;
            this.txt_lastupdateDate.Location = new System.Drawing.Point(695, 46);
            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateDate.Size = new System.Drawing.Size(157, 28);
            this.txt_lastupdateDate.TabIndex = 219;
            //
            // lb_lastupdateBy
            //
            this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdateBy.Appearance.Options.UseFont = true;
            this.lb_lastupdateBy.Location = new System.Drawing.Point(639, 12);
            this.lb_lastupdateBy.Name = "lb_lastupdateBy";
            this.lb_lastupdateBy.Size = new System.Drawing.Size(51, 21);
            this.lb_lastupdateBy.TabIndex = 217;
            this.lb_lastupdateBy.Text = "更新人";
            //
            // txt_lastupdateBy
            //
            this.txt_lastupdateBy.Enabled = false;
            this.txt_lastupdateBy.Location = new System.Drawing.Point(695, 8);
            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateBy.Size = new System.Drawing.Size(157, 28);
            this.txt_lastupdateBy.TabIndex = 217;
            // 
            // picCheckBox
            // 
@@ -589,10 +589,9 @@
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_MesQaMj";
            this.Text = "免检维护";
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -604,6 +603,8 @@
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txtGysNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);
@@ -635,13 +636,7 @@
        private DevExpress.XtraEditors.LabelControl lb_checkUser;
        private DevExpress.XtraEditors.TextEdit txt_checkUser;
        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
        private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
        private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
        private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
        private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
@@ -658,5 +653,9 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraEditors.TextEdit txtGysNo;
        private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
        private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
        private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
        private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -392,5 +392,7 @@
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -29,16 +29,16 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1isdepsIn = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -77,6 +77,8 @@
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
            this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_fType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
@@ -161,14 +163,15 @@
            this.gvMx1returnFlag.AppearanceCell.Options.UseFont = true;
            this.gvMx1returnFlag.Caption = "退货标识";
            this.gvMx1returnFlag.FieldName = "returnFlag";
            this.gvMx1returnFlag.MinWidth = 60;
            this.gvMx1returnFlag.MaxWidth = 50;
            this.gvMx1returnFlag.MinWidth = 50;
            this.gvMx1returnFlag.Name = "gvMx1returnFlag";
            this.gvMx1returnFlag.OptionsColumn.ReadOnly = true;
            this.gvMx1returnFlag.Tag = "query_a.return_flag";
            this.gvMx1returnFlag.UnboundDataType = typeof(bool);
            this.gvMx1returnFlag.Visible = true;
            this.gvMx1returnFlag.VisibleIndex = 1;
            this.gvMx1returnFlag.Width = 100;
            this.gvMx1returnFlag.Width = 50;
            // 
            // gvMx1okRkqty
            // 
@@ -176,13 +179,14 @@
            this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
            this.gvMx1okRkqty.Caption = "已入库数量";
            this.gvMx1okRkqty.FieldName = "okRkqty";
            this.gvMx1okRkqty.MinWidth = 90;
            this.gvMx1okRkqty.MaxWidth = 80;
            this.gvMx1okRkqty.MinWidth = 80;
            this.gvMx1okRkqty.Name = "gvMx1okRkqty";
            this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
            this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
            this.gvMx1okRkqty.Visible = true;
            this.gvMx1okRkqty.VisibleIndex = 10;
            this.gvMx1okRkqty.Width = 100;
            this.gvMx1okRkqty.Width = 80;
            // 
            // gvMx1isdepsIn
            // 
@@ -190,14 +194,15 @@
            this.gvMx1isdepsIn.AppearanceCell.Options.UseFont = true;
            this.gvMx1isdepsIn.Caption = "完结标识";
            this.gvMx1isdepsIn.FieldName = "isdepsIn";
            this.gvMx1isdepsIn.MinWidth = 60;
            this.gvMx1isdepsIn.MaxWidth = 50;
            this.gvMx1isdepsIn.MinWidth = 50;
            this.gvMx1isdepsIn.Name = "gvMx1isdepsIn";
            this.gvMx1isdepsIn.OptionsColumn.ReadOnly = true;
            this.gvMx1isdepsIn.Tag = "query_a.isdeps_in";
            this.gvMx1isdepsIn.UnboundDataType = typeof(bool);
            this.gvMx1isdepsIn.Visible = true;
            this.gvMx1isdepsIn.VisibleIndex = 3;
            this.gvMx1isdepsIn.Width = 100;
            this.gvMx1isdepsIn.Width = 50;
            // 
            // gvMx1boardStyle
            // 
@@ -279,13 +284,14 @@
            this.gvMx1urgentFlag.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1urgentFlag.Caption = "急料标识";
            this.gvMx1urgentFlag.FieldName = "urgentFlag";
            this.gvMx1urgentFlag.MinWidth = 60;
            this.gvMx1urgentFlag.MaxWidth = 50;
            this.gvMx1urgentFlag.MinWidth = 50;
            this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
            this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
            this.gvMx1urgentFlag.Tag = "edit";
            this.gvMx1urgentFlag.UnboundDataType = typeof(bool);
            this.gvMx1urgentFlag.Visible = true;
            this.gvMx1urgentFlag.VisibleIndex = 2;
            this.gvMx1urgentFlag.Width = 100;
            this.gvMx1urgentFlag.Width = 50;
            // 
            // gvMx1subQty
            // 
@@ -293,13 +299,14 @@
            this.gvMx1subQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1subQty.Caption = "本次应收数量";
            this.gvMx1subQty.FieldName = "subQty";
            this.gvMx1subQty.MinWidth = 90;
            this.gvMx1subQty.MaxWidth = 80;
            this.gvMx1subQty.MinWidth = 80;
            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.Width = 100;
            this.gvMx1subQty.Width = 80;
            // 
            // gvMx1quantity
            // 
@@ -311,12 +318,13 @@
            this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1quantity.Caption = "本次实收数量";
            this.gvMx1quantity.FieldName = "quantity";
            this.gvMx1quantity.MinWidth = 90;
            this.gvMx1quantity.MaxWidth = 80;
            this.gvMx1quantity.MinWidth = 80;
            this.gvMx1quantity.Name = "gvMx1quantity";
            this.gvMx1quantity.Tag = "yz_quantity_0";
            this.gvMx1quantity.Tag = "yz_quantity_0_edit";
            this.gvMx1quantity.Visible = true;
            this.gvMx1quantity.VisibleIndex = 8;
            this.gvMx1quantity.Width = 100;
            this.gvMx1quantity.Width = 80;
            // 
            // gvMx1ebelnQty
            // 
@@ -324,13 +332,14 @@
            this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebelnQty.Caption = "采购订单数量";
            this.gvMx1ebelnQty.FieldName = "ebelnQty";
            this.gvMx1ebelnQty.MinWidth = 90;
            this.gvMx1ebelnQty.MaxWidth = 80;
            this.gvMx1ebelnQty.MinWidth = 80;
            this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
            this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
            this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
            this.gvMx1ebelnQty.Visible = true;
            this.gvMx1ebelnQty.VisibleIndex = 9;
            this.gvMx1ebelnQty.Width = 100;
            this.gvMx1ebelnQty.Width = 80;
            // 
            // gvMx1ebelnLine
            // 
@@ -480,23 +489,25 @@
            // 
            this.gridColumn9.Caption = "采购单位";
            this.gridColumn9.FieldName = "cgUnit";
            this.gridColumn9.MaxWidth = 60;
            this.gridColumn9.MinWidth = 60;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 15;
            this.gridColumn9.Width = 94;
            this.gridColumn9.Width = 60;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "库存单位";
            this.gridColumn7.FieldName = "kcUnit";
            this.gridColumn7.MaxWidth = 60;
            this.gridColumn7.MinWidth = 60;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 16;
            this.gridColumn7.Width = 94;
            this.gridColumn7.Width = 60;
            // 
            // gvMxTui
            // 
@@ -506,15 +517,15 @@
            this.gvMxTui.Name = "gvMxTui";
            this.gvMxTui.Visible = true;
            this.gvMxTui.VisibleIndex = 18;
            this.gvMxTui.Width = 94;
            this.gvMxTui.Width = 80;
            // 
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.reset_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.reset_16x16;
            editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
@@ -532,10 +543,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -633,6 +644,7 @@
            this.gridView1.AppearancePrint.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.AppearancePrint.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
            this.gridBand19,
            this.gridBand1,
            this.gridBand2,
            this.gridBand3,
@@ -645,6 +657,7 @@
            this.gridBand18});
            this.gridView1.ColumnPanelRowHeight = 34;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
            this.bandedGridColumn1,
            this.gv_fType,
            this.gv_urgentFlag,
            this.gv_fstatus,
@@ -668,13 +681,33 @@
            this.gridView1.OptionsView.ShowColumnHeaders = false;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridBand19
            //
            this.gridBand19.Caption = "收料组织";
            this.gridBand19.Columns.Add(this.bandedGridColumn1);
            this.gridBand19.Name = "gridBand19";
            this.gridBand19.VisibleIndex = 0;
            this.gridBand19.Width = 250;
            //
            // bandedGridColumn1
            //
            this.bandedGridColumn1.Caption = "收料组织";
            this.bandedGridColumn1.FieldName = "receivingOrg";
            this.bandedGridColumn1.MinWidth = 250;
            this.bandedGridColumn1.Name = "bandedGridColumn1";
            this.bandedGridColumn1.OptionsColumn.AllowEdit = false;
            this.bandedGridColumn1.OptionsColumn.ReadOnly = true;
            this.bandedGridColumn1.Tag = "org.fnamber";
            this.bandedGridColumn1.Visible = true;
            this.bandedGridColumn1.Width = 250;
            //
            // gridBand1
            // 
            this.gridBand1.Caption = "委外";
            this.gridBand1.Columns.Add(this.gv_fType);
            this.gridBand1.MinWidth = 50;
            this.gridBand1.Name = "gridBand1";
            this.gridBand1.VisibleIndex = 0;
            this.gridBand1.VisibleIndex = 1;
            this.gridBand1.Width = 50;
            // 
            // gv_fType
@@ -698,7 +731,7 @@
            this.gridBand2.Columns.Add(this.gv_urgentFlag);
            this.gridBand2.MinWidth = 50;
            this.gridBand2.Name = "gridBand2";
            this.gridBand2.VisibleIndex = 1;
            this.gridBand2.VisibleIndex = 2;
            this.gridBand2.Width = 50;
            // 
            // gv_urgentFlag
@@ -720,7 +753,7 @@
            this.gridBand3.Columns.Add(this.gv_fstatus);
            this.gridBand3.MinWidth = 50;
            this.gridBand3.Name = "gridBand3";
            this.gridBand3.VisibleIndex = 2;
            this.gridBand3.VisibleIndex = 3;
            this.gridBand3.Width = 50;
            // 
            // gv_fstatus
@@ -742,7 +775,7 @@
            this.gridBand4.Columns.Add(this.gridColumn2);
            this.gridBand4.MinWidth = 50;
            this.gridBand4.Name = "gridBand4";
            this.gridBand4.VisibleIndex = 3;
            this.gridBand4.VisibleIndex = 4;
            this.gridBand4.Width = 50;
            // 
            // gridColumn2
@@ -761,7 +794,7 @@
            this.gridBand5.Columns.Add(this.gv_billNo);
            this.gridBand5.MinWidth = 150;
            this.gridBand5.Name = "gridBand5";
            this.gridBand5.VisibleIndex = 4;
            this.gridBand5.VisibleIndex = 5;
            this.gridBand5.Width = 150;
            // 
            // gv_billNo
@@ -785,8 +818,8 @@
            this.gridBand7,
            this.gridBand8});
            this.gridBand6.Name = "gridBand6";
            this.gridBand6.VisibleIndex = 5;
            this.gridBand6.Width = 451;
            this.gridBand6.VisibleIndex = 6;
            this.gridBand6.Width = 265;
            // 
            // gridBand7
            // 
@@ -816,7 +849,7 @@
            this.gridBand8.MinWidth = 180;
            this.gridBand8.Name = "gridBand8";
            this.gridBand8.VisibleIndex = 1;
            this.gridBand8.Width = 366;
            this.gridBand8.Width = 180;
            // 
            // gv_createDate
            // 
@@ -828,7 +861,7 @@
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.Width = 366;
            this.gv_createDate.Width = 180;
            // 
            // gridBand9
            // 
@@ -839,7 +872,7 @@
            this.gridBand10,
            this.gridBand11});
            this.gridBand9.Name = "gridBand9";
            this.gridBand9.VisibleIndex = 6;
            this.gridBand9.VisibleIndex = 7;
            this.gridBand9.Width = 233;
            // 
            // gridBand10
@@ -890,7 +923,7 @@
            this.gridBand12,
            this.gridBand14});
            this.gridBand13.Name = "gridBand13";
            this.gridBand13.VisibleIndex = 7;
            this.gridBand13.VisibleIndex = 8;
            this.gridBand13.Width = 281;
            // 
            // gridBand12
@@ -938,7 +971,7 @@
            this.gridBand16.Columns.Add(this.gv_remark);
            this.gridBand16.MinWidth = 180;
            this.gridBand16.Name = "gridBand16";
            this.gridBand16.VisibleIndex = 8;
            this.gridBand16.VisibleIndex = 9;
            this.gridBand16.Width = 180;
            // 
            // gv_remark
@@ -962,7 +995,7 @@
            this.gridBand15,
            this.gridBand17});
            this.gridBand18.Name = "gridBand18";
            this.gridBand18.VisibleIndex = 9;
            this.gridBand18.VisibleIndex = 10;
            this.gridBand18.Width = 479;
            // 
            // gridBand15
@@ -1356,6 +1389,17 @@
        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_suppNo;
        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn5;
        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_remark;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private UserControl.UcLookOrg txt_receiveOrgId;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.LabelControl labelControl5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxTui;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand19;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
@@ -1374,14 +1418,5 @@
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand18;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand17;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private UserControl.UcLookOrg txt_receiveOrgId;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.LabelControl labelControl5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxTui;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
    }
}
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -51,6 +51,8 @@
            this.txt_receiveOrgId.EditChanged += (s, e) =>
            {
                string _orgId = txt_receiveOrgId.GetId();
                if (string.IsNullOrEmpty(_orgId))
                    return;
                txt_suppId.getSuppler(_orgId);
                txt_depotsId.getSuppler(_orgId);
            };
@@ -72,7 +74,7 @@
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择供应商,才能选择来料明细!");
                    return;
                }
                var frm = new SelectCgMx(this.txt_suppId.GetId());
                var frm = new SelectCgMx(this.txt_suppId.GetId(), txt_receiveOrgId.GetId());
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                {
@@ -81,9 +83,7 @@
                        var lst = new List<string>();
                        lst = ee.StringList;
                        var _obj = lst;
                        var strReturn = UtilityHelper.HttpPost("",
                            _webServiceName + "SelectDialogToView",
                            JsonConvert.SerializeObject(_obj));
                        var strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectFormTo", JsonConvert.SerializeObject(_obj));
                        var dt = UtilityHelper.ReturnToList(strReturn);
                        DataTable _newTable = dt.rtnData;
                        DataTable _oldTable = (DataTable)gcMx1.DataSource;
@@ -113,7 +113,7 @@
            Task.Delay(100);
            getPageList(1);
        }
        /// <summary>
        ///     åˆ†é¡µäº‹ä»¶
        /// </summary>
@@ -200,8 +200,7 @@
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_billNo, gridView1);
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
@@ -271,7 +270,16 @@
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(rowGuid);
            }
            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>
@@ -369,6 +377,8 @@
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
                }
            }
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -334,7 +334,7 @@
        {
            var dataTable = new DataTable();
            dataTable.Columns.Add("docCode", typeof(string));
            dataTable.Rows.Add("CGDH(到货单)");
            dataTable.Rows.Add("CGDH(到货单)");//V
            dataTable.Rows.Add("JY(检验单)");
            dataTable.Rows.Add("TL(退料单)");
            dataTable.Rows.Add("IN(入库单)");
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemMoves.Designer.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemMoves.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemMoves.resx
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -717,6 +717,7 @@
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.currentAction = null;
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -1527,7 +1528,6 @@
            this.xtraTabPage2.Controls.Add(this.tabMx);
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(1363, 570);
            this.xtraTabPage2.Text = "数据详细";
            // 
@@ -1586,6 +1586,7 @@
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_MesRohIn";
            this.Text = "采购订单";
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -32,7 +32,6 @@
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -49,12 +48,13 @@
            this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -78,8 +78,11 @@
            // 
            // 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.gv_chk,
            this.gv_guid,
@@ -111,21 +114,12 @@
            // 
            this.gv_chk.Caption = "选择";
            this.gv_chk.FieldName = "gvChk";
            this.gv_chk.MinWidth = 60;
            this.gv_chk.MaxWidth = 50;
            this.gv_chk.MinWidth = 50;
            this.gv_chk.Name = "gv_chk";
            this.gv_chk.Visible = true;
            this.gv_chk.VisibleIndex = 0;
            this.gv_chk.Width = 94;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "收料组织";
            this.gridColumn2.FieldName = "fSubsidiary";
            this.gridColumn2.MinWidth = 250;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 17;
            this.gridColumn2.Width = 250;
            this.gv_chk.Width = 50;
            // 
            // gv_guid
            // 
@@ -248,45 +242,49 @@
            // 
            this.gridColumn6.Caption = "采购数量";
            this.gridColumn6.FieldName = "purchaseQty";
            this.gridColumn6.MinWidth = 100;
            this.gridColumn6.MaxWidth = 50;
            this.gridColumn6.MinWidth = 50;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 9;
            this.gridColumn6.Width = 100;
            this.gridColumn6.Width = 50;
            // 
            // gridColumn8
            // 
            this.gridColumn8.Caption = "实收数量";
            this.gridColumn8.FieldName = "sssl";
            this.gridColumn8.MinWidth = 100;
            this.gridColumn8.MaxWidth = 50;
            this.gridColumn8.MinWidth = 50;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.OptionsColumn.ReadOnly = true;
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 10;
            this.gridColumn8.Width = 100;
            this.gridColumn8.Width = 50;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "应收数量";
            this.gridColumn7.FieldName = "yssl";
            this.gridColumn7.MinWidth = 100;
            this.gridColumn7.MaxWidth = 50;
            this.gridColumn7.MinWidth = 50;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 11;
            this.gridColumn7.Width = 100;
            this.gridColumn7.Width = 50;
            // 
            // gridColumn9
            // 
            this.gridColumn9.Caption = "已收数量";
            this.gridColumn9.FieldName = "yssl";
            this.gridColumn9.MinWidth = 100;
            this.gridColumn9.MaxWidth = 50;
            this.gridColumn9.MinWidth = 50;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 12;
            this.gridColumn9.Width = 100;
            this.gridColumn9.Width = 50;
            // 
            // gv_purchaseUnit
            // 
@@ -294,14 +292,15 @@
            this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseUnit.Caption = "采购单位";
            this.gv_purchaseUnit.FieldName = "fname";
            this.gv_purchaseUnit.MinWidth = 100;
            this.gv_purchaseUnit.MaxWidth = 50;
            this.gv_purchaseUnit.MinWidth = 50;
            this.gv_purchaseUnit.Name = "gv_purchaseUnit";
            this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
            this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
            this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
            this.gv_purchaseUnit.Visible = true;
            this.gv_purchaseUnit.VisibleIndex = 13;
            this.gv_purchaseUnit.Width = 100;
            this.gv_purchaseUnit.Width = 50;
            // 
            // gv_inventoryUnit
            // 
@@ -309,14 +308,15 @@
            this.gv_inventoryUnit.AppearanceCell.Options.UseFont = true;
            this.gv_inventoryUnit.Caption = "MES库存";
            this.gv_inventoryUnit.FieldName = "meskc";
            this.gv_inventoryUnit.MinWidth = 100;
            this.gv_inventoryUnit.MaxWidth = 50;
            this.gv_inventoryUnit.MinWidth = 50;
            this.gv_inventoryUnit.Name = "gv_inventoryUnit";
            this.gv_inventoryUnit.OptionsColumn.AllowEdit = false;
            this.gv_inventoryUnit.OptionsColumn.ReadOnly = true;
            this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
            this.gv_inventoryUnit.Visible = true;
            this.gv_inventoryUnit.VisibleIndex = 14;
            this.gv_inventoryUnit.Width = 100;
            this.gv_inventoryUnit.Width = 50;
            // 
            // gv_remarks
            // 
@@ -332,6 +332,26 @@
            this.gv_remarks.Visible = true;
            this.gv_remarks.VisibleIndex = 15;
            this.gv_remarks.Width = 100;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "供应商";
            this.gridColumn10.FieldName = "gysName";
            this.gridColumn10.MinWidth = 125;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 16;
            this.gridColumn10.Width = 125;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "收料组织";
            this.gridColumn2.FieldName = "fSubsidiary";
            this.gridColumn2.MinWidth = 250;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 17;
            this.gridColumn2.Width = 250;
            // 
            // xtraTabControl1
            // 
@@ -383,16 +403,6 @@
            this.pageBar1.Size = new System.Drawing.Size(984, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "供应商";
            this.gridColumn10.FieldName = "gysName";
            this.gridColumn10.MinWidth = 125;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 16;
            this.gridColumn10.Width = 125;
            // 
            // SelectCgMx
            // 
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -17,22 +17,22 @@
        private readonly string _webServiceName = "MesInvItemArnManager/";
        private string suppId = "";
        private string receiveOrgId = "";
        /// <summary>
        /// ä¾›åº”商编号
        /// </summary>
        /// <param name="supp_no"></param>
        public SelectCgMx(string _suppId)
        public SelectCgMx(string _suppId,string _receiveOrgId)
        {
            InitializeComponent();
            this.suppId = _suppId;
            this.receiveOrgId = _receiveOrgId;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            getPageList(1, UtilityHelper.GetPageSize());
            gridView1.IndicatorWidth = 50;
            gridView1.CustomDrawRowIndicator += (s, e) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
            };
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            });
            getPageList(1, UtilityHelper.GetPageSize());
            btnIn.Click += (s, e) =>
            {
                var list = new List<string>();
@@ -80,13 +80,14 @@
                sortName = "",
                keyWhere = "",
                inBusType = "CG",
                inSupId = this.suppId
                inSupId = this.suppId,
                inReceiveOrgId=this.receiveOrgId,
            };
            var json = JsonConvert.SerializeObject(_obj);
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                    _webServiceName + "SelectDialog", json);
                    _webServiceName + "SelectForm", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -276,7 +276,7 @@
            //_ckService(1.ToString());
        }
        private async  void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
        private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (string.IsNullOrEmpty(xlsInService))
            {
@@ -416,7 +416,7 @@
        {
            if (btnQueryClick != null) btnQueryClick(this, e);
        }
        private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (MsgHelper.AskQuestion("确定要要取消吗?"))
@@ -483,6 +483,15 @@
            _enabledBtn(lst);
            this.currentAction = "edit";
            if (btnEdtClick != null) btnEdtClick(this, e);
            Form parentForm = this.FindForm();
            if (parentForm != null)
            {
                Control specificControl = parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
                if (specificControl != null)
                {
                    specificControl.Visible = false;
                }
            }
        }
        private void BtnDel_ItemClick(object sender, ItemClickEventArgs e)
@@ -503,6 +512,15 @@
            _enabledBtn(lst);
            this.currentAction = "add";
            if (btnAddClick != null) btnAddClick(this, e);
            Form parentForm = this.FindForm();
            if (parentForm != null)
            {
                Control specificControl = parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
                if (specificControl != null)
                {
                    specificControl.Visible = false;
                }
            }
        }
        private void BtnRole_ItemClick(object sender, ItemClickEventArgs e)
@@ -519,7 +537,7 @@
            if (btnWgClick != null) btnWgClick(this, e);
        }
        private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e)
        {
@@ -738,7 +756,7 @@
            }
            return false;
        }
        #region å…¬å…±äº‹ä»¶
@@ -873,18 +891,18 @@
        /// é€šçŸ¥å¤‡æ–™
        /// </summary>
        public event EventHandler btnTzblClick;
        /// <summary>
        /// çŠ¶æ€
        /// </summary>
        public event EventHandler btnZhongTaiClick;
        /// <summary>
        /// æ‰‹åŠ¨å®Œå·¥
        /// </summary>
        public event EventHandler btnWgClick;
        #endregion
        #region å…¬å…±å±žæ€§