1、采购到货新增合并提交 2、顶部按钮合并按钮启用

kyy

2025-08-06 cf758a0cd625345be2176bd19ac0d94c8fe609d6

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs

@@ -53,6 +53,7 @@
            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.XtraGrid.Columns.GridColumn gv_remainingReceivedQty;
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -149,9 +150,12 @@
            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_sourceDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_demandDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
            gv_remainingReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -997,7 +1001,10 @@
            this.gridColumn18,
            this.gridColumn4,
            this.gridColumn19,
            this.gridColumn20});
            this.gridColumn20,
            gv_remainingReceivedQty,
            this.gv_sourceDocumentId,
            this.gv_demandDocumentId});
            this.gvMx1.DetailHeight = 272;
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
@@ -1058,7 +1065,7 @@
            this.gvMx1returnFlag.UnboundDataType = typeof(bool);
            this.gvMx1returnFlag.Visible = true;
            this.gvMx1returnFlag.VisibleIndex = 0;
            this.gvMx1returnFlag.Width = 23;
            this.gvMx1returnFlag.Width = 22;
            // 
            // gvMx1urgentFlag
            // 
@@ -1100,7 +1107,7 @@
            this.gvMx1checkStates.Tag = "query_a.check_states";
            this.gvMx1checkStates.Visible = true;
            this.gvMx1checkStates.VisibleIndex = 2;
            this.gvMx1checkStates.Width = 42;
            this.gvMx1checkStates.Width = 28;
            // 
            // gvMx1checkRes
            // 
@@ -1113,7 +1120,7 @@
            this.gvMx1checkRes.Tag = "query_a.check_res";
            this.gvMx1checkRes.Visible = true;
            this.gvMx1checkRes.VisibleIndex = 3;
            this.gvMx1checkRes.Width = 42;
            this.gvMx1checkRes.Width = 28;
            // 
            // gvMx1ebeln
            // 
@@ -1136,7 +1143,7 @@
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 5;
            this.gridColumn8.Width = 32;
            this.gridColumn8.Width = 22;
            // 
            // gvMx1boardStyle
            // 
@@ -1149,7 +1156,7 @@
            this.gvMx1boardStyle.Tag = "query_a.board_style";
            this.gvMx1boardStyle.Visible = true;
            this.gvMx1boardStyle.VisibleIndex = 6;
            this.gvMx1boardStyle.Width = 84;
            this.gvMx1boardStyle.Width = 56;
            // 
            // gvMx1ebelnQty
            // 
@@ -1162,7 +1169,7 @@
            this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
            this.gvMx1ebelnQty.Visible = true;
            this.gvMx1ebelnQty.VisibleIndex = 7;
            this.gvMx1ebelnQty.Width = 37;
            this.gvMx1ebelnQty.Width = 24;
            // 
            // gvMx1subQty
            // 
@@ -1175,7 +1182,7 @@
            this.gvMx1subQty.Tag = "query_a.sub_qty";
            this.gvMx1subQty.Visible = true;
            this.gvMx1subQty.VisibleIndex = 9;
            this.gvMx1subQty.Width = 37;
            this.gvMx1subQty.Width = 24;
            // 
            // gvMx1quantity
            // 
@@ -1190,8 +1197,8 @@
            this.gvMx1quantity.Name = "gvMx1quantity";
            this.gvMx1quantity.Tag = "edit";
            this.gvMx1quantity.Visible = true;
            this.gvMx1quantity.VisibleIndex = 10;
            this.gvMx1quantity.Width = 37;
            this.gvMx1quantity.VisibleIndex = 11;
            this.gvMx1quantity.Width = 25;
            // 
            // gvMx1memo
            // 
@@ -1207,8 +1214,8 @@
            this.gvMx1memo.OptionsColumn.ReadOnly = true;
            this.gvMx1memo.Tag = "edit";
            this.gvMx1memo.Visible = true;
            this.gvMx1memo.VisibleIndex = 11;
            this.gvMx1memo.Width = 84;
            this.gvMx1memo.VisibleIndex = 12;
            this.gvMx1memo.Width = 58;
            // 
            // gvMx1okRkqty
            // 
@@ -1221,7 +1228,7 @@
            this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
            this.gvMx1okRkqty.Visible = true;
            this.gvMx1okRkqty.VisibleIndex = 8;
            this.gvMx1okRkqty.Width = 37;
            this.gvMx1okRkqty.Width = 24;
            // 
            // gvMx1checkDate
            // 
@@ -1251,8 +1258,8 @@
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 12;
            this.gridColumn9.Width = 23;
            this.gridColumn9.VisibleIndex = 15;
            this.gridColumn9.Width = 25;
            // 
            // gridColumn7
            // 
@@ -1262,8 +1269,8 @@
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 13;
            this.gridColumn7.Width = 23;
            this.gridColumn7.VisibleIndex = 16;
            this.gridColumn7.Width = 25;
            // 
            // gridColumn6
            // 
@@ -1273,8 +1280,8 @@
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 14;
            this.gridColumn6.Width = 84;
            this.gridColumn6.VisibleIndex = 17;
            this.gridColumn6.Width = 65;
            // 
            // gridColumn10
            // 
@@ -1283,8 +1290,8 @@
            this.gridColumn10.MinWidth = 22;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 18;
            this.gridColumn10.Width = 22;
            this.gridColumn10.VisibleIndex = 21;
            this.gridColumn10.Width = 25;
            // 
            // gridColumn12
            // 
@@ -1293,8 +1300,8 @@
            this.gridColumn12.MinWidth = 22;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 19;
            this.gridColumn12.Width = 22;
            this.gridColumn12.VisibleIndex = 22;
            this.gridColumn12.Width = 25;
            // 
            // gridColumn13
            // 
@@ -1303,8 +1310,8 @@
            this.gridColumn13.MinWidth = 22;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 20;
            this.gridColumn13.Width = 22;
            this.gridColumn13.VisibleIndex = 23;
            this.gridColumn13.Width = 25;
            // 
            // gvBtnAlawys
            // 
@@ -1313,8 +1320,8 @@
            this.gvBtnAlawys.MinWidth = 70;
            this.gvBtnAlawys.Name = "gvBtnAlawys";
            this.gvBtnAlawys.Visible = true;
            this.gvBtnAlawys.VisibleIndex = 21;
            this.gvBtnAlawys.Width = 70;
            this.gvBtnAlawys.VisibleIndex = 24;
            this.gvBtnAlawys.Width = 81;
            // 
            // repositoryItemButtonEdit2
            // 
@@ -1334,8 +1341,8 @@
            this.gvMxDel.MinWidth = 70;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 22;
            this.gvMxDel.Width = 70;
            this.gvMxDel.VisibleIndex = 25;
            this.gvMxDel.Width = 81;
            // 
            // repositoryItemButtonEdit1
            // 
@@ -1363,8 +1370,8 @@
            this.gridColumn15.MinWidth = 22;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 15;
            this.gridColumn15.Width = 44;
            this.gridColumn15.VisibleIndex = 18;
            this.gridColumn15.Width = 25;
            // 
            // gridColumn16
            // 
@@ -1373,8 +1380,8 @@
            this.gridColumn16.MinWidth = 22;
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 16;
            this.gridColumn16.Width = 44;
            this.gridColumn16.VisibleIndex = 19;
            this.gridColumn16.Width = 25;
            // 
            // gridColumn2
            // 
@@ -1383,8 +1390,8 @@
            this.gridColumn2.MinWidth = 22;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 17;
            this.gridColumn2.Width = 23;
            this.gridColumn2.VisibleIndex = 20;
            this.gridColumn2.Width = 25;
            // 
            // gridColumn17
            // 
@@ -1393,8 +1400,8 @@
            this.gridColumn17.MinWidth = 22;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 23;
            this.gridColumn17.Width = 23;
            this.gridColumn17.VisibleIndex = 26;
            this.gridColumn17.Width = 25;
            // 
            // rptHistory
            // 
@@ -1421,7 +1428,8 @@
            this.gridColumn4.FieldName = "depotCode";
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 24;
            this.gridColumn4.VisibleIndex = 27;
            this.gridColumn4.Width = 22;
            // 
            // gridColumn19
            // 
@@ -1429,7 +1437,17 @@
            this.gridColumn19.FieldName = "depotName";
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 25;
            this.gridColumn19.VisibleIndex = 28;
            this.gridColumn19.Width = 22;
            // 
            // gridColumn20
            // 
            this.gridColumn20.Caption = "仓管员";
            this.gridColumn20.FieldName = "staffName";
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 29;
            this.gridColumn20.Width = 35;
            // 
            // picCheckBox
            // 
@@ -1443,13 +1461,32 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn20
            // gv_remainingReceivedQty
            // 
            this.gridColumn20.Caption = "仓管员";
            this.gridColumn20.FieldName = "staffName";
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 26;
            gv_remainingReceivedQty.Caption = "ERP累计未收数量";
            gv_remainingReceivedQty.FieldName = "remainingReceivedQty";
            gv_remainingReceivedQty.Name = "gv_remainingReceivedQty";
            gv_remainingReceivedQty.Visible = true;
            gv_remainingReceivedQty.VisibleIndex = 10;
            gv_remainingReceivedQty.Width = 27;
            // 
            // gv_sourceDocumentId
            // 
            this.gv_sourceDocumentId.Caption = "源单单号";
            this.gv_sourceDocumentId.FieldName = "sourceDocumentId";
            this.gv_sourceDocumentId.Name = "gv_sourceDocumentId";
            this.gv_sourceDocumentId.Visible = true;
            this.gv_sourceDocumentId.VisibleIndex = 13;
            this.gv_sourceDocumentId.Width = 31;
            // 
            // gv_demandDocumentId
            // 
            this.gv_demandDocumentId.Caption = "需求单据号";
            this.gv_demandDocumentId.FieldName = "demandDocumentId";
            this.gv_demandDocumentId.Name = "gv_demandDocumentId";
            this.gv_demandDocumentId.Visible = true;
            this.gv_demandDocumentId.VisibleIndex = 14;
            this.gv_demandDocumentId.Width = 23;
            // 
            // Frm_MesInvItemArn
            // 
@@ -1620,5 +1657,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
        private DevExpress.XtraGrid.Columns.GridColumn gv_sourceDocumentId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_demandDocumentId;
    }
}