~tjx/GsMesClient.git

			@@ -53,7 +53,6 @@
			return;
			txt_suppId.getSuppler(orgId, _ucGys);
			txt_fPurchaseDeptId.getSuppler(orgId, _ucBm);
			// txt_fPurchaserId.getSuppler();
			};
			//选择需要的明细
			btnSelect.Click += (s, e) =>
			@@ -104,6 +103,46 @@
			var frm2 = new SelectMesCgthSqLink(this.txt_thOrgId.GetId());
			frm2.UpdateParent += (ss, ee) =>
			{
			try
			{
			var lst = ee.DynamicList;
			DataTable _Table = (DataTable)gcMx1.DataSource;
			foreach (dynamic dym in lst)
			{
			DataRow _row = _Table.NewRow();
			_row["id"] = dym.id;
			_row["mid"] = dym.mid;
			_row["rkmxGuid"] = dym.rkmxGuid;//入库明细表guid
			_row["cgdh"] = dym.cgdh;//采购单号
			_row["invWorkLine"] = dym.invWorkLine;//行号,
			_row["wlbm"] = dym.wlbm; //物料编号,
			_row["wlmc"] = dym.wlmc; //物料名称,
			_row["wlgg"] = dym.wlgg;//规格型号,
			_row["rksl"] = dym.rksl; //入库数量,
			_row["dwName"] = dym.dwName;
			_row["eid"] = dym.eid;
			_row["erpid"] = dym.erpid;
			_row["itemId"] = dym.itemId; //物料id,
			_row["ysNum"] = dym.ysNum;//已扫数量
			_row["remark"] = dym.remark;
			_row["orderNo"] = dym.orderNo; //序号
			_row["kcQty"] = dym.kcQty; //库存数量
			_row["depotId"] = dym.depotId; //库存数量
			_row["depotName"] = dym.depotName; //库存数量
			_Table.Rows.Add(_row);
			}
			gcMx1.BindingContext = new BindingContext();
			gcMx1.DataSource = _Table;
			gcMx1.ForceInitialize();
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gvMx1.BestFitColumns();
			}
			catch (Exception ex)
			{
			MessageBox.Show(ex.Message);
			}
			};
			frm2.ShowDialog();
			return;
			@@ -111,10 +150,7 @@
			};
			//源单事件
			txt_fHasLinkRad.SelectedIndex = 0;
			layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
			layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
			layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
			layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
			setSrm();
			txt_fHasLinkRad.SelectedIndexChanged += (s, e) =>
			{
			setSrm();
			@@ -214,7 +250,7 @@
			lbGuid, txt_billNo, gridView1, "billNo");
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
			@@ -232,18 +268,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);
			}
			else

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

			}
			@@ -283,7 +321,7 @@
			lbGuid, txt_billNo, gridView1);
			if (string.IsNullOrEmpty(rowGuid))
			{
			MsgHelper.Warning("请先选择你要操作的行！");
			MsgHelper.ShowError("请先选择你要操作的行！");
			return;
			}
			Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
			@@ -305,7 +343,7 @@
			txt_fRequireOrgId.IsReadly = true;
			txt_fOwnerIdHead.IsReadly = true;
			txt_fPurchaseDeptId.IsReadly = true;
			txt_fPurchaserId.IsReadly = true;
			// txt_fPurchaserId.IsReadly = true;
			}
			/// <summary>
			/// 新增事件
			@@ -339,7 +377,8 @@
			string _xqzz = txt_fRequireOrgId.GetId();//需求组织
			string _hz = txt_fOwnerIdHead.GetId();//货主
			string _bm = txt_fPurchaseDeptId.GetId();//部门
			string _ygbh = txt_fPurchaserId.GetId();//员工
			//string _ygbh = txt_fPurchaserId.GetId();//员工
			string _ygbh = "";
			if (string.IsNullOrEmpty(_orgId))
			{
			MsgHelper.ShowError("请选择组织！");
			@@ -385,12 +424,12 @@
			txt_fPurchaseDeptId.Focus();
			return;
			}
			if (string.IsNullOrEmpty(_ygbh))
			{
			MsgHelper.ShowError("请选择员工！");
			txt_fPurchaserId.Focus();
			return;
			}
			//if (string.IsNullOrEmpty(_ygbh))
			//{
			// MsgHelper.ShowError("请选择员工！");
			// txt_fPurchaserId.Focus();
			// return;
			//}
			}
			var _obj = new
			{
			@@ -441,6 +480,7 @@
			Quantity = decimal.Parse(row["sqNum"].ToString()),
			Bz = row["remark"].ToString(),
			DepotId = row["depotId"].ToString(),
			ItemId = row["itemId"].ToString(),
			});
			}
			}
			@@ -478,7 +518,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.TH_ORG_ID in");
			_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
			_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
			PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
			string json = JsonConvert.SerializeObject(pgq);
			try
			@@ -719,14 +763,14 @@
			{
			layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
			layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
			layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
			// layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
			layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
			}
			else
			{
			layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
			layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
			layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
			//layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
			layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
			}
			}