修改了检查guid

lu

2024-10-27 66315d3ad5ab7fcc673cdf479742c6eff73df8ea

修改了检查guid

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs

@@ -248,7 +248,7 @@

            var _obj = new
            {
                guid = lbGuid.Text.Trim(), //主建
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                name = txt_name.Text.Trim(),
                time1 = txt_begTime.Value.Date,
                time2 = txt_endTime.Value.Date,

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

@@ -252,7 +252,7 @@
                if (row != null)
                    lst.Add(new
                    {
                        guid = row["guid"].ToString(),
                        guid = UtilityHelper.ToGuid(row["guid"].ToString()),
                        lineNo = row["lineNo"].ToString(),
                        name = row["name"].ToString(),
                        remark = row["remark"].ToString(),
@@ -262,7 +262,7 @@

            var _obj = new
            {
                guid = lbGuid.Text.Trim(), //主建
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                workshopNo = txt_workshopNo.Text.Trim(),
                name = txt_name.Text.Trim(),
                remark = txt_remark.Text.Trim(),

 DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs

@@ -223,9 +223,7 @@
                if (row != null)
                    lst.Add(new MesSysLookups
                    {
                        Guid = row["Guid"].ToString().Length > 0
                            ? Guid.Parse(row["Guid"].ToString())
                            : Guid.Empty,
                        Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
                        LookupName = row["LookupName"].ToString(),
                        LookupValue = row["LookupValue"].ToString()
                    });
@@ -233,9 +231,8 @@

            var _obj = new MesSysLookupTypes
            {
                Guid = lbGuid.Text.Trim().Length > 0
                    ? Guid.Parse(lbGuid.Text.Trim())
                    : Guid.Empty,
                
                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                LookupTypeCode = txt_lookupTypeCode.Text,
                LookupTypeName = txt_lookupTypeName.Text,
                list = lst

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs

@@ -1088,7 +1088,7 @@
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = "MES_QM_AQL1,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR";
            this.toolBarMenu1.chkParameter = "MES_QM_AQL1,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mesQmAql1";
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs

@@ -88,22 +88,6 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_sampleSizeNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;

            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "AntiAudit", JsonConvert.SerializeObject(rowGuid));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                }
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
        }

        /// <summary>
@@ -303,9 +287,7 @@
                if (row != null)
                    qmaql2.Add(new MesQmAql2
                    {
                        Guid = row["Guid"].ToString().Length > 0
                            ? Guid.Parse(row["Guid"].ToString())
                            : Guid.Empty,
                        Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
                        LotFrom =  Convert.ToInt32(row["LotFrom"].ToString()),
                        LotTo =  Convert.ToInt32(row["LotTo"].ToString()),
                        FlevelS1 =   row["FlevelS1"].ToString(),
@@ -326,9 +308,7 @@
                if (row != null)
                    qmaql3.Add(new MesQmAql3
                    {
                        Guid = row["Guid"].ToString().Length > 0
                            ? Guid.Parse(row["Guid"].ToString())
                            : Guid.Empty,
                        Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
                        FsampleSizeWord = Convert.ToInt32(row["FsampleSizeWord"].ToString()),
                        SampleSizeWord =  row["SampleSizeWord"].ToString(),
                        Aql00010 = Convert.ToInt32(row["Aql00010"].ToString()),
@@ -353,10 +333,7 @@

            var _obj = new MesQmAql1
            {
                Guid = lbGuid.Text.Trim().Length > 0
                    ? Guid.Parse(lbGuid.Text.Trim())
                    : Guid.Empty,

                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                SampleSizeNo = txt_sampleSizeNo.Text.Trim(),
                SampleSizeName = txt_sampleSizeName.Text.Trim(),
                Memo = txt_memo.Text.Trim(),

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs

@@ -205,7 +205,7 @@
        {
            toolBarMenu1.isSetBtn = false;
            string _ItemId = txt_itemId.GetId()
;            if (string.IsNullOrEmpty(_ItemId))
; if (string.IsNullOrEmpty(_ItemId))
            {
                MsgHelper.Warning("请选择物料！");
                // txt_account.Focus();
@@ -224,7 +224,7 @@
                        Forder = 1,
                        FcheckItem = row["FcheckItem"].ToString(),
                        SampleSizeNo = row["SampleSizeNo"].ToString(),
                        FcheckTool= row["FcheckTool"].ToString(),
                        FcheckTool = row["FcheckTool"].ToString(),
                        FcheckLevel = row["FcheckLevel"].ToString(),
                        Fstand = row["Fstand"].ToString(),
                        FacLevel = row["FacLevel"].ToString(),
@@ -233,11 +233,9 @@

            var _obj = new MesQmCheckitem
            {
                Guid = lbGuid.Text.Trim().Length > 0
                    ? Guid.Parse(lbGuid.Text.Trim())
                    : Guid.Empty,
                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                Memo = txt_memo.Text.Trim(),
                ItemNo =txt_itemNo.Text.Trim(),
                ItemNo = txt_itemNo.Text.Trim(),
                IsEnabled = txt_isenabled.Checked,
                list = lst
            };
@@ -507,8 +505,8 @@
                var dt = rtn.rtnData.list;
                foreach (DataRow dr in dt.Rows)
                {
                    rptJYBZ.Items.Add(dr["SampleSizeNo"].ToString());
                    string ddddd = dr["SampleSizeName"].ToString();
                    rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
                    //string ddddd = dr["SampleSizeName"].ToString();
                }
            }
            catch (Exception ex)
@@ -555,7 +553,7 @@
                ,"7.特殊检验水平(S4),"
            });
        }
       

        /// <summary>
        /// 关联检验标准名称
        /// </summary>
@@ -566,12 +564,20 @@
            ComboBoxEdit comboBox = sender as ComboBoxEdit;
            if (comboBox != null)
            {
                CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
                string _val = _itm.Value.ToString();
                string _txt = _itm.Text.ToString();
                gvMx1.CloseEditor();
                gvMx1.UpdateCurrentRow();
                GridView myView = (gcMx1.MainView as GridView);
                int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
                myView.SetRowCellValue(dataIndex, "sampleSizeName", "sdf");
                myView.SetRowCellValue(dataIndex, "gridColumn6", "sdf");
                myView.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
                myView.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
            }
        }

        #endregion


    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs

@@ -10,7 +10,6 @@
using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

@@ -24,13 +23,10 @@
        public Frm_MesSysLookups()
        {
            InitializeComponent();
            toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            getPageList(1, UtilityHelper.GetPageSize());
            pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -75,31 +71,6 @@
        }

        /// <summary>
        ///     查询事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            var frm =
                new ShowFilter(gridView1.Columns,
                    _filterList);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }

        /// <summary>
        ///     查询回调
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
        {
            _filterList = e.FilterList;
            getPageList(1, pageBar1.RowsCount);
        }

        /// <summary>
        ///     取消事件
        /// </summary>
        /// <param name="sender"></param>
@@ -107,48 +78,6 @@
        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
        {
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
        }

        /// <summary>
        ///     删除事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_lookupTypeCode, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }

            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
                return;
            var lst = new List<dynamic>();
            lst.Add(rowGuid);
            var _obj = lst;
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "DeleteModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn =
                    UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                }

                MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
            }
        }

        /// <summary>
@@ -182,23 +111,6 @@
        }

        /// <summary>
        ///     新增事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
        {
            UtilityHelper.JumpToTab(xtraTabControl1, 1);
            lbGuid.Text = "";
            var gridViews =
                new List<GridView>();
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(panel1.Controls, true,
                gridViews);
            UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
        }

        /// <summary>
        ///     保存事件
        /// </summary>
        /// <param name="sender"></param>
@@ -215,7 +127,6 @@

            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();

            var lst = new List<MesSysLookups>();
            for (var i = 0; i < gvMx1.DataRowCount; i++)
            {
@@ -223,9 +134,7 @@
                if (row != null)
                    lst.Add(new MesSysLookups
                    {
                        Guid = row["Guid"].ToString().Length > 0
                            ? Guid.Parse(row["Guid"].ToString())
                            : Guid.Empty,
                        Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
                        LookupName = row["LookupName"].ToString(),
                        LookupValue = row["LookupValue"].ToString()
                    });
@@ -233,14 +142,11 @@

            var _obj = new MesSysLookupTypes
            {
                Guid = lbGuid.Text.Trim().Length > 0
                    ? Guid.Parse(lbGuid.Text.Trim())
                    : Guid.Empty,
                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                LookupTypeCode = txt_lookupTypeCode.Text,
                LookupTypeName = txt_lookupTypeName.Text,
                list = lst
            };

            try
            {
                var strJson = UtilityHelper.HttpPost("",
@@ -276,7 +182,6 @@
                                   itm.fileValue + "'");

            _sbSqlWhere.Append("and LOOKUP_TYPE_CODE = 'QATOOLS'");

            var pgq = new PageQueryModel(curPage, pageSize,
                "create_date", "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);

 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs

@@ -227,7 +227,7 @@

            var _obj = new
            {
                guid = lbGuid.Text.Trim(), //主建
                guid =UtilityHelper.ToGuid( lbGuid.Text.Trim()), //主建
                docCode = txt_docCode.EditValue.ToString(),
                docFormat = txt_docFormat.Text,
                noLength = txt_noLength.Value.ToString(),

 DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs

@@ -199,7 +199,7 @@
                : "";
            var _obj = new
            {
                guid = lbGuid.Text.Trim(), //主建
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                upGuid = _upGuid, //上级的主建
                name = txt_name.Text.Trim(), //名称
                conPeople = txt_conPeople.Text, //联系人

 DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs

@@ -224,7 +224,7 @@

            var _obj = new
            {
                guid = lbGuid.Text.Trim(), //主建
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                upGuid = _upGuid, //上级的主建
                name = txt_name.Text.Trim(), //名称
                icon = txt_icon.Text, //菜单图标

 DevApp/Gs.DevApp/DevFrm/User/Role.cs

@@ -229,7 +229,7 @@

            var _obj = new
            {
                guid = lbGuid.Text.Trim(),
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                roleName = txt_roleName.Text.Trim(),
                roleRemark = txt_roleRemark.Text.Trim(),
                isStatus = txt_isStatus.Checked //状态

 DevApp/Gs.DevApp/DevFrm/User/User.cs

@@ -216,7 +216,7 @@

            var _obj = new
            {
                guid = lbGuid.Text.Trim(), //主建
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                account = txt_account.Text.Trim(),
                password = txt_password.Text.Trim(),
                userName = txt_userName.Text.Trim(),

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs

@@ -261,9 +261,7 @@

            var _obj = new MesDepots
            {
                Guid = lbGuid.Text.Trim().Length > 0
                    ? Guid.Parse(lbGuid.Text.Trim())
                    : Guid.Empty,
                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                DepotCode = txt_depotCode.Text,
                DepotName = txt_depotName.Text,
                Description = txt_description.Text,

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs

@@ -294,11 +294,7 @@
                var row = gvMx1.GetDataRow(i);
                if (row != null)
                {
                    Guid? _guid = null;
                    if (string.IsNullOrEmpty(row["guid"].ToString()))
                        _guid = null;
                    else
                        _guid = Guid.Parse(row["guid"].ToString());
                    Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
                    _obj.list.Add(new MesInvItemArnDetail
                    {
                        Guid = _guid,

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -678,7 +678,7 @@
        /// </summary>
        /// <param name="str"></param>
        /// <returns></returns>
        public Guid ToGuid(string str)
        public static Guid ToGuid(string str)
        {
            if (string.IsNullOrEmpty(str)) return Guid.Empty;
            return Guid.Parse(str);

 DevApp/Gs.DevApp/UserControl/UcLookItems.cs

@@ -31,7 +31,8 @@
            set
            {
                _KeyFile = value;
                getSuppler();
                if (!string.IsNullOrEmpty(_KeyFile))
                    getSuppler();
            }
        }
        /// <summary>
@@ -53,9 +54,9 @@
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                    "MesItemsManager/GetListPage", json);
                var rtn = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = rtn.rtnData.list;
                    "MesItemsManager/GetListPageByLook", json);
                var rtn = UtilityHelper.ReturnToList(strReturn);
                var dt = rtn.rtnData;
                lookSearchSupplier.Properties.DataSource = dt;
                lookSearchSupplier.Properties.DisplayMember = "itemName";
                // lookSearchSupplier.Properties.ValueMember = "depotId";

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -675,7 +675,7 @@
        public string xlsInService { get; set; }

        /// <summary>
        ///     审核参数,表名,字段名，如：MES_HOLIDAY,check_date,check_status,check_by
        ///     审核参数,表名,字段名，如：MES_HOLIDAY,check_date,check_status,check_by,存储过程名
        /// </summary>
        public string chkParameter { get; set; }


 DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs

@@ -184,7 +184,7 @@
            }
            var _obj = new
            {
                guid = lbGuid.Text.Trim(),//主建
                guid =UtilityHelper.ToGuid( lbGuid.Text.Trim()), //主建

            };
            try

 DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs

@@ -189,8 +189,7 @@
            }
            var _obj = new
            {
                guid = lbGuid.Text.Trim(),//主建

                  guid =UtilityHelper.ToGuid( lbGuid.Text.Trim()), //主建
            };
            try
            {