~tjx/GsMesClient.git

			@@ -1,4 +1,6 @@
			using DevExpress.XtraEditors;
			using DevExpress.XtraRichEdit.Model;
			using Gs.DevApp.DevFrm.Rpt;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Gs.DevApp.UserControl;
			@@ -31,6 +33,8 @@
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnCaiGouChkClick += ToolBarMenu1_btnCaiGouChkClick;
			toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick;
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			@@ -54,7 +58,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 )");
			System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
			sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
			var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
			@@ -69,55 +74,8 @@
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("提示：" + ex.Message);
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			};
			gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
			this.ucBtnPrint1.btnDesignClick += (s, e) =>
			{
			ucBtnPrint1.rptParameter = "rpt_Strk{}";
			};
			this.ucBtnPrint1.btnReportClick += (s, e) =>
			{
			ucBtnPrint1.guidKey = "";
			string rowGuid = lbMxGuid.Text.Trim();
			ucBtnPrint1.guidKey = rowGuid;
			if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请输入正确的条码数量！");
			txt_iCount_1.Focus();
			this.ucBtnPrint1.rptParameter = "return false";
			return;
			}
			if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(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_Strk{" + lbMxGuid.Text.Trim()
			+ "," + ""
			+ "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
			+ "," + txt_iCount_1.Text.Trim()
			+ "," + txt_psnQty_1.Text.Trim()
			+ "}";
			};
			//自动计算打印量
			txt_psnQty_1.TextChanged += (s, e) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
			};

			radOut.SelectedIndexChanged += (s, e) =>
			{
			Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
			};
			}
			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			@@ -195,7 +153,7 @@
			lbGuid, txt_billNo, gridView1, "billNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
			@@ -213,17 +171,19 @@
			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);
			}
			}

			@@ -261,7 +221,7 @@
			lbGuid, txt_billNo, gridView1);
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			@@ -276,6 +236,9 @@
			gvList.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
			}
			//2025/07/12加上修改状态下不能修改
			txt_fStockOrgId.IsReadly = true;
			txt_fCustId.IsReadly = true;
			}
			/// <summary>
			/// 新增事件
			@@ -292,6 +255,8 @@
			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_fStockOrgId);
			}
			/// <summary>
			/// 保存事件
			@@ -307,19 +272,19 @@
			string kh = txt_fCustId.GetId();//客户
			if (string.IsNullOrEmpty(kcZz))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择库存组织！");
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择库存组织！");
			txt_fStockOrgId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(kcCk))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择收料仓库！");
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择收料仓库！");
			txt_fStockId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(kh))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择客户！");
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择客户！");
			txt_fCustId.Focus();
			return;
			}
			@@ -365,9 +330,9 @@
			{
			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;
			@@ -378,10 +343,12 @@
			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);
			}
			}

			@@ -392,7 +359,7 @@
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage)
			{
			gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "billNo", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			@@ -435,7 +402,7 @@
			if (toolBarMenu1.currentAction == "edit") isEdit = true;
			if (string.IsNullOrEmpty(strGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			var _obj = new
			@@ -496,11 +463,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);
			}
			}

			@@ -546,13 +513,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);
			}
			}
			}
			@@ -577,7 +546,25 @@
			{
			_toolCk(0);
			}
			/// <summary>
			/// 采购审核
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void ToolBarMenu1_btnCaiGouChkClick(object sender, EventArgs e)
			{
			_toolCk(40);
			}
			/// <summary>
			/// 采购反审核
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>

			private void ToolBarMenu1_btnCaiGouFchkClick(object sender, EventArgs e)
			{
			_toolCk(41);
			}
			/// <summary>
			/// 工具条事件
			/// </summary>
			@@ -593,14 +580,21 @@
			case 0:
			strMsg = "反审核";
			break;
			};
			case 40:
			strMsg = "采购审核";
			break;
			case 41:
			strMsg = "采购反审核";
			break;
			}
			;
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
			lbGuid, txt_billNo, gridView1, "billNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
			@@ -616,90 +610,25 @@
			_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());
			}
			int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
			//注意，这里和其它页面有点不一样
			getPageList(this.pageBar1.CurrentPage);
			int rowHandle = gridView1.LocateByValue("guid", rowGuid);
			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);
			}
			}
			private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
			{
			if (e.FocusedRowHandle >= 0)
			{
			DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
			lbMxGuid.Text = row["guid"].ToString();
			ucBtnPrint1.guidKey = row["guid"].ToString();
			txtWlid.Text = row["itemNo"].ToString();
			txtWlgg.Text = row["itemModel"].ToString();
			txtWlmc.Text = row["itemName"].ToString();
			txtQuantity.Text = row["sqsl"].ToString();//申请总量
			txtYdy.Text = row["ydy"].ToString();//已打印总量
			txt_kQty.Text = row["kdy"].ToString();//可打印总量
			}
			else
			{
			lbMxGuid.Text = "";
			ucBtnPrint1.guidKey = "";
			txtWlid.Text = "";
			txtWlgg.Text = "";
			txtWlmc.Text = "";
			txtQuantity.Text = "";
			txtYdy.Text = "";
			txt_kQty.Text = "";
			txt_psnQty_1.Text = "";
			txt_iCount_1.Text = "";
			}
			}
			/// <summary>
			/// 重打条码
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			MsgHelper.ShowInformation("功能开发中！");
			return;
			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("",
			"VArrivalBarcodeManager/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);
			}
			MsgHelper.ShowError("提示：" + ex.Message);
			}
			}
			}