lg
6 天以前 0c683086b6e9ab02c454f3edfddb3f8a79c37045
加上仓位打印
已修改3个文件
150 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -36,6 +36,7 @@
            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.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();
@@ -100,6 +101,8 @@
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -142,6 +145,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -461,11 +465,12 @@
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1264, 570);
            this.splitMx1.SplitterPosition = 76;
            this.splitMx1.SplitterPosition = 117;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.ucBtnPrint1);
            this.layoutMx1.Controls.Add(this.txt_remark5);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_isFkc);
@@ -483,16 +488,16 @@
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(460, 453, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1264, 76);
            this.layoutMx1.Size = new System.Drawing.Size(1264, 117);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
            // txt_remark5
            // 
            this.txt_remark5.BtnTxt = "仓库属性";
            this.txt_remark5.Location = new System.Drawing.Point(945, 12);
            this.txt_remark5.Location = new System.Drawing.Point(929, 12);
            this.txt_remark5.Name = "txt_remark5";
            this.txt_remark5.Size = new System.Drawing.Size(307, 52);
            this.txt_remark5.Size = new System.Drawing.Size(302, 62);
            this.txt_remark5.TabIndex = 292;
            this.txt_remark5.TextTxt = "";
            this.txt_remark5.WhereTxt = " a.s_type=\'仓库属性\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -508,20 +513,20 @@
            // 
            // txt_isFkc
            // 
            this.txt_isFkc.Location = new System.Drawing.Point(721, 12);
            this.txt_isFkc.Location = new System.Drawing.Point(710, 12);
            this.txt_isFkc.Name = "txt_isFkc";
            this.txt_isFkc.Properties.Appearance.Options.UseFont = true;
            this.txt_isFkc.Size = new System.Drawing.Size(220, 24);
            this.txt_isFkc.Size = new System.Drawing.Size(215, 24);
            this.txt_isFkc.StyleController = this.layoutMx1;
            this.txt_isFkc.TabIndex = 291;
            this.txt_isFkc.Tag = "readonly";
            // 
            // txt_isNg
            // 
            this.txt_isNg.Location = new System.Drawing.Point(721, 40);
            this.txt_isNg.Location = new System.Drawing.Point(710, 45);
            this.txt_isNg.Name = "txt_isNg";
            this.txt_isNg.Properties.Appearance.Options.UseFont = true;
            this.txt_isNg.Size = new System.Drawing.Size(220, 24);
            this.txt_isNg.Size = new System.Drawing.Size(215, 24);
            this.txt_isNg.StyleController = this.layoutMx1;
            this.txt_isNg.TabIndex = 267;
            this.txt_isNg.Tag = "readonly";
@@ -531,7 +536,7 @@
            this.txt_depotCode.Location = new System.Drawing.Point(99, 12);
            this.txt_depotCode.Name = "txt_depotCode";
            this.txt_depotCode.Properties.Appearance.Options.UseFont = true;
            this.txt_depotCode.Size = new System.Drawing.Size(220, 24);
            this.txt_depotCode.Size = new System.Drawing.Size(214, 24);
            this.txt_depotCode.StyleController = this.layoutMx1;
            this.txt_depotCode.TabIndex = 213;
            this.txt_depotCode.Tag = "readonly";
@@ -548,30 +553,30 @@
            // 
            // txt_depotName
            // 
            this.txt_depotName.Location = new System.Drawing.Point(410, 12);
            this.txt_depotName.Location = new System.Drawing.Point(404, 12);
            this.txt_depotName.Name = "txt_depotName";
            this.txt_depotName.Properties.Appearance.Options.UseFont = true;
            this.txt_depotName.Size = new System.Drawing.Size(220, 24);
            this.txt_depotName.Size = new System.Drawing.Size(215, 24);
            this.txt_depotName.StyleController = this.layoutMx1;
            this.txt_depotName.TabIndex = 216;
            this.txt_depotName.Tag = "readonly";
            // 
            // txt_description
            // 
            this.txt_description.Location = new System.Drawing.Point(99, 40);
            this.txt_description.Location = new System.Drawing.Point(99, 45);
            this.txt_description.Name = "txt_description";
            this.txt_description.Properties.Appearance.Options.UseFont = true;
            this.txt_description.Size = new System.Drawing.Size(220, 24);
            this.txt_description.Size = new System.Drawing.Size(214, 24);
            this.txt_description.StyleController = this.layoutMx1;
            this.txt_description.TabIndex = 217;
            this.txt_description.Tag = "readonly";
            // 
            // txt_depottype
            // 
            this.txt_depottype.Location = new System.Drawing.Point(410, 40);
            this.txt_depottype.Location = new System.Drawing.Point(404, 45);
            this.txt_depottype.Name = "txt_depottype";
            this.txt_depottype.Properties.Appearance.Options.UseFont = true;
            this.txt_depottype.Size = new System.Drawing.Size(220, 24);
            this.txt_depottype.Size = new System.Drawing.Size(215, 24);
            this.txt_depottype.StyleController = this.layoutMx1;
            this.txt_depottype.TabIndex = 231;
            this.txt_depottype.Tag = "readonly";
@@ -610,7 +615,8 @@
            this.layoutControlItem5,
            this.layoutControlItem7,
            this.layoutControlItem8,
            this.layoutControlItem10});
            this.layoutControlItem10,
            this.layoutControlItem3});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -630,10 +636,13 @@
            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;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2});
            this.Root.Size = new System.Drawing.Size(1264, 76);
            rowDefinition2,
            rowDefinition3});
            this.Root.Size = new System.Drawing.Size(1243, 119);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -641,17 +650,17 @@
            this.layoutControlItem1.Control = this.txt_depotCode;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(311, 28);
            this.layoutControlItem1.Size = new System.Drawing.Size(305, 33);
            this.layoutControlItem1.Text = "仓库编码";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_depotName;
            this.layoutControlItem2.Location = new System.Drawing.Point(311, 0);
            this.layoutControlItem2.Location = new System.Drawing.Point(305, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(311, 28);
            this.layoutControlItem2.Size = new System.Drawing.Size(306, 33);
            this.layoutControlItem2.Text = "仓库名称";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -659,53 +668,53 @@
            // 
            this.layoutControlItem4.Control = this.txt_description;
            this.layoutControlItem4.CustomizationFormText = "仓库备注";
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 33);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(311, 28);
            this.layoutControlItem4.Size = new System.Drawing.Size(305, 33);
            this.layoutControlItem4.Text = "仓库备注";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_depottype;
            this.layoutControlItem5.Location = new System.Drawing.Point(311, 28);
            this.layoutControlItem5.Location = new System.Drawing.Point(305, 33);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(311, 28);
            this.layoutControlItem5.Size = new System.Drawing.Size(306, 33);
            this.layoutControlItem5.Text = "仓库类型";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_isFkc;
            this.layoutControlItem7.Location = new System.Drawing.Point(622, 0);
            this.layoutControlItem7.Location = new System.Drawing.Point(611, 0);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(311, 28);
            this.layoutControlItem7.Size = new System.Drawing.Size(306, 33);
            this.layoutControlItem7.Text = "允许负库存";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_isNg;
            this.layoutControlItem8.Location = new System.Drawing.Point(622, 28);
            this.layoutControlItem8.Location = new System.Drawing.Point(611, 33);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(311, 28);
            this.layoutControlItem8.Size = new System.Drawing.Size(306, 33);
            this.layoutControlItem8.Text = "禁用状态";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_remark5;
            this.layoutControlItem10.Location = new System.Drawing.Point(933, 0);
            this.layoutControlItem10.Location = new System.Drawing.Point(917, 0);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.OptionsTableLayoutItem.RowSpan = 2;
            this.layoutControlItem10.Size = new System.Drawing.Size(311, 56);
            this.layoutControlItem10.Size = new System.Drawing.Size(306, 66);
            this.layoutControlItem10.Text = "仓库属性";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem10.TextVisible = false;
@@ -716,7 +725,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(1264, 482);
            this.tabMx.Size = new System.Drawing.Size(1264, 441);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -725,7 +734,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1262, 450);
            this.tabMxPage1.Size = new System.Drawing.Size(1262, 409);
            this.tabMxPage1.Text = "仓位列表";
            // 
            // gcMx1
@@ -736,7 +745,7 @@
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1262, 450);
            this.gcMx1.Size = new System.Drawing.Size(1262, 409);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -864,6 +873,28 @@
            this.gridColumn11.VisibleIndex = 5;
            this.gridColumn11.Width = 94;
            // 
            // ucBtnPrint1
            //
            this.ucBtnPrint1.allClickKey = null;
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(623, 78);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(302, 29);
            this.ucBtnPrint1.TabIndex = 293;
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.Control = this.ucBtnPrint1;
            this.layoutControlItem3.Location = new System.Drawing.Point(611, 66);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(306, 33);
            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem3.TextVisible = false;
            //
            // Frm_MesDepot
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -915,6 +946,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            this.ResumeLayout(false);
        }
@@ -978,5 +1010,7 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private UserControl.UcBtnPrint ucBtnPrint1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -1,6 +1,7 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -43,6 +44,47 @@
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            #region 打印库位码,仅仅打印
            this.ucBtnPrint1.SetPlButton(true);
            this.ucBtnPrint1.SetPrintButton(false);
            //打印批量操作事件
            this.ucBtnPrint1.btnAllClick += (s, e) =>
            {
                string rowGuid = lbGuid.Text.Trim();
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "仓位码");
                string strCodeList = "";
                frm.UpdateParent += (ss, ee) =>
                {
                    strCodeList = ee.StringSingle;
                };
                frm.ShowDialog();
                if (string.IsNullOrEmpty(strCodeList))
                    return;
                try
                {
                    string rptParameter = "rpt_KW{"
                        + "100" // 重打都是传100
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + strCodeList
                        + "}";
                    using (Form rpt = new RptPreview(rowGuid, rptParameter))
                    {
                        rpt.ShowDialog();
                    }
                    frm.Close();
                }
                catch (Exception ex)
                {
                    MsgHelper.ShowError(ex.Message);
                }
            };
            #endregion
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -203,7 +245,7 @@
                DepotCode = txt_depotCode.Text,
                DepotName = txt_depotName.Text,
                Description = txt_description.Text,
                Remark5=txt_remark5.TextTxt.Trim(),
                Remark5 = txt_remark5.TextTxt.Trim(),
                list = lst
            };
            try
@@ -371,5 +413,6 @@
                }
            }
        }
    }
}
DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
@@ -46,6 +46,9 @@
                case "托板码":
                    btnDelete.Visible = false;
                    break;
                case "仓位码":
                    btnDelete.Visible = false;
                    break;
                case "追溯码":
                    btnDelete.Visible = false;
                    colT1.Caption = "线体编号";