~tjx/GsMesClient.git

			@@ -14,6 +14,7 @@
			{
			public partial class Frm_FqcDetect01 : DevExpress.XtraEditors.XtraForm
			{
			string _strTag= "N:不合格";
			string _webServiceName = "FqcManager/";
			List<FilterEntity> _filterList = new List<FilterEntity>();
			public Frm_FqcDetect01()
			@@ -51,16 +52,10 @@
			gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
			btnIpt.Click += BtnIpt_Click;
			txt_suppId.getSuppler("");
			txt_lineId.getSuppler("");
			txt_itemId.Click += (s, e) =>
			//选择工单
			txt_lotNo.Click += (s, e) =>
			{
			string _lineId = txt_lineId.GetId();
			if (string.IsNullOrEmpty(_lineId))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请先选择产线！");
			return;
			}
			var frm = new SelectFqcItem(_lineId);
			var frm = new SelectFqcDaa();
			frm.UpdateParent += (ss, ee) =>
			{
			try
			@@ -72,6 +67,45 @@
			txt_itemName.Text = lst[0].itemName;
			txt_itemNo.Text = lst[0].itemNo;
			txt_lotNo.Text = lst[0].gdbh;
			txt_lineName.Text = lst[0].lineName;
			txt_lineId.Text = lst[0].lineId;
			txt_checkStates.Text = "W:未知";
			txt_fcheckResu.Text = "W:未知";
			}
			catch (Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			};
			frm.ShowDialog();
			};
			//选择箱码
			txt_kbList.Click += (s, e) =>
			{
			string _lotNo = txt_lotNo.Text.Trim();
			if (string.IsNullOrEmpty(_lotNo))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请先选择工单！");
			return;
			}
			var frm = new SelectFqcBox(_lotNo);
			frm.UpdateParent += (ss, ee) =>
			{
			try
			{
			var lst = new List<dynamic>();
			lst = ee.DynamicList;
			System.Text.StringBuilder sb = new System.Text.StringBuilder();
			decimal kbSl = 0;
			foreach (var item in lst)
			{
			if (sb.Length > 0)
			sb.Append(",");
			sb.Append(item.itemBarcode);
			kbSl += decimal.Parse(item.sl.ToString());
			};
			txt_kbList.Text = sb.ToString();
			txt_kbSl.Text = kbSl.ToString();
			}
			catch (Exception ex)
			{
			@@ -280,14 +314,70 @@
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定提交检验吗？"))
			return;
			if (txt_fcheckResu.Text.Trim() == "不合格")
			if (txt_fcheckResu.Text.Trim() == _strTag)
			{
			if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim()))
			{
			MsgHelper.Warning("单据为不合格时，请填写违规信息！");
			return;
			}
			string _txt_fngHandle = txt_fngHandle.Text.Trim();
			string _txt_fmrmode = txt_fmrmode.GetCode();
			string _txt_fzrId = txt_fzrId.GetId();
			string _txt_workNo = txt_workNo.Text.Trim();
			string _txt_msg = txt_msg.TextTxt;
			string _txt_zrType = txt_zrType.Text.Trim();
			if (txt_fngHandle.SelectedIndex <= 0)
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择处置结果！");
			txt_fngHandle.Focus();
			return;
			}
			if (txt_zrType.SelectedIndex <= 0)
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择责任判定！");
			txt_zrType.Focus();
			return;
			}
			if (_txt_fzrId.Length <= 0)
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择责任人！");
			txt_fzrId.Focus();
			return;
			}
			//当处置结果为反工时，要选择工序和反工编号
			if (txt_fngHandle.SelectedIndex == 1)
			{
			if (string.IsNullOrEmpty(_txt_workNo))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请填写反工单号！");
			txt_workNo.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_txt_fmrmode))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请填选择反工工序！");
			txt_fmrmode.Focus();
			return;
			}
			}
			else
			{
			if (!string.IsNullOrEmpty(_txt_workNo))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("不需要填写反工单号！");
			txt_workNo.Focus();
			return;
			}
			if (!string.IsNullOrEmpty(_txt_fmrmode))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("不需要选择反工工序！");
			txt_fmrmode.Focus();
			return;
			}
			}
			};

			var _obj = new
			{
			guid = rowGuid,
			@@ -315,7 +405,6 @@
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}

			}

			/// <summary>
			@@ -348,7 +437,6 @@
			var _obj = new
			{
			guid = rowGuid,
			mxGuid = Guid.Empty.ToString(),
			};
			try
			{
			@@ -407,6 +495,7 @@
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			this.ucUpFileList1.pGuid = "";
			this.ucChouJianList1.pGuid = "";
			}
			/// <summary>
			/// 修改事件
			@@ -450,36 +539,19 @@
			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_lineId = "";//产线
			string _txt_itemId = "";//产品
			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();//生产工单
			string _kbList = txt_kbList.Text.Trim();
			if (txt_djType.SelectedIndex <= 0)
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("单据类型不能为空！");
			txt_djType.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_txt_fbatchQty.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("抽检数量不能为空！");
			txt_fbatchQty.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_txt_lineId.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("产线不能为空！");
			txt_lineId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_txt_itemId.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("产品不能为空！");
			txt_itemId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_txt_lotNo.Trim()))
			@@ -488,6 +560,108 @@
			txt_lotNo.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_kbList.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("送检箱码不能为空！");
			txt_kbList.Focus();
			return;
			}
			if (string.IsNullOrEmpty(txt_kbSl.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("送检数量不能为空！");
			txt_kbList.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_txt_fbatchQty.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("抽检数量不能为空！");
			txt_fbatchQty.Focus();
			return;
			}
			if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(_txt_fbatchQty))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请输入正确的抽检数量！");
			txt_fbatchQty.Focus();
			return;
			}
			if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(txt_kbSl.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请输入正确的送检数量！");
			txt_kbList.Focus();
			return;
			}
			if (Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_txt_fbatchQty) > Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_kbSl.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("抽检数量不能大于送检数量！");
			txt_fbatchQty.Focus();
			return;
			}
			//当不合格时的检查
			string _txt_fngHandle = txt_fngHandle.Text.Trim();
			string _txt_fmrmode = txt_fmrmode.GetCode();
			string _txt_fzrId = txt_fzrId.GetId();
			string _txt_workNo = txt_workNo.Text.Trim();
			string _txt_zrType = txt_zrType.Text.Trim();
			if (txt_fcheckResu.Text.Trim() == _strTag)
			{
			if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim()))
			{
			MsgHelper.Warning("当不合格时，请填写违规信息！");
			txt_msg.Focus();
			return;
			}

			if (txt_fngHandle.SelectedIndex <= 0)
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请选择处置结果！");
			txt_fngHandle.Focus();
			return;
			}
			if (txt_zrType.SelectedIndex <= 0)
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请选择责任判定！");
			txt_zrType.Focus();
			return;
			}
			if (_txt_fzrId.Length <= 0)
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请选择责任人！");
			txt_fzrId.Focus();
			return;
			}
			//当处置结果为反工时，要选择工序和反工编号
			if (txt_fngHandle.SelectedIndex == 1)
			{
			if (string.IsNullOrEmpty(_txt_workNo))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请填写反工单号！");
			txt_workNo.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_txt_fmrmode))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请填选择反工工序！");
			txt_fmrmode.Focus();
			return;
			}
			}
			else
			{
			if (!string.IsNullOrEmpty(_txt_workNo))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("不需要填写反工单号！");
			txt_workNo.Focus();
			return;
			}
			if (!string.IsNullOrEmpty(_txt_fmrmode))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("不需要选择反工工序！");
			txt_fmrmode.Focus();
			return;
			}
			}
			};

			var _obj = new
			{
			guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
			@@ -503,7 +677,12 @@
			fmanageNo = _txt_fmanageNo,//流程编号
			lotNo1 = _txt_lotNo1,//送检批号
			lotNo = _txt_lotNo,//生产工单
			edtType = 0,
			kbList = _kbList,
			fngHandle = _txt_fngHandle,
			fzrId = _txt_fzrId,
			workNo = _txt_workNo,
			fmrmode = _txt_fmrmode,
			zrType = _txt_zrType,
			list = new List<dynamic>(),
			};
			gvMx1.CloseEditor();
			@@ -518,7 +697,7 @@
			string _defectLevel = row["defectLevel"].ToString();
			string _defectDetails = row["defectDetails"].ToString();
			string _fcheckResu = row["fcheckResu"].ToString();
			if (_fcheckResu == "不合格")
			if (_fcheckResu == _strTag)
			{
			if (string.IsNullOrEmpty(_defectLevel))
			{
			@@ -569,7 +748,7 @@
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage)
			{
			var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			// _sbSqlWhere += " and isnull(fsubmit,0)=0";
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			@@ -646,6 +825,7 @@
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			ucUpFileList1.pGuid = lbGuid.Text.Trim();
			ucChouJianList1.pGuid = lbGuid.Text.Trim();
			if (guid5.Length > 10)
			{
			int rowHandle = 0;
			@@ -677,6 +857,11 @@
			private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
			{
			if (e.Page.Name == "tabMxPage2")
			{
			ucChouJianList1.getList14();

			}
			if (e.Page.Name == "tabMxPage3")
			{
			ucUpFileList1.getFileList();
			}
			@@ -727,9 +912,10 @@
			{
			txtJianYan.ReadOnly = !bl;
			btnLoad.Enabled = bl;
			ucChouJianList1.IsReadOnly(!bl);
			btnIpt.Text = (bl == true ? "录入样本" : "查看样本");
			}

			}

			/// <summary>
			/// 读取缺陷等级
			@@ -781,7 +967,5 @@
			};
			frm.ShowDialog();
			}


			}
			}