~tjx/GsMesClient.git

			@@ -52,7 +52,8 @@
			if (string.IsNullOrEmpty(orgId))
			return;
			txt_fCustId.getSuppler(orgId, _ucKh);
			txt_fStockId.getSuppler(orgId, _ucCk);
			//2025-08-11加上只能是代管仓
			txt_fStockId.getSuppler(orgId, _ucCk, " and a.depot_id in(select [仓库Id] from [dbo].[仓库属性] where [是否代管良品仓]=1 )");
			};
			//选择需要的明细
			btnSelect.Click += (s, e) =>
			@@ -75,7 +76,7 @@
			this.txt_fStockId.Focus();
			return;
			}
			var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(), txt_fIsLink.SelectedIndex.ToString());
			var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(), txt_fHasLinkRad.SelectedIndex.ToString());
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			{
			@@ -106,7 +107,7 @@
			}
			catch (Exception ex)
			{
			MessageBox.Show(ex.Message);
			Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
			}
			};
			frm.ShowDialog();
			@@ -206,7 +207,7 @@
			lbGuid, txt_billNo, gridView1, "billNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
			@@ -224,20 +225,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>
			@@ -275,7 +276,7 @@
			lbGuid, txt_billNo, gridView1);
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			@@ -289,6 +290,10 @@
			gvList.Add(gvMx1);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
			}
			//2025/07/12加上修改状态下不能修改
			txt_fStockOrgId.IsReadly = true;
			txt_fCustId.IsReadly = true;
			txt_fHasLinkRad.ReadOnly = true;
			}
			/// <summary>
			/// 新增事件
			@@ -303,6 +308,9 @@
			gridViews.Add(gvMx1);
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			//增加时，默认组织
			string deftOrg = UtilityHelper.GetFirstOrg(txt_fStockOrgId);

			}
			/// <summary>
			/// 保存事件
			@@ -315,28 +323,27 @@
			var _ckId = txt_fStockId.GetId();
			var _khId = txt_fCustId.GetId();
			string _orgId = txt_fStockOrgId.GetId();
			int _fIsLink = txt_fIsLink.SelectedIndex == 0 ? 1 : 0;
			if (string.IsNullOrEmpty(_orgId))
			{
			MsgHelper.Warning("请选择组织！");
			MsgHelper.ShowError("请选择组织！");
			txt_fStockOrgId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_ckId))
			{
			MsgHelper.Warning("请选择仓库！");
			MsgHelper.ShowError("请选择仓库！");
			txt_fStockId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_khId))
			{
			MsgHelper.Warning("请选择客户！");
			MsgHelper.ShowError("请选择客户！");
			txt_fCustId.Focus();
			return;
			}
			if (txt_fReturnStyle.SelectedIndex <= 0)
			{
			MsgHelper.Warning("请选择退料方式！");
			MsgHelper.ShowError("请选择退料方式！");
			txt_fReturnStyle.Focus();
			return;
			}
			@@ -347,14 +354,13 @@
			Remark = txt_remark.Text.Trim(), //备注
			CusId = int.Parse(_khId),
			DepotId = int.Parse(_ckId),
			FIsLink = _fIsLink,//有无源单
			FIsLink = txt_fHasLinkRad.SelectedIndex,//有无源单
			FReturnStyle = txt_fReturnStyle.Text,//退料方式
			list = new List<dynamic>(),
			}; gvMx1.PostEditor();
			};
			gvMx1.PostEditor();
			gvMx1.CloseEditor();
			gvMx1.UpdateCurrentRow();


			if (gvMx1.DataRowCount <= 0)
			{
			MsgHelper.ShowError("明细不能为空，请选择你的收料明细！");
			@@ -394,9 +400,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;
			@@ -406,10 +412,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);
			}
			}

			@@ -462,7 +470,7 @@
			if (toolBarMenu1.currentAction == "edit") isEdit = true;
			if (string.IsNullOrEmpty(strGuid))
			{
			ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
			ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			var _obj = new
			@@ -504,11 +512,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>
			@@ -532,7 +540,7 @@
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
			@@ -548,9 +556,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());
			@@ -559,10 +568,12 @@
			gridView1.FocusedRowHandle = rowHandle;
			UtilityHelper.SetCheckIco(gridView1, "isCheck", "checkBy", "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)
			@@ -597,13 +608,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);
			}
			}
			}