From 574ecd529365b8789e5a229e59c8219d2dbd083e Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 22 九月 2025 11:09:05 +0800
Subject: [PATCH] 报表挪移
---
DevApp/Gs.DevApp/DevFrm/Rpt/FQCMX.cs | 8 ++--
DevApp/Gs.DevApp/DevFrm/Rpt/IPQCSJMX.cs | 8 ++--
DevApp/Gs.DevApp/DevFrm/Rpt/IQCMX.cs | 8 ++--
DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db | 0
DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db | 0
DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs | 8 ++--
DevApp/Gs.DevApp/Gs.DevApp.csproj | 63 +++++++++++++++++++++++++++++++
DevApp/Gs.DevApp/Entity/XlsOutModel.cs | 5 ++
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs | 4 +-
9 files changed, 85 insertions(+), 19 deletions(-)
diff --git a/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db b/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db
index 0a8ee5a..d2f5e30 100644
--- a/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db
+++ b/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db
Binary files differ
diff --git a/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db b/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db
index 9ab8afb..b104205 100644
--- a/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db
+++ b/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db
Binary files differ
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
index 333c59a..2f05b99 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
@@ -193,8 +193,8 @@
{
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(" and a.ERP_SCZZ in");
+ //_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/FQCMX.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/FQCMX.cs
index dec76c8..784365b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/FQCMX.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/FQCMX.cs
@@ -79,8 +79,8 @@
{
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and a.erp_sczz in");
- _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ //_sbSqlWhere.Append(" and a.erp_sczz in");
+ //_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
// 鏋勯�犺姹傚弬鏁�
@@ -200,8 +200,8 @@
{
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(" and a.erp_sczz in");
+ //_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/IPQCSJMX.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/IPQCSJMX.cs
index e7562a3..88c8cf7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/IPQCSJMX.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/IPQCSJMX.cs
@@ -79,8 +79,8 @@
{
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and a.erp_sczz in");
- _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ //_sbSqlWhere.Append(" and a.erp_sczz in");
+ //_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
// 鏋勯�犺姹傚弬鏁�
@@ -200,8 +200,8 @@
{
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(" and a.erp_sczz in");
+ //_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/IQCMX.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/IQCMX.cs
index d13fa48..8100411 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/IQCMX.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/IQCMX.cs
@@ -79,8 +79,8 @@
{
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and a.ReceiveOrgId in");
- _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ //_sbSqlWhere.Append(" and a.ReceiveOrgId in");
+ //_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
// 鏋勯�犺姹傚弬鏁�
@@ -200,8 +200,8 @@
{
gcMain1.DataSource = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and a.ReceiveOrgId in");
- _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ //_sbSqlWhere.Append(" and a.ReceiveOrgId in");
+ //_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs
index 53a09ef..12e7281 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs
@@ -95,8 +95,8 @@
{
gcMain1.DataSource = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and c.FSubsidiary in");
- _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ //_sbSqlWhere.Append(" and c.FSubsidiary in");
+ //_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
@@ -144,8 +144,8 @@
if (dialogResult == DialogResult.OK)
{
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and c.FSubsidiary in");
- _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ //_sbSqlWhere.Append(" and c.FSubsidiary in");
+ //_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
string _folder = folderBrowserDialog.SelectedPath;
var _params = new
diff --git a/DevApp/Gs.DevApp/Entity/XlsOutModel.cs b/DevApp/Gs.DevApp/Entity/XlsOutModel.cs
index 0020481..c147979 100644
--- a/DevApp/Gs.DevApp/Entity/XlsOutModel.cs
+++ b/DevApp/Gs.DevApp/Entity/XlsOutModel.cs
@@ -9,12 +9,13 @@
/// <param name="_outSortName">鎺掑簭瀛楁</param>
/// <param name="_outSortOrder">鎺掑簭</param>
public XlsOutModel(string _outParameter = "", string _outWhere = "",
- string _outSortName = "", string _outSortOrder = "")
+ string _outSortName = "", string _outSortOrder = "", object outParams = null)
{
outParameter = _outParameter;
outWhere = _outWhere;
outSortName = _outSortName;
outSortOrder = _outSortOrder;
+ this.outParams = outParams;
}
@@ -28,5 +29,7 @@
public string outSortOrder { get; set; }
+
+ public object outParams { get; set; }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index bf0f141..cf633b7 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -625,6 +625,48 @@
<Compile Include="DevFrm\Rk\Frm_MesItemTblShow.Designer.cs">
<DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Rpt\BGTMmx.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\BGTMmx.Designer.cs">
+ <DependentUpon>BGTMmx.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\CPMX.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\CPMX.Designer.cs">
+ <DependentUpon>CPMX.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\FQCMX.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\FQCMX.Designer.cs">
+ <DependentUpon>FQCMX.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\IPQCSJMX.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\IPQCSJMX.Designer.cs">
+ <DependentUpon>IPQCSJMX.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\IPQCXJMX.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\IPQCXJMX.Designer.cs">
+ <DependentUpon>IPQCXJMX.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\IQCMX.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\IQCMX.Designer.cs">
+ <DependentUpon>IQCMX.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\ItemQL.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\ItemQL.Designer.cs">
+ <DependentUpon>ItemQL.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Sales\Frm_SalesDeliverSelect.cs">
<SubType>Form</SubType>
</Compile>
@@ -1635,6 +1677,27 @@
<EmbeddedResource Include="DevFrm\Rk\Frm_MesItemTblShow.resx">
<DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\BGTMmx.resx">
+ <DependentUpon>BGTMmx.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\CPMX.resx">
+ <DependentUpon>CPMX.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\FQCMX.resx">
+ <DependentUpon>FQCMX.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\IPQCSJMX.resx">
+ <DependentUpon>IPQCSJMX.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\IPQCXJMX.resx">
+ <DependentUpon>IPQCXJMX.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\IQCMX.resx">
+ <DependentUpon>IQCMX.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\ItemQL.resx">
+ <DependentUpon>ItemQL.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverSelect.resx">
<DependentUpon>Frm_SalesDeliverSelect.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3