产线bug修改

lu

2024-10-25 970ce3551dcdebec60cf3ed0c52f5b4329dcdb76

产线bug修改

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs

@@ -29,11 +29,11 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions 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.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -48,7 +48,6 @@
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.lb_checkStatus = new DevExpress.XtraEditors.LabelControl();
            this.txt_checkStatus = new DevExpress.XtraEditors.TextEdit();
            this.gv_checkStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_checkBy = new DevExpress.XtraEditors.LabelControl();
            this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
@@ -86,12 +85,12 @@
            this.txt_isStatus = new System.Windows.Forms.CheckBox();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
@@ -108,6 +107,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
            this.SuspendLayout();
            // 
            // gvMx1createBy
@@ -224,6 +224,7 @@
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
@@ -257,10 +258,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -269,20 +270,11 @@
            // 
            this.lb_checkStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_checkStatus.Appearance.Options.UseFont = true;
            this.lb_checkStatus.Location = new System.Drawing.Point(767, 20);
            this.lb_checkStatus.Location = new System.Drawing.Point(979, 53);
            this.lb_checkStatus.Name = "lb_checkStatus";
            this.lb_checkStatus.Size = new System.Drawing.Size(34, 21);
            this.lb_checkStatus.Size = new System.Drawing.Size(68, 21);
            this.lb_checkStatus.TabIndex = 243;
            this.lb_checkStatus.Text = "审核";
            // 
            // txt_checkStatus
            // 
            this.txt_checkStatus.Location = new System.Drawing.Point(819, 16);
            this.txt_checkStatus.Name = "txt_checkStatus";
            this.txt_checkStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkStatus.Properties.Appearance.Options.UseFont = true;
            this.txt_checkStatus.Size = new System.Drawing.Size(150, 28);
            this.txt_checkStatus.TabIndex = 243;
            this.lb_checkStatus.Text = "审核状态";
            // 
            // gv_checkStatus
            // 
@@ -302,7 +294,7 @@
            // 
            this.lb_checkBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_checkBy.Appearance.Options.UseFont = true;
            this.lb_checkBy.Location = new System.Drawing.Point(750, 59);
            this.lb_checkBy.Location = new System.Drawing.Point(754, 18);
            this.lb_checkBy.Name = "lb_checkBy";
            this.lb_checkBy.Size = new System.Drawing.Size(51, 21);
            this.lb_checkBy.TabIndex = 240;
@@ -310,7 +302,8 @@
            // 
            // txt_checkBy
            // 
            this.txt_checkBy.Location = new System.Drawing.Point(819, 55);
            this.txt_checkBy.Enabled = false;
            this.txt_checkBy.Location = new System.Drawing.Point(823, 14);
            this.txt_checkBy.Name = "txt_checkBy";
            this.txt_checkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
@@ -335,7 +328,7 @@
            // 
            this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_checkDate.Appearance.Options.UseFont = true;
            this.lb_checkDate.Location = new System.Drawing.Point(975, 20);
            this.lb_checkDate.Location = new System.Drawing.Point(737, 53);
            this.lb_checkDate.Name = "lb_checkDate";
            this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
            this.lb_checkDate.TabIndex = 235;
@@ -343,7 +336,8 @@
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(1050, 16);
            this.txt_checkDate.Enabled = false;
            this.txt_checkDate.Location = new System.Drawing.Point(823, 49);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -368,11 +362,11 @@
            // 
            this.lb_isStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_isStatus.Appearance.Options.UseFont = true;
            this.lb_isStatus.Location = new System.Drawing.Point(37, 53);
            this.lb_isStatus.Location = new System.Drawing.Point(3, 53);
            this.lb_isStatus.Name = "lb_isStatus";
            this.lb_isStatus.Size = new System.Drawing.Size(39, 21);
            this.lb_isStatus.Size = new System.Drawing.Size(73, 21);
            this.lb_isStatus.TabIndex = 231;
            this.lb_isStatus.Text = "状态 ";
            this.lb_isStatus.Text = "车间状态 ";
            // 
            // gv_isStatus
            // 
@@ -400,6 +394,7 @@
            // 
            // txt_createDate
            // 
            this.txt_createDate.Enabled = false;
            this.txt_createDate.Location = new System.Drawing.Point(580, 49);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -433,6 +428,7 @@
            // 
            // txt_createBy
            // 
            this.txt_createBy.Enabled = false;
            this.txt_createBy.Location = new System.Drawing.Point(579, 15);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -458,7 +454,7 @@
            // 
            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark.Appearance.Options.UseFont = true;
            this.lb_remark.Location = new System.Drawing.Point(285, 56);
            this.lb_remark.Location = new System.Drawing.Point(285, 53);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(39, 21);
            this.lb_remark.TabIndex = 217;
@@ -466,7 +462,7 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(330, 52);
            this.txt_remark.Location = new System.Drawing.Point(330, 49);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
@@ -671,11 +667,11 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_checkStatus);
            this.panel1.Controls.Add(this.txt_isStatus);
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_checkStatus);
            this.panel1.Controls.Add(this.txt_checkStatus);
            this.panel1.Controls.Add(this.lb_checkBy);
            this.panel1.Controls.Add(this.txt_checkBy);
            this.panel1.Controls.Add(this.lb_checkDate);
@@ -701,7 +697,7 @@
            // txt_isStatus
            // 
            this.txt_isStatus.AutoSize = true;
            this.txt_isStatus.Location = new System.Drawing.Point(80, 51);
            this.txt_isStatus.Location = new System.Drawing.Point(80, 55);
            this.txt_isStatus.Name = "txt_isStatus";
            this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
            this.txt_isStatus.TabIndex = 244;
@@ -726,6 +722,15 @@
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            // 
            // txt_checkStatus
            // 
            this.txt_checkStatus.Enabled = false;
            this.txt_checkStatus.Location = new System.Drawing.Point(1053, 49);
            this.txt_checkStatus.Name = "txt_checkStatus";
            this.txt_checkStatus.Properties.Caption = "";
            this.txt_checkStatus.Size = new System.Drawing.Size(94, 24);
            this.txt_checkStatus.TabIndex = 245;
            // 
            // Frm_MesWorkshop
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -739,7 +744,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
@@ -757,6 +761,7 @@
            this.tabMx.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
            this.ResumeLayout(false);

        }
@@ -782,7 +787,6 @@
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraEditors.LabelControl lb_checkStatus;
        private DevExpress.XtraEditors.TextEdit txt_checkStatus;
        private DevExpress.XtraGrid.Columns.GridColumn gv_checkStatus;

        private DevExpress.XtraEditors.LabelControl lb_checkBy;
@@ -821,5 +825,6 @@
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1isStatus;
        private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
        private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
    }
}

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs

@@ -402,6 +402,11 @@
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
                    gvMx1.DeleteRow(rowhandle);
                    return;
                }
                var strJson = "";
                var lst = new List<string>();
                lst.Add(mxGuid);