kyy
昨天 574ecd529365b8789e5a229e59c8219d2dbd083e
报表挪移
已修改9个文件
104 ■■■■ 文件已修改
DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/FQCMX.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/IPQCSJMX.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/IQCMX.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Entity/XlsOutModel.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db
Binary files differ
DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db
Binary files differ
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);
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);
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);
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);
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
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; }
    }
}
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>