补料

lu

2025-03-26 508e6bb769ed1075005d683478c951e53e4fc664

补料

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

@@ -108,6 +108,11 @@
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -141,11 +146,6 @@
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -195,6 +195,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -204,11 +209,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -871,6 +871,7 @@
            this.txt_tldh.Size = new System.Drawing.Size(195, 24);
            this.txt_tldh.StyleController = this.layoutMx1;
            this.txt_tldh.TabIndex = 291;
            this.txt_tldh.Tag = "readonly";
            // 
            // txt_bl004
            // 
@@ -1096,6 +1097,61 @@
            this.layoutControlItem8.Text = "产品型号";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_bl004;
            this.layoutControlItem18.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem18.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem18.Text = "申请人";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_bl006;
            this.layoutControlItem3.Location = new System.Drawing.Point(828, 99);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem3.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem3.Text = "审核日期";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem19
            // 
            this.layoutControlItem19.Control = this.txt_bl005;
            this.layoutControlItem19.Location = new System.Drawing.Point(828, 33);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem19.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem19.Text = "申请时间";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_bl018;
            this.layoutControlItem15.Location = new System.Drawing.Point(828, 132);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem15.Size = new System.Drawing.Size(278, 35);
            this.layoutControlItem15.Text = "审核标识";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem15.TextVisible = false;
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_bl016;
            this.layoutControlItem4.Location = new System.Drawing.Point(828, 66);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem4.Text = "审核人";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
            // 
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1260,6 +1316,7 @@
            // 
            this.gridColumn4.Caption = "物料规格";
            this.gridColumn4.FieldName = "itemModel";
            this.gridColumn4.MaxWidth = 200;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 4;
@@ -1485,61 +1542,6 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_bl004;
            this.layoutControlItem18.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem18.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem18.Text = "申请人";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_bl006;
            this.layoutControlItem3.Location = new System.Drawing.Point(828, 99);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem3.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem3.Text = "审核日期";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem19
            // 
            this.layoutControlItem19.Control = this.txt_bl005;
            this.layoutControlItem19.Location = new System.Drawing.Point(828, 33);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem19.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem19.Text = "申请时间";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_bl018;
            this.layoutControlItem15.Location = new System.Drawing.Point(828, 132);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem15.Size = new System.Drawing.Size(278, 35);
            this.layoutControlItem15.Text = "审核标识";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem15.TextVisible = false;
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_bl016;
            this.layoutControlItem4.Location = new System.Drawing.Point(828, 66);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem4.Text = "审核人";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
            // 
            // UcBlcl
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1598,6 +1600,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -1607,11 +1614,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            this.ResumeLayout(false);

        }

 DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs

@@ -80,6 +80,7 @@
                txt_dptName.Text = txt_aboutGuid.GetWorkName();
                txt_bl012.Text = txt_aboutGuid.GetWorkXb();
                txt_bl013.Text = txt_aboutGuid.GetRwd();
                txt_tldh.Text = txt_aboutGuid.GetTldh();
                var _obj = new
                {
                    currentPage = 1,
@@ -106,7 +107,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -145,10 +146,16 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            Form parentForm;
            if (this.Parent is Form)
                parentForm = this.Parent as Form;
            else
                parentForm = this.Parent.Parent as Form;
          
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
              var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -464,6 +471,7 @@
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                    }
                    else
                    {

 DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs

@@ -53,7 +53,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }

 DevApp/Gs.DevApp/UserControl/UcLookDaa.cs

@@ -208,7 +208,7 @@
        }

        /// <summary>
        /// 线别
        /// 任务单号
        /// </summary>
        /// <returns></returns>
        public string GetRwd()
@@ -221,5 +221,20 @@
            }
            return "";
        }

        /// <summary>
        /// 投料单号
        /// </summary>
        /// <returns></returns>
        public string GetTldh()
        {
            var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
            if (row != null)
            {
                string id = row["daa014"].ToString();
                return id;
            }
            return "";
        }
    }
}

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -7,9 +7,6 @@
using System.Net;
using System.Text;
using System.Windows.Forms;
using DevExpress.LookAndFeel;
using DevExpress.Skins;
using DevExpress.UserSkins;
using DevExpress.XtraBars;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid;
@@ -663,6 +660,8 @@
        private void BtnLayout_ItemClick(object sender, ItemClickEventArgs ee)
        {
            Form parentForm = this.Parent as Form;
            if (parentForm == null)
                parentForm = this.Parent.Parent as Form;
            string _formNamespace = parentForm.GetType().FullName;
            if (parentForm != null)
            {