iqc
lu
2024-11-04 0ae97d187cc35bf647a896c184e2afd0c11a870c
iqc
已修改3个文件
81 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -54,10 +54,12 @@
            this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panMsg = new DevExpress.XtraEditors.PanelControl();
            this.labCurrentItem = new DevExpress.XtraEditors.LabelControl();
            this.btnLoad = new DevExpress.XtraEditors.SimpleButton();
            this.txtJianYan = new DevExpress.XtraEditors.TextEdit();
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
@@ -148,6 +150,7 @@
            this.txt_modify1Flag = new DevExpress.XtraEditors.TextEdit();
            this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
            this.labCurrentGuid = new DevExpress.XtraEditors.LabelControl();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -519,11 +522,22 @@
            // gvMx2
            // 
            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn4,
            this.gridColumn3,
            this.gridColumn2,
            this.gridColumn1});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "guid不能删除";
            this.gridColumn4.FieldName = "guid";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.Width = 94;
            // 
            // gridColumn3
            // 
@@ -557,6 +571,8 @@
            // 
            // panMsg
            // 
            this.panMsg.Controls.Add(this.labCurrentGuid);
            this.panMsg.Controls.Add(this.labCurrentItem);
            this.panMsg.Controls.Add(this.btnLoad);
            this.panMsg.Controls.Add(this.txtJianYan);
            this.panMsg.Controls.Add(this.labelControl3);
@@ -567,10 +583,18 @@
            this.panMsg.Size = new System.Drawing.Size(1340, 68);
            this.panMsg.TabIndex = 1;
            // 
            // labCurrentItem
            //
            this.labCurrentItem.Location = new System.Drawing.Point(141, 30);
            this.labCurrentItem.Name = "labCurrentItem";
            this.labCurrentItem.Size = new System.Drawing.Size(81, 18);
            this.labCurrentItem.TabIndex = 4;
            this.labCurrentItem.Text = "labelControl4";
            //
            // btnLoad
            // 
            this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
            this.btnLoad.Location = new System.Drawing.Point(810, 16);
            this.btnLoad.Location = new System.Drawing.Point(889, 16);
            this.btnLoad.Name = "btnLoad";
            this.btnLoad.Size = new System.Drawing.Size(180, 34);
            this.btnLoad.TabIndex = 3;
@@ -578,7 +602,7 @@
            // 
            // txtJianYan
            // 
            this.txtJianYan.Location = new System.Drawing.Point(569, 16);
            this.txtJianYan.Location = new System.Drawing.Point(648, 16);
            this.txtJianYan.Name = "txtJianYan";
            this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F);
            this.txtJianYan.Properties.Appearance.Options.UseFont = true;
@@ -589,7 +613,7 @@
            // 
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 14F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(161, 19);
            this.labelControl3.Location = new System.Drawing.Point(240, 19);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(398, 29);
            this.labelControl3.TabIndex = 1;
@@ -599,7 +623,7 @@
            // 
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 14F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(35, 19);
            this.labelControl2.Location = new System.Drawing.Point(24, 19);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(120, 29);
            this.labelControl2.TabIndex = 0;
@@ -1664,6 +1688,14 @@
            this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
            this.txt_lotNo.TabIndex = 262;
            // 
            // labCurrentGuid
            //
            this.labCurrentGuid.Location = new System.Drawing.Point(86, 3);
            this.labCurrentGuid.Name = "labCurrentGuid";
            this.labCurrentGuid.Size = new System.Drawing.Size(81, 18);
            this.labCurrentGuid.TabIndex = 5;
            this.labCurrentGuid.Text = "labelControl4";
            //
            // Frm_MesQaItemsDetect01
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1852,5 +1884,8 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraEditors.SimpleButton btnLoad;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraEditors.LabelControl labCurrentItem;
        private DevExpress.XtraEditors.LabelControl labCurrentGuid;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -5,6 +5,7 @@
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
@@ -161,6 +162,38 @@
                    gvMx2.SetRowCellValue(i, "fcheckResu", _str1);
                    gvMx2.SetRowCellValue(i, "fstand", _str1);
                }
                List<MesQaItemsDetectDetail12> lst = new List<MesQaItemsDetectDetail12>();
                for (var i = 0; i < gvMx2.DataRowCount; i++)
                {
                    var row = gvMx2.GetDataRow(i);
                    if (row != null)
                        lst.Add(new MesQaItemsDetectDetail12()
                        {
                            ParentGuid= UtilityHelper.ToGuid(labCurrentGuid.Text.Trim()),
                            Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
                            FcheckResu = row["fcheckResu"].ToString(),
                            //Fstand = row["fstand"].ToString(),
                            FcheckItem = labCurrentItem.Text.Trim(),
                            GrandpaGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                        });
                }
                var _obj = lst;
                try
                {
                    var strJson = UtilityHelper.HttpPost("",
                        _webServiceName + "EdtModelDetail12",
                        JsonConvert.SerializeObject(_obj));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                    }
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                }
            }
        }
@@ -227,7 +260,7 @@
                lbGuid, txt_releaseNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        /// <summary>
        /// 取消事件
        /// </summary>
@@ -529,6 +562,8 @@
        {
            var myDataRow = gvMx1.GetDataRow(e.FocusedRowHandle);
            if (myDataRow == null) return;
            labCurrentItem.Text = myDataRow["fcheckItem"].ToString();
            labCurrentGuid.Text = myDataRow["guid"].ToString();
            var _obj = new
            {
                parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs
@@ -327,5 +327,6 @@
        ///</summary>
    
         public string Remarks { get; set; }
    }
}