~tjx/GsMesClient.git

			@@ -18,10 +18,13 @@
			public partial class Jyxm : DevExpress.XtraEditors.XtraUserControl
			{
			private List<FilterEntity> _filterList = new List<FilterEntity>();
			string _ucItem = "";//物料
			private readonly string _webServiceName = "MesQmCheckitemManager/";
			public string strType = "";//iqc type
			public decimal dfValue = 1; //iqc的样品数量默认5，否则1
			private string dftSsampleSizeName = "GB/T2828.1-2012/ISO";//默认
			private string dftSsampleSizeNo = "GB/T2828.1-2012/ISO";//默认
			private string dftFcheckLevel = "2.一般检验水平(II)";//默认检验水平
			private string dftFacLevel = "0.015---(AQL_0_0015)";//默认接收水平
			public Jyxm(string _strType)
			{
			InitializeComponent();
			@@ -43,28 +46,32 @@
			toolBarMenu1.xlsInService = "XlsInItemJyxm&" + strType;
			//类型，iqc,ipqc巡检，ipqc首检查,fqc，iqc的样品值默认为5，其它为1
			txt_ftype.Text = strType;
			if (strType == "iqc")
			if (strType == QcSeason.iqc.ToString())
			dfValue = 5;
			//如果是ipqc巡检，显示工位
			if (strType != "ipqc巡检")
			if (strType != QcSeason.ipqc巡检.ToString())
			{
			gvMx1.Columns["stationName"].Visible = false;
			}
			//如果是ipqc首检，显示认证
			if (strType != "ipqc首检")
			if (strType != QcSeason.ipqc首检.ToString())
			{
			gvMx1.Columns["isRzxx"].Visible = false;
			}
			//新行初始值
			this.gvMx1.InitNewRow += (s, e) =>
			{
			this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
			int newIndex = gvMx1.DataRowCount + 1;
			this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
			this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex);
			this.gvMx1.SetRowCellValue(e.RowHandle, "sampleSizeName", dftSsampleSizeName);
			this.gvMx1.SetRowCellValue(e.RowHandle, "sampleSizeNo", dftSsampleSizeNo);
			this.gvMx1.SetRowCellValue(e.RowHandle, "facLevel", dftFacLevel);
			this.gvMx1.SetRowCellValue(e.RowHandle, "fcheckLevel", dftFcheckLevel);
			};
			this.toolBarMenu1.getXmlConfig();
			Form parentForm = this.FindForm();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "foneChecked", "", (value) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
			@@ -91,7 +98,7 @@
			Gs.DevApp.ToolBox.MsgHelper.ShowInformation("该项目未审核，暂不能复制到其它物料！");
			return;
			}
			JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType);
			JyxmShowCopy frm = new JyxmShowCopy(lbGuid.Text.Trim(), strType);
			frm.ShowDialog();
			};
			}
			@@ -257,14 +264,7 @@
			private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
			{
			toolBarMenu1.isSetBtn = false;
			string _orgId = txt_fSubsidiary.GetId();
			if (string.IsNullOrEmpty(_orgId))
			{
			MsgHelper.Warning("请选择使用组织！");
			txt_fSubsidiary.Focus();
			return;
			}
			string _ItemId = txt_itemId.GetId();
			string _ItemId = txt_itemId.EditValue.ToString().Trim();
			if (string.IsNullOrEmpty(_ItemId))
			{
			MsgHelper.Warning("请选择物料！");
			@@ -325,7 +325,10 @@
			string _Fstand = row["Fstand"].ToString();
			string _FupAllow = row["FupAllow"].ToString();
			string _FdownAllow = row["FdownAllow"].ToString();
			bool _isRzxx = (row["isRzxx"].ToString() == "1" ? true : false);
			string _isRzxxTxt = row["isRzxx"].ToString();
			bool _isRzxx = false;
			if (_isRzxxTxt == "1" \|\| _isRzxxTxt.ToUpper() == "true".ToUpper())
			_isRzxx = true;
			//假如三个都为空通过
			if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
			{
			@@ -366,6 +369,7 @@
			FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
			ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
			stationName = row["stationName"].ToString(),
			FcheckType = row["FcheckType"].ToString(),
			isRzxx = _isRzxx,
			});
			}
			@@ -485,12 +489,10 @@
			if (_rtn.rtnCode > 0)
			{
			var dy = _rtn.rtnData;
			_ucItem = dy.itemId;
			lbGuid.Text = strGuid;
			var gvList = new List<GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
			_ucItem = "";
			var _job = JObject.Parse(strJson);
			var array = new JArray();
			foreach (var a in _job["rtnData"]["list"]) array.Add(a);
			@@ -501,6 +503,7 @@
			gcMx1.DataSource = dt;
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			else
			{
			@@ -593,19 +596,27 @@
			#region 以下为种种下拉
			private void _setIno()
			{
			this.txt_fSubsidiary.EditChanged += (s, e) =>
			txt_itemId.Click += (s, e) =>
			{
			string _orgId = txt_fSubsidiary.GetId();
			if (string.IsNullOrEmpty(_orgId))
			return;
			txt_itemId.getSuppler(_orgId, _ucItem, " ", strType);
			};
			txt_itemId.EditChanged += (s, e) =>
			{
			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();
			var frm = new JyxmShow(this.strType);
			frm.UpdateParent += (ss, ee) =>
			{
			try
			{
			var lst = new List<dynamic>();
			lst = ee.DynamicList;
			txt_itemId.Text = lst[0].itemId;
			txt_gg.Text = lst[0].itemModel;
			txt_mc.Text = lst[0].itemName;
			txt_itemNo.Text = lst[0].itemNo;
			txt_fSubsidiary.Text = lst[0].fSubsidiary;
			}
			catch (Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			};
			frm.ShowDialog();
			};
			_getListJyxm();
			_getListJygj();
			@@ -613,7 +624,9 @@
			_getListJssp();
			_getListJysp();
			_getListStation();
			_getListGroup();
			}

			/// <summary>
			/// 读取检验项目
			/// </summary>
			@@ -699,8 +712,6 @@
			foreach (DataRow dr in dt.Rows)
			{
			rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
			//rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
			//string ddddd = dr["SampleSizeName"].ToString();
			}
			}
			catch (Exception ex)
			@@ -745,7 +756,22 @@
			,"7.特殊检验水平(S4)"
			});
			}

			/// <summary>
			/// 读取检验水平
			/// </summary>
			private void _getListGroup()
			{
			rptGroup.Items.AddRange(new string[] {
			"外观"
			,"颜色"
			,"尺寸"
			, "关键部件一致性"
			, "品水测试"
			,"制热性能"
			,"进水压力"
			,"电气性能"
			});
			}
			/// <summary>
			/// 关联检验标准名称
			/// </summary>