From acf9d7b001514b3586166cbd0609e9d836ada792 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期三, 23 七月 2025 16:24:49 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 323 +++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 235 insertions(+), 88 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs index 48f91fa..5c02edc 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs @@ -1,5 +1,5 @@ -using DevExpress.XtraPivotGrid.Data; -using Gs.DevApp.DevFrm.WOM; +using Gs.DevApp.DevFrm.Rpt; +using Gs.DevApp.DevFrm.Sys; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -20,6 +20,9 @@ public Frm_Womdaa() { InitializeComponent(); + this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2; + this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2; + this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2; this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; // this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; @@ -27,7 +30,7 @@ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; this.toolBarMenu1.btnZhongTaiClick += ToolBarMenu1_btnZhongTaiClick; this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick; - // this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick; + this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick; this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick; @@ -50,15 +53,6 @@ }, lbGuid); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; - //杩欐槸鎵樻澘鐮� - this.ucBtnPrint1.btnDesignClick += (s, e) => - { - ucBtnPrint1.rptParameter = "rpt_daa{}"; - }; - this.ucBtnPrint1.btnReportClick += (s, e) => - { - _print(); - }; txt_psnQty_1.TextChanged += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1); @@ -67,23 +61,142 @@ { Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1); }; - //杩欐槸杩芥函鐮� - this.ucBtnPrint98.btnDesignClick += (s, e) => + //杩欐槸鎵樻澘鐮� + this.ucBtnPrint1.btnPrintClick += (s, e) => { - ucBtnPrint98.rptParameter = "rpt_trace{}"; + _print(); }; - this.ucBtnPrint98.btnReportClick += (s, e) => + this.ucBtnPrint1.btnAllClick += (s, e) => + { + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_daa001, gridView1); + SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鎵樻澘鐮�"); + string strCodeList = ""; + string strAction = ""; + frm.UpdateParent += (ss, ee) => + { + strCodeList = ee.StringSingle; + strAction = ee.Data; + }; + frm.ShowDialog(); + if (string.IsNullOrEmpty(strCodeList)) + return; + if (strAction == "print") + { + try + { + string rptParameter = "rpt_daa{" + + "100" + + "," + "" + + "," + "" + + "," + "" + + "," + "" + + "," + strCodeList + + "}"; + using (Form rpt = new RptPreview(rowGuid, rptParameter)) + { + rpt.ShowDialog(); + } + frm.Close(); + } + catch (Exception ex) + { + MsgHelper.ShowError(ex.Message); + } + } + }; + //杩欐槸杩芥函鐮� + this.ucBtnPrint98.btnPrintClick += (s, e) => { _print98(); }; - //杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛� - this.ucBtnPrint100.btnDesignClick += (s, e) => + this.ucBtnPrint98.btnAllClick += (s, e) => { - ucBtnPrint100.rptParameter = "rpt_hgm{}"; + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_daa001, gridView1); + SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "杩芥函鐮�"); + string strCodeList = ""; + frm.UpdateParent += (ss, ee) => + { + strCodeList = ee.StringSingle; + }; + frm.ShowDialog(); + if (string.IsNullOrEmpty(strCodeList)) + return; + try + { + string rptParameter = "rpt_trace{" + + "100" + + "," + "" + + "," + "" + + "," + "" + + "," + "" + + "," + strCodeList + + "}"; + using (Form rpt = new RptPreview(rowGuid, rptParameter)) + { + rpt.ShowDialog(); + } + frm.Close(); + } + catch (Exception ex) + { + MsgHelper.ShowError(ex.Message); + } }; - this.ucBtnPrint100.btnReportClick += (s, e) => + //杩欐槸鍚庣洊鐮� + this.ucBtnPrint100.btnPrintClick += (s, e) => { _print100(); + }; + this.ucBtnPrint100.btnAllClick += (s, e) => + { + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_daa001, gridView1); + SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鍚庣洊鐮�"); + string strCodeList = ""; + string strAction = ""; + frm.UpdateParent += (ss, ee) => + { + strCodeList = ee.StringSingle; + strAction = ee.Data; + }; + frm.ShowDialog(); + if (string.IsNullOrEmpty(strCodeList)) + return; + if (strAction.StartsWith("print")) + { + string printParm = strAction.Replace("print", ""); + try + { + string rptParameter = printParm + "{" + + "100" + + "," + "" + + "," + "" + + "," + "" + + "," + "" + + "," + strCodeList + + "}"; + using (Form rpt = new RptPreview(rowGuid, rptParameter)) + { + rpt.ShowDialog(); + } + frm.Close(); + } + catch (Exception ex) + { + MsgHelper.ShowError(ex.Message); + } + } + }; + //杩欐槸榻愬鏍囪瘑鍗★紝浠呬粎鎵撳嵃 + this.ucBtnPrint101.SetPlButton(false); + this.ucBtnPrint101.btnPrintClick += (s, e) => + { + _print101(); }; //瀵煎叆妯℃澘 this.btnIn.Click += (s, e) => @@ -105,17 +218,27 @@ "XlsInOut/" + strService, JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } }; frm.ShowDialog(); }; + this.btnDesign.Click += (s, e) => + { + EasyRptEdtShow frm = new EasyRptEdtShow(); + frm.UpdateParent += (ss, ee) => + { + }; + frm.ShowDialog(); + }; } - private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { @@ -170,7 +293,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1, "daa001"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) @@ -188,17 +311,19 @@ 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); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> @@ -214,7 +339,7 @@ lbGuid, txt_daa001, gridView1, "daa001"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾閲嶆柊鐢熸垚棣栨鍚楋紵")) @@ -230,25 +355,16 @@ _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; - //} + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -256,10 +372,10 @@ { _toolCk(7); } - //private void ToolBarMenu1_btnKgClick(object sender, EventArgs e) - //{ - // _toolCk(8); - //} + private void ToolBarMenu1_btnKgClick(object sender, EventArgs e) + { + _toolCk(8); + } private void ToolBarMenu1_btnWgClick(object sender, EventArgs e) { _toolCk(9); @@ -554,14 +670,60 @@ { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4); } + //鍔犱笂鎵撳嵃鏉冮檺 + JArray array5 = new JArray(); + foreach (var a in _job["rtnData"]["list5"]) + { + if (a["blackName"].ToString() == "鎵樻澘鐮佹墦鍗�") + { + splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both; + continue; + } + if (a["blackName"].ToString() == "杩芥函鐮佹墦鍗�") + { + splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both; + continue; + } + if (a["blackName"].ToString() == "鍚庣洊鐮佹墦鍗�") + { + splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both; + continue; + } + if (a["blackName"].ToString() == "榻愬鏍囪瘑鍗℃墦鍗�") + { + xtraTabPage5.PageVisible = true; + continue; + } + } + + //2025-7-20鍔犱笂浜х嚎纭 + JArray array6 = new JArray(); + foreach (var a in _job["rtnData"]["list6"]) + { + array6.Add(a); + } + DataTable dt6 = JsonConvert.DeserializeObject<DataTable>(array6.ToString()); + if (dt6.Rows.Count > 0) + { + gcMx6.BindingContext = new BindingContext(); + gcMx6.DataSource = dt6; + gcMx6.ForceInitialize(); + gvMx6.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx6); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx6, gvMx6); + } + txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = ""; } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -601,14 +763,15 @@ case 9: strMsg = "鎵嬪姩瀹屽伐"; break; - }; + } + ; toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1, "daa001"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) @@ -625,9 +788,10 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); + if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -640,10 +804,12 @@ gridView1.FocusedRowHandle = rowHandle; } } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -665,7 +831,7 @@ this.ucBtnPrint1.rptParameter = "return false"; return; } - if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim())) + if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); @@ -741,7 +907,7 @@ this.ucBtnPrint100.rptParameter = "return false"; return; } - this.ucBtnPrint100.rptParameter = "rpt_trace{" + this.ucBtnPrint100.rptParameter = "rpt_hgm{" + "" + "," + "" + "," + "" @@ -751,46 +917,27 @@ } /// <summary> - /// 閲嶆墦 + /// 杩欐槸榻愬 /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + private void _print101() { - - MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�"); - return; - var rowhandle = gvMx2.FocusedRowHandle; - if (rowhandle < 0) - return; - if (e.Button.Index == 0) + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_daa001, gridView1); + ucBtnPrint101.guidKey = rowGuid; + if (rowGuid.Length < 36) { - 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); - } + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�"); + this.ucBtnPrint101.rptParameter = "return false"; + return; } + this.ucBtnPrint101.rptParameter = "rpt_qitao{" + + "" + + "," + "" + + "," + "" + + "," + "" + + "," + "" + + "}"; } #endregion } -- Gitblit v1.9.3