~tjx/GsMesClient.git

			@@ -1,4 +1,4 @@

			using Gs.DevApp.DevFrm.Work;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Gs.DevApp.UserControl;
			@@ -80,8 +80,10 @@
			};
			frm.ShowDialog();
			};
			// 读取缺陷等级
			getRptDefectLevel();
			}


			/// <summary>
			/// 批量录入
			/// </summary>
			@@ -94,7 +96,6 @@
			Gs.DevApp.DevFrm.QC.Frm_MesQaItemsDetect01Input frm = new Gs.DevApp.DevFrm.QC.Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(), bl);
			frm.ShowDialog();
			}

			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			@@ -270,7 +271,7 @@
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_releaseNo, gridView1, "lotNo");
			lbGuid, txt_releaseNo, gridView1, "releaseNo");
			toolBarMenu1.guidKey = rowGuid;
			if (string.IsNullOrEmpty(rowGuid))
			{
			@@ -281,9 +282,9 @@
			return;
			if (txt_fcheckResu.Text.Trim() == "不合格")
			{
			if (string.IsNullOrEmpty(txt_remarks.Text.Trim()))
			if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim()))
			{
			MsgHelper.Warning("单据为不合格时，请填写备注说明！");
			MsgHelper.Warning("单据为不合格时，请填写违规信息！");
			return;
			}
			};
			@@ -405,6 +406,7 @@
			gridViews.Add(gvMx1);
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			this.ucUpFileList1.pGuid = "";
			}
			/// <summary>
			/// 修改事件
			@@ -444,21 +446,18 @@
			private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
			{
			toolBarMenu1.isSetBtn = false;
			string _txt_djType = txt_djType.Text.Trim();
			string _txt_fbatchQty = txt_fbatchQty.Text.Trim();
			string _txt_lifnr = txt_lifnr.Text.Trim();
			string _txt_suppId = txt_suppId.GetId();
			string _txt_lineId = txt_lineId.GetId();
			string _txt_itemId = txt_itemId.Text.Trim();
			string _txt_remarks = txt_remarks.Text.Trim();
			string _txt_workNo = txt_workNo.GetCode();
			string _txt_epTag = txt_epTag.Text.Trim();
			string _txt_fzrId = txt_fzrId.GetId();
			string _txt_msg = txt_msg.TextTxt;
			string _txt_fmanageNo = txt_fmanageNo.Text.Trim();
			string _txt_lotNo2 = txt_lotNo2.Text.Trim();
			string _txt_lotNo1 = txt_lotNo1.Text.Trim();
			string _txt_lotNo = txt_lotNo.Text.Trim();
			string _txt_djType = txt_djType.Text.Trim();//单据类型
			string _txt_fbatchQty = txt_fbatchQty.Text.Trim();//抽检数量
			string _txt_lifnr = txt_lifnr.Text.Trim();//客户订单
			string _txt_suppId = txt_suppId.GetId();//客户id
			string _txt_lineId = txt_lineId.GetId();//产线
			string _txt_itemId = txt_itemId.Text.Trim();//产品
			string _txt_remarks = txt_remarks.Text.Trim();//备注
			string _txt_epTag = txt_epTag.Text.Trim();//环保
			string _txt_msg = txt_msg.TextTxt;//异常
			string _txt_fmanageNo = txt_fmanageNo.Text.Trim();//流程编号
			string _txt_lotNo1 = txt_lotNo1.Text.Trim();//送检批号
			string _txt_lotNo = txt_lotNo.Text.Trim();//生产工单
			if (txt_djType.SelectedIndex <= 0)
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("单据类型不能为空！");
			@@ -483,12 +482,6 @@
			txt_itemId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_txt_itemId.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("产品不能为空！");
			txt_itemId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_txt_lotNo.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("工单号不能为空！");
			@@ -498,22 +491,50 @@
			var _obj = new
			{
			guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
			djType = _txt_djType,
			fbatchQty = _txt_fbatchQty,
			lifnr = _txt_lifnr,
			suppId = _txt_suppId,
			lineId = _txt_lineId,
			itemId = _txt_itemId,
			remarks = _txt_remarks,
			workNo = _txt_workNo,
			epTag = _txt_epTag,
			fzrId = _txt_fzrId,
			msg = _txt_msg,
			fmanageNo = _txt_fmanageNo,
			lotNo2 = _txt_lotNo2,
			lotNo1 = _txt_lotNo1,
			lotNo = _txt_lotNo
			djType = _txt_djType,//单据类型
			fbatchQty = _txt_fbatchQty,//抽检数量
			lifnr = _txt_lifnr,//客户订单
			suppId = _txt_suppId,//客户id
			lineId = _txt_lineId,//产线
			itemId = _txt_itemId,//产品
			remarks = _txt_remarks,//备注
			epTag = _txt_epTag,//环保
			msg = _txt_msg,//异常
			fmanageNo = _txt_fmanageNo,//流程编号
			lotNo1 = _txt_lotNo1,//送检批号
			lotNo = _txt_lotNo,//生产工单
			edtType = 0,
			list = new List<dynamic>(),
			};
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			for (var i = 0; i < gvMx1.DataRowCount; i++)
			{
			var row = gvMx1.GetDataRow(i);
			if (row != null)
			{
			Guid _guid = UtilityHelper.ToGuid(row["guid"].ToString());
			string defectLevel = row["defectLevel"].ToString();
			string defectDetails = row["defectDetails"].ToString();
			if (string.IsNullOrEmpty(defectLevel))
			{
			MsgHelper.ShowError("请选择缺陷等级！");
			return;
			}
			if (string.IsNullOrEmpty(defectDetails))
			{
			MsgHelper.ShowError("请填写缺陷描述！");
			return;
			}
			_obj.list.Add(new
			{
			guid5 = _guid,
			defectLevel = defectLevel,
			defectDetails = defectDetails,
			});
			}
			}
			try
			{
			string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
			@@ -528,6 +549,7 @@
			this.setEable(false);
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			getModel(lbGuid.Text, "0");
			}
			}
			catch (Exception ex)
			@@ -696,12 +718,66 @@
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}


			private void setEable(bool bl)
			{
			txtJianYan.ReadOnly = !bl;
			btnLoad.Enabled = bl;
			btnIpt.Text = (bl == true ? "录入样本" : "查看样本");
			}


			/// <summary>
			/// 读取缺陷等级
			/// </summary>
			/// <param name="curPage"></param>
			private void getRptDefectLevel()
			{
			string _where = " and 1=1 and s_type='缺陷等级'";
			var pgq = new PageQueryModel(1, 999999, "a.defect_code", "asc", "", _where);
			var json = JsonConvert.SerializeObject(pgq);
			try
			{
			var strReturn = UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
			var dd = UtilityHelper.ReturnToTablePage(strReturn);
			var dt = dd.rtnData.list;
			foreach (DataRow dr in dt.Rows)
			{
			rptDefectLevel.Items.Add(dr["defectName"].ToString());
			}
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}
			/// <summary>
			/// 选择缺陷描述
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void rptDefectDetails_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx1.FocusedRowHandle;
			if (rowhandle < 0)
			return;
			UcDictionarySelect frm = new UcDictionarySelect("缺陷描述", " s_type='FQC缺陷描述'");
			frm.UpdateParent += (ss, ee) =>
			{
			System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
			var lst = ee.DynamicList;
			foreach (dynamic dym in lst)
			{
			if (stringBuilder.Length > 0)
			stringBuilder.Append("\|");
			stringBuilder.Append(dym.dicTxt);
			}
			gvMx1.SetFocusedRowCellValue("defectDetails", stringBuilder.ToString());
			// this.TextTxt = ;
			};
			frm.ShowDialog();
			}


			}
			}