bug
lu
2025-08-02 c1ddac72637f73b87610974e69704f5497019ba3
bug
已修改7个文件
806 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs 86 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs 540 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -151,7 +151,7 @@
            this.ucBtnPrint1.btnAllClick += (s, e) =>
            {
                string rowGuid = lbMxGuid.Text.Trim();
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "采购入库");
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "生产退料");
                string strCodeList = "";
                string strAction = "";
                frm.UpdateParent += (ss, ee) =>
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -121,32 +121,36 @@
                string rowGuid = txt_aboutGuid.Text.Trim();
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, strType);
                string strCodeList = "";
                string strAction = "";
                frm.UpdateParent += (ss, ee) =>
                {
                    strCodeList = ee.StringSingle;
                    strAction = ee.Data;
                };
                frm.ShowDialog();
                if (string.IsNullOrEmpty(strCodeList))
                    return;
                try
                {
                    string rptParameter = rptName + "{"
                    + "100"
                    + "," + ""
                    + "," + ""
                    + "," + ""
                    + "," + ""
                    + "," + strCodeList
                    + "}";
                    using (Form rpt = new RptPreview(rowGuid, rptParameter))
                if (strAction == "print") {
                    try
                    {
                        rpt.ShowDialog();
                        string rptParameter = rptName + "{"
                        + "100"
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + strCodeList
                        + "}";
                        using (Form rpt = new RptPreview(rowGuid, rptParameter))
                        {
                            rpt.ShowDialog();
                        }
                        frm.Close();
                    }
                    frm.Close();
                }
                catch (Exception ex)
                {
                    MsgHelper.ShowError(ex.Message);
                    catch (Exception ex)
                    {
                        MsgHelper.ShowError(ex.Message);
                    }
                }
            };
            //自动计算打印量
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
@@ -25,6 +25,7 @@
            this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "auditStatusChk", "", (value) =>
@@ -81,7 +82,19 @@
            _filterList = e.FilterList;
            getPageList(1);
        }
        /// <summary>
        /// 日志
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_orderNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        /// <summary>
        /// 刷新事件
        /// </summary>
@@ -190,7 +203,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -229,11 +242,11 @@
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
@@ -73,7 +73,7 @@
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
            this.txt_wgTime = new DevExpress.XtraEditors.TextEdit();
            this.txt_wgUser = new DevExpress.XtraEditors.TextEdit();
            this.txt_kgTime = new DevExpress.XtraEditors.TextEdit();
            this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
            this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
            this.txt_blStateTxt = new DevExpress.XtraEditors.TextEdit();
@@ -96,6 +96,8 @@
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -117,8 +119,6 @@
            this.gvMx1dab012 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1dab002 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -141,7 +141,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wgTime.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kgTime.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_blStateTxt.Properties)).BeginInit();
@@ -164,13 +164,13 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -554,7 +554,7 @@
            this.layoutMx1.Controls.Add(this.txt_remark);
            this.layoutMx1.Controls.Add(this.txt_daa001);
            this.layoutMx1.Controls.Add(this.txt_wgTime);
            this.layoutMx1.Controls.Add(this.txt_wgUser);
            this.layoutMx1.Controls.Add(this.txt_kgTime);
            this.layoutMx1.Controls.Add(this.txt_daa014);
            this.layoutMx1.Controls.Add(this.txt_daa018);
            this.layoutMx1.Controls.Add(this.txt_blStateTxt);
@@ -614,15 +614,15 @@
            this.txt_wgTime.StyleController = this.layoutMx1;
            this.txt_wgTime.TabIndex = 258;
            // 
            // txt_wgUser
            // txt_kgTime
            // 
            this.txt_wgUser.Location = new System.Drawing.Point(927, 40);
            this.txt_wgUser.Name = "txt_wgUser";
            this.txt_wgUser.Properties.Appearance.Options.UseFont = true;
            this.txt_wgUser.Properties.ReadOnly = true;
            this.txt_wgUser.Size = new System.Drawing.Size(187, 24);
            this.txt_wgUser.StyleController = this.layoutMx1;
            this.txt_wgUser.TabIndex = 262;
            this.txt_kgTime.Location = new System.Drawing.Point(927, 40);
            this.txt_kgTime.Name = "txt_kgTime";
            this.txt_kgTime.Properties.Appearance.Options.UseFont = true;
            this.txt_kgTime.Properties.ReadOnly = true;
            this.txt_kgTime.Size = new System.Drawing.Size(187, 24);
            this.txt_kgTime.StyleController = this.layoutMx1;
            this.txt_kgTime.TabIndex = 262;
            // 
            // txt_daa014
            // 
@@ -832,13 +832,13 @@
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_wgUser;
            this.layoutControlItem7.Control = this.txt_kgTime;
            this.layoutControlItem7.Location = new System.Drawing.Point(828, 28);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(278, 29);
            this.layoutControlItem7.Text = "完工人员";
            this.layoutControlItem7.Text = "开工时间";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem12
@@ -883,6 +883,28 @@
            this.layoutControlItem13.Size = new System.Drawing.Size(552, 29);
            this.layoutControlItem13.Text = "备注备注";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem19
            //
            this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
            this.layoutControlItem19.Location = new System.Drawing.Point(552, 57);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem19.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem19.Text = "任务单号";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_dwName;
            this.layoutControlItem10.Location = new System.Drawing.Point(552, 28);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem10.Text = "单位";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
            // 
            // tabMx
            // 
@@ -1116,28 +1138,6 @@
            this.gvMx1dab002.VisibleIndex = 9;
            this.gvMx1dab002.Width = 50;
            // 
            // layoutControlItem19
            //
            this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
            this.layoutControlItem19.Location = new System.Drawing.Point(552, 57);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem19.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem19.Text = "任务单号";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_dwName;
            this.layoutControlItem10.Location = new System.Drawing.Point(552, 28);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem10.Text = "单位";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
            //
            // Frm_WwGd
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1169,7 +1169,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wgTime.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kgTime.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_blStateTxt.Properties)).EndInit();
@@ -1192,13 +1192,13 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            this.ResumeLayout(false);
        }
@@ -1229,7 +1229,7 @@
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.TextEdit txt_remark;
        private DevExpress.XtraEditors.TextEdit txt_wgUser;
        private DevExpress.XtraEditors.TextEdit txt_kgTime;
        private DevExpress.XtraEditors.TextEdit txt_wgTime;
        private DevExpress.XtraEditors.TextEdit txt_daa018;
        private DevExpress.XtraEditors.TextEdit txt_blStateTxt;
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -38,26 +38,11 @@
            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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = 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();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -114,35 +99,6 @@
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layout99 = new DevExpress.XtraLayout.LayoutControl();
            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.radOut = new DevExpress.XtraEditors.RadioGroup();
            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
            this.txtWlid = new DevExpress.XtraEditors.TextEdit();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
            this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
            this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMx1tlid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -172,8 +128,6 @@
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -226,46 +180,15 @@
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
            this.split99.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit();
            this.split99.Panel2.SuspendLayout();
            this.split99.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit();
            this.layout99.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
            this.layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.xtraTabPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
@@ -976,7 +899,6 @@
            // 
            // split99.Panel1
            // 
            this.split99.Panel1.Controls.Add(this.layout99);
            this.split99.Panel1.Text = "Panel1";
            // 
            // split99.Panel2
@@ -985,378 +907,8 @@
            this.split99.Panel2.Text = "Panel2";
            this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split99.Size = new System.Drawing.Size(1124, 412);
            this.split99.SplitterPosition = 124;
            this.split99.SplitterPosition = 0;
            this.split99.TabIndex = 2;
            //
            // layout99
            //
            this.layout99.Controls.Add(this.layoutControl1);
            this.layout99.Controls.Add(this.ucBtnPrint1);
            this.layout99.Controls.Add(this.radOut);
            this.layout99.Controls.Add(this.lbMxGuid);
            this.layout99.Controls.Add(this.txtWlid);
            this.layout99.Controls.Add(this.txt_psnQty_1);
            this.layout99.Controls.Add(this.txtWlmc);
            this.layout99.Controls.Add(this.txtWlgg);
            this.layout99.Controls.Add(this.txt_kQty);
            this.layout99.Controls.Add(this.txtQuantity);
            this.layout99.Controls.Add(this.txt_yQty);
            this.layout99.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem22});
            this.layout99.Location = new System.Drawing.Point(0, 0);
            this.layout99.Name = "layout99";
            this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(131, 424, 812, 500);
            this.layout99.Root = this.layoutControlGroup1;
            this.layout99.Size = new System.Drawing.Size(1124, 124);
            this.layout99.TabIndex = 0;
            this.layout99.Text = "layoutControl1";
            //
            // layoutControl1
            //
            this.layoutControl1.Controls.Add(this.txt_iCount_1);
            this.layoutControl1.Controls.Add(this.txt_yuliang_1);
            this.layoutControl1.Location = new System.Drawing.Point(692, 76);
            this.layoutControl1.Name = "layoutControl1";
            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1081, 196, 812, 500);
            this.layoutControl1.Root = this.layoutControlGroup2;
            this.layoutControl1.Size = new System.Drawing.Size(336, 28);
            this.layoutControl1.TabIndex = 477;
            this.layoutControl1.Text = "layoutControl1";
            //
            // txt_iCount_1
            //
            this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Properties.ReadOnly = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
            this.txt_iCount_1.StyleController = this.layoutControl1;
            this.txt_iCount_1.TabIndex = 228;
            //
            // txt_yuliang_1
            //
            this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
            this.txt_yuliang_1.Name = "txt_yuliang_1";
            this.txt_yuliang_1.Properties.ReadOnly = true;
            this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
            this.txt_yuliang_1.TabIndex = 229;
            //
            // layoutControlGroup2
            //
            this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.layoutControlGroup2.GroupBordersVisible = false;
            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem26,
            this.layoutControlItem27});
            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup2.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6});
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition5});
            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
            this.layoutControlGroup2.TextVisible = false;
            //
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.txt_iCount_1;
            this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.Size = new System.Drawing.Size(168, 28);
            this.layoutControlItem26.Text = "打印整张数值";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem27
            //
            this.layoutControlItem27.Control = this.txt_yuliang_1;
            this.layoutControlItem27.Location = new System.Drawing.Point(168, 0);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem27.Size = new System.Drawing.Size(168, 28);
            this.layoutControlItem27.Text = "打印余数";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
            //
            // ucBtnPrint1
            //
            this.ucBtnPrint1.allClickKey = null;
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(338, 32);
            this.ucBtnPrint1.TabIndex = 231;
            //
            // radOut
            //
            this.radOut.Location = new System.Drawing.Point(1033, 10);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
            this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全打"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "只打整张"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动打")});
            this.radOut.Size = new System.Drawing.Size(227, 28);
            this.radOut.StyleController = this.layout99;
            this.radOut.TabIndex = 476;
            //
            // lbMxGuid
            //
            this.lbMxGuid.Location = new System.Drawing.Point(771, 63);
            this.lbMxGuid.Name = "lbMxGuid";
            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
            this.lbMxGuid.StyleController = this.layout99;
            this.lbMxGuid.TabIndex = 229;
            this.lbMxGuid.Text = "lbMxGuid";
            this.lbMxGuid.Visible = false;
            //
            // txtWlid
            //
            this.txtWlid.Location = new System.Drawing.Point(114, 12);
            this.txtWlid.Name = "txtWlid";
            this.txtWlid.Properties.Appearance.Options.UseFont = true;
            this.txtWlid.Properties.ReadOnly = true;
            this.txtWlid.Size = new System.Drawing.Size(234, 24);
            this.txtWlid.StyleController = this.layout99;
            this.txtWlid.TabIndex = 214;
            //
            // txt_psnQty_1
            //
            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
            this.txt_psnQty_1.StyleController = this.layout99;
            this.txt_psnQty_1.TabIndex = 226;
            //
            // txtWlmc
            //
            this.txtWlmc.Location = new System.Drawing.Point(114, 44);
            this.txtWlmc.Name = "txtWlmc";
            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
            this.txtWlmc.Properties.ReadOnly = true;
            this.txtWlmc.Size = new System.Drawing.Size(234, 24);
            this.txtWlmc.StyleController = this.layout99;
            this.txtWlmc.TabIndex = 216;
            //
            // txtWlgg
            //
            this.txtWlgg.Location = new System.Drawing.Point(114, 76);
            this.txtWlgg.Name = "txtWlgg";
            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
            this.txtWlgg.Properties.ReadOnly = true;
            this.txtWlgg.Size = new System.Drawing.Size(574, 24);
            this.txtWlgg.StyleController = this.layout99;
            this.txtWlgg.TabIndex = 218;
            //
            // txt_kQty
            //
            this.txt_kQty.Location = new System.Drawing.Point(794, 12);
            this.txt_kQty.Name = "txt_kQty";
            this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
            this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
            this.txt_kQty.Properties.ReadOnly = true;
            this.txt_kQty.Size = new System.Drawing.Size(234, 24);
            this.txt_kQty.StyleController = this.layout99;
            this.txt_kQty.TabIndex = 224;
            //
            // txtQuantity
            //
            this.txtQuantity.Location = new System.Drawing.Point(454, 12);
            this.txtQuantity.Name = "txtQuantity";
            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
            this.txtQuantity.Properties.ReadOnly = true;
            this.txtQuantity.Size = new System.Drawing.Size(234, 24);
            this.txtQuantity.StyleController = this.layout99;
            this.txtQuantity.TabIndex = 220;
            //
            // txt_yQty
            //
            this.txt_yQty.Location = new System.Drawing.Point(454, 44);
            this.txt_yQty.Name = "txt_yQty";
            this.txt_yQty.Properties.Appearance.Options.UseFont = true;
            this.txt_yQty.Properties.ReadOnly = true;
            this.txt_yQty.Size = new System.Drawing.Size(234, 24);
            this.txt_yQty.StyleController = this.layout99;
            this.txt_yQty.TabIndex = 222;
            //
            // layoutControlItem22
            //
            this.layoutControlItem22.Control = this.lbMxGuid;
            this.layoutControlItem22.Location = new System.Drawing.Point(1020, 64);
            this.layoutControlItem22.Name = "layoutControlItem22";
            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
            this.layoutControlItem22.Text = "lbMxGuid";
            this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem22.TextVisible = false;
            //
            // layoutControlGroup1
            //
            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.layoutControlGroup1.GroupBordersVisible = false;
            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem12,
            this.layoutControlItem16,
            this.layoutControlItem17,
            this.layoutControlItem18,
            this.layoutControlItem19,
            this.layoutControlItem20,
            this.layoutControlItem21,
            this.layoutControlItem23,
            this.layoutControlItem24,
            this.layoutControlItem25});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9.Width = 100D;
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition7,
            columnDefinition8,
            columnDefinition9,
            columnDefinition10});
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition6,
            rowDefinition7,
            rowDefinition8});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
            this.layoutControlGroup1.TextVisible = false;
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txtWlid;
            this.layoutControlItem12.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.Size = new System.Drawing.Size(340, 32);
            this.layoutControlItem12.Text = "物料编码";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem16
            //
            this.layoutControlItem16.Control = this.txtWlmc;
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 32);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem16.Size = new System.Drawing.Size(340, 32);
            this.layoutControlItem16.Text = "物料名称";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem17
            //
            this.layoutControlItem17.Control = this.txtWlgg;
            this.layoutControlItem17.Location = new System.Drawing.Point(0, 64);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem17.Size = new System.Drawing.Size(680, 32);
            this.layoutControlItem17.Text = "物料规格";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txtQuantity;
            this.layoutControlItem18.Location = new System.Drawing.Point(340, 0);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem18.Size = new System.Drawing.Size(340, 32);
            this.layoutControlItem18.Text = "本次申请总量";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem19
            //
            this.layoutControlItem19.Control = this.txt_yQty;
            this.layoutControlItem19.Location = new System.Drawing.Point(340, 32);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem19.Size = new System.Drawing.Size(340, 32);
            this.layoutControlItem19.Text = "已打印总量";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem20
            //
            this.layoutControlItem20.Control = this.txt_kQty;
            this.layoutControlItem20.Location = new System.Drawing.Point(680, 0);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem20.Size = new System.Drawing.Size(340, 32);
            this.layoutControlItem20.Text = "可打印总数";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem21
            //
            this.layoutControlItem21.Control = this.txt_psnQty_1;
            this.layoutControlItem21.Location = new System.Drawing.Point(680, 32);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem21.Size = new System.Drawing.Size(340, 32);
            this.layoutControlItem21.Text = "每张条码数量";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem23
            //
            this.layoutControlItem23.Control = this.radOut;
            this.layoutControlItem23.Location = new System.Drawing.Point(1020, 0);
            this.layoutControlItem23.MaxSize = new System.Drawing.Size(230, 28);
            this.layoutControlItem23.MinSize = new System.Drawing.Size(230, 28);
            this.layoutControlItem23.Name = "layoutControlItem23";
            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
            this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
            this.layoutControlItem23.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem23.Text = "打印计算";
            this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem23.TextVisible = false;
            //
            // layoutControlItem24
            //
            this.layoutControlItem24.Control = this.ucBtnPrint1;
            this.layoutControlItem24.Location = new System.Drawing.Point(1020, 32);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem24.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
            this.layoutControlItem24.Size = new System.Drawing.Size(340, 32);
            this.layoutControlItem24.Text = "打印按钮";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem24.TextVisible = false;
            //
            // layoutControlItem25
            //
            this.layoutControlItem25.Control = this.layoutControl1;
            this.layoutControlItem25.Location = new System.Drawing.Point(680, 64);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
            this.layoutControlItem25.Text = "打印数量";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem25.TextVisible = false;
            // 
            // gcMx1
            // 
@@ -1366,7 +918,7 @@
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1124, 276);
            this.gcMx1.Size = new System.Drawing.Size(1124, 400);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -1581,8 +1133,6 @@
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit2});
            this.gcMx2.Size = new System.Drawing.Size(1124, 412);
            this.gcMx2.TabIndex = 2;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1599,8 +1149,7 @@
            this.gvMx1quantity,
            this.gridColumn7,
            this.gvMx1createBy,
            this.gvMx1lotDate,
            this.gvBtnAlawys});
            this.gvMx1lotDate});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1705,27 +1254,6 @@
            this.gvMx1lotDate.VisibleIndex = 7;
            this.gvMx1lotDate.Width = 94;
            // 
            // gvBtnAlawys
            //
            this.gvBtnAlawys.Caption = "移出";
            this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
            this.gvBtnAlawys.MinWidth = 25;
            this.gvBtnAlawys.Name = "gvBtnAlawys";
            this.gvBtnAlawys.Visible = true;
            this.gvBtnAlawys.VisibleIndex = 8;
            this.gvBtnAlawys.Width = 94;
            //
            // repositoryItemButtonEdit2
            //
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
            //
            // picCheckBox
            // 
            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1796,47 +1324,16 @@
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
            this.split99.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit();
            this.split99.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit();
            this.split99.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit();
            this.layout99.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
            this.layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.xtraTabPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);
@@ -1909,16 +1406,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private UserControl.UcBtnPrint ucBtnPrint1;
        private DevExpress.XtraEditors.LabelControl lbMxGuid;
        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
        private DevExpress.XtraEditors.TextEdit txt_kQty;
        private DevExpress.XtraEditors.TextEdit txt_yQty;
        private DevExpress.XtraEditors.TextEdit txtQuantity;
        private DevExpress.XtraEditors.TextEdit txtWlgg;
        private DevExpress.XtraEditors.TextEdit txtWlmc;
        private DevExpress.XtraEditors.TextEdit txtWlid;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1931,8 +1418,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
        private DevExpress.XtraEditors.TextEdit txt_erpProductionOrderNo;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
@@ -1940,25 +1425,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraEditors.RadioGroup radOut;
        private DevExpress.XtraEditors.SplitContainerControl split99;
        private DevExpress.XtraLayout.LayoutControl layout99;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
    }
}
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -1,3 +1,4 @@
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -28,7 +29,6 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -86,48 +86,6 @@
                    }
                };
                frm.ShowDialog();
            };
            this.ucBtnPrint1.btnPrintClick += (s, e) =>
            {
                ucBtnPrint1.guidKey = "";
                string rowGuid = lbMxGuid.Text.Trim();
                ucBtnPrint1.guidKey = rowGuid;
                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请输入正确的条码数量!");
                    txt_iCount_1.Focus();
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码数量!");
                    txt_psnQty_1.Focus();
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                if (lbMxGuid.Text.Trim().Length < 10)
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印的行!");
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                this.ucBtnPrint1.rptParameter = "rpt_wwtl{" + lbMxGuid.Text.Trim()
                       + "," + ""
                       + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
                       + "," + txt_iCount_1.Text.Trim()
                       + "," + txt_psnQty_1.Text.Trim()
                       + "}";
            };
            //自动计算打印量
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
            };
            radOut.SelectedIndexChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
            };
        }
@@ -586,49 +544,7 @@
                }
            }
        }
        /// <summary>
        /// 移出条码
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gvMx2.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMx2.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                var _obj = new
                {
                    mxGuid = mxGuid,
                    inType = "dhtm"
                };
                try
                {
                    var strJson = UtilityHelper.HttpPost("",
                       "VArrivalBarcodeManager/DeleteBarcode",
                        JsonConvert.SerializeObject(_obj));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                        getModel(lbGuid.Text);
                    }
                    else
                        MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.ShowError("提示:" + ex.Message);
                }
            }
        }
        /// <summary>
        /// 工具条事件
        /// </summary>
@@ -687,34 +603,6 @@
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
        {
            if (e.FocusedRowHandle >= 0)
            {
                DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
                lbMxGuid.Text = row["tlid"].ToString();
                toolBarMenu1.guidKey = row["tlid"].ToString();
                txtWlid.Text = row["tld002"].ToString();
                txtWlgg.Text = row["tld004"].ToString();
                txtWlmc.Text = row["tld003"].ToString();
                txtQuantity.Text = row["tld005"].ToString();//申请总量
                txt_yQty.Text = row["ydy"].ToString();//已打印总量
                txt_kQty.Text = row["kdy"].ToString();//可打印总量
            }
            else
            {
                lbMxGuid.Text = "";
                ucBtnPrint1.guidKey = "";
                txtWlid.Text = "";
                txtWlgg.Text = "";
                txtWlmc.Text = "";
                txtQuantity.Text = "";
                txt_yQty.Text = "";
                txt_kQty.Text = "";
                txt_psnQty_1.Text = "";
                txt_iCount_1.Text = "";
            }
        }
    }
}
DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
@@ -51,7 +51,6 @@
                    colT1.Caption = "绑定托板码";
                    colT2.Caption = "绑定追溯码";
                    break;
                default:
                    colT1.Caption = "入库人";
                    colT2.Caption = "入库日期";