From a725e8b58d445ca00071762f6484a3de4e1474ae Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 07 十一月 2025 08:39:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 108 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 21f4d55..4c0b1bd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -43,6 +43,7 @@
this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
this.toolBarMenu1.btnGxClick += ToolBarMenu1_btnGxClick;
+ this.toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
this.toolBarMenu1.getXmlConfig();
gvMx1.Columns["barbl"].DisplayFormat.FormatType = FormatType.Numeric;
gvMx1.Columns["barbl"].DisplayFormat.FormatString = "p0";
@@ -67,6 +68,8 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+ #region 鎵樻澘鐮佹墦鍗扮浉鍏�
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);
@@ -75,7 +78,6 @@
{
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
- //杩欐槸鎵樻澘鐮�
this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
_print();
@@ -120,7 +122,12 @@
}
}
};
- //杩欐槸杩芥函鐮�
+ this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
+ {
+ _print();
+ };
+ #endregion
+ #region 杩芥函鐮佹墦鍗扮浉鍏�
this.ucBtnPrint98.btnPrintClick += (s, e) =>
{
_print98();
@@ -165,7 +172,13 @@
}
}
};
- //杩欐槸鍚庣洊鐮�
+ this.ucBtnPrint98.btnZhiJieClick += (s, e) =>
+ {
+ _print98();
+ };
+ #endregion
+
+ #region 鍚庣洊鐮佹墦鍗扮浉鍏�
this.ucBtnPrint100.btnPrintClick += (s, e) =>
{
_print100();
@@ -211,12 +224,23 @@
}
}
};
- //杩欐槸榻愬鏍囪瘑鍗★紝浠呬粎鎵撳嵃
+ this.ucBtnPrint100.btnZhiJieClick += (s, e) =>
+ {
+ _print100();
+ };
+ #endregion
+
+ #region 杩欐槸榻愬鏍囪瘑鍗★紝浠呬粎鎵撳嵃
this.ucBtnPrint101.SetPlButton(false);
this.ucBtnPrint101.btnPrintClick += (s, e) =>
{
_print101();
};
+ this.ucBtnPrint101.btnZhiJieClick += (s, e) =>
+ {
+ _print101();
+ };
+ #endregion
//瀵煎叆妯℃澘
this.btnIn.Click += (s, e) =>
{
@@ -284,7 +308,7 @@
inP3 = "",
inP4 = ""
};
- var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOutDaa", "", "", "", _params);
+ var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOutDaaMx", "", "", "", _params);
try
{
string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
@@ -315,6 +339,7 @@
};
}
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -630,6 +655,64 @@
catch (Exception ex)
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 宸ュ崟瀵煎嚭
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnOutClick(object sender, EventArgs e)
+ {
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.ERP_SCZZ in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+ using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+ {
+ folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+ DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+ if (dialogResult == DialogResult.OK)
+ {
+ string _folder = folderBrowserDialog.SelectedPath;
+ var _params = new
+ {
+ inQueryWhere = _sbSqlWhere.ToString(),
+ inFid = "",
+ inP1 = "",
+ inP2 = "",
+ inP3 = "",
+ inP4 = ""
+ };
+ var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOutDaa", "", "", "", _params);
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ string _file = _rtn.rtnData.fileUrl.ToString();
+ string _folderName = _folder + "\\" + _file.Replace("down/", "");
+ string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
+ using (WebClient client = new WebClient())
+ {
+ client.DownloadFile(_url, _folderName);
+ }
+ var frm = new Gs.DevApp.DevFrm.QC.Xls(_folderName);
+ frm.ShowDialog();
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
}
}
@@ -1125,5 +1208,25 @@
frm.ShowDialog();
}
}
+ /// <summary>
+ /// 杩涘叆鐪嬫澘
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ if (e.Button.Index == 0)
+ {
+ var userGuid =
+ string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginUserGuid)
+ ? Guid.NewGuid().ToString()
+ : LoginInfoModel.CurrentUser.LoginUserGuid;
+ var rowhandle = gridView1.FocusedRowHandle;
+ var dr = gridView1.GetDataRow(rowhandle);
+ var qcGuid = dr["guid"].ToString() + "&mth=" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "&userGuid=" + userGuid;
+ KanBanLaTouH5 frm = new KanBanLaTouH5(qcGuid);
+ frm.ShowDialog();
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3