Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

2025-08-30 7e2fe692d16412e0c20a433a81cb85a3cb39cb2b

Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs

@@ -277,7 +277,7 @@
                }
                else

                MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
@@ -343,7 +343,7 @@
            txt_fRequireOrgId.IsReadly = true;
            txt_fOwnerIdHead.IsReadly = true;
            txt_fPurchaseDeptId.IsReadly = true;
          //  txt_fPurchaserId.IsReadly = true;
            //  txt_fPurchaserId.IsReadly = true;
        }
        /// <summary>
        /// 新增事件
@@ -763,7 +763,7 @@
            {
                layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
               // layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                // layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            }
            else

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

@@ -30,26 +30,26 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            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.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
            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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -64,7 +64,6 @@
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_qt005 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_qt001 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_qt008 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_qt010 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_qt016 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_qt002 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -100,6 +99,7 @@
            this.txt_qt033 = new DevExpress.XtraEditors.TextEdit();
            this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit();
            this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit();
            this.txt_qtlx = new DevExpress.XtraEditors.ComboBoxEdit();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -124,6 +124,7 @@
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -190,6 +191,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtlx.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -214,6 +216,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -309,7 +312,6 @@
            this.gridColumn4,
            this.gv_qt005,
            this.gv_qt001,
            this.gv_qt008,
            this.gv_qt010,
            this.gv_qt016,
            this.gv_qt002,
@@ -424,19 +426,6 @@
            this.gv_qt001.Visible = true;
            this.gv_qt001.VisibleIndex = 9;
            this.gv_qt001.Width = 180;
            // 
            // gv_qt008
            // 
            this.gv_qt008.AppearanceCell.Options.UseFont = true;
            this.gv_qt008.Caption = "发料仓库 ";
            this.gv_qt008.FieldName = "flckName";
            this.gv_qt008.MinWidth = 25;
            this.gv_qt008.Name = "gv_qt008";
            this.gv_qt008.OptionsColumn.AllowEdit = false;
            this.gv_qt008.Tag = "query_a.qt008";
            this.gv_qt008.Visible = true;
            this.gv_qt008.VisibleIndex = 5;
            this.gv_qt008.Width = 94;
            // 
            // gv_qt010
            // 
@@ -598,6 +587,7 @@
            this.layoutMx1.Controls.Add(this.txt_qt033);
            this.layoutMx1.Controls.Add(this.txt_qt032);
            this.layoutMx1.Controls.Add(this.txt_qt035);
            this.layoutMx1.Controls.Add(this.txt_qtlx);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem14});
@@ -837,6 +827,26 @@
            this.txt_qt035.StyleController = this.layoutMx1;
            this.txt_qt035.TabIndex = 330;
            // 
            // txt_qtlx
            // 
            this.txt_qtlx.EditValue = "请选择";
            this.txt_qtlx.Location = new System.Drawing.Point(390, 152);
            this.txt_qtlx.Name = "txt_qtlx";
            this.txt_qtlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_qtlx.Properties.Items.AddRange(new object[] {
            "请选择",
            "1:辅料领用",
            "2:研发领用",
            "3:测试部门品质工艺",
            "4:客户赠送",
            "5:报废出库",
            "6:样机出库"});
            this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_qtlx.Size = new System.Drawing.Size(170, 24);
            this.txt_qtlx.StyleController = this.layoutMx1;
            this.txt_qtlx.TabIndex = 331;
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.lbGuid;
@@ -875,41 +885,42 @@
            this.layoutControlItem10,
            this.layoutControlItem5,
            this.layoutControlItem13,
            this.layoutControlItem24});
            this.layoutControlItem24,
            this.layoutControlItem12});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition11.Height = 100D;
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition12.Height = 100D;
            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            rowDefinition7,
            rowDefinition8,
            rowDefinition9,
            rowDefinition10,
            rowDefinition11,
            rowDefinition12});
            this.Root.Size = new System.Drawing.Size(1126, 188);
            this.Root.TextVisible = false;
            // 
@@ -1151,6 +1162,17 @@
            this.layoutControlItem24.Size = new System.Drawing.Size(276, 28);
            this.layoutControlItem24.Text = "来源单号";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_qtlx;
            this.layoutControlItem12.Location = new System.Drawing.Point(276, 140);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
            this.layoutControlItem12.Text = "出库类型";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
            // 
            // tabMx
            // 
@@ -1433,10 +1455,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
@@ -1467,10 +1489,10 @@
            // rptCk
            // 
            this.rptCk.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.rptCk.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.rptCk.Name = "rptCk";
            this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
            // 
@@ -1539,6 +1561,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtlx.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1563,6 +1586,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -1592,7 +1616,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_qt005;
        private DevExpress.XtraGrid.Columns.GridColumn gv_qt001;
        private DevExpress.XtraGrid.Columns.GridColumn gv_qt008;
        private DevExpress.XtraGrid.Columns.GridColumn gv_qt010;
        private DevExpress.XtraGrid.Columns.GridColumn gv_qt016;
        private DevExpress.XtraGrid.Columns.GridColumn gv_qt002;
@@ -1681,5 +1704,7 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
        private DevExpress.XtraEditors.ComboBoxEdit txt_qtlx;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
    }
}

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs

@@ -300,6 +300,7 @@
            string inLyCus = txt_qt013.GetId();//领用客户
            string inLyDepart = txt_qt009.GetId();//领用部门
            string inKcfx = txt_qt020.Text.Trim();//库存方向
            string qtlx = txt_qtlx.Text.Trim();//后来增加的类型
            if (string.IsNullOrEmpty(inOrgId))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择库存组织！");
@@ -316,16 +317,16 @@
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择货主！");
                return;
            }
            //if (txt_qt019.SelectedIndex <= 0)
            //{
            //    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择单据类型！");
            //    txt_qt019.Focus();
            //    return;
            //}
            if (string.IsNullOrEmpty(inLyOrg))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择领用组织！");
                txt_qt024.Focus();
                return;
            }
            if (txt_qtlx.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择入库类型！");
                txt_qtlx.Focus();
                return;
            }
            if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
@@ -333,12 +334,6 @@
                Gs.DevApp.ToolBox.MsgHelper.ShowError("客户或部门必选一个！");
                return;
            }
            //if (txt_qt020.SelectedIndex <= 0)
            //{
            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择库存方向！");
            //    txt_qt020.Focus();
            //    return;
            //}
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
@@ -352,6 +347,7 @@
                inLyDepart = inLyDepart,//领用部门
                inKcfx = inKcfx,//库存方向
                inSource = txt_qt035.EditValue,//工单号
                qtlx=qtlx,
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
@@ -394,7 +390,6 @@
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);

                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
@@ -689,7 +684,7 @@
                        int rowHandle = gridView1.LocateByValue("guid", rowGuid);
                        gridView1.FocusedRowHandle = rowHandle;
                    }
                   

                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());

 DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs

@@ -190,6 +190,7 @@
            this.barOrg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.usergroup_16x161;
            this.barOrg.Name = "barOrg";
            this.barOrg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            this.barOrg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // repositoryItemCheckedComboBoxEdit1
            // 

 DevApp/Gs.DevApp/DevFrm/FrmMain.cs

@@ -487,7 +487,7 @@
            string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
            System.Text.StringBuilder sbSql= new System.Text.StringBuilder();
            sbSql.Append(" and IS_STATUS=1");
            sbSql.Append("  and fid in( select org.FID from [dbo].[SYS_USER_BIND] b left join SYS_ORGANIZATION org on b.aboutGuid=org.FID where  userGuid='"+ LoginInfoModel.CurrentUser.LoginUserGuid + "' and fType='组织' ) ");
            sbSql.Append(" and fid in( select org.FID from [dbo].[SYS_USER_BIND] b left join SYS_ORGANIZATION org on b.aboutGuid=org.FID where  userGuid='"+ LoginInfoModel.CurrentUser.LoginUserGuid + "' and fType='组织' ) ");
            var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, sbSql.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/FrmMain.resx

@@ -120,9 +120,6 @@
  <metadata name="strp1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>284, 17</value>
  </metadata>
  <metadata name="strp1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>284, 17</value>
  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="barMy.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.cs

@@ -229,7 +229,7 @@
        {
            gcMain1.DataSource = null; 
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and daa.erp_sczz in");
            _sbSqlWhere.Append(" and bm.FSubsidiary in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());

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

@@ -30,6 +30,7 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemQtrk));
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -89,6 +90,7 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
            this.txt_qt003 = new Gs.DevApp.UserControl.UcDictionaryComBox();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_qt010 = new DevExpress.XtraEditors.TextEdit();
@@ -112,8 +114,11 @@
            this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit();
            this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit();
            this.txt_isIqc = new DevExpress.XtraEditors.CheckEdit();
            this.txt_qtlx = new DevExpress.XtraEditors.ComboBoxEdit();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -121,7 +126,6 @@
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -129,12 +133,14 @@
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -212,9 +218,6 @@
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
            this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
            this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -250,8 +253,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtlx.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -259,7 +265,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
@@ -267,12 +272,14 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -322,8 +329,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -680,7 +685,7 @@
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1332, 570);
            this.splitMx1.SplitterPosition = 194;
            this.splitMx1.SplitterPosition = 203;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
@@ -709,21 +714,34 @@
            this.layoutMx1.Controls.Add(this.txt_qt032);
            this.layoutMx1.Controls.Add(this.txt_qt035);
            this.layoutMx1.Controls.Add(this.txt_isIqc);
            this.layoutMx1.Controls.Add(this.txt_qtlx);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem12,
            this.layoutControlItem36});
            this.layoutControlItem36,
            this.layoutControlItem14,
            this.layoutControlItem15});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(578, 285, 812, 500);
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(600, 497, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1332, 194);
            this.layoutMx1.Size = new System.Drawing.Size(1332, 203);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
            // btnCopyXls
            // 
            this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
            this.btnCopyXls.Location = new System.Drawing.Point(12, 167);
            this.btnCopyXls.Name = "btnCopyXls";
            this.btnCopyXls.Size = new System.Drawing.Size(131, 27);
            this.btnCopyXls.StyleController = this.layoutMx1;
            this.btnCopyXls.TabIndex = 444;
            this.btnCopyXls.Text = "快捷录入";
            // 
            // txt_qt003
            // 
            this.txt_qt003.Location = new System.Drawing.Point(759, 0);
            this.txt_qt003.Location = new System.Drawing.Point(759, 43);
            this.txt_qt003.Name = "txt_qt003";
            this.txt_qt003.Size = new System.Drawing.Size(217, 24);
            this.txt_qt003.TabIndex = 333;
@@ -741,7 +759,7 @@
            // 
            // txt_qt010
            // 
            this.txt_qt010.Location = new System.Drawing.Point(114, 124);
            this.txt_qt010.Location = new System.Drawing.Point(114, 136);
            this.txt_qt010.Name = "txt_qt010";
            this.txt_qt010.Properties.Appearance.Options.UseFont = true;
            this.txt_qt010.Size = new System.Drawing.Size(216, 24);
@@ -752,7 +770,7 @@
            // 
            this.ucLookHuoZhu1.HzId = null;
            this.ucLookHuoZhu1.IsReadly = false;
            this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 62);
            this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 74);
            this.ucLookHuoZhu1.Margin = new System.Windows.Forms.Padding(0);
            this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
            this.ucLookHuoZhu1.OrgId = null;
@@ -762,7 +780,7 @@
            // txt_qt008
            // 
            this.txt_qt008.IsReadly = false;
            this.txt_qt008.Location = new System.Drawing.Point(436, 93);
            this.txt_qt008.Location = new System.Drawing.Point(436, 105);
            this.txt_qt008.Margin = new System.Windows.Forms.Padding(0);
            this.txt_qt008.Name = "txt_qt008";
            this.txt_qt008.Size = new System.Drawing.Size(217, 24);
@@ -770,7 +788,7 @@
            // 
            // txt_qt016
            // 
            this.txt_qt016.Location = new System.Drawing.Point(759, 124);
            this.txt_qt016.Location = new System.Drawing.Point(759, 74);
            this.txt_qt016.Name = "txt_qt016";
            this.txt_qt016.Properties.Appearance.Options.UseFont = true;
            this.txt_qt016.Size = new System.Drawing.Size(217, 24);
@@ -781,7 +799,7 @@
            // txt_qt018
            // 
            this.txt_qt018.IsReadly = false;
            this.txt_qt018.Location = new System.Drawing.Point(436, 62);
            this.txt_qt018.Location = new System.Drawing.Point(436, 74);
            this.txt_qt018.Margin = new System.Windows.Forms.Padding(0);
            this.txt_qt018.Name = "txt_qt018";
            this.txt_qt018.Size = new System.Drawing.Size(217, 24);
@@ -790,7 +808,7 @@
            // txt_qt022
            // 
            this.txt_qt022.IsReadly = false;
            this.txt_qt022.Location = new System.Drawing.Point(114, 31);
            this.txt_qt022.Location = new System.Drawing.Point(114, 43);
            this.txt_qt022.Name = "txt_qt022";
            this.txt_qt022.Size = new System.Drawing.Size(216, 24);
            this.txt_qt022.TabIndex = 326;
@@ -798,14 +816,14 @@
            // txt_qt009
            // 
            this.txt_qt009.IsReadly = false;
            this.txt_qt009.Location = new System.Drawing.Point(436, 31);
            this.txt_qt009.Location = new System.Drawing.Point(436, 43);
            this.txt_qt009.Name = "txt_qt009";
            this.txt_qt009.Size = new System.Drawing.Size(217, 24);
            this.txt_qt009.TabIndex = 304;
            // 
            // txt_qtck
            // 
            this.txt_qtck.Location = new System.Drawing.Point(114, 0);
            this.txt_qtck.Location = new System.Drawing.Point(114, 12);
            this.txt_qtck.Name = "txt_qtck";
            this.txt_qtck.Properties.Appearance.Options.UseFont = true;
            this.txt_qtck.Size = new System.Drawing.Size(216, 24);
@@ -815,7 +833,7 @@
            // 
            // txt_qt002
            // 
            this.txt_qt002.Location = new System.Drawing.Point(759, 93);
            this.txt_qt002.Location = new System.Drawing.Point(759, 105);
            this.txt_qt002.Name = "txt_qt002";
            this.txt_qt002.Properties.Appearance.Options.UseFont = true;
            this.txt_qt002.Size = new System.Drawing.Size(217, 24);
@@ -825,13 +843,12 @@
            // 
            // txt_qt019
            // 
            this.txt_qt019.EditValue = "请选择";
            this.txt_qt019.Location = new System.Drawing.Point(436, 0);
            this.txt_qt019.EditValue = "普通(GENERAL)";
            this.txt_qt019.Location = new System.Drawing.Point(759, 12);
            this.txt_qt019.Name = "txt_qt019";
            this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_qt019.Properties.Items.AddRange(new object[] {
            "请选择",
            "普通(GENERAL)",
            "退货(RETURN)"});
            this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
@@ -841,7 +858,7 @@
            // 
            // txt_qt015
            // 
            this.txt_qt015.Location = new System.Drawing.Point(657, 155);
            this.txt_qt015.Location = new System.Drawing.Point(657, 136);
            this.txt_qt015.Name = "txt_qt015";
            this.txt_qt015.Properties.Caption = "审核状态";
            this.txt_qt015.Size = new System.Drawing.Size(319, 24);
@@ -851,7 +868,7 @@
            // 
            // txt_qt005
            // 
            this.txt_qt005.Location = new System.Drawing.Point(759, 31);
            this.txt_qt005.Location = new System.Drawing.Point(759, 43);
            this.txt_qt005.Name = "txt_qt005";
            this.txt_qt005.Properties.Appearance.Options.UseFont = true;
            this.txt_qt005.Size = new System.Drawing.Size(217, 24);
@@ -861,7 +878,7 @@
            // 
            // txt_qt001
            // 
            this.txt_qt001.Location = new System.Drawing.Point(759, 62);
            this.txt_qt001.Location = new System.Drawing.Point(759, 74);
            this.txt_qt001.Name = "txt_qt001";
            this.txt_qt001.Properties.Appearance.Options.UseFont = true;
            this.txt_qt001.Size = new System.Drawing.Size(217, 24);
@@ -871,7 +888,7 @@
            // 
            // txt_qt030
            // 
            this.txt_qt030.Location = new System.Drawing.Point(1082, 93);
            this.txt_qt030.Location = new System.Drawing.Point(1082, 105);
            this.txt_qt030.Name = "txt_qt030";
            this.txt_qt030.Size = new System.Drawing.Size(217, 24);
            this.txt_qt030.StyleController = this.layoutMx1;
@@ -880,7 +897,7 @@
            // 
            // txt_qt029
            // 
            this.txt_qt029.Location = new System.Drawing.Point(1082, 124);
            this.txt_qt029.Location = new System.Drawing.Point(1082, 136);
            this.txt_qt029.Name = "txt_qt029";
            this.txt_qt029.Size = new System.Drawing.Size(217, 24);
            this.txt_qt029.StyleController = this.layoutMx1;
@@ -889,7 +906,7 @@
            // 
            // txt_qt028
            // 
            this.txt_qt028.Location = new System.Drawing.Point(980, 155);
            this.txt_qt028.Location = new System.Drawing.Point(980, 167);
            this.txt_qt028.Name = "txt_qt028";
            this.txt_qt028.Properties.Caption = "财务审核标识";
            this.txt_qt028.Size = new System.Drawing.Size(319, 24);
@@ -899,7 +916,7 @@
            // 
            // txt_qt034
            // 
            this.txt_qt034.Location = new System.Drawing.Point(1082, 0);
            this.txt_qt034.Location = new System.Drawing.Point(1082, 12);
            this.txt_qt034.Name = "txt_qt034";
            this.txt_qt034.Size = new System.Drawing.Size(217, 24);
            this.txt_qt034.StyleController = this.layoutMx1;
@@ -908,7 +925,7 @@
            // 
            // txt_qt033
            // 
            this.txt_qt033.Location = new System.Drawing.Point(1082, 31);
            this.txt_qt033.Location = new System.Drawing.Point(1082, 43);
            this.txt_qt033.Name = "txt_qt033";
            this.txt_qt033.Size = new System.Drawing.Size(217, 24);
            this.txt_qt033.StyleController = this.layoutMx1;
@@ -917,7 +934,7 @@
            // 
            // txt_qt032
            // 
            this.txt_qt032.Location = new System.Drawing.Point(980, 62);
            this.txt_qt032.Location = new System.Drawing.Point(980, 74);
            this.txt_qt032.Name = "txt_qt032";
            this.txt_qt032.Properties.Caption = "采购审核标识";
            this.txt_qt032.Size = new System.Drawing.Size(319, 24);
@@ -927,7 +944,7 @@
            // 
            // txt_qt035
            // 
            this.txt_qt035.Location = new System.Drawing.Point(436, 124);
            this.txt_qt035.Location = new System.Drawing.Point(436, 136);
            this.txt_qt035.Name = "txt_qt035";
            this.txt_qt035.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton()});
@@ -944,6 +961,23 @@
            this.txt_isIqc.StyleController = this.layoutMx1;
            this.txt_isIqc.TabIndex = 341;
            this.txt_isIqc.Tag = "readonly";
            // 
            // txt_qtlx
            // 
            this.txt_qtlx.EditValue = "请选择";
            this.txt_qtlx.Location = new System.Drawing.Point(436, 12);
            this.txt_qtlx.Name = "txt_qtlx";
            this.txt_qtlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_qtlx.Properties.Items.AddRange(new object[] {
            "请选择",
            "1:供应商赠送",
            "2:售后维修",
            "3:拆卸入库"});
            this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_qtlx.Size = new System.Drawing.Size(217, 24);
            this.txt_qtlx.StyleController = this.layoutMx1;
            this.txt_qtlx.TabIndex = 445;
            // 
            // layoutControlItem12
            // 
@@ -969,6 +1003,29 @@
            this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem36.TextVisible = false;
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_qt005;
            this.layoutControlItem14.CustomizationFormText = "申请人";
            this.layoutControlItem14.Location = new System.Drawing.Point(645, 31);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem14.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem14.Text = "申请人员";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_qt001;
            this.layoutControlItem15.Location = new System.Drawing.Point(645, 62);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem15.Text = "申请时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
            // Root
            // 
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -980,7 +1037,6 @@
            this.layoutControlItem7,
            this.layoutControlItem8,
            this.layoutControlItem6,
            this.layoutControlItem3,
            this.layoutControlItem13,
            this.layoutControlItem16,
            this.layoutControlItem17,
@@ -988,14 +1044,14 @@
            this.layoutControlItem19,
            this.layoutControlItem20,
            this.layoutControlItem10,
            this.layoutControlItem21,
            this.layoutControlItem35,
            this.layoutControlItem37,
            this.layoutControlItem9,
            this.layoutControlItem11,
            this.layoutControlItem21,
            this.layoutControlItem2,
            this.layoutControlItem15,
            this.layoutControlItem14,
            this.layoutControlItem35,
            this.layoutControlItem37});
            this.layoutControlItem38,
            this.layoutControlItem3});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1098,16 +1154,6 @@
            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem6.TextVisible = false;
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_qt019;
            this.layoutControlItem3.Location = new System.Drawing.Point(322, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem3.Text = "库存方向";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_qt010;
@@ -1184,29 +1230,6 @@
            this.layoutControlItem10.Text = "审核日期";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_qt016;
            this.layoutControlItem9.Location = new System.Drawing.Point(645, 124);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem9.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem9.Text = "审核人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_qt015;
            this.layoutControlItem11.Location = new System.Drawing.Point(645, 155);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem11.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem11.Text = "审核状态";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // layoutControlItem21
            // 
            this.layoutControlItem21.Control = this.txt_qt032;
@@ -1219,38 +1242,84 @@
            this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem21.TextVisible = false;
            // 
            // layoutControlItem35
            // 
            this.layoutControlItem35.Control = this.txt_qt035;
            this.layoutControlItem35.Location = new System.Drawing.Point(322, 124);
            this.layoutControlItem35.Name = "layoutControlItem35";
            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem35.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem35.Text = "来源单号";
            this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem37
            // 
            this.layoutControlItem37.Control = this.btnCopyXls;
            this.layoutControlItem37.Location = new System.Drawing.Point(0, 155);
            this.layoutControlItem37.MaxSize = new System.Drawing.Size(135, 31);
            this.layoutControlItem37.MinSize = new System.Drawing.Size(129, 31);
            this.layoutControlItem37.Name = "layoutControlItem37";
            this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem37.Size = new System.Drawing.Size(322, 31);
            this.layoutControlItem37.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem37.Text = "从XLS复制明细";
            this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem37.TextVisible = false;
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_qt016;
            this.layoutControlItem9.Location = new System.Drawing.Point(645, 62);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem9.Text = "审核人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_qt015;
            this.layoutControlItem11.Location = new System.Drawing.Point(645, 124);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem11.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem11.Text = "审核状态";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_qt003;
            this.layoutControlItem2.Location = new System.Drawing.Point(645, 0);
            this.layoutControlItem2.Location = new System.Drawing.Point(645, 31);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem2.Text = "单据类型";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // layoutControlItem38
            // 
            this.layoutControlItem15.Control = this.txt_qt001;
            this.layoutControlItem15.Location = new System.Drawing.Point(645, 62);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem15.Text = "申请时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem38.Control = this.txt_qtlx;
            this.layoutControlItem38.Location = new System.Drawing.Point(322, 0);
            this.layoutControlItem38.Name = "layoutControlItem38";
            this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem38.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem38.Text = "入库类型";
            this.layoutControlItem38.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem14
            // layoutControlItem3
            // 
            this.layoutControlItem14.Control = this.txt_qt005;
            this.layoutControlItem14.CustomizationFormText = "申请人";
            this.layoutControlItem14.Location = new System.Drawing.Point(645, 31);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem14.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem14.Text = "申请人员";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem3.Control = this.txt_qt019;
            this.layoutControlItem3.Location = new System.Drawing.Point(645, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem3.Text = "库存方向";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
            // tabMx
            // 
@@ -1258,7 +1327,7 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1332, 364);
            this.tabMx.Size = new System.Drawing.Size(1332, 355);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -1268,7 +1337,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.split99);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1330, 332);
            this.tabMxPage1.Size = new System.Drawing.Size(1330, 323);
            this.tabMxPage1.Text = "物料明细";
            // 
            // split99
@@ -1288,7 +1357,7 @@
            this.split99.Panel2.Controls.Add(this.gcMx1);
            this.split99.Panel2.Text = "Panel2";
            this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split99.Size = new System.Drawing.Size(1330, 332);
            this.split99.Size = new System.Drawing.Size(1330, 323);
            this.split99.SplitterPosition = 131;
            this.split99.TabIndex = 2;
            // 
@@ -1682,7 +1751,7 @@
            this.repositoryItemSearchLookUpEdit1,
            this.rptBl,
            this.repositoryItemMemoEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1330, 189);
            this.gcMx1.Size = new System.Drawing.Size(1330, 180);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -2010,7 +2079,7 @@
            // 
            this.xtraTabPage3.Controls.Add(this.gcMx2);
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(1330, 334);
            this.xtraTabPage3.Size = new System.Drawing.Size(1330, 323);
            this.xtraTabPage3.Text = "已打印条码明细";
            // 
            // gcMx2
@@ -2019,7 +2088,7 @@
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(1330, 334);
            this.gcMx2.Size = new System.Drawing.Size(1330, 323);
            this.gcMx2.TabIndex = 2;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -2196,41 +2265,6 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // layoutControlItem35
            // 
            this.layoutControlItem35.Control = this.txt_qt035;
            this.layoutControlItem35.Location = new System.Drawing.Point(322, 124);
            this.layoutControlItem35.Name = "layoutControlItem35";
            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem35.Size = new System.Drawing.Size(323, 31);
            this.layoutControlItem35.Text = "来源单号";
            this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
            // 
            // btnCopyXls
            // 
            this.btnCopyXls.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnCopyXls.Location = new System.Drawing.Point(12, 155);
            this.btnCopyXls.Name = "btnCopyXls";
            this.btnCopyXls.Size = new System.Drawing.Size(131, 27);
            this.btnCopyXls.StyleController = this.layoutMx1;
            this.btnCopyXls.TabIndex = 444;
            this.btnCopyXls.Text = "从XLS复制明细";
            // 
            // layoutControlItem37
            // 
            this.layoutControlItem37.Control = this.btnCopyXls;
            this.layoutControlItem37.Location = new System.Drawing.Point(0, 155);
            this.layoutControlItem37.MaxSize = new System.Drawing.Size(135, 31);
            this.layoutControlItem37.MinSize = new System.Drawing.Size(129, 31);
            this.layoutControlItem37.Name = "layoutControlItem37";
            this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem37.Size = new System.Drawing.Size(322, 31);
            this.layoutControlItem37.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem37.Text = "从XLS复制明细";
            this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem37.TextVisible = false;
            // 
            // Frm_MesItemQtrk
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2276,8 +2310,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtlx.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -2285,7 +2322,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
@@ -2293,12 +2329,14 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -2348,8 +2386,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
            this.ResumeLayout(false);

        }
@@ -2437,7 +2473,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraEditors.TextEdit txt_qt005;
        private DevExpress.XtraEditors.TextEdit txt_qt001;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
@@ -2464,14 +2499,11 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl;
        private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
        private DevExpress.XtraEditors.ButtonEdit txt_qt035;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControl lay99;
@@ -2509,5 +2541,11 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
        private DevExpress.XtraEditors.SimpleButton btnCopyXls;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
        private DevExpress.XtraEditors.ComboBoxEdit txt_qtlx;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
    }
}

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs

@@ -184,7 +184,6 @@
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
            };

            #region 2025-08-27 复制beg
            btnCopyXls.Click += (s, e) =>
            {
@@ -198,14 +197,43 @@
                string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
                if (File.Exists(filePath))
                {
                    var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.其它入库.ToString());
                    var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.其它入库.ToString(), txt_qt022.GetId());
                    frm.UpdateParent += (ss, ee) =>
                    {
                        try
                        {
                            var lst = ee.DynamicList;
                            MessageBox.Show(lst.Count.ToString());
                            //DataTable _Table = (DataTable)gcMx1.DataSource;
                            //foreach (dynamic dym in lst)
                            //{
                            //    DataRow _row = _Table.NewRow();
                            //    _row["fSeq"] = dym.fSeq;
                            //    _row["statStatus"] = "Y-是";
                            //    _row["collectionName"] = "空";
                            //    _row["processNo"] = dym.processNo;
                            //    _row["processName"] = dym.processName;
                            //    _Table.Rows.Add(_row);
                            //}
                            //gcMx1.BindingContext = new BindingContext();
                            //gcMx1.DataSource = _Table;
                            //gcMx1.ForceInitialize();
                            //gvMx1.CloseEditor();
                            //gvMx1.PostEditor();
                            //gvMx1.UpdateCurrentRow();
                            //gvMx1.BestFitColumns();
                        }
                        catch (Exception ex)
                        {
                            Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
                        }
                    };
                    frm.ShowDialog();
                }
                else
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("找不到xlsCopy.xls文件，请联系管理员！");
                }

            };
            #endregion
        }
@@ -409,6 +437,7 @@
            string inHz = ucLookHuoZhu1.GetHzId();//货主
            string inRkyy = txt_qt010.Text.Trim();//入库原因
            string kcCk = txt_qt008.GetId();//仓库
            string qtlx = txt_qtlx.Text.Trim();//后来增加的类型
            if (string.IsNullOrEmpty(kcZz))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择库存组织！");
@@ -431,10 +460,10 @@
                txt_qt003.Focus();
                return;
            }
            if (txt_qt019.SelectedIndex <= 0)
            if (txt_qtlx.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择库存方向！");
                txt_qt019.Focus();
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择入库类型！");
                txt_qtlx.Focus();
                return;
            }
            if (string.IsNullOrEmpty(kcBm) && string.IsNullOrEmpty(kcGys))
@@ -462,6 +491,7 @@
                hzlx = inHzlx,//货主类型
                inHz = inHz,//货主
                inSource = txt_qt035.EditValue,//工单号
                qtlx = qtlx,
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.resx

@@ -117,6 +117,24 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="btnCopyXls.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAG3RFWHRUaXRsZQBNb2RlbDtD
        b3B5O0NvcHlNb2RlbDuJLVnLAAACYElEQVQ4T43RXUhTYRzH8dV0L24aJL3cdNF93XZRBEEQdFs3kb2A
        RZBEkVlYLLWac+WS+TqNAmsrGxQZVkqLNoa6FNcLFphQN1npcjvbPNvOtrP9+j+PuM6iiw58kAef//c8
        e44KQIHRaFR3OoO+btdbdLnekSA6nEG0M/emYCe22+N+2qdZmfk7UNrhnEI+D5LnckxumUxu3pkE7dMX
        AvSsImpSotVqDYOeGUiSBCGa4MJCApFoCjExg3Q2hxt9ARYoUwbUlt6Az9r3Bi29EyQAi2MMzY4AzORa
        zxhuDQQREkRImRwsPaMsYFAGSpsdo0XHVh6dHbvR7sePX1Gk0jKa2v0sYFQGNFc7WSAPMZnllpIyFxdl
        fmyTzYtv8wISkgxTm5cFypUBbX2rl78xlsgiyohZCEsZjr31rPklvswtIk7/u2D1sECFMqA73+Lhx2UD
        EbqsCP2NUURMZel3y3j2egahcByJVAYvfJ+h1+sraa6EsMtXlZ1qfI6snEcomiYSFgSJ3pbB3MggZhtq
        Cj6Y9yPQuqMICxhOmoYokMM8DUbiaRpOIxxLYvZyDeB1cSnXdQwc2gwID7n4tJmveeD4xafI0GX9jCx/
        77vDn3DgykjBCfs51PVvKfJ9+OifQHXdE37bcfYVEhL2nHFjQgTnng5hX/0mLKKfG//axNfKgK7q9H3f
        kdrHOFz7CO6h9zzQ8GqBq+6e4APOjzu5Sw+28nXX3o2w7l5vY4HVRE8qyBqy4X8CtG8t0fBvqUSPbluV
        A0q7jq0rsv1gZRsfZs8/AisnMiqUK7C1ltA+leo3c1CK6vE87QgAAAAASUVORK5CYII=
</value>
  </data>
  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>

 DevApp/Gs.DevApp/UserControl/CopyXls.cs

@@ -1,6 +1,7 @@
using CefSharp.DevTools.Debugger;
using DevExpress.Spreadsheet;
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -19,14 +20,15 @@
    {
        private string orderType;
        private string orderGuid;
        private string orgId;
        private static readonly string filePath = AppContext.BaseDirectory + "xlsCopy.xls";

        public CopyXls(string orgId, string _orderGuid, string _orderType)
        public CopyXls(string orgId, string _orderGuid, string _orderType, string _orgId)
        {
            InitializeComponent();
            this.Text = "正在复制：" + _orderType;
            this.orderType = _orderType;
            this.orderGuid = _orderGuid;
            this.orgId = _orgId;
            this.spreadsheetControl1.DocumentLoaded += new EventHandler(spreadsheetControl1_DocumentLoaded);
            if (!string.IsNullOrEmpty(filePath))
            {
@@ -34,7 +36,10 @@
                {
                    IWorkbook workbook = spreadsheetControl1.Document;
                    workbook.LoadDocument(filePath);
                   // SetCellText(spreadsheetControl1.ActiveWorksheet, location, item.F_Name, true);
                    SetCellText(spreadsheetControl1.ActiveWorksheet, "A1", "物料编号", true);
                    SetCellText(spreadsheetControl1.ActiveWorksheet, "B1", "申请数量", true);
                    SetCellText(spreadsheetControl1.ActiveWorksheet, "C1", "申请备注", true);
                    SetCellText(spreadsheetControl1.ActiveWorksheet, "D1", "不良类型", true);
                }
                else
                {
@@ -55,7 +60,8 @@
            }
            else
            {
                Text = fileName;
                //Text = "正在从【" + fileName + "】复制到【" + this.orderType.ToString()+"】";
                Text = "正在快捷录入到【" + this.orderType.ToString() + "】，组织ID为【" + this.orgId.ToString() + "】";
            }
        }

@@ -66,7 +72,24 @@
        /// <param name="e"></param>
        private void btnSave_Click(object sender, EventArgs e)
        {
            spreadsheetControl1.SaveDocument();
            var list = new List<dynamic>();
            for (int row = 2; row <= spreadsheetControl1.ActiveWorksheet.GetUsedRange().RowCount; row++)
            {
                string itemNo = spreadsheetControl1.ActiveWorksheet.Cells["A1"].Value.ToString();
                string sl = spreadsheetControl1.ActiveWorksheet.Cells["B1"].Value.ToString();
                string bz = spreadsheetControl1.ActiveWorksheet.Cells["C1"].Value.ToString();
                string bllx = spreadsheetControl1.ActiveWorksheet.Cells["D1"].Value.ToString();
                list.Add(new
                {
                    itemNo = itemNo,
                    sl = sl,
                    bz = bz,
                    bllx = bllx,
                });
            }
            UpdateParent?.Invoke(this,
                new UpdateParentEventArgs { DynamicList = list });
            Close();
        }

        /// <summary>
@@ -81,6 +104,11 @@
            workSheet.Cells[coordinates].Value = coordValue;
            workSheet.Cells[coordinates].Style.Font.Bold = isBold;
        }
 

        /// <summary>
        /// 选择后的回调事件
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;

    }
}