From 9878916af28906629dad956b65726167b50834cf Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期二, 22 七月 2025 15:08:27 +0800 Subject: [PATCH] 现场管理 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 118 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 87 insertions(+), 31 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs index bdb262f..226ff69 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs @@ -16,6 +16,7 @@ { string _webServiceName = "SalesReturnManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); + string _ucCk = "";//鍙戞枡浠撳簱 public Frm_SalesReturnNotice() { InitializeComponent(); @@ -29,30 +30,34 @@ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; + this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (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; // 璁剧疆閿�鍞崟 - txt_customerOrderNo.getSuppler("", ""); - this.txt_customerOrderNo.EditChanged += (s, e) => + txt_salesOrderId.getSuppler("", ""); + this.txt_salesOrderId.EditChanged += (s, e) => { //鏈夋病鏈夐攢鍞鍗� - string _sqGuid = txt_customerOrderNo.GetId(); + string _sqGuid = txt_salesOrderId.GetId(); if (string.IsNullOrEmpty(_sqGuid)) return; - txt_returnCustomer.Text = txt_customerOrderNo.GetSalesCusName(); - txt_salesOrg.Text = txt_customerOrderNo.GetSalesOrgName(); + txt_custName.Text = txt_salesOrderId.GetSalesCusName(); + txt_xsOrgName.Text = txt_salesOrderId.GetSalesOrgName(); + string _xsOrgFid = txt_salesOrderId.GetSalesOrgFid(); + txt_fstockid.getSuppler(_xsOrgFid, _ucCk); System.Text.StringBuilder sbWhere = new System.Text.StringBuilder(); var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid); var json = JsonConvert.SerializeObject(_obj); @@ -63,6 +68,7 @@ var rtn = UtilityHelper.ReturnToTablePage(strReturn); var dt = rtn.rtnData.list; this.repositoryItemSearchLookUpEdit1.DataSource = dt; + repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup; } catch (Exception ex) { @@ -70,7 +76,6 @@ } }; } - private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { @@ -97,7 +102,7 @@ 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, this.GetType().FullName); frm.UpdateParent += Frm_UpdateParent; frm.ShowDialog(); } @@ -207,13 +212,14 @@ 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); + gvList.Add(gvMx2); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList); } } /// <summary> @@ -227,8 +233,10 @@ 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); + gridViews.Add(gvMx2); + UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2); } /// <summary> @@ -241,11 +249,13 @@ toolBarMenu1.isSetBtn = false; string djlx = txt_billType.Text.ToString(); string FNote = txt_returnReason.Text.ToString(); - string _sqGuid = txt_customerOrderNo.GetId(); + string _sqGuid = txt_salesOrderId.GetId(); + string ckId = txt_fstockid.GetId(); + int _fIsLink = txt_fIsLink.SelectedIndex == 0 ? 1 : 0; if (string.IsNullOrEmpty(_sqGuid)) { Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞鍗曪紒"); - txt_customerOrderNo.Focus(); + txt_salesOrderId.Focus(); return; } if (txt_billType.SelectedIndex < 0) @@ -254,15 +264,24 @@ txt_billType.Focus(); return; } + if (string.IsNullOrEmpty(ckId)) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�"); + txt_fstockid.Focus(); + return; + } var _obj = new { guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 djlx = djlx,//鍗曟嵁绫诲瀷 salesId = _sqGuid,//閿�鍞崟鍙� inRemark = FNote.Trim(),//澶囨敞 + ckId = ckId, + FIsLink = _fIsLink,//鏈夋棤婧愬崟 list = new List<dynamic>(), }; gvMx1.CloseEditor(); + gvMx1.PostEditor(); gvMx1.UpdateCurrentRow(); if (gvMx1.DataRowCount <= 0) { @@ -274,7 +293,7 @@ var row = gvMx1.GetDataRow(i); if (row != null) { - Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString()); + Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString()); string _msl = row["sqQty"].ToString(); if (string.IsNullOrEmpty(_msl)) { @@ -308,21 +327,25 @@ { 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; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); - UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList); + gvList.Add(gvMx2); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList); 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); } } /// <summary> @@ -345,7 +368,7 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -355,16 +378,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;//褰撳墠椤� @@ -379,10 +402,15 @@ { ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } - } + + /// <summary> + /// 璇诲彇瀹炰綋 + /// </summary> + /// <param name="strGuid"></param> private void getModel(string strGuid) { + gcMx1.DataSource = null; bool isEdit = false; if (toolBarMenu1.currentAction == "add") return; if (toolBarMenu1.currentAction == "edit") isEdit = true; @@ -402,10 +430,13 @@ if (_rtn.rtnCode > 0) { dynamic dy = _rtn.rtnData; + _ucCk = dy.fstockid; 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); + gvList.Add(gvMx2); + UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); + _ucCk = ""; JObject _job = JObject.Parse(strJson); JArray array = new JArray(); foreach (var a in _job["rtnData"]["list"]) @@ -419,10 +450,29 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + } + JArray array2 = new JArray(); + foreach (var a in _job["rtnData"]["list2"]) + { + array2.Add(a); + } + DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString()); + if (dt2.Rows.Count > 0) + { + gcMx2.BindingContext = new BindingContext(); + gcMx2.DataSource = dt2; + gcMx2.ForceInitialize(); + gvMx2.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2); } } else @@ -514,16 +564,22 @@ { SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit; DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow(); - //gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString()); - gvMx1.SetFocusedRowCellValue("materialName", SelectedDataRow["itemName"].ToString()); - //gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString()); - //gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString()); + gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString()); + gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString()); + gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString()); + gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["itemId"].ToString()); //gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString()); + gvMx1.SetFocusedRowCellValue("salesQuantity", SelectedDataRow["fhSl"].ToString()); gvMx1.SetFocusedRowCellValue("deliveDetailGuid", SelectedDataRow["ckmxGuid"].ToString()); gvMx1.CloseEditor(); + gvMx1.PostEditor(); gvMx1.UpdateCurrentRow(); } - + /// <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; -- Gitblit v1.9.3