个人计件工资报表怎加车间过滤

yl

2023-03-20 e3a58acc667088ccb7eaaac2e424800ecf1050b3

个人计件工资报表怎加车间过滤

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/Controllers/ReportManagerController.cs

@@ -98,7 +98,7 @@
        /// <param name="groupcode">生产班组</param>
        /// <param name="username">操作人员</param>
        /// <param name="operdate">操作时间</param>
        /// <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
        /// <param name="rejectstepcode">剔除车间(固定薪资车间不参与计算)</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
@@ -150,7 +150,7 @@
        /// <param name="groupcode">生产班组</param>
        /// <param name="username">操作人员</param>
        /// <param name="operdate">操作时间</param>
        /// <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
        /// <param name="rejectstepcode">剔除车间(固定薪资车间不参与计算)</param>
        /// <returns></returns>
        [Route(template: "GroupSalaryReportExcelSearch")]
        [HttpGet]
@@ -182,7 +182,7 @@
        /// <param name="groupcode">生产班组</param>
        /// <param name="reportname">报工人员</param>
        /// <param name="reportdate">报工时间</param>
        /// <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
        /// <param name="rejectstepcode">剔除车间(固定薪资车间不参与计算)</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
@@ -219,7 +219,7 @@
        /// <param name="groupcode">生产班组</param>
        /// <param name="reportname">报工人员</param>
        /// <param name="reportdate">报工时间</param>
        /// <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
        /// <param name="rejectstepcode">剔除车间(固定薪资车间不参与计算)</param>
        /// <returns></returns>
        [Route(template: "PeopleSalaryReportExcelSearch")]
        [HttpGet]

 VueWebApi/DLL/DAL/ReportManagerDAL.cs

@@ -276,7 +276,7 @@
                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";
                    search += "and E.wksp_code not in @s1";
                    dynamicParams.Add("@s1", s1);
                }

@@ -298,6 +298,7 @@
                            left  join TMateriel_Info M on A.materiel_code=M.partcode
                            left  join TStep T on A.step_code=T.stepcode
                            left  join TUser U on A.lm_user=U.usercode 
                            left  join TEqpInfo E on A.eqp_code=E.code
                            where G.group_code<>'' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
@@ -400,7 +401,7 @@
                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";
                    search += "and E.wksp_code not in @s1";
                    dynamicParams.Add("@s1", s1);
                }

@@ -423,6 +424,7 @@
                            left  join TMateriel_Info M on A.materiel_code=M.partcode
                            left  join TStep T on A.step_code=T.stepcode
                            left  join TUser U on A.lm_user=U.usercode 
                            left  join TEqpInfo E on A.eqp_code=E.code
                            where G.group_code<>'' " + search;
                DataTable data = DapperHelper.selectdata(sql, dynamicParams);
                data.TableName = "Table"; //设置DataTable的名称
@@ -500,7 +502,7 @@
                if (rejectstepcode != "" && rejectstepcode != null)
                {
                    string[] s1 = Array.ConvertAll<string, string>(rejectstepcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 
                    search += "and AA.stepcode not in @s1";
                    search += "and AA.wksp_code not in @s1";
                    dynamicParams.Add("@s1", s1);
                }
                if (search == "")
@@ -512,11 +514,11 @@
                var total = 0; //总条数
                var sql = @"select AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,
                            AA.task_qty,AA.group_code,AA.group_name,AA.report_qty,AA.unprice,AA.ratio,AA.isend,
                            AA.moneys as usermoney,AA.username,AA.report_date
                            AA.moneys as usermoney,AA.username,AA.report_date,AA.wksp_code
                            from (
                            select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
                            A.task_qty,G.group_code,G.group_name,B.report_qty,isnull(S.unprice,0) as unprice,B.ratio,P.isend,
                            (B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,U.username,B.report_date
                            (B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,U.username,B.report_date,E.wksp_code
                            from TK_Wrk_Record A
                            inner join TK_Wrk_RecordSub B on A.id=B.m_id
                            inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code 
@@ -526,6 +528,7 @@
                            left  join TMateriel_Info M on A.materiel_code=M.partcode
                            left  join TStep T on A.step_code=T.stepcode
                            left  join TUser U on B.report_person=U.usercode
                            left  join TEqpInfo E on A.eqp_code=E.code
                            ) as AA
                            where " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -613,11 +616,11 @@
                var total = 0; //总条数
                var sql = @"select AA.wo_code as 工单编号,AA.partcode as 产品编码,AA.partname as 产品名称,AA.partspec as 产品规格,AA.stepcode as 工序编码,AA.stepname as 工序名称,AA.isend as 是否末道工序,
                            AA.task_qty as 任务数量,AA.group_code as 生产班组编码,AA.group_name as 生产班组名称,AA.report_qty as 报工数量,AA.unprice as 工序单价,AA.ratio as 分配比例,
                            AA.moneys as 计件工资,AA.username as 报工人员,AA.report_date as 报工时间
                            AA.moneys as 计件工资,AA.username as 报工人员,AA.report_date as 报工时间,AA.wksp_code as 车间编码
                            from (
                            select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
                            A.task_qty,G.group_code,G.group_name,B.report_qty,isnull(S.unprice,0) as unprice,B.ratio,P.isend,
                            (B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,U.username,B.report_date
                            (B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,U.username,B.report_date,E.wksp_code
                            from TK_Wrk_Record A
                            inner join TK_Wrk_RecordSub B on A.id=B.m_id
                            inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code 
@@ -627,6 +630,7 @@
                            left  join TMateriel_Info M on A.materiel_code=M.partcode
                            left  join TStep T on A.step_code=T.stepcode
                            left  join TUser U on B.report_person=U.usercode
                            left  join TEqpInfo E on A.eqp_code=E.code
                            ) as AA
                            where " + search;
                DataTable data = DapperHelper.selectdata(sql, dynamicParams);

 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|2023-03-06T08:07:04.9212059Z;True|2023-03-04T16:04:10.1419275+08:00;True|2023-03-04T14:44:43.4920595+08:00;True|2023-03-04T11:24:07.2811270+08:00;True|2023-03-03T16:01:45.2965979+08:00;</History>
    <History>True|2023-03-17T13:27:42.1161689Z;True|2023-03-07T07:51:26.5589289+08:00;True|2023-03-06T16:07:04.9212059+08:00;True|2023-03-04T16:04:10.1419275+08:00;True|2023-03-04T14:44:43.4920595+08:00;True|2023-03-04T11:24:07.2811270+08:00;True|2023-03-03T16:01:45.2965979+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="Areas/HelpPage/HelpPage.css">
@@ -714,13 +714,13 @@
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>03/06/2023 16:06:51</publishTime>
      <publishTime>03/17/2023 21:27:34</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>03/06/2023 16:06:51</publishTime>
      <publishTime>03/17/2023 21:27:34</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>03/06/2023 16:06:51</publishTime>
      <publishTime>03/17/2023 21:27:34</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>
@@ -1098,7 +1098,7 @@
      <publishTime>06/16/2022 13:39:23</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>03/06/2023 16:07:03</publishTime>
      <publishTime>03/17/2023 21:27:41</publishTime>
    </File>
  </ItemGroup>
</Project>

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/bin/VueWebApi.xml

@@ -758,7 +758,7 @@
            <param name="groupcode">生产班组</param>
            <param name="username">操作人员</param>
            <param name="operdate">操作时间</param>
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
            <param name="rejectstepcode">剔除车间(固定薪资车间不参与计算)</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
@@ -785,7 +785,7 @@
            <param name="groupcode">生产班组</param>
            <param name="username">操作人员</param>
            <param name="operdate">操作时间</param>
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</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,System.String,System.String)">
@@ -801,7 +801,7 @@
            <param name="groupcode">生产班组</param>
            <param name="reportname">报工人员</param>
            <param name="reportdate">报工时间</param>
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
            <param name="rejectstepcode">剔除车间(固定薪资车间不参与计算)</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
@@ -821,7 +821,7 @@
            <param name="groupcode">生产班组</param>
            <param name="reportname">报工人员</param>
            <param name="reportdate">报工时间</param>
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
            <param name="rejectstepcode">剔除车间(固定薪资车间不参与计算)</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportSearch(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)">
@@ -2234,6 +2234,23 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            MES报废补单工单查询
            </summary>
            <param name="mesordercode">工单编号</param>
            <param name="sourceorder">源单单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">产品规格</param>
            <param name="creatuser">创建人员</param>
            <param name="createdate">创建时间</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
            <summary>
            产品编码查找工艺路线下拉接口

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

Binary files differ

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

@@ -758,7 +758,7 @@
            <param name="groupcode">生产班组</param>
            <param name="username">操作人员</param>
            <param name="operdate">操作时间</param>
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
            <param name="rejectstepcode">剔除车间(固定薪资车间不参与计算)</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
@@ -785,7 +785,7 @@
            <param name="groupcode">生产班组</param>
            <param name="username">操作人员</param>
            <param name="operdate">操作时间</param>
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</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,System.String,System.String)">
@@ -801,7 +801,7 @@
            <param name="groupcode">生产班组</param>
            <param name="reportname">报工人员</param>
            <param name="reportdate">报工时间</param>
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
            <param name="rejectstepcode">剔除车间(固定薪资车间不参与计算)</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
@@ -821,7 +821,7 @@
            <param name="groupcode">生产班组</param>
            <param name="reportname">报工人员</param>
            <param name="reportdate">报工时间</param>
            <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
            <param name="rejectstepcode">剔除车间(固定薪资车间不参与计算)</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ReportManagerController.DefectDetailsReportSearch(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)">
@@ -2234,6 +2234,23 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            MES报废补单工单查询
            </summary>
            <param name="mesordercode">工单编号</param>
            <param name="sourceorder">源单单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">产品规格</param>
            <param name="creatuser">创建人员</param>
            <param name="createdate">创建时间</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
            <summary>
            产品编码查找工艺路线下拉接口

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

Binary files differ

 VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt

@@ -847,6 +847,7 @@
D:\新凯迪MES\MES项目\MES福来泰\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\新凯迪MES\MES项目\MES福来泰\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\新凯迪MES\MES项目\MES福来泰\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
D:\新凯迪MES\MES项目\MES福来泰\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\新凯迪MES\MES项目\MES福来泰\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\新凯迪MES\MES项目\MES福来泰\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\新凯迪MES\MES项目\MES福来泰\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ