lu
2024-11-20 65440c8489e3f560880b71645325611351fca996
采购入库
已修改3个文件
119 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs
@@ -150,12 +150,12 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
            this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
            this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk();
            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -177,8 +177,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
            this.SuspendLayout();
            // 
            // gvMx2itemInId
@@ -191,7 +191,7 @@
            this.gvMx2itemInId.Name = "gvMx2itemInId";
            this.gvMx2itemInId.Tag = "query_a.ITEM_IN_ID";
            this.gvMx2itemInId.Visible = true;
            this.gvMx2itemInId.VisibleIndex = 10;
            this.gvMx2itemInId.VisibleIndex = 8;
            this.gvMx2itemInId.Width = 94;
            // 
            // gvMx2itemId
@@ -217,7 +217,7 @@
            this.gvMx2lineK3id.Name = "gvMx2lineK3id";
            this.gvMx2lineK3id.Tag = "query_a.LINE_K3ID";
            this.gvMx2lineK3id.Visible = true;
            this.gvMx2lineK3id.VisibleIndex = 9;
            this.gvMx2lineK3id.VisibleIndex = 7;
            this.gvMx2lineK3id.Width = 94;
            // 
            // gvMx2ebelnK3id
@@ -230,7 +230,7 @@
            this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
            this.gvMx2ebelnK3id.Tag = "query_a.EBELN_K3ID";
            this.gvMx2ebelnK3id.Visible = true;
            this.gvMx2ebelnK3id.VisibleIndex = 8;
            this.gvMx2ebelnK3id.VisibleIndex = 6;
            this.gvMx2ebelnK3id.Width = 94;
            // 
            // gvMx2workNo
@@ -243,7 +243,7 @@
            this.gvMx2workNo.Name = "gvMx2workNo";
            this.gvMx2workNo.Tag = "query_a.WORK_NO";
            this.gvMx2workNo.Visible = true;
            this.gvMx2workNo.VisibleIndex = 6;
            this.gvMx2workNo.VisibleIndex = 5;
            this.gvMx2workNo.Width = 94;
            // 
            // gvMx2ebeln
@@ -256,7 +256,7 @@
            this.gvMx2ebeln.Name = "gvMx2ebeln";
            this.gvMx2ebeln.Tag = "query_a.EBELN";
            this.gvMx2ebeln.Visible = true;
            this.gvMx2ebeln.VisibleIndex = 5;
            this.gvMx2ebeln.VisibleIndex = 4;
            this.gvMx2ebeln.Width = 94;
            // 
            // gvMx2unit
@@ -282,7 +282,7 @@
            this.gvMx2itemSname.Name = "gvMx2itemSname";
            this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
            this.gvMx2itemSname.Visible = true;
            this.gvMx2itemSname.VisibleIndex = 2;
            this.gvMx2itemSname.VisibleIndex = 1;
            this.gvMx2itemSname.Width = 94;
            // 
            // gvMx2quantity
@@ -295,7 +295,7 @@
            this.gvMx2quantity.Name = "gvMx2quantity";
            this.gvMx2quantity.Tag = "query_a.QUANTITY";
            this.gvMx2quantity.Visible = true;
            this.gvMx2quantity.VisibleIndex = 3;
            this.gvMx2quantity.VisibleIndex = 2;
            this.gvMx2quantity.Width = 94;
            // 
            // gvMx2guid
@@ -357,7 +357,7 @@
            this.gvMx1lineK3id.Name = "gvMx1lineK3id";
            this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID";
            this.gvMx1lineK3id.Visible = true;
            this.gvMx1lineK3id.VisibleIndex = 13;
            this.gvMx1lineK3id.VisibleIndex = 12;
            this.gvMx1lineK3id.Width = 94;
            // 
            // gvMx1ebelnK3id
@@ -370,7 +370,7 @@
            this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
            this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
            this.gvMx1ebelnK3id.Visible = true;
            this.gvMx1ebelnK3id.VisibleIndex = 12;
            this.gvMx1ebelnK3id.VisibleIndex = 11;
            this.gvMx1ebelnK3id.Width = 94;
            // 
            // gvMx1rbillNo
@@ -396,7 +396,7 @@
            this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
            this.gvMx1urgentFlag.Tag = "query_a.URGENT_FLAG";
            this.gvMx1urgentFlag.Visible = true;
            this.gvMx1urgentFlag.VisibleIndex = 1;
            this.gvMx1urgentFlag.VisibleIndex = 0;
            this.gvMx1urgentFlag.Width = 94;
            // 
            // gvMx1workNo
@@ -409,7 +409,7 @@
            this.gvMx1workNo.Name = "gvMx1workNo";
            this.gvMx1workNo.Tag = "query_a.WORK_NO";
            this.gvMx1workNo.Visible = true;
            this.gvMx1workNo.VisibleIndex = 3;
            this.gvMx1workNo.VisibleIndex = 2;
            this.gvMx1workNo.Width = 94;
            // 
            // gvMx1unit
@@ -461,7 +461,7 @@
            this.gvMx1depotCode.Name = "gvMx1depotCode";
            this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
            this.gvMx1depotCode.Visible = true;
            this.gvMx1depotCode.VisibleIndex = 11;
            this.gvMx1depotCode.VisibleIndex = 10;
            this.gvMx1depotCode.Width = 94;
            // 
            // gvMx1itemNo
@@ -500,7 +500,7 @@
            this.gvMx1cItemCode.Name = "gvMx1cItemCode";
            this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
            this.gvMx1cItemCode.Visible = true;
            this.gvMx1cItemCode.VisibleIndex = 4;
            this.gvMx1cItemCode.VisibleIndex = 3;
            this.gvMx1cItemCode.Width = 94;
            // 
            // gvMx1itemBarcode
@@ -513,7 +513,7 @@
            this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
            this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gvMx1itemBarcode.Visible = true;
            this.gvMx1itemBarcode.VisibleIndex = 3;
            this.gvMx1itemBarcode.VisibleIndex = 1;
            this.gvMx1itemBarcode.Width = 94;
            // 
            // gvMx1guid
@@ -715,7 +715,7 @@
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = "0,0,0,0,000prc_cgrk_chk";
            this.toolBarMenu1.chkParameter = "";
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -1716,6 +1716,14 @@
            this.panel1.Size = new System.Drawing.Size(1346, 144);
            this.panel1.TabIndex = 1;
            // 
            // txt_status
            //
            this.txt_status.Location = new System.Drawing.Point(896, 24);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "";
            this.txt_status.Size = new System.Drawing.Size(48, 24);
            this.txt_status.TabIndex = 591;
            //
            // txt_suppId
            // 
            this.txt_suppId.IsReadly = false;
@@ -1764,14 +1772,6 @@
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            // 
            // txt_status
            //
            this.txt_status.Location = new System.Drawing.Point(896, 24);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "";
            this.txt_status.Size = new System.Drawing.Size(48, 24);
            this.txt_status.TabIndex = 591;
            //
            // Frm_MesInvItemIns
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1802,8 +1802,8 @@
            this.tabMx.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
            this.ResumeLayout(false);
        }
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs
@@ -1,5 +1,3 @@
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -86,20 +84,6 @@
            _filterList = e.FilterList;
            getPageList(1, pageBar1.RowsCount);
        }
        /// <summary>
        ///     反审核
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_billNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        /// <summary>
        ///     审核事件
@@ -112,7 +96,34 @@
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_billNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
            //toolBarMenu1.guidKey = rowGuid;
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            MsgHelper.Warning(rowGuid);
        }
        /// <summary>
        ///     反审核
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_billNo, gridView1);
            // toolBarMenu1.guidKey = rowGuid;
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            MsgHelper.Warning(rowGuid);
        }
        /// <summary>
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -63,8 +63,6 @@
            if (Parent != null) getNamespace();
        }
        private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnBoHuiClick != null)
@@ -178,10 +176,10 @@
            if (string.IsNullOrEmpty(guidKey))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                //  MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            else {
            if (string.IsNullOrEmpty(chkParameter))
            {
                MsgHelper.ShowError("没有指定审核参数,请联系开发人员获取支持!");
@@ -192,6 +190,7 @@
                return;
            _ckService(0.ToString());
        }
        }
        private void BtnChk_ItemClick(object sender, ItemClickEventArgs e)
        {
@@ -200,22 +199,23 @@
            else
                return;
            if (string.IsNullOrEmpty(chkParameter))
            {
                //MsgHelper.ShowError("没有指定审核参数,请联系开发人员获取支持!");
                return;
            }
            else
            {
            if (string.IsNullOrEmpty(guidKey))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (string.IsNullOrEmpty(chkParameter))
            {
                MsgHelper.ShowError("没有指定审核参数,请联系开发人员获取支持!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了1条数据,确定审核吗?"))
                return;
            _ckService(1.ToString());
        }
        }
        private void BtnFjieAn_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnFjieAnClick != null)