Merge remote-tracking branch 'origin/master'

啊鑫

2025-09-12 8366fcbfed5c66fa1fab4f6dba964a3451c24091

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs

@@ -1,4 +1,6 @@
namespace Gs.DevApp.DevFrm.Ck
using Gs.DevApp.UserControl;

namespace Gs.DevApp.DevFrm.Ck
{
    partial class Frm_MesItemQtDj
    {
@@ -67,7 +69,8 @@
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -298,7 +301,8 @@
            this.gridColumn12,
            this.gridColumn13,
            this.gridColumn7,
            this.gridColumn14});
            this.gridColumn14,
            this.gridColumn9});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -356,7 +360,7 @@
            this.gv_outDate.OptionsColumn.AllowEdit = false;
            this.gv_outDate.Tag = "query_a.out_date";
            this.gv_outDate.Visible = true;
            this.gv_outDate.VisibleIndex = 3;
            this.gv_outDate.VisibleIndex = 6;
            this.gv_outDate.Width = 120;
            // 
            // gv_outType
@@ -369,7 +373,7 @@
            this.gv_outType.OptionsColumn.AllowEdit = false;
            this.gv_outType.Tag = "query_a.out_type";
            this.gv_outType.Visible = true;
            this.gv_outType.VisibleIndex = 4;
            this.gv_outType.VisibleIndex = 7;
            this.gv_outType.Width = 94;
            // 
            // gv_checkUser
@@ -382,7 +386,7 @@
            this.gv_checkUser.OptionsColumn.AllowEdit = false;
            this.gv_checkUser.Tag = "query_a.check_user";
            this.gv_checkUser.Visible = true;
            this.gv_checkUser.VisibleIndex = 5;
            this.gv_checkUser.VisibleIndex = 8;
            this.gv_checkUser.Width = 94;
            // 
            // gv_checkDate
@@ -395,7 +399,7 @@
            this.gv_checkDate.OptionsColumn.AllowEdit = false;
            this.gv_checkDate.Tag = "query_a.check_date";
            this.gv_checkDate.Visible = true;
            this.gv_checkDate.VisibleIndex = 6;
            this.gv_checkDate.VisibleIndex = 9;
            this.gv_checkDate.Width = 120;
            // 
            // gv_receiver
@@ -408,7 +412,7 @@
            this.gv_receiver.OptionsColumn.AllowEdit = false;
            this.gv_receiver.Tag = "query_a.receiver";
            this.gv_receiver.Visible = true;
            this.gv_receiver.VisibleIndex = 7;
            this.gv_receiver.VisibleIndex = 10;
            this.gv_receiver.Width = 94;
            // 
            // gv_outPart
@@ -421,7 +425,7 @@
            this.gv_outPart.OptionsColumn.AllowEdit = false;
            this.gv_outPart.Tag = "query_a.out_part";
            this.gv_outPart.Visible = true;
            this.gv_outPart.VisibleIndex = 8;
            this.gv_outPart.VisibleIndex = 11;
            this.gv_outPart.Width = 94;
            // 
            // gv_createBy
@@ -434,7 +438,7 @@
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 9;
            this.gv_createBy.VisibleIndex = 12;
            this.gv_createBy.Width = 94;
            // 
            // gv_createDate
@@ -447,7 +451,7 @@
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 10;
            this.gv_createDate.VisibleIndex = 13;
            this.gv_createDate.Width = 94;
            // 
            // gv_remark
@@ -460,7 +464,7 @@
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 11;
            this.gv_remark.VisibleIndex = 14;
            this.gv_remark.Width = 94;
            // 
            // gridColumn1
@@ -478,7 +482,7 @@
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 12;
            this.gridColumn6.VisibleIndex = 15;
            this.gridColumn6.Width = 94;
            // 
            // gridColumn8
@@ -488,7 +492,7 @@
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 13;
            this.gridColumn8.VisibleIndex = 16;
            this.gridColumn8.Width = 94;
            // 
            // gridColumn10
@@ -498,7 +502,7 @@
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 14;
            this.gridColumn10.VisibleIndex = 17;
            this.gridColumn10.Width = 94;
            // 
            // gridColumn11
@@ -508,7 +512,7 @@
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 15;
            this.gridColumn11.VisibleIndex = 18;
            this.gridColumn11.Width = 94;
            // 
            // gridColumn12
@@ -518,7 +522,7 @@
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 16;
            this.gridColumn12.VisibleIndex = 19;
            this.gridColumn12.Width = 94;
            // 
            // gridColumn13
@@ -528,7 +532,7 @@
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 17;
            this.gridColumn13.VisibleIndex = 20;
            this.gridColumn13.Width = 94;
            // 
            // gridColumn7
@@ -538,7 +542,7 @@
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 18;
            this.gridColumn7.VisibleIndex = 4;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn14
@@ -548,8 +552,18 @@
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 19;
            this.gridColumn14.VisibleIndex = 5;
            this.gridColumn14.Width = 94;
            // 
            // gridColumn9
            // 
            this.gridColumn9.Caption = "出库类型";
            this.gridColumn9.FieldName = "qtlx";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 3;
            this.gridColumn9.Width = 94;
            // 
            // pageBar1
            // 
@@ -1454,7 +1468,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
        private UserControls.Data.UcPageBar pageBar1;
        private UcPageBar pageBar1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;
@@ -1532,5 +1546,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
    }
}