nf/JH/JH_MesClient.git

			@@ -7,6 +7,7 @@
			using System;
			using System.Collections.Generic;
			using System.Data;
			using System.IO;
			using System.Threading.Tasks;
			using System.Windows.Forms;

			@@ -58,8 +59,7 @@
			var json = JsonConvert.SerializeObject(_obj);
			try
			{
			var strReturn = UtilityHelper.HttpPost("",
			"MesItemsManager/GetListSelect", json);
			var strReturn = UtilityHelper.HttpPost("","MesItemsManager/GetListSelect", json);
			var rtn = UtilityHelper.ReturnToTablePage(strReturn);
			var dt = rtn.rtnData.list;
			this.repositoryItemSearchLookUpEdit1.DataSource = dt;
			@@ -86,6 +86,170 @@
			gvMx1.SetFocusedRowCellValue("dcHz", _orgName);
			gvMx1.SetFocusedRowCellValue("dcHzGuid", _orgId);
			};

			#region 2025-08-27 复制beg
			btnCopyXls.Click += (s, e) =>
			{
			string kcZz = txt_fapporgid.GetId();
			if (string.IsNullOrEmpty(kcZz))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能使用复制功能！");
			txt_fapporgid.Focus();
			return;
			}
			string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
			if (File.Exists(filePath))
			{
			var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.物料调拨.ToString());
			frm.UpdateParent += (ss, ee) =>
			{
			try
			{
			string _orgId = txt_fapporgid.GetId();
			string _orgName = txt_fapporgid.GetName();
			var lst = ee.DynamicList;
			DataTable _Table = (DataTable)gcMx1.DataSource;
			foreach (dynamic dym in lst)
			{
			DataRow _row = _Table.NewRow();
			_row["itemNo"] = dym.itemNo;
			_row["itemName"] = dym.itemName;
			_row["itemModel"] = dym.itemModel;
			_row["itemUnit"] = dym.dwName;
			_row["itemId"] = dym.itemId;
			_row["shNum"] = dym.sl;
			_row["remark"] = dym.bz;
			if (!string.IsNullOrEmpty(_orgId))
			{
			_row["dcOrg"] = _orgName;
			_row["dcOrgGuid"] = _orgId;
			_row["drOrg"] = _orgName;
			_row["drOrgGuid"] = _orgId;
			_row["drHz"] = _orgName;
			_row["drHzGuid"] = _orgId;
			_row["dcHz"] = _orgName;
			_row["dcHzGuid"] = _orgId;
			}
			_Table.Rows.Add(_row);
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _Table;
			gcMx1.ForceInitialize();
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gvMx1.BestFitColumns();
			}
			catch (Exception ex)
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
			}
			};
			frm.ShowDialog();
			}
			else
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("找不到xlsCopy.xls文件，请联系管理员！");
			}
			};
			#endregion

			#region 2025-10-17 选择生产/委外订单
			btnSelect.Click += (s, e) =>
			{
			string kcZz = txt_fapporgid.GetId();
			if (string.IsNullOrEmpty(kcZz))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能选择生产订单！");
			txt_fapporgid.Focus();
			return;
			}
			var frm = new SelectSqmx();
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			{
			try
			{
			var lst = new List<string>();
			lst = ee.StringList;
			var _obj = new
			{
			lst = ee.StringList,
			workId = ee.Data,
			};
			var strReturn = UtilityHelper.HttpPost("", "MesInvItemMovesManager/SelectScddToView", JsonConvert.SerializeObject(_obj));
			var dt = UtilityHelper.ReturnToList(strReturn);
			DataTable _newTable = dt.rtnData;
			DataTable _oldTable = (DataTable)gcMx1.DataSource;
			DataRow[] sourceRows = _newTable.Select();
			for (int i = 0; i < sourceRows.Length; i++)
			{
			_oldTable.ImportRow(sourceRows[i]);
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _oldTable;
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			catch(Exception ex)
			{
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			};
			frm.ShowDialog();
			};
			#endregion

			#region 2025-10-17 选择委外订单
			btnScdd.Click += (s, e) =>
			{
			string kcZz = txt_fapporgid.GetId();
			if (string.IsNullOrEmpty(kcZz))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能选择委外订单！");
			txt_fapporgid.Focus();
			return;
			}
			var frm = new SelectScdd("1");
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			{
			try
			{
			var lst = new List<string>();
			lst = ee.StringList;
			var _obj = lst;
			var strReturn = UtilityHelper.HttpPost("", "WompbaManager/SelectPbaToView", JsonConvert.SerializeObject(_obj));
			var dt = UtilityHelper.ReturnToList(strReturn);
			DataTable _newTable = dt.rtnData;
			DataTable _oldTable = (DataTable)gcMx1.DataSource;
			DataRow[] sourceRows = _newTable.Select();
			for (int i = 0; i < sourceRows.Length; i++)
			{
			_oldTable.ImportRow(sourceRows[i]);
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _oldTable;
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			catch (Exception ex)
			{
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			};
			frm.ShowDialog();
			};
			#endregion

			}
			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			@@ -161,9 +325,7 @@
			};
			try
			{
			var strJson = UtilityHelper.HttpPost("",
			_webServiceName + "DeleteModelOrMx",
			JsonConvert.SerializeObject(_obj));
			var strJson = UtilityHelper.HttpPost("",_webServiceName + "DeleteModelOrMx",JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			@@ -420,7 +582,11 @@
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage)
			{
			gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			gcMain1.DataSource = null;
			System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
			_sbSqlWhere.Append(" and a.FAPPORGID in");
			_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
			_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			@@ -602,10 +768,18 @@
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(lbGuid.Text.Trim());
			int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
			gridView1.FocusedRowHandle = rowHandle;
			if (_inFieldValue <= 1)
			UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
			}
			int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
			gridView1.FocusedRowHandle = rowHandle;
			UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
			else
			{
			//注意，这里和其它页面有点不一样
			getPageList(this.pageBar1.CurrentPage);
			int rowHandle = gridView1.LocateByValue("guid", rowGuid);
			gridView1.FocusedRowHandle = rowHandle;
			}
			}
			else
			MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
			@@ -716,7 +890,6 @@
			return;
			var dr = gvMx1.GetDataRow(rowhandle);
			var strOrgGuid = dr["dcOrgGuid"].ToString();
			//var strItemId = dr["itemId"].ToString();
			if (string.IsNullOrEmpty(strOrgGuid))
			{
			MsgHelper.ShowError("提示：请先选择调出组织！");