lu
2025-02-06 d7a44d991ee3bbc31fd20e702a490aad7d059b1b
物料检验项目
已修改7个文件
375 ■■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs 193 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs 92 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/App.config
@@ -34,7 +34,7 @@
        <add key="ProductName" value="广深科技 G-MES V2.0" />
        <add key="PageSize" value="50" />
        <add key="Version" value="0.1" />
        <add key="IsAutoUpdater" value="1" />
        <add key="IsAutoUpdater" value="0" />
        <add key="AutoUpdaterXml" value="https://dianbei.top/AutoUpdater/AutoUpdater.xml" />
    </appSettings>
    <userSettings>
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -59,10 +59,10 @@
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_OrgName = new Gs.DevApp.UserControl.UcLookOrg();
            this.txt_fSubsidiary = new Gs.DevApp.UserControl.UcLookOrg();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.txtGysNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_suppNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
            this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
@@ -82,7 +82,7 @@
            this.xtraTabPage1.SuspendLayout();
            this.xtraTabPage2.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txtGysNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
@@ -373,7 +373,7 @@
            // gridColumn1
            // 
            this.gridColumn1.Caption = "使用组织";
            this.gridColumn1.FieldName = "orgName";
            this.gridColumn1.FieldName = "fSubsidiary";
            this.gridColumn1.MinWidth = 250;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.AllowEdit = false;
@@ -448,10 +448,10 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_OrgName);
            this.panel1.Controls.Add(this.txt_fSubsidiary);
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.labelControl1);
            this.panel1.Controls.Add(this.txtGysNo);
            this.panel1.Controls.Add(this.txt_suppNo);
            this.panel1.Controls.Add(this.txt_suppId);
            this.panel1.Controls.Add(this.txt_itemId);
            this.panel1.Controls.Add(this.txt_status);
@@ -475,13 +475,13 @@
            this.panel1.Size = new System.Drawing.Size(668, 213);
            this.panel1.TabIndex = 1;
            // 
            // txt_OrgName
            // txt_fSubsidiary
            // 
            this.txt_OrgName.IsReadly = false;
            this.txt_OrgName.Location = new System.Drawing.Point(100, 11);
            this.txt_OrgName.Name = "txt_OrgName";
            this.txt_OrgName.Size = new System.Drawing.Size(281, 30);
            this.txt_OrgName.TabIndex = 242;
            this.txt_fSubsidiary.IsReadly = false;
            this.txt_fSubsidiary.Location = new System.Drawing.Point(100, 11);
            this.txt_fSubsidiary.Name = "txt_fSubsidiary";
            this.txt_fSubsidiary.Size = new System.Drawing.Size(281, 30);
            this.txt_fSubsidiary.TabIndex = 242;
            // 
            // labelControl2
            // 
@@ -503,15 +503,15 @@
            this.labelControl1.TabIndex = 239;
            this.labelControl1.Text = "供应商编码";
            // 
            // txtGysNo
            // txt_suppNo
            // 
            this.txtGysNo.Location = new System.Drawing.Point(100, 140);
            this.txtGysNo.Name = "txtGysNo";
            this.txtGysNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txtGysNo.Properties.Appearance.Options.UseFont = true;
            this.txtGysNo.Size = new System.Drawing.Size(281, 28);
            this.txtGysNo.TabIndex = 240;
            this.txtGysNo.Tag = "readOnly";
            this.txt_suppNo.Location = new System.Drawing.Point(100, 140);
            this.txt_suppNo.Name = "txt_suppNo";
            this.txt_suppNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_suppNo.Properties.Appearance.Options.UseFont = true;
            this.txt_suppNo.Size = new System.Drawing.Size(281, 28);
            this.txt_suppNo.TabIndex = 240;
            this.txt_suppNo.Tag = "readOnly";
            // 
            // txt_suppId
            // 
@@ -621,7 +621,7 @@
            this.xtraTabPage2.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txtGysNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
@@ -672,12 +672,12 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraEditors.TextEdit txtGysNo;
        private DevExpress.XtraEditors.TextEdit txt_suppNo;
        private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
        private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
        private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
        private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
        private UserControl.UcLookOrg txt_OrgName;
        private UserControl.UcLookOrg txt_fSubsidiary;
        private DevExpress.XtraEditors.LabelControl labelControl2;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -41,8 +41,8 @@
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            this.txt_OrgName.EditChanged += (s, e) => {
                string _orgId = txt_OrgName.GetId();
            this.txt_fSubsidiary.EditChanged += (s, e) => {
                string _orgId = txt_fSubsidiary.GetId();
                if (string.IsNullOrEmpty(_orgId))
                    return;
                txt_suppId.getSuppler(_orgId);
@@ -50,11 +50,13 @@
            };
            txt_itemId.EditChanged += (s, e) =>
            {
                txt_itemNo.Text = this.txt_itemId.GetCode();
                if (!string.IsNullOrEmpty(this.txt_itemId.GetCode()))
                    txt_itemNo.Text = this.txt_itemId.GetCode();
            };
            txt_suppId.EditChanged += (s, e) =>
            {
                txtGysNo.Text = this.txt_suppId.GetCode();
                if (!string.IsNullOrEmpty(this.txt_suppId.GetCode()))
                    txt_suppNo.Text = this.txt_suppId.GetCode();
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -208,7 +210,7 @@
            toolBarMenu1.isSetBtn = false;
            string _ItemId = txt_itemId.GetId();
            string _suppNo = txt_suppId.GetId();
            string _orgId = txt_OrgName.GetId();
            string _orgId = txt_fSubsidiary.GetId();
            //if (string.IsNullOrEmpty(_orgId))
            //{
            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择组织!");
@@ -325,7 +327,6 @@
                    dynamic dy = _rtn.rtnData;
                    lbGuid.Text = strGuid;
                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -29,16 +29,16 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
            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();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = 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.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
@@ -54,6 +54,7 @@
            this.rptJYXM = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1forder = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -118,20 +119,21 @@
            this.btnSave = new DevExpress.XtraEditors.SimpleButton();
            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
            this.txt_ItemId = new Gs.DevApp.UserControl.UcLookItems();
            this.txt_fSubsidiary = new Gs.DevApp.UserControl.UcLookOrg();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.txt_gg = new DevExpress.XtraEditors.MemoEdit();
            this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
            this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
            this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
            this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.txt_OrgName = new Gs.DevApp.UserControl.UcLookOrg();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -158,7 +160,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
@@ -186,7 +188,7 @@
            this.gvMx1facLevel.Name = "gvMx1facLevel";
            this.gvMx1facLevel.Tag = "edit";
            this.gvMx1facLevel.Visible = true;
            this.gvMx1facLevel.VisibleIndex = 7;
            this.gvMx1facLevel.VisibleIndex = 8;
            this.gvMx1facLevel.Width = 150;
            // 
            // rptJSSP
@@ -205,9 +207,9 @@
            this.gvMx1fstand.FieldName = "fstand";
            this.gvMx1fstand.MinWidth = 60;
            this.gvMx1fstand.Name = "gvMx1fstand";
            this.gvMx1fstand.Tag = "yz_quantity_edit";
            this.gvMx1fstand.Tag = "yz_quantity_0_edit";
            this.gvMx1fstand.Visible = true;
            this.gvMx1fstand.VisibleIndex = 9;
            this.gvMx1fstand.VisibleIndex = 10;
            this.gvMx1fstand.Width = 60;
            // 
            // gvMx1fcheckLevel
@@ -221,7 +223,7 @@
            this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
            this.gvMx1fcheckLevel.Tag = "edit";
            this.gvMx1fcheckLevel.Visible = true;
            this.gvMx1fcheckLevel.VisibleIndex = 6;
            this.gvMx1fcheckLevel.VisibleIndex = 7;
            this.gvMx1fcheckLevel.Width = 200;
            // 
            // rptJYSP
@@ -240,9 +242,9 @@
            this.gvMx1fdownAllow.FieldName = "fdownAllow";
            this.gvMx1fdownAllow.MinWidth = 60;
            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
            this.gvMx1fdownAllow.Tag = "yz_quantity_edit";
            this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
            this.gvMx1fdownAllow.Visible = true;
            this.gvMx1fdownAllow.VisibleIndex = 10;
            this.gvMx1fdownAllow.VisibleIndex = 11;
            this.gvMx1fdownAllow.Width = 60;
            // 
            // gvMx1fcheckTool
@@ -256,7 +258,7 @@
            this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
            this.gvMx1fcheckTool.Tag = "edit";
            this.gvMx1fcheckTool.Visible = true;
            this.gvMx1fcheckTool.VisibleIndex = 3;
            this.gvMx1fcheckTool.VisibleIndex = 4;
            this.gvMx1fcheckTool.Width = 150;
            // 
            // rptJYGJ
@@ -278,7 +280,7 @@
            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
            this.gvMx1sampleSizeNo.Tag = "edit";
            this.gvMx1sampleSizeNo.Visible = true;
            this.gvMx1sampleSizeNo.VisibleIndex = 4;
            this.gvMx1sampleSizeNo.VisibleIndex = 5;
            this.gvMx1sampleSizeNo.Width = 150;
            // 
            // rptJYBZ
@@ -301,7 +303,7 @@
            this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
            this.gvMx1fcheckItem.Tag = "edit";
            this.gvMx1fcheckItem.Visible = true;
            this.gvMx1fcheckItem.VisibleIndex = 0;
            this.gvMx1fcheckItem.VisibleIndex = 1;
            this.gvMx1fcheckItem.Width = 150;
            // 
            // rptJYXM
@@ -310,7 +312,7 @@
            this.rptJYXM.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.rptJYXM.Name = "rptJYXM";
            this.rptJYXM.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
           // this.rptJYXM.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            // 
            // gvMx1fupAllow
            // 
@@ -320,9 +322,9 @@
            this.gvMx1fupAllow.FieldName = "fupAllow";
            this.gvMx1fupAllow.MinWidth = 60;
            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
            this.gvMx1fupAllow.Tag = "yz_quantity_edit";
            this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
            this.gvMx1fupAllow.Visible = true;
            this.gvMx1fupAllow.VisibleIndex = 8;
            this.gvMx1fupAllow.VisibleIndex = 9;
            this.gvMx1fupAllow.Width = 60;
            // 
            // gvMx1forder
@@ -330,11 +332,37 @@
            this.gvMx1forder.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1forder.AppearanceCell.Options.UseFont = true;
            this.gvMx1forder.Caption = "顺序";
            this.gvMx1forder.ColumnEdit = this.repositoryItemComboBox1;
            this.gvMx1forder.FieldName = "forder";
            this.gvMx1forder.MinWidth = 50;
            this.gvMx1forder.Name = "gvMx1forder";
            this.gvMx1forder.Tag = "yz_quantity_edit";
            this.gvMx1forder.Tag = "yz_quantity_0_edit";
            this.gvMx1forder.Visible = true;
            this.gvMx1forder.VisibleIndex = 0;
            this.gvMx1forder.Width = 50;
            //
            // repositoryItemComboBox1
            //
            this.repositoryItemComboBox1.AutoHeight = false;
            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemComboBox1.Items.AddRange(new object[] {
            "1",
            "2",
            "3",
            "4",
            "5",
            "6",
            "7",
            "8",
            "9",
            "10",
            "11",
            "12",
            "13",
            "14",
            "15"});
            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
            // 
            // gvMx1memo
            // 
@@ -346,7 +374,7 @@
            this.gvMx1memo.Name = "gvMx1memo";
            this.gvMx1memo.Tag = "edit";
            this.gvMx1memo.Visible = true;
            this.gvMx1memo.VisibleIndex = 2;
            this.gvMx1memo.VisibleIndex = 3;
            this.gvMx1memo.Width = 150;
            // 
            // gvMx1guid
@@ -379,7 +407,8 @@
            this.rptJYBZ,
            this.rptJSSP,
            this.rptJYSP,
            this.repositoryItemButtonEdit1});
            this.repositoryItemButtonEdit1,
            this.repositoryItemComboBox1});
            this.gcMx1.Size = new System.Drawing.Size(1125, 352);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -418,7 +447,7 @@
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Tag = "edit";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 1;
            this.gridColumn5.VisibleIndex = 2;
            this.gridColumn5.Width = 150;
            // 
            // sampleSizeName
@@ -430,7 +459,7 @@
            this.sampleSizeName.OptionsColumn.ReadOnly = true;
            this.sampleSizeName.Tag = "edit";
            this.sampleSizeName.Visible = true;
            this.sampleSizeName.VisibleIndex = 5;
            this.sampleSizeName.VisibleIndex = 6;
            this.sampleSizeName.Width = 150;
            // 
            // gvMxDel
@@ -440,16 +469,16 @@
            this.gvMxDel.MinWidth = 50;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 11;
            this.gvMxDel.VisibleIndex = 12;
            this.gvMxDel.Width = 100;
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.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, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移除", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", 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);
@@ -939,7 +968,7 @@
            this.xtraTabPageCopy.Controls.Add(this.gridControl2);
            this.xtraTabPageCopy.Controls.Add(this.panelControl1);
            this.xtraTabPageCopy.Name = "xtraTabPageCopy";
            this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 377);
            this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 352);
            this.xtraTabPageCopy.Text = "复制到其它物料";
            // 
            // gridControl2
@@ -950,7 +979,7 @@
            this.gridControl2.Name = "gridControl2";
            this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit3});
            this.gridControl2.Size = new System.Drawing.Size(1125, 334);
            this.gridControl2.Size = new System.Drawing.Size(1125, 309);
            this.gridControl2.TabIndex = 1;
            this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView2});
@@ -1051,10 +1080,10 @@
            // repositoryItemButtonEdit3
            // 
            this.repositoryItemButtonEdit3.AutoHeight = false;
            editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", 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.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
            this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
@@ -1098,10 +1127,10 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_OrgName);
            this.panel1.Controls.Add(this.txt_fSubsidiary);
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.txt_itemModel);
            this.panel1.Controls.Add(this.txt_ItemId);
            this.panel1.Controls.Add(this.txt_gg);
            this.panel1.Controls.Add(this.txt_itemId);
            this.panel1.Controls.Add(this.txt_ftwoChecked);
            this.panel1.Controls.Add(this.txt_foneChecked);
            this.panel1.Controls.Add(this.lb_itemModel);
@@ -1130,24 +1159,42 @@
            this.panel1.Size = new System.Drawing.Size(1127, 186);
            this.panel1.TabIndex = 1;
            // 
            // txt_itemModel
            // txt_fSubsidiary
            // 
            this.txt_itemModel.Location = new System.Drawing.Point(85, 113);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
            this.txt_itemModel.Size = new System.Drawing.Size(301, 64);
            this.txt_itemModel.TabIndex = 381;
            this.txt_itemModel.Tag = "readOnly";
            this.txt_fSubsidiary.IsReadly = false;
            this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 14);
            this.txt_fSubsidiary.Name = "txt_fSubsidiary";
            this.txt_fSubsidiary.Size = new System.Drawing.Size(302, 30);
            this.txt_fSubsidiary.TabIndex = 383;
            // 
            // txt_ItemId
            // labelControl2
            // 
            this.txt_ItemId.IsReadly = false;
            this.txt_ItemId.Location = new System.Drawing.Point(85, 46);
            this.txt_ItemId.Name = "txt_ItemId";
            this.txt_ItemId.Size = new System.Drawing.Size(301, 33);
            this.txt_ItemId.TabIndex = 380;
            this.txt_ItemId.Tag = "no";
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(11, 19);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(68, 21);
            this.labelControl2.TabIndex = 382;
            this.labelControl2.Text = "选择组织";
            //
            // txt_gg
            //
            this.txt_gg.Location = new System.Drawing.Point(85, 113);
            this.txt_gg.Name = "txt_gg";
            this.txt_gg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_gg.Properties.Appearance.Options.UseFont = true;
            this.txt_gg.Size = new System.Drawing.Size(301, 64);
            this.txt_gg.TabIndex = 381;
            this.txt_gg.Tag = "readOnly";
            //
            // txt_itemId
            //
            this.txt_itemId.IsReadly = false;
            this.txt_itemId.Location = new System.Drawing.Point(85, 46);
            this.txt_itemId.Name = "txt_itemId";
            this.txt_itemId.Size = new System.Drawing.Size(301, 33);
            this.txt_itemId.TabIndex = 380;
            this.txt_itemId.Tag = "no";
            // 
            // txt_ftwoChecked
            // 
@@ -1196,24 +1243,6 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // txt_OrgName
            //
            this.txt_OrgName.IsReadly = false;
            this.txt_OrgName.Location = new System.Drawing.Point(84, 14);
            this.txt_OrgName.Name = "txt_OrgName";
            this.txt_OrgName.Size = new System.Drawing.Size(302, 30);
            this.txt_OrgName.TabIndex = 383;
            //
            // labelControl2
            //
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(11, 19);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(68, 21);
            this.labelControl2.TabIndex = 382;
            this.labelControl2.Text = "选择组织";
            //
            // Frm_MesQmCheckitemDt
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1229,6 +1258,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
@@ -1256,7 +1286,7 @@
            this.panelControl1.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
@@ -1336,8 +1366,8 @@
        private DevExpress.XtraEditors.LabelControl lb_itemModel;
        private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
        private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
        private UserControl.UcLookItems txt_ItemId;
        private DevExpress.XtraEditors.MemoEdit txt_itemModel;
        private UserControl.UcLookItems txt_itemId;
        private DevExpress.XtraEditors.MemoEdit txt_gg;
        private DevExpress.XtraEditors.SimpleButton btnSelect;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYGJ;
@@ -1362,7 +1392,8 @@
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
        private DevExpress.XtraEditors.SimpleButton btnSave;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private UserControl.UcLookOrg txt_OrgName;
        private UserControl.UcLookOrg txt_fSubsidiary;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -67,8 +67,6 @@
                frm.ShowDialog();
            };
            btnSave.Click += BtnSave_Click;
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -227,15 +225,20 @@
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            string _ItemId = txt_ItemId.GetId();
            string _ItemId = txt_itemId.GetId();
            if (string.IsNullOrEmpty(_ItemId))
            {
                MsgHelper.Warning("请选择物料!");
                txt_ItemId.Focus();
                txt_itemId.Focus();
                return;
            }
            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();
            if (gvMx1.DataRowCount <= 0)
            {
                MsgHelper.Warning("项目明细不能为空!");
                return;
            }
            try
            {
                var lst = new List<MesQmCheckitemDt>();
@@ -243,11 +246,68 @@
                {
                    var row = gvMx1.GetDataRow(i);
                    if (row != null)
                    {
                        if (string.IsNullOrEmpty(row["forder"].ToString()))
                        {
                            MsgHelper.ShowError("顺序不能为空!");
                            return;
                        }
                        if (string.IsNullOrEmpty(row["FcheckItem"].ToString()))
                        {
                            MsgHelper.ShowError("检验项目不能为空!");
                            return;
                        }
                        if (string.IsNullOrEmpty(row["FcheckTool"].ToString()))
                        {
                            MsgHelper.ShowError("检验工具不能为空!");
                            return;
                        }
                        if (string.IsNullOrEmpty(row["SampleSizeNo"].ToString()))
                        {
                            MsgHelper.ShowError("检验标准不能为空!");
                            return;
                        }
                        if (string.IsNullOrEmpty(row["FcheckLevel"].ToString()))
                        {
                            MsgHelper.ShowError("检验水平不能为空!");
                            return;
                        }
                        if (string.IsNullOrEmpty(row["FacLevel"].ToString()))
                        {
                            MsgHelper.ShowError("接受水平不能为空!");
                            return;
                        }
                        string _Fstand = row["Fstand"].ToString();
                        string _FupAllow = row["FupAllow"].ToString();
                        string _FdownAllow = row["FdownAllow"].ToString();
                        //假如三个都为空通过
                        if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
                        {
                        }
                        else
                        {
                            if (!string.IsNullOrEmpty(_Fstand) && !string.IsNullOrEmpty(_FupAllow) && !string.IsNullOrEmpty(_FdownAllow))
                            {
                                decimal _Fstand_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_Fstand);
                                decimal _FupAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FupAllow);
                                decimal _FdownAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FdownAllow);
                                if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f) { }
                                else {
                                    MsgHelper.ShowError("标准值必须在上限和下限之间!");
                                    return;
                                }
                            }
                            else
                            {
                                MsgHelper.ShowError("请填写正确的上限,标准值,下限!");
                                return;
                            }
                        }
                        lst.Add(new MesQmCheckitemDt
                        {
                            Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
                           // Forder = int.Parse(row["forder"].ToString()),
                            Forder = 0,
                            Forder = int.Parse(row["forder"].ToString()),
                            FcheckItem = row["FcheckItem"].ToString(),
                            SampleSizeNo = row["SampleSizeNo"].ToString(),
                            FcheckTool = row["FcheckTool"].ToString(),
@@ -259,6 +319,7 @@
                            FupAllow = row["FupAllow"].ToString(),
                            FdownAllow = row["FdownAllow"].ToString(),
                        });
                    }
                }
                var _obj = new MesQmCheckitem
                {
@@ -466,18 +527,21 @@
        #region 以下为种种下拉
        private void _setIno()
        {
            this.txt_OrgName.EditChanged += (s, e) => {
                string _orgId = txt_OrgName.GetId();
            this.txt_fSubsidiary.EditChanged += (s, e) =>
            {
                string _orgId = txt_fSubsidiary.GetId();
                if (string.IsNullOrEmpty(_orgId))
                    return;
                txt_ItemId.getSuppler(_orgId);
                txt_itemModel.Text ="";
                txt_itemNo.Text = "";
                txt_itemId.getSuppler(_orgId);
                //txt_gg.Text ="";
                //txt_itemNo.Text = "";
            };
            txt_ItemId.EditChanged += (s, e) =>
            txt_itemId.EditChanged += (s, e) =>
            {
                txt_itemModel.Text = this.txt_ItemId.GetModel();
                txt_itemNo.Text = this.txt_ItemId.GetCode();
                if (!string.IsNullOrEmpty(this.txt_itemId.GetModel()))
                    txt_gg.Text = this.txt_itemId.GetModel();
                if (!string.IsNullOrEmpty(this.txt_itemId.GetCode()))
                    txt_itemNo.Text = this.txt_itemId.GetCode();
            };
            _getListJyxm();
            _getListJygj();
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1335,7 +1335,18 @@
            if (string.IsNullOrEmpty(str)) return Guid.Empty;
            return Guid.Parse(str);
        }
        public static decimal ToDecimal(string str)
        {
            try
            {
                return decimal.Parse(str);
            }
            catch (Exception)
            {
                return 0;
            }
        }
        public static int ToInt(string str)
        {
            try
@@ -1373,12 +1384,7 @@
                return true;
            return false;
        }
        public string GetIsNullOrEmpty(string str)
        {
            if (string.IsNullOrEmpty(str.Trim()))
                return "{>";
            return str.Trim();
        }
        /// <summary>
        /// 读取grid的当前行
DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
@@ -72,7 +72,7 @@
            // 
            this.gridColumn6.Caption = "使用组织";
            this.gridColumn6.FieldName = "fSubsidiary";
            this.gridColumn6.MinWidth = 200;
            this.gridColumn6.MinWidth = 50;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 0;
@@ -94,7 +94,8 @@
            // 
            this.gridColumn2.Caption = "物料编号";
            this.gridColumn2.FieldName = "itemNo";
            this.gridColumn2.MinWidth = 110;
            this.gridColumn2.MaxWidth = 110;
            this.gridColumn2.MinWidth = 50;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.UnboundDataType = typeof(string);
            this.gridColumn2.Visible = true;
@@ -105,7 +106,8 @@
            // 
            this.gridColumn3.Caption = "物料名称";
            this.gridColumn3.FieldName = "itemName";
            this.gridColumn3.MinWidth = 100;
            this.gridColumn3.MaxWidth = 150;
            this.gridColumn3.MinWidth = 50;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 3;
@@ -115,7 +117,8 @@
            // 
            this.gridColumn5.Caption = "物料规格";
            this.gridColumn5.FieldName = "itemModel";
            this.gridColumn5.MinWidth = 100;
            this.gridColumn5.MaxWidth = 200;
            this.gridColumn5.MinWidth = 50;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 4;