From b636536b754ef512f8dd44842f50846ef8fa9a9c Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 13 十月 2025 13:50:02 +0800
Subject: [PATCH] 增加不需要过滤的组织
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 155 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index d2f96cd..ff9655d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,6 +1,4 @@
-using DevExpress.Data;
using DevExpress.Utils;
-using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.DevFrm.WOM;
@@ -11,8 +9,10 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
+using System.Configuration;
using System.Data;
using System.Drawing;
+using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -26,6 +26,7 @@
{
InitializeComponent();
//鍏堥殣钘�4绉嶆墦鍗�
+ // txt_mesStartProd.CustomFormat = "yyyy-MM-dd HH:mm";
this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
@@ -42,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";
@@ -228,7 +230,7 @@
var _obj = new
{
tmpGuid = upGuid,
- strType = "",
+ strType = txt_daa001.Text.Trim(),
};
try
{
@@ -257,7 +259,64 @@
};
frm.ShowDialog();
};
+ //瀵煎嚭澶囨枡鍗曡韩
+ btnXls.Click += (s, e) =>
+ {
+ if (string.IsNullOrEmpty(lbGuid.Text.Trim()))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犲鍑虹殑宸ュ崟锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + txt_daa001.Text.Trim() + "銆戯紝纭畾瀵煎嚭鍚楋紵"))
+ return;
+ using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+ {
+ folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+ DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+ if (dialogResult == DialogResult.OK)
+ {
+ string _folder = folderBrowserDialog.SelectedPath;
+ var _params = new
+ {
+ inQueryWhere = lbGuid.Text.Trim(),//涓诲缓
+ inFid = "",
+ inP1 = "",
+ inP2 = "",
+ inP3 = "",
+ inP4 = ""
+ };
+ var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOutDaaMx", "", "", "", _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);
+ }
+ }
+ }
+
+ };
}
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -515,12 +574,38 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
+ DateTime _dtKg = txt_mesStartProd.DateTime;
+ DateTime _dtWg = txt_mesEndProd.DateTime;
+ if (string.IsNullOrEmpty(txt_mesStartProd.Text.Trim()))
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛氶璁″紑宸ユ椂闂翠笉鑳戒负绌猴紒");
+ txt_mesStartProd.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_mesEndProd.Text.Trim()))
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛氶璁″畬宸ユ椂闂翠笉鑳戒负绌猴紒");
+ txt_mesEndProd.Focus();
+ return;
+ }
+ if (_dtWg < _dtKg)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛氬畬宸ユ椂闂翠笉鑳藉皬浜庡紑宸ユ椂闂达紒");
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_daa015.GetId()))
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛氱嚎浣撲笉鑳戒负绌猴紒");
+ return;
+ }
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
sjxt = txt_daa015.GetId(), //绾夸綋
sclx = txt_daa025.Text.Trim(),//鐢熶骇绫诲瀷
- bz = txt_daa009.Text.Trim()//澶囨敞
+ bz = txt_daa009.Text.Trim(),//澶囨敞
+ dtKg = _dtKg.ToString("yyyy-MM-dd HH:mm:ss"),
+ dtWg = _dtWg.ToString("yyyy-MM-dd HH:mm:ss"),
};
try
{
@@ -533,12 +618,13 @@
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);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
//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);
+ toolBarMenu1.currentAction = "";
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -550,13 +636,76 @@
}
/// <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);
+ }
+ }
+ }
+
+ }
+
+ /// <summary>
///
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ 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));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3