富尔达Api
上一版本: 489b7b5c | 补丁 | 提交 | 显示空白
yl
2022-11-30 9492f3e6c95c610e06a5dbbd03d8094ac1858f10 
班组计件工资报表增加剔除工序(不参与计算)
已修改14个文件
58 ■■■■■ 文件已修改
.vs/VueWebApi/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Controllers/ReportManagerController.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/BLL/ReportManagerBLL.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/ReportManagerDAL.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.dll 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.dll 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史 
 .vs/VueWebApi/v16/.suo

Binary files differ



 VueWebApi/Controllers/ReportManagerController.cs


@@ -97,6 +97,7 @@


        /// <param name="groupcode">生产班组</param>


        /// <param name="username">操作人员</param>


        /// <param name="operdate">操作时间</param>


        /// <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>


        /// <param name="page">页码</param>


        /// <param name="rows">每页显示条数</param>


        /// <param name="prop">排序字段</param>


@@ -104,7 +105,7 @@


        /// <returns></returns>


        [Route(template: "GroupSalaryReportSearch")]


        [HttpGet]


        public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)


        public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null,string rejectstepcode=null)


        {


            string operopendate = "";  //报工开始时间


            string operclosedate = "";    //报工结束时间


@@ -115,7 +116,7 @@


            }


            int startNum = rows * (page - 1) + 1;  //起始记录rowNum


            int endNum = rows * page;   //结束记录 rowNum


            mes = ReportManagerBLL.GroupSalaryReportSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);


            mes = ReportManagerBLL.GroupSalaryReportSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);


            return TJson.toJson(mes);


        }


        #endregion


@@ -147,10 +148,11 @@


        /// <param name="groupcode">生产班组</param>


        /// <param name="username">操作人员</param>


        /// <param name="operdate">操作时间</param>


        /// <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>


        /// <returns></returns>


        [Route(template: "GroupSalaryReportExcelSearch")]


        [HttpGet]


        public HttpResponseMessage GroupSalaryReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)


        public HttpResponseMessage GroupSalaryReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null,string rejectstepcode=null)


        {


            string operopendate = "";  //报工开始时间


            string operclosedate = "";    //报工结束时间


@@ -159,7 +161,7 @@


                operopendate = operdate.Split('~')[0].ToString();


                operclosedate = operdate.Split('~')[1].ToString();


            }


            mes = ReportManagerBLL.GroupSalaryReportExcelSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);


            mes = ReportManagerBLL.GroupSalaryReportExcelSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);


            return TJson.toJson(mes);


        }


        #endregion




 VueWebApi/DLL/BLL/ReportManagerBLL.cs


@@ -25,9 +25,9 @@






        #region[班组工资报表记录查询]


        public static ToMessage GroupSalaryReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)


        public static ToMessage GroupSalaryReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)


        {


            return ReportManagerDAL.GroupSalaryReportSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);


            return ReportManagerDAL.GroupSalaryReportSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);


        }


        #endregion




@@ -39,9 +39,9 @@


        #endregion




        #region[班组工资报表记录导出]


        public static ToMessage GroupSalaryReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate)


        public static ToMessage GroupSalaryReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode)


        {


            return ReportManagerDAL.GroupSalaryReportExcelSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);


            return ReportManagerDAL.GroupSalaryReportExcelSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);


        }


        #endregion






 VueWebApi/DLL/DAL/ReportManagerDAL.cs


@@ -221,7 +221,7 @@






        #region[班组工资报表记录查询]


        public static ToMessage GroupSalaryReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)


        public static ToMessage GroupSalaryReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)


        {


            var dynamicParams = new DynamicParameters();


            string search = "";


@@ -268,7 +268,12 @@


                    dynamicParams.Add("@operopendate", operopendate + " 00:00:00");


                    dynamicParams.Add("@operclosedate", operclosedate + " 23:59:59");


                }




                if (rejectstepcode != "" && rejectstepcode != null) 


                {


                    string[] s1 = Array.ConvertAll<string, string>(rejectstepcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 


                    search+= "and A.step_code not in @s1";


                    dynamicParams.Add("@s1", s1);


                }


                if (search == "")


                {


                    search = "and 1=1 ";


@@ -334,7 +339,7 @@


        #endregion




        #region[班组工资报表记录导出]


        public static ToMessage GroupSalaryReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate)


        public static ToMessage GroupSalaryReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode)


        {


            var dynamicParams = new DynamicParameters();


            string search = "";


@@ -381,7 +386,12 @@


                    dynamicParams.Add("@operopendate", operopendate + " 00:00:00");


                    dynamicParams.Add("@operclosedate", operclosedate + " 23:59:59");


                }




                if (rejectstepcode != "" && rejectstepcode != null)


                {


                    string[] s1 = Array.ConvertAll<string, string>(rejectstepcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 


                    search += "and A.step_code not in @s1";


                    dynamicParams.Add("@s1", s1);


                }


                if (search == "")


                {


                    search = "and 1=1 ";




 VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user


@@ -5,7 +5,7 @@


<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


  <PropertyGroup>


    <_PublishTargetUrl>D:\网站发布\MES富尔达</_PublishTargetUrl>


    <History>True|2022-11-23T06:06:03.8602775Z;True|2022-11-21T15:13:10.4385853+08:00;True|2022-11-16T10:29:41.2258924+08:00;True|2022-11-16T09:54:23.4213778+08:00;</History>


    <History>True|2022-11-30T06:04:20.4425530Z;True|2022-11-30T14:03:51.8326823+08:00;True|2022-11-30T13:26:46.0316090+08:00;True|2022-11-29T08:57:17.3697109+08:00;True|2022-11-23T14:06:03.8602775+08:00;True|2022-11-21T15:13:10.4385853+08:00;True|2022-11-16T10:29:41.2258924+08:00;True|2022-11-16T09:54:23.4213778+08:00;</History>


  </PropertyGroup>


  <ItemGroup>


    <File Include="Areas/HelpPage/HelpPage.css">


@@ -705,13 +705,13 @@


      <publishTime>12/24/2021 15:38:29</publishTime>


    </File>


    <File Include="bin/VueWebApi.dll">


      <publishTime>11/23/2022 14:05:57</publishTime>


      <publishTime>11/30/2022 14:03:45</publishTime>


    </File>


    <File Include="bin/VueWebApi.pdb">


      <publishTime>11/23/2022 14:05:57</publishTime>


      <publishTime>11/30/2022 14:03:45</publishTime>


    </File>


    <File Include="bin/VueWebApi.xml">


      <publishTime>11/23/2022 14:05:56</publishTime>


      <publishTime>11/30/2022 14:03:44</publishTime>


    </File>


    <File Include="bin/WebActivatorEx.dll">


      <publishTime>02/08/2013 16:42:28</publishTime>


@@ -1074,7 +1074,7 @@


      <publishTime>06/16/2022 13:39:23</publishTime>


    </File>


    <File Include="Web.config">


      <publishTime>11/23/2022 14:06:03</publishTime>


      <publishTime>11/30/2022 14:03:51</publishTime>


    </File>


  </ItemGroup>


</Project>




 VueWebApi/bin/VueWebApi.dll

Binary files differ



 VueWebApi/bin/VueWebApi.pdb

Binary files differ



 VueWebApi/bin/VueWebApi.xml


@@ -538,7 +538,7 @@


            <param name="receivdate">收料时间</param>


            <returns></returns>


        </member>


        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">


        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">


            <summary>


            班组工资报表记录查询


            </summary>


@@ -550,6 +550,7 @@


            <param name="groupcode">生产班组</param>


            <param name="username">操作人员</param>


            <param name="operdate">操作时间</param>


            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>


            <param name="page">页码</param>


            <param name="rows">每页显示条数</param>


            <param name="prop">排序字段</param>


@@ -563,7 +564,7 @@


            <param name="id">报工记录主表id</param>


            <returns></returns>


        </member>


        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">


        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">


            <summary>


            班组工资报表记录查询


            </summary>


@@ -575,6 +576,7 @@


            <param name="groupcode">生产班组</param>


            <param name="username">操作人员</param>


            <param name="operdate">操作时间</param>


            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>


            <returns></returns>


        </member>


        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">




 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll

Binary files differ



 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb

Binary files differ



 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml


@@ -538,7 +538,7 @@


            <param name="receivdate">收料时间</param>


            <returns></returns>


        </member>


        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">


        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">


            <summary>


            班组工资报表记录查询


            </summary>


@@ -550,6 +550,7 @@


            <param name="groupcode">生产班组</param>


            <param name="username">操作人员</param>


            <param name="operdate">操作时间</param>


            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>


            <param name="page">页码</param>


            <param name="rows">每页显示条数</param>


            <param name="prop">排序字段</param>


@@ -563,7 +564,7 @@


            <param name="id">报工记录主表id</param>


            <returns></returns>


        </member>


        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">


        <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">


            <summary>


            班组工资报表记录查询


            </summary>


@@ -575,6 +576,7 @@


            <param name="groupcode">生产班组</param>


            <param name="username">操作人员</param>


            <param name="operdate">操作时间</param>


            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>


            <returns></returns>


        </member>


        <member name="M:VueWebApi.Controllers.ReportManagerController.PeopleSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">




 VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache

Binary files differ



 VueWebApi/obj/Release/VueWebApi.dll

Binary files differ



 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ