~tjx/GsMesClient.git

			@@ -1,4 +1,6 @@
			using DevExpress.XtraEditors;
			using DevExpress.XtraLayout.Utils;
			using Gs.DevApp.DevFrm.Ck;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Gs.DevApp.UserControl;
			@@ -7,6 +9,7 @@
			using System;
			using System.Collections.Generic;
			using System.Data;
			using System.Linq;
			using System.Threading.Tasks;
			using System.Windows.Forms;

			@@ -23,6 +26,11 @@
			InitializeComponent();
			strType = _strType;
			txt_bl017.Text = _strType;
			txt_bl017.Tag = "moren." + _strType;
			if(_strType == "委外领料")
			{
			layoutControlItem14.Visibility = LayoutVisibility.Never;
			}
			}
			protected override void OnCreateControl()
			{
			@@ -38,22 +46,20 @@
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			this.toolBarMenu1.getXmlConfig();
			Form parentForm = this.FindForm();
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gridView1);
			Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(parentForm.GetType().FullName, gvList);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, parentForm, "bl018", "", (value) =>
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "bl018", "", (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;
			//设置组织
			@@ -93,10 +99,62 @@
			MsgHelper.Warning("提示：" + ex.Message);
			}
			};

			//选择需要入库的明细
			btnSelect.Click += (s, e) =>
			{
			if (string.IsNullOrEmpty(this.txt_orgId.GetId()))
			{
			MsgHelper.ShowError("请选择生产组织！");
			txt_orgId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(this.txt_aboutGuid.GetId()))
			{
			Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择生产工单！");
			return;
			}
			var frm = new UcWwBlclSelect(txt_aboutGuid.GetId(), this.txt_orgId.GetId());
			//赋值给明细表
			frm.UpdateParent += (ss, ee) =>
			{
			try
			{
			var lst = ee.DynamicList;
			DataTable _Table = (DataTable)gcMx1.DataSource;
			int idx = 1;
			foreach (dynamic dym in lst)
			{
			DataRow _row = _Table.NewRow();
			_row["bld002"] = dym.itemNo;//物料编号
			_row["bld003"] = dym.itemName;//物料名称
			_row["bld004"] = dym.itemModel;//规格型号
			_row["dabGuid"] = dym.dabGuid;
			_row["bld008"] = dym.dab007;//项次
			_row["bld009"] = dym.dwName;//项次
			_Table.Rows.Add(_row);

			idx++;
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _Table;
			gcMx1.ForceInitialize();
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gvMx1.BestFitColumns();
			}
			catch (Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			};
			frm.ShowDialog();
			};
			}
			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			Task.Delay(100);
			getPageList(1);
			}
			@@ -113,7 +171,7 @@
			lbGuid, txt_blNo, gridView1);
			toolBarMenu1.guidKey = rowGuid;
			}


			/// <summary>
			/// 分页事件
			/// </summary>
			@@ -130,10 +188,16 @@
			/// <param name="e"></param>
			private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
			{
			Form parentForm;
			if (this.Parent is Form)
			parentForm = this.Parent as Form;
			else
			parentForm = this.Parent.Parent as Form;

			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, parentForm.GetType().FullName);
			frm.UpdateParent += Frm_UpdateParent;
			frm.ShowDialog();
			}
			@@ -243,14 +307,17 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			if (xtraTabControl1.SelectedTabPageIndex == 1)
			{
			getModel(lbGuid.Text.Trim());
			getModel(rowGuid);
			}
			else
			{
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
			}
			//2025/07/12加上修改状态下不能修改
			txt_orgId.IsReadly = true;
			txt_aboutGuid.IsReadly = true;
			}
			/// <summary>
			/// 新增事件
			@@ -263,8 +330,11 @@
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
			List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gridViews.Add(gvMx1);
			UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			//增加时，默认组织
			string deftOrg = UtilityHelper.GetFirstOrg(txt_orgId);


			}
			/// <summary>
			@@ -277,7 +347,7 @@
			toolBarMenu1.isSetBtn = false;
			string inGdId = txt_aboutGuid.GetId();//工单号
			string inCkId = txt_bl010.GetId();//发料仓
			string inFlOrg= txt_orgId.GetId();//发料组织
			string inFlOrg = txt_orgId.GetId();//发料组织
			if (string.IsNullOrEmpty(inFlOrg))
			{
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择发料组织！");
			@@ -313,6 +383,7 @@
			list = new List<dynamic>(),
			};
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			if (gvMx1.DataRowCount <= 0)
			{
			@@ -353,8 +424,9 @@
			toolBarMenu1.isSetBtn = true;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
			toolBarMenu1.currentAction = "";
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
			}
			}
			catch (Exception ex)
			@@ -370,8 +442,12 @@
			/// <param name="pageSize">每页几条</param>
			private void getPageList(int curPage)
			{
			var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
			_sbSqlWhere += " and a.bl008='" + strType + "'";
			gcMain1.DataSource = null;
			System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
			_sbSqlWhere.Append(" and a.bl008='" + strType + "'");
			_sbSqlWhere.Append(" and a.org_id 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
			@@ -381,16 +457,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;//当前页
			@@ -432,7 +508,7 @@
			lbGuid.Text = strGuid;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gvMx1);
			UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
			UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
			_ucCk = "";
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			@@ -540,18 +616,6 @@
			}
			}

			private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
			{
			SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
			DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
			gvMx1.SetFocusedRowCellValue("bld002", SelectedDataRow["itemNo"]);
			gvMx1.SetFocusedRowCellValue("bld003", SelectedDataRow["itemName"]);
			gvMx1.SetFocusedRowCellValue("bld004", SelectedDataRow["itemModel"]);
			gvMx1.SetFocusedRowCellValue("dabGuid", SelectedDataRow["dabGuid"]);
			gvMx1.SetFocusedRowCellValue("bld008", SelectedDataRow["dab007"]);//已领用量
			gvMx1.SetFocusedRowCellValue("bld009", SelectedDataRow["dwName"]);//单位
			}

			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx1.FocusedRowHandle;
			@@ -591,6 +655,6 @@
			}
			}
			}


			}
			}