LXAPI.git - Gitblit

2022-11-16 f02fbdcea9b3b3f5c0275e9f4086619f24dfa0c5

班组、个人计件工资接口修改

已修改15个文件

	.vs/VueWebApi/v16/.suo	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/DLL/DAL/ReportManagerDAL.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/bin/VueWebApi.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/bin/VueWebApi.dll.config	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/bin/VueWebApi.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/bin/VueWebApi.xml	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/Package/PackageTmp/Web.config	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| 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	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/TransformWebConfig/original/Web.config	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/VueWebApi.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/VueWebApi.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/DLL/DAL/ReportManagerDAL.cs

@@ -431,42 +431,42 @@
            {
                if (wocode != "" && wocode != null)
                {
                    search += "and A.wo_code like '%'+@wocode+'%' ";
                    search += "and AA.wo_code like '%'+@wocode+'%' ";
                    dynamicParams.Add("@wocode", wocode);
                }
                if (partcode != "" && partcode != null)
                {
                    search += "and M.partcode like '%'+@partcode+'%' ";
                    search += "and AA.partcode like '%'+@partcode+'%' ";
                    dynamicParams.Add("@partcode", partcode);
                }
                if (partname != "" && partname != null)
                {
                    search += "and M.partname like '%'+@partname+'%' ";
                    search += "and AA.partname like '%'+@partname+'%' ";
                    dynamicParams.Add("@partname", partname);
                }
                if (partspec != "" && partspec != null)
                {
                    search += "and M.partspec like '%'+@partspec+'%' ";
                    search += "and AA.partspec like '%'+@partspec+'%' ";
                    dynamicParams.Add("@partspec", partspec);
                }
                if (stepname != "" && stepname != null)
                {
                    search += "and T.stepname like '%'+@stepname+'%' ";
                    search += "and AA.stepname like '%'+@stepname+'%' ";
                    dynamicParams.Add("@stepname", stepname);
                }
                if (groupcode != "" && groupcode != null)
                {
                    search += "and G.group_code=@groupcode ";
                    search += "and AA.group_code=@groupcode ";
                    dynamicParams.Add("@groupcode", groupcode);
                }
                if (reportname != "" && reportname != null)
                {
                    search += "and U.username like '%'+@reportname+'%' ";
                    search += "and AA.username like '%'+@reportname+'%' ";
                    dynamicParams.Add("@reportname", reportname);
                }
                if (reportopendate != "" && reportopendate != null)
                {
                    search += "and B.report_date between @reportopendate and @reportclosedate ";
                    search += "and AA.report_date between @reportopendate and @reportclosedate ";
                    dynamicParams.Add("@reportopendate", reportopendate + " 00:00:00");
                    dynamicParams.Add("@reportclosedate", reportclosedate + " 23:59:59");
                }
@@ -478,8 +478,13 @@
                search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"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.report_qty*isnull(S.unprice,0) as usermoney,U.username as lm_user,B.report_date,
                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.moneys/colum as usermoney,AA.username,AA.report_date,colum
                            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.report_qty*isnull(S.unprice,0) as moneys,U.username,B.report_date,
                            (select distinct count(*)   from TK_Wrk_RecordSub S  where S.m_id=B.m_id) as colum
                            from TK_Wrk_Record A
                            inner join TK_Wrk_RecordSub B on A.id=B.m_id
@@ -490,6 +495,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
                            ) as AA
                            where " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";

 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-11T05:23:20.3484151Z;True|2022-11-09T13:07:34.9422662+08:00;True|2022-11-09T10:59:58.4912849+08:00;True|2022-11-09T10:11:04.4851324+08:00;True|2022-11-09T10:10:46.8698985+08:00;</History>
    <History>True|2022-11-16T01:54:50.9630719Z;True|2022-11-11T13:23:20.3484151+08:00;True|2022-11-09T13:07:34.9422662+08:00;True|2022-11-09T10:59:58.4912849+08:00;True|2022-11-09T10:11:04.4851324+08:00;True|2022-11-09T10:10:46.8698985+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/11/2022 13:23:11</publishTime>
      <publishTime>11/16/2022 09:54:44</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>11/11/2022 13:23:11</publishTime>
      <publishTime>11/16/2022 09:54:44</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>11/11/2022 13:23:11</publishTime>
      <publishTime>11/16/2022 09:54: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/11/2022 13:23:19</publishTime>
      <publishTime>11/16/2022 09:54:50</publishTime>
    </File>
  </ItemGroup>
</Project>

 VueWebApi/bin/VueWebApi.dll

Binary files differ

 VueWebApi/bin/VueWebApi.dll.config

@@ -15,7 +15,7 @@
        <!--本地环境-->
        <!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
        <!--服务器环境-->
        <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20220602;pooling=false" />
        <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_lx;User ID=sa;Password=xkd@20220602;pooling=false" />
        <!--大岛服务器环境-->
        <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
        <!--redis数据库链接配置ip-->

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/bin/VueWebApi.xml

@@ -2136,13 +2136,27 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepVerifySeave(System.Collections.Generic.List{VueWebApi.Models.UpdateProductReport})">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepUpdateSeave(System.Collections.Generic.List{VueWebApi.Models.UpdateProductReport})">
            <summary>
            生产管理,修改报工数据提交
            </summary>
            <param name="json"></param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepVerifySeave(System.Collections.Generic.List{VueWebApi.Models.UpdateProductReport})">
            <summary>
            生产管理,修改报工审核提交
            </summary>
            <param name="json"></param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepNoVerifySeave(System.Collections.Generic.List{VueWebApi.Models.UpdateProductReport})">
            <summary>
            生产管理,修改报工反审核提交
            </summary>
            <param name="json"></param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderBitchClosedSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            MES工单查询

 VueWebApi/obj/Release/Package/PackageTmp/Web.config

@@ -15,7 +15,7 @@
    <!--本地环境-->
    <!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
    <!--服务器环境-->
    <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20220602;pooling=false" />
    <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_lx;User ID=sa;Password=xkd@20220602;pooling=false" />
    <!--大岛服务器环境-->
    <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
    <!--redis数据库链接配置ip-->

 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

@@ -2136,13 +2136,27 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepVerifySeave(System.Collections.Generic.List{VueWebApi.Models.UpdateProductReport})">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepUpdateSeave(System.Collections.Generic.List{VueWebApi.Models.UpdateProductReport})">
            <summary>
            生产管理,修改报工数据提交
            </summary>
            <param name="json"></param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepVerifySeave(System.Collections.Generic.List{VueWebApi.Models.UpdateProductReport})">
            <summary>
            生产管理,修改报工审核提交
            </summary>
            <param name="json"></param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepNoVerifySeave(System.Collections.Generic.List{VueWebApi.Models.UpdateProductReport})">
            <summary>
            生产管理,修改报工反审核提交
            </summary>
            <param name="json"></param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderBitchClosedSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            MES工单查询

 VueWebApi/obj/Release/TransformWebConfig/original/Web.config

@@ -15,7 +15,7 @@
        <!--本地环境-->
        <!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
        <!--服务器环境-->
        <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20220602;pooling=false" />
        <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_lx;User ID=sa;Password=xkd@20220602;pooling=false" />
        <!--大岛服务器环境-->
        <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
        <!--redis数据库链接配置ip-->

 VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config

@@ -15,7 +15,7 @@
    <!--本地环境-->
    <!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
    <!--服务器环境-->
    <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20220602;pooling=false" />
    <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_lx;User ID=sa;Password=xkd@20220602;pooling=false" />
    <!--大岛服务器环境-->
    <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
    <!--redis数据库链接配置ip-->

 VueWebApi/obj/Release/VueWebApi.dll

Binary files differ

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ

			@@ -431,42 +431,42 @@
			{
			if (wocode != "" && wocode != null)
			{
			search += "and A.wo_code like '%'+@wocode+'%' ";
			search += "and AA.wo_code like '%'+@wocode+'%' ";
			dynamicParams.Add("@wocode", wocode);
			}
			if (partcode != "" && partcode != null)
			{
			search += "and M.partcode like '%'+@partcode+'%' ";
			search += "and AA.partcode like '%'+@partcode+'%' ";
			dynamicParams.Add("@partcode", partcode);
			}
			if (partname != "" && partname != null)
			{
			search += "and M.partname like '%'+@partname+'%' ";
			search += "and AA.partname like '%'+@partname+'%' ";
			dynamicParams.Add("@partname", partname);
			}
			if (partspec != "" && partspec != null)
			{
			search += "and M.partspec like '%'+@partspec+'%' ";
			search += "and AA.partspec like '%'+@partspec+'%' ";
			dynamicParams.Add("@partspec", partspec);
			}
			if (stepname != "" && stepname != null)
			{
			search += "and T.stepname like '%'+@stepname+'%' ";
			search += "and AA.stepname like '%'+@stepname+'%' ";
			dynamicParams.Add("@stepname", stepname);
			}
			if (groupcode != "" && groupcode != null)
			{
			search += "and G.group_code=@groupcode ";
			search += "and AA.group_code=@groupcode ";
			dynamicParams.Add("@groupcode", groupcode);
			}
			if (reportname != "" && reportname != null)
			{
			search += "and U.username like '%'+@reportname+'%' ";
			search += "and AA.username like '%'+@reportname+'%' ";
			dynamicParams.Add("@reportname", reportname);
			}
			if (reportopendate != "" && reportopendate != null)
			{
			search += "and B.report_date between @reportopendate and @reportclosedate ";
			search += "and AA.report_date between @reportopendate and @reportclosedate ";
			dynamicParams.Add("@reportopendate", reportopendate + " 00:00:00");
			dynamicParams.Add("@reportclosedate", reportclosedate + " 23:59:59");
			}
			@@ -478,8 +478,13 @@
			search = search.Substring(3);//截取索引2后面的字符
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var sql = @"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.report_qty*isnull(S.unprice,0) as usermoney,U.username as lm_user,B.report_date,
			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.moneys/colum as usermoney,AA.username,AA.report_date,colum
			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.report_qty*isnull(S.unprice,0) as moneys,U.username,B.report_date,
			(select distinct count(*) from TK_Wrk_RecordSub S where S.m_id=B.m_id) as colum
			from TK_Wrk_Record A
			inner join TK_Wrk_RecordSub B on A.id=B.m_id
			@@ -490,6 +495,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
			) as AA
			where " + search;
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";

			@@ -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-11T05:23:20.3484151Z;True\|2022-11-09T13:07:34.9422662+08:00;True\|2022-11-09T10:59:58.4912849+08:00;True\|2022-11-09T10:11:04.4851324+08:00;True\|2022-11-09T10:10:46.8698985+08:00;</History>
			<History>True\|2022-11-16T01:54:50.9630719Z;True\|2022-11-11T13:23:20.3484151+08:00;True\|2022-11-09T13:07:34.9422662+08:00;True\|2022-11-09T10:59:58.4912849+08:00;True\|2022-11-09T10:11:04.4851324+08:00;True\|2022-11-09T10:10:46.8698985+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/11/2022 13:23:11</publishTime>
			<publishTime>11/16/2022 09:54:44</publishTime>
			</File>
			<File Include="bin/VueWebApi.pdb">
			<publishTime>11/11/2022 13:23:11</publishTime>
			<publishTime>11/16/2022 09:54:44</publishTime>
			</File>
			<File Include="bin/VueWebApi.xml">
			<publishTime>11/11/2022 13:23:11</publishTime>
			<publishTime>11/16/2022 09:54: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/11/2022 13:23:19</publishTime>
			<publishTime>11/16/2022 09:54:50</publishTime>
			</File>
			</ItemGroup>
			</Project>

			@@ -15,7 +15,7 @@
			<!--本地环境-->
			<!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />-->
			<!--服务器环境-->
			<add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20220602;pooling=false" />
			<add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_lx;User ID=sa;Password=xkd@20220602;pooling=false" />
			<!--大岛服务器环境-->
			<!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->
			<!--redis数据库链接配置ip-->

			@@ -2136,13 +2136,27 @@
			<param name="order">排序规则</param>
			<returns></returns>
			</member>
			<member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepVerifySeave(System.Collections.Generic.List{VueWebApi.Models.UpdateProductReport})">
			<member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepUpdateSeave(System.Collections.Generic.List{VueWebApi.Models.UpdateProductReport})">
			<summary>
			生产管理,修改报工数据提交
			</summary>
			<param name="json"></param>
			<returns></returns>
			</member>
			<member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepVerifySeave(System.Collections.Generic.List{VueWebApi.Models.UpdateProductReport})">
			<summary>
			生产管理,修改报工审核提交
			</summary>
			<param name="json"></param>
			<returns></returns>
			</member>
			<member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepNoVerifySeave(System.Collections.Generic.List{VueWebApi.Models.UpdateProductReport})">
			<summary>
			生产管理,修改报工反审核提交
			</summary>
			<param name="json"></param>
			<returns></returns>
			</member>
			<member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderBitchClosedSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
			<summary>
			MES工单查询