~tjx/GsMesClient.git

			@@ -10,7 +10,6 @@
			using System.Data;
			using System.Threading.Tasks;
			using System.Windows.Forms;

			namespace Gs.DevApp.DevFrm
			{
			public partial class Frm_SalesDeliver : DevExpress.XtraEditors.XtraForm
			@@ -33,6 +32,7 @@
			toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
			toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
			toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
			toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
			@@ -61,8 +61,8 @@
			txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName();
			txt_shf.Text = txt_salesId.GetSalesShf();
			txt_shName.Text = txt_salesId.GetSalesShfName();
			txt_SaleOrgId.Text = txt_salesId.GetSalesOrgFid();
			};

			//选择需要的明细
			btnSelect.Click += (s, e) =>
			{
			@@ -88,11 +88,12 @@
			_row["itemNo"] = dym.itemNo;
			_row["itemName"] = dym.itemName;
			_row["itemModel"] = dym.itemModel;
			_row["itemId"] = dym.itemId;
			_row["dwXs"] = dym.dwXs;
			_row["dwJj"] = dym.dwJj;
			_row["jjSl"] = dym.jjSl;
			_row["deliveryDate"] = dym.deliveryDate;
			_row["xsSl"] = dym.xsSl;
			_row["xsSl"] = dym.xsSl;
			_row["isFree"] = dym.isFree;
			_row["hzlx"] = dym.hzlx;
			_row["hz"] = dym.hz;
			@@ -102,6 +103,11 @@
			_row["jsOrg"] = dym.jsOrg;
			_row["gyOrg"] = dym.gyOrg;
			_row["kcOrg"] = dym.kcOrg;
			_row["kcQty"] = dym.kcQty; //库存数量
			_row["depotId"] = dym.depotId; //库存数量
			_row["depotName"] = dym.depotName; //库存数量
			_row["yjfhDate"] = DateTime.Now.ToString("yyyy-MM-dd");
			_row["fEntrynote"] = dym.entryNote; ;
			_Table.Rows.Add(_row);
			}
			gcMx1.BindingContext = new BindingContext();
			@@ -110,7 +116,7 @@
			gvMx1.CloseEditor();
			gvMx1.PostEditor();
			gvMx1.UpdateCurrentRow();
			gridView1.BestFitColumns();
			gvMx1.BestFitColumns();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			catch (Exception ex)
			@@ -121,6 +127,8 @@
			frm.ShowDialog();
			};
			}


			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			@@ -365,6 +373,11 @@
			MsgHelper.ShowError("销售单物料明细不能为空！");
			return;
			}
			if (string.IsNullOrEmpty(row["depotId"].ToString()))
			{
			MsgHelper.ShowError("请选择发货仓库！");
			return;
			}
			_obj.list.Add(new
			{
			Guid = _guid,
			@@ -372,6 +385,7 @@
			Sqsl = (row["fMustQty"].ToString()),
			Bz = (row["fEntrynote"].ToString()),
			Yjsj = (row["YjfhDate"].ToString()),
			depotId = (row["depotId"].ToString()),
			});
			}
			}
			@@ -514,6 +528,12 @@
			}
			}


			private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
			{
			_toolCk(2);
			}

			/// <summary>
			/// 财务审核
			/// </summary>
			@@ -570,14 +590,16 @@
			case 0:
			strMsg = "反审核";
			break;
			case 2:
			strMsg = "完结";
			break;
			case 30:
			strMsg = "财务审核";
			break;
			case 31:
			strMsg = "财务反审核";
			break;
			}
			;
			};
			toolBarMenu1.guidKey = "";
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
			@@ -624,7 +646,12 @@
			}

			}


			/// <summary>
			/// 删除数据
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx1.FocusedRowHandle;
			@@ -665,5 +692,37 @@
			}
			}
			}
			/// <summary>
			/// 查找仓库
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void rptCk_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx1.FocusedRowHandle;
			if (rowhandle < 0)
			return;
			var dr = gvMx1.GetDataRow(rowhandle);
			var strItemId = dr["itemId"].ToString();
			var strOrgGuid = txt_SaleOrgId.Text.Trim();
			if (string.IsNullOrEmpty(strOrgGuid))
			{
			MsgHelper.ShowError("提示：请先选择销售组织！");
			return;
			}
			SelectCk frm = new SelectCk(strOrgGuid, strItemId);
			frm.UpdateParent += (ss, ee) =>
			{
			var lst = new List<dynamic>();
			lst = ee.DynamicList;
			gvMx1.SetFocusedRowCellValue("depotName", lst[0].name);
			gvMx1.SetFocusedRowCellValue("depotId", lst[0].guid);
			gvMx1.SetFocusedRowCellValue("kcQty", lst[0].kcQty);
			gvMx1.BestFitColumns();
			};
			frm.ShowDialog();
			}


			}
			}