From adc3fd8af6ff791cd3f924890419cd0cba385f51 Mon Sep 17 00:00:00 2001 From: cdk <2441919651@qq.com> Date: 星期五, 25 七月 2025 15:48:34 +0800 Subject: [PATCH] 调整审核的文字提示 --- DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 284 ++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 171 insertions(+), 113 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs index 4e45ee8..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; @@ -53,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); @@ -70,30 +61,140 @@ { 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.ucBtnPrint101.btnDesignClick += (s, e) => + this.ucBtnPrint100.btnAllClick += (s, e) => { - ucBtnPrint101.rptParameter = "rpt_qitao{}"; + 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.btnReportClick += (s, e) => + //杩欐槸榻愬鏍囪瘑鍗★紝浠呬粎鎵撳嵃 + this.ucBtnPrint101.SetPlButton(false); + this.ucBtnPrint101.btnPrintClick += (s, e) => { _print101(); }; @@ -117,40 +218,23 @@ "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.btnDeleteBar.Click += (s, e) => + this.btnDesign.Click += (s, e) => { - string rowGuid, rowName; - (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, - lbGuid, txt_daa001, gridView1, "daa001"); - if (string.IsNullOrEmpty(rowGuid)) - { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勬暟鎹紒"); - return; - } - SelectDeleteBar frm = new SelectDeleteBar(rowGuid,"鍚庣洊鐮�"); - //璧嬪�肩粰鏄庣粏琛� + EasyRptEdtShow frm = new EasyRptEdtShow(); frm.UpdateParent += (ss, ee) => { - try - { - string strMsg = ee.StringSingle; - if(strMsg=="1") - getModel(rowGuid); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message); - } }; frm.ShowDialog(); }; @@ -209,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 + "銆戯紝纭畾鍒犻櫎鍚楋紵")) @@ -227,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> @@ -253,7 +339,7 @@ lbGuid, txt_daa001, gridView1, "daa001"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾閲嶆柊鐢熸垚棣栨鍚楋紵")) @@ -269,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); } } @@ -619,14 +696,34 @@ } } + //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); } } @@ -666,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 + "鍚楋紵")) @@ -690,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()); @@ -705,10 +804,12 @@ gridView1.FocusedRowHandle = rowHandle; } } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -837,49 +938,6 @@ + "," + "" + "," + "" + "}"; - } - - /// <summary> - /// 閲嶆墦 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) - { - - MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�"); - return; - 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 } -- Gitblit v1.9.3