From 437425784b7612e10d4a54bd64905c508347514d Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 06 五月 2025 15:12:50 +0800 Subject: [PATCH] fqc --- DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 383 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 324 insertions(+), 59 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs index e77afd7..3cdc7e1 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs @@ -1,3 +1,5 @@ +using DevExpress.XtraPivotGrid.Data; +using Gs.DevApp.DevFrm.WOM; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -19,7 +21,7 @@ { InitializeComponent(); this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; - this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; + // this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; @@ -28,22 +30,27 @@ this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick; this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; + this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick; + this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) => - { - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); - }); + { + 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_sjXt.getSuppler(""); + + //杩欐槸鍗℃澘鐮� this.ucBtnPrint1.btnDesignClick += (s, e) => { ucBtnPrint1.rptParameter = "rpt_daa{}"; @@ -52,10 +59,39 @@ { _print(); }; + //杩欐槸杩芥函鐮� + this.ucBtnPrint98.btnDesignClick += (s, e) => + { + ucBtnPrint98.rptParameter = "rpt_trace{}"; + }; + this.ucBtnPrint98.btnReportClick += (s, e) => + { + _print98(); + }; + //杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛� + this.ucBtnPrint100.btnDesignClick += (s, e) => + { + ucBtnPrint100.rptParameter = "rpt_hgm{}"; + }; + this.ucBtnPrint100.btnReportClick += (s, e) => + { + _print100(); + }; + txt_psnQty_1.TextChanged += (s, e) => + { + Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut); + }; + + radOut.SelectedIndexChanged += (s, e) => + { + Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut); + }; } + + private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { - _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); Task.Delay(100); getPageList(1); } @@ -79,7 +115,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(); } @@ -93,6 +129,58 @@ _filterList = e.FilterList; getPageList(1); } + + /// <summary> + /// 鐢熸垚棣栨 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnShouJianClick(object sender, EventArgs e) + { + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_daa001, gridView1, "daa001"); + if (string.IsNullOrEmpty(rowGuid)) + { + MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾閲嶆柊鐢熸垚棣栨鍚楋紵")) + return; + var _obj = new + { + guid = rowGuid, + inFieldValue = "", + }; + try + { + var strJson = UtilityHelper.HttpPost("", + _webServiceName + "EditModelSubmitShouJian", + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); + if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) + { + //if (xtraTabControl1.SelectedTabPageIndex == 1) + //{ + // getModel(lbGuid.Text.Trim()); + //} + //else + //{ + // //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍� + // getPageList(this.pageBar1.CurrentPage); + // int rowHandle = gridView1.LocateByValue("guid", rowGuid); + // gridView1.FocusedRowHandle = rowHandle; + //} + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + private void ToolBarMenu1_btnTzblClick(object sender, EventArgs e) { _toolCk(7); @@ -157,14 +245,15 @@ getModel(lbGuid.Text.Trim()); else { - _filterList.Clear(); - if (gridView1.ActiveFilter.Count > 0) - { - gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; - gridView1.ActiveFilter.Clear(); - gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; - } - getPageList(1); + //_filterList.Clear(); + //if (gridView1.ActiveFilter.Count > 0) + //{ + // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + // gridView1.ActiveFilter.Clear(); + // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + //} + //getPageList(1); + getPageList(this.pageBar1.CurrentPage); } } /// <summary> @@ -174,6 +263,7 @@ /// <param name="e"></param> private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) { + toolBarMenu1.currentAction = "edit"; string rowGuid = "", rowName = ""; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1); if (string.IsNullOrEmpty(rowGuid)) @@ -182,9 +272,17 @@ return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); - List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); - gvList.Add(gvMx1); - UtilityHelper.ChangeEnableByControl(panel1.Controls, true); + if (xtraTabControl1.SelectedTabPageIndex == 1) + { + getModel(rowGuid); + } + else + { + List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gvList.Add(gvMx1); + gvList.Add(gvMx2); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList); + } } /// <summary> @@ -194,29 +292,36 @@ /// <param name="e"></param> private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) { - toolBarMenu1.isSetBtn = false; - var _obj = new - { - guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 - sjxt = txt_sjXt.GetCode(), //瀹為檯绾夸綋 - bz = txt_daa009.Text.Trim()//澶囨敞 - }; - try - { - 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) - { - lbGuid.Text = _rtn.rtnData; - toolBarMenu1.isSetBtn = true; - UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false); - } - } - catch (Exception ex) - { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } + //toolBarMenu1.isSetBtn = false; + //var _obj = new + //{ + // guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 + // sjxt = txt_sjXt.GetId(), //瀹為檯绾夸綋 + // bz = txt_daa009.Text.Trim()//澶囨敞 + //}; + //try + //{ + // 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) + // { + // lbGuid.Text = _rtn.rtnData; + // toolBarMenu1.isSetBtn = true; + // List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + // gvList.Add(gvMx1); + // UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList); + // toolBarMenu1.currentAction = ""; + // txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true; + // txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false; + // toolBarMenu1.currentAction = ""; + // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); + // } + //} + //catch (Exception ex) + //{ + // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + //} } /// <summary> @@ -226,8 +331,8 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); - PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try { @@ -236,15 +341,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(); + 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;//褰撳墠椤� @@ -259,16 +365,17 @@ { ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } - } private void getModel(string strGuid) { bool isEdit = false; - if (toolBarMenu1.currentAction == "add") + if (toolBarMenu1.currentAction == "add") return; + if (toolBarMenu1.currentAction == "edit") isEdit = true; + if (string.IsNullOrEmpty(strGuid)) { - Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; - }; + } if (string.IsNullOrEmpty(strGuid)) { ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); @@ -285,11 +392,22 @@ if (_rtn.rtnCode > 0) { dynamic dy = _rtn.rtnData; + //string cjId = dy.daa013; + //string xjxt = dy.sjXt; + // txt_sjXt.getSuppler(cjId, xjxt); + //鎵樻澘鐮� + txt_zQty.Text = dy.daa008; + txt_yQty.Text = dy.yQty; + txt_kQty.Text = dy.kQty; + //杩芥函鐮� + txt_zQty98.Text = dy.daa008; + txt_yQty98.Text = dy.yQty98; + txt_kQty98.Text = dy.kQty98; lbGuid.Text = strGuid; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); gvList.Add(gvMx2); - UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList); + UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); JObject _job = JObject.Parse(strJson); JArray array = new JArray(); foreach (var a in _job["rtnData"]["list"]) @@ -302,6 +420,8 @@ gcMx1.BindingContext = new BindingContext(); gcMx1.DataSource = dt; gcMx1.ForceInitialize(); + gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { @@ -318,11 +438,51 @@ 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); } + JArray array3 = new JArray(); + foreach (var a in _job["rtnData"]["list3"]) + { + array3.Add(a); + } + DataTable dt3 = JsonConvert.DeserializeObject<DataTable>(array3.ToString()); + if (dt3.Rows.Count > 0) + { + gcMx3.BindingContext = new BindingContext(); + gcMx3.DataSource = dt3; + gcMx3.ForceInitialize(); + gvMx3.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx3); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3); + } + JArray array4 = new JArray(); + foreach (var a in _job["rtnData"]["list4"]) + { + array4.Add(a); + } + DataTable dt4 = JsonConvert.DeserializeObject<DataTable>(array4.ToString()); + if (dt4.Rows.Count > 0) + { + gcMx4.BindingContext = new BindingContext(); + gcMx4.DataSource = dt4; + gcMx4.ForceInitialize(); + gvMx4.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx4); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4); + } + txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = ""; + radOut.Properties.Items[0].Description = "鍏ㄨ嚜鍔�"; } else ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); @@ -349,7 +509,7 @@ strMsg = "宸ュ崟鏆傚仠"; break; case 3: - strMsg = "鎾ゅ洖瀹屽伐"; + strMsg = "娓呭熬"; break; case 4: strMsg = "绱ф�ュ鏂�"; @@ -381,6 +541,7 @@ } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) return; + var _obj = new { guid = rowGuid, @@ -393,12 +554,19 @@ JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); - if (_rtn.rtnCode > 0) + if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { if (xtraTabControl1.SelectedTabPageIndex == 1) + { getModel(lbGuid.Text.Trim()); + } else + { + //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍� getPageList(this.pageBar1.CurrentPage); + int rowHandle = gridView1.LocateByValue("guid", rowGuid); + gridView1.FocusedRowHandle = rowHandle; + } } } catch (Exception ex) @@ -407,6 +575,12 @@ } } + + #region 鍚勭鎵撳嵃 + + /// <summary> + /// 杩欐槸鍗℃澘鐮� + /// </summary> private void _print() { string rowGuid, rowName; @@ -419,26 +593,117 @@ this.ucBtnPrint1.rptParameter = "return false"; return; } - if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim())) + if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); txt_iCount_1.Focus(); this.ucBtnPrint1.rptParameter = "return false"; return; } - if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim())) + 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; } - this.ucBtnPrint1.rptParameter = "rpt_daa{" + "" - + "," + txt_printRemark.Text.Trim() + this.ucBtnPrint1.rptParameter = "rpt_daa{" + + txt_printRemark.Text.Trim() + "," + "" + + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString() + "," + txt_iCount_1.Text.Trim() + "," + txt_psnQty_1.Text.Trim() + "}"; } + + /// <summary> + /// 杩欐槸杩芥函鐮� + /// </summary> + private void _print98() + { + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_daa001, gridView1); + ucBtnPrint98.guidKey = rowGuid; + if (rowGuid.Length < 36) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�"); + this.ucBtnPrint98.rptParameter = "return false"; + return; + } + if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_98.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + txt_iCount_98.Focus(); + this.ucBtnPrint98.rptParameter = "return false"; + return; + } + this.ucBtnPrint98.rptParameter = "rpt_trace{" + + "" + + "," + txt_printRemark98.Text.Trim() + + "," + "" + + "," + txt_iCount_98.Text.Trim() + + "," + 1 + + "}"; + } + + /// <summary> + /// 杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛� + /// </summary> + private void _print100() + { + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_daa001, gridView1); + ucBtnPrint100.guidKey = rowGuid; + if (rowGuid.Length < 36) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�"); + this.ucBtnPrint100.rptParameter = "return false"; + return; + } + this.ucBtnPrint100.rptParameter = "rpt_hgm{" + + "100" + + "," + "" + + "," + "" + + "," + "" + + "," + "" + + "}"; + } + private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + 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 = "daa" + }; + 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); + } + } + } + #endregion } } \ No newline at end of file -- Gitblit v1.9.3