~tjx/GsMesClient.git

			@@ -1,3 +1,5 @@
			using Gs.DevApp.DevFrm.Rk;
			using Gs.DevApp.DevFrm.Work;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Gs.DevApp.UserControl;
			@@ -15,6 +17,7 @@
			{
			string _webServiceName = "MesItemTblManager/";
			List<FilterEntity> _filterList = new List<FilterEntity>();
			string _ucGg = "";
			public Frm_MesItemTbl()
			{
			InitializeComponent();
			@@ -27,20 +30,23 @@
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnFPiZhunClick += ToolBarMenu1_btnFPiZhunClick;
			toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "tbl013", "", (value) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
			});
			}, tips);
			Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
			{
			getModel(value);
			}, (value) =>
			{
			getPageList(this.pageBar1.CurrentPage);
			});
			}, lbGuid);
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			//设置组织
			@@ -48,7 +54,7 @@
			{
			string orgdId = txt_tbl023.GetId();
			if (string.IsNullOrEmpty(orgdId)) return;
			txt_tbl002.getSuppler(orgdId);
			txt_tbl002.getSuppler(orgdId, _ucGg);
			};
			//设置工单子
			txt_tbl002.EditChanged += (s, e) =>
			@@ -57,8 +63,8 @@
			if (string.IsNullOrEmpty(daaId)) return;
			txt_rwd.Text = txt_tbl002.GetRwd();
			txt_workName.Text = txt_tbl002.GetWorkName();
			txt_lineName.Text = txt_tbl002.GetPrdName();
			txt_itemName.Text = txt_tbl002.GetPrdModel();
			txt_itemName.Text = txt_tbl002.GetPrdName();
			txt_itemNo.Text = txt_tbl002.GetPrdNo();
			};
			//选择需要入库的明细
			btnSelect.Click += (s, e) =>
			@@ -92,6 +98,7 @@
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _oldTable;
			gcMx1.ForceInitialize();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			catch (Exception ex)
			{
			@@ -100,47 +107,12 @@
			};
			frm.ShowDialog();
			};
			gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
			this.ucBtnPrint1.btnDesignClick += (s, e) =>
			{
			ucBtnPrint1.rptParameter = "rpt_SCTL{}";
			};
			this.ucBtnPrint1.btnReportClick += (s, e) =>
			{
			ucBtnPrint1.guidKey = "";
			string rowGuid = lbMxGuid.Text.Trim();
			ucBtnPrint1.guidKey = rowGuid;
			if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码张数！");
			txt_iCount_1.Focus();
			this.ucBtnPrint1.rptParameter = "return false";
			return;
			}
			if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码数量！");
			txt_psnQty_1.Focus();
			this.ucBtnPrint1.rptParameter = "return false";
			return;
			}
			if (lbMxGuid.Text.Trim().Length < 10)
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印的行！");
			this.ucBtnPrint1.rptParameter = "return false";
			return;
			}
			this.ucBtnPrint1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim()
			+ "," + ""
			+ "," + ""
			+ "," + txt_iCount_1.Text.Trim()
			+ "," + txt_psnQty_1.Text.Trim()
			+ "}";
			};
			}


			private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			await Task.Delay(100);
			getPageList(1);
			}
			@@ -176,7 +148,7 @@
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gridView1.ActiveFilter.Clear();
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			var frm = new ShowFilter(gridView1.Columns, _filterList);
			var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
			frm.UpdateParent += Frm_UpdateParent;
			frm.ShowDialog();
			}
			@@ -190,56 +162,26 @@
			_filterList = e.FilterList;
			getPageList(1);
			}
			private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)

			/// <summary>
			/// 批准
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
			{
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_billNo, gridView1);
			toolBarMenu1.guidKey = rowGuid;
			toolBarMenu1.rptParameter = "rpt_SCTL{}";
			_toolCk(2);
			}
			private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
			/// <summary>
			/// 反批准
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			/// <exception cref="NotImplementedException"></exception>
			private void ToolBarMenu1_btnFPiZhunClick(object sender, EventArgs e)
			{
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_billNo, gridView1);
			toolBarMenu1.guidKey = rowGuid;
			if (xtraTabControl1.SelectedTabPageIndex == 0)
			{
			getModel(rowGuid);
			this.toolBarMenu1.rptParameter = "return false";
			return;
			}
			if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码张数！");
			txt_iCount_1.Focus();
			this.toolBarMenu1.rptParameter = "return false";
			return;
			}
			if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码数量！");
			txt_psnQty_1.Focus();
			this.toolBarMenu1.rptParameter = "return false";
			return;
			}
			if (lbMxGuid.Text.Trim().Length < 10)
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印的行！");
			this.toolBarMenu1.rptParameter = "return false";
			return;
			}
			this.toolBarMenu1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim()
			+ "," + ""
			+ "," + ""
			+ "," + txt_iCount_1.Text.Trim()
			+ "," + txt_psnQty_1.Text.Trim()
			+ "}";
			_toolCk(3);
			}

			/// <summary>
			/// 审核事件
			/// </summary>
			@@ -361,7 +303,7 @@
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			gvList.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
			}

			}
			@@ -377,9 +319,11 @@
			List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gridViews.Add(gvMx1);
			gridViews.Add(gvMx2);
			UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
			//增加时，默认组织
			string deftOrg = UtilityHelper.GetFirstOrg(txt_tbl023);
			}
			/// <summary>
			/// 保存事件
			@@ -419,6 +363,7 @@
			list = new List<dynamic>(),
			};
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			if (gvMx1.DataRowCount <= 0)
			{
			@@ -437,33 +382,46 @@
			MsgHelper.ShowError("申请数量不能为空！");
			return;
			}
			string _tld014 = row["tld014"].ToString();
			if (string.IsNullOrEmpty(_tld014))
			{
			MsgHelper.ShowError("退料备注不能为空！");
			return;
			}
			_obj.list.Add(new
			{
			Guid = _guid,
			AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
			Sl = _sl //申请数量
			});
			Sl = _sl, //申请数量
			Remark = _tld014,
			Bllb = row["tld015"].ToString().Replace("\|",",")
			});
			}
			}
			try
			{
			string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
			ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);

			if (_rtn.rtnCode > 0)
			{
			ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
			lbGuid.Text = _rtn.rtnData.outGuid;
			txt_billNo.Text = _rtn.rtnData.outNo;
			toolBarMenu1.isSetBtn = true;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			gvList.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			else
			ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
			}
			}

			@@ -474,7 +432,7 @@
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage)
			{
			var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			@@ -484,16 +442,16 @@
			if (dd.rtnCode > 0)
			{
			DataTable dt = dd.rtnData.list;
			gcMain.BindingContext = new BindingContext();
			gcMain1.BindingContext = new BindingContext();
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			if (dt.Rows.Count > 0)
			{
			gcMain.DataSource = dt;
			gcMain.ForceInitialize();
			gridView1.BestFitColumns();
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			else
			UtilityHelper.SetDefaultTable(gcMain, gridView1);
			UtilityHelper.SetDefaultTable(gcMain1, gridView1);
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			pageBar1.TotalPages = dd.rtnData.pages;//总页
			pageBar1.CurrentPage = curPage;//当前页
			@@ -511,6 +469,7 @@
			}
			private void getModel(string strGuid)
			{
			gcMx1.DataSource = null;
			bool isEdit = false;
			if (toolBarMenu1.currentAction == "add") return;
			if (toolBarMenu1.currentAction == "edit") isEdit = true;
			@@ -530,11 +489,13 @@
			if (_rtn.rtnCode > 0)
			{
			dynamic dy = _rtn.rtnData;
			_ucGg = dy.tbl002;
			lbGuid.Text = strGuid;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			gvList.Add(gvMx2);
			UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
			UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
			_ucGg = "";
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			foreach (var a in _job["rtnData"]["list"])
			@@ -548,6 +509,7 @@
			gcMx1.DataSource = dt;
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			else
			{
			@@ -565,6 +527,7 @@
			gcMx2.DataSource = dt2;
			gcMx2.ForceInitialize();
			gvMx2.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
			}
			else
			{
			@@ -625,46 +588,6 @@
			}
			}


			/// <summary>
			/// 移出条码
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx2.FocusedRowHandle;
			if (rowhandle < 0)
			return;
			if (e.Button.Index == 0)
			{
			var dr = gvMx2.GetDataRow(rowhandle);
			var mxGuid = dr["guid"].ToString();
			if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
			return;
			var _obj = new
			{
			mxGuid = mxGuid,
			inType = "dhtm"
			};
			try
			{
			var strJson = UtilityHelper.HttpPost("",
			_webServiceName + "DeleteBarcode",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
			}
			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			}
			}
			}
			/// <summary>
			/// 工具条事件
			/// </summary>
			@@ -680,6 +603,12 @@
			case 0:
			strMsg = "反审核";
			break;
			case 2:
			strMsg = "批准";
			break;
			case 3:
			strMsg = "反批准";
			break;
			};
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			@@ -691,10 +620,31 @@
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
			return;

			//如果是审核，询问要不要生成补料beg
			string txt_chkOut = "0";
			if (_inFieldValue == 1 && txt_tbl005.Text.Trim() == "作业不良退料") {
			var frm = new Frm_MesItemTblShow();
			frm.UpdateParent += (ss, ee) =>
			{
			try
			{
			txt_chkOut = ee.StringSingle;
			}
			catch (Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			};
			frm.ShowDialog();
			}
			//如果是审核，询问要不要生成补料end

			var _obj = new
			{
			guid = rowGuid,
			inFieldValue = _inFieldValue,
			chkOut = txt_chkOut
			};
			try
			{
			@@ -702,9 +652,10 @@
			_webServiceName + "EditModelSubmit",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());

			if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
			{
			MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(lbGuid.Text.Trim());
			@@ -712,30 +663,43 @@
			int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
			gridView1.FocusedRowHandle = rowHandle;
			Form parentForm = this.FindForm();
			UtilityHelper.SetCheckIco(gridView1, "isChk", "tbl011", "tbl012", picCheckBox, parentForm, _inFieldValue.ToString());
			if (_inFieldValue < 2)
			UtilityHelper.SetCheckIco(gridView1, "isChk", "tbl011", "tbl012", picCheckBox, parentForm, _inFieldValue.ToString());
			}
			else
			MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			}

			private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
			/// <summary>
			/// 选择不良
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void rptBl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			if (e.FocusedRowHandle >= 0)
			var rowhandle = gvMx1.FocusedRowHandle;
			if (rowhandle < 0)
			return;
			UcDictionarySelect frm = new UcDictionarySelect("异常描述", " a.s_type='QC异常描述' and a.pid<>'00000000-0000-0000-0000-000000000000'");
			frm.UpdateParent += (ss, ee) =>
			{
			DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
			lbMxGuid.Text = row["tlid"].ToString();
			toolBarMenu1.guidKey = row["tlid"].ToString();
			txtWlid.Text = row["tld002"].ToString();
			txtWlgg.Text = row["tld004"].ToString();
			txtWlmc.Text = row["tld003"].ToString();
			txtQuantity.Text = row["tld005"].ToString();//申请总量
			txtYdy.Text = row["ydy"].ToString();//已打印总量
			txtKdy.Text = row["kdy"].ToString();//可打印总量
			}
			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("tld015", stringBuilder.ToString());
			// this.TextTxt = ;
			};
			frm.ShowDialog();
			}

			}
			}