~tjx/GsMesClient.git

			@@ -16,7 +16,6 @@
			string _webServiceName = "MesSctkSqManager/";
			List<FilterEntity> _filterList = new List<FilterEntity>();
			string _ucCk = "";//发料仓库
			string _ucGys = "";//供应商
			public Frm_MesSctkSq()
			{
			InitializeComponent();
			@@ -45,7 +44,7 @@
			}, lbGuid);
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			//选择库存组织（仓库和供应商）
			//选择库存组织（仓库）
			txt_thOrgId.EditChanged += (s, e) =>
			{
			var orgId = txt_thOrgId.GetId();
			@@ -72,23 +71,33 @@
			{
			try
			{
			var lst = new List<string>();
			lst = ee.StringList;
			var _obj = lst;
			var strReturn = UtilityHelper.HttpPost("",
			_webServiceName + "SelectFormTo",
			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++)
			var lst = ee.DynamicList;
			DataTable _Table = (DataTable)gcMx1.DataSource;
			foreach (dynamic dym in lst)
			{
			_oldTable.ImportRow(sourceRows[i]);
			DataRow _row = _Table.NewRow();
			_row["rkmxGuid"] = dym.rkmxGuid;
			_row["id"] = "";
			_row["mid"] = "";
			_row["workShop"] = dym.workShop;
			_row["itemId"] = dym.itemId;
			_row["itemNo"] = dym.itemNo;
			_row["itemName"] = dym.itemName;
			_row["itemModel"] = dym.itemModel;
			_row["dwName"] = dym.dwName;
			// _row["sqNum"] = "";
			_row["ysNum"] = "0";
			_row["remark"] = "";
			_Table.Rows.Add(_row);
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _oldTable;
			gcMx1.DataSource = _Table;
			gcMx1.ForceInitialize();
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
			}
			catch (Exception ex)
			{
			@@ -192,7 +201,7 @@
			lbGuid, txt_billNo, gridView1, "billNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
			@@ -210,20 +219,20 @@
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
			if (xtraTabControl1.SelectedTabPageIndex == 0)
			{ }
			else
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
			getPageList(this.pageBar1.CurrentPage);
			}

			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			else
			MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			MsgHelper.ShowError("提示：" + ex.Message);
			}

			}

			/// <summary>
			@@ -261,7 +270,7 @@
			lbGuid, txt_billNo, gridView1);
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			@@ -275,6 +284,8 @@
			gvList.Add(gvMx1);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
			}
			//2025/07/12加上修改状态下不能修改
			txt_thOrgId.IsReadly = true;
			}
			/// <summary>
			/// 新增事件
			@@ -302,29 +313,29 @@
			string _orgId = txt_thOrgId.GetId();
			if (string.IsNullOrEmpty(_orgId))
			{
			MsgHelper.Warning("请选择组织！");
			MsgHelper.ShowError("请选择组织！");
			txt_thOrgId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_ckId))
			{
			MsgHelper.Warning("请选择仓库！");
			MsgHelper.ShowError("请选择仓库！");
			txt_depotId.Focus();
			return;
			}
			if (txt_returnType.SelectedIndex <= 0)
			if (txt_returnType.TextTxt.Length <= 0)
			{
			MsgHelper.Warning("请选择退料原因！");
			MsgHelper.ShowError("请选择退库原因！");
			txt_returnType.Focus();
			return;
			}
			var _obj = new
			{
			Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()),
			OrgId= txt_thOrgId.GetId(),//选择组织
			OrgId = txt_thOrgId.GetId(),//选择组织
			Remark = txt_remark.Text.Trim(), //备注
			DepotId = int.Parse(_ckId),//仓库
			Reason = txt_returnType.Text,//退料原因
			Reason = txt_returnType.TextTxt,//退料原因
			list = new List<dynamic>(),
			};
			gvMx1.CloseEditor();
			@@ -347,6 +358,12 @@
			MsgHelper.ShowError("申请数量不能为空！");
			return;
			}
			_msl = row["remark"].ToString();
			if (string.IsNullOrEmpty(_msl))
			{
			MsgHelper.ShowError("申请备注不能为空！");
			return;
			}
			_obj.list.Add(new
			{
			Guid = _guid,
			@@ -362,9 +379,9 @@
			_webServiceName + "EditModel",
			JsonConvert.SerializeObject(_obj));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			if (_rtn.rtnCode > 0)
			{
			MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
			lbGuid.Text = _rtn.rtnData.outGuid;
			txt_billNo.Text = _rtn.rtnData.outNo;
			toolBarMenu1.isSetBtn = true;
			@@ -374,10 +391,12 @@
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			else
			MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			}

			@@ -388,7 +407,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, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			@@ -444,13 +463,11 @@
			if (_rtn.rtnCode > 0)
			{
			dynamic dy = _rtn.rtnData;
			_ucGys = dy.suppId;
			_ucCk = dy.depotId;
			lbGuid.Text = strGuid;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
			_ucGys = "";
			_ucCk = "";
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			@@ -473,11 +490,11 @@
			}
			}
			else
			ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			ToolBox.MsgHelper.Warning("提示：" + ex.Message);
			ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
			}
			}
			/// <summary>
			@@ -495,7 +512,8 @@
			case 0:
			strMsg = "反审核";
			break;
			};
			}
			;
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
			@@ -517,9 +535,9 @@
			_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());
			@@ -528,10 +546,12 @@
			gridView1.FocusedRowHandle = rowHandle;
			UtilityHelper.SetCheckIco(gridView1, "status", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
			}
			else
			MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			}
			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			@@ -566,13 +586,15 @@
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0)
			{
			if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
			MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
			getModel(lbGuid.Text);
			}
			MsgHelper.Warning("提示：" + _rtn.rtnMsg);
			else
			MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			}
			}