From 66315d3ad5ab7fcc673cdf479742c6eff73df8ea Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期日, 27 十月 2024 07:57:50 +0800
Subject: [PATCH] 修改了检查guid
---
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookItems.cs | 9 +-
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 28 ++++--
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 2
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs | 3
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs | 4
DevApp/Gs.DevApp/DevFrm/User/User.cs | 2
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 29 ------
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 2
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 99 ------------------------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 6 -
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | 9 -
19 files changed, 45 insertions(+), 166 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
index e596080..96cd618 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
+++ b/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,
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
index 17e6a63..e75786c 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
+++ b/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(),
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index c233be1..45c1491 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/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
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index 2563c5f..d7e634d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/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;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index e141561..dc60933 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/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(),
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 5a0acf7..be988bb 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/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
+
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index 05902bf..7678abf 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/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);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index c0df5a6..0cf9684 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/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(),
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index 405e68c..f1e0d40 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/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, //鑱旂郴浜�
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
index 84eec46..fd2785d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
+++ b/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, //鑿滃崟鍥炬爣
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 2ff7957..8c8338d 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/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 //鐘舵��
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index b364acc..48ca2c6 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/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(),
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
index c632a57..375f72c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
+++ b/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,
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 365f536..18b0ae6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/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,
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 5685fb1..cd6b43f 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/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);
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
index e96e881..6fdeffc 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
+++ b/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";
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 95bc704..b8907e3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/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; }
diff --git a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs b/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs
index cd132f2..b868177 100644
--- a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs
+++ b/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
diff --git a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs b/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs
index 257c1b1..7b6b561 100644
--- a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs
+++ b/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
{
--
Gitblit v1.9.3