修改报工查询接口修改

yl

2022-11-18 65c8842002adbf48b7bd2f30f503106c05263203

修改报工查询接口修改

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/Controllers/ProductionManagementController.cs

@@ -647,7 +647,7 @@
        /// <summary>
        /// 生产管理,修改报工数据查询接口
        /// </summary>
        /// <param name="reporttype">报工类型</param>
        /// <param name="verify">审核状态</param>
        /// <param name="wo_code">工单编号</param>
        /// <param name="partnumber">产品编码</param>
        /// <param name="partname">产品名称</param>
@@ -661,7 +661,7 @@
        /// <returns></returns>
        [Route(template: "MesOrderStepVerifySearch")]
        [HttpGet]
        public HttpResponseMessage MesOrderStepVerifySearch(string reporttype,string wo_code=null,string partnumber=null,string partname=null,string partspec=null,string reportuser=null,string reportdate=null, int page = 0, int rows = 0, string prop = null, string order = null)
        public HttpResponseMessage MesOrderStepVerifySearch(string verify, string wo_code=null,string partnumber=null,string partname=null,string partspec=null,string reportuser=null,string reportdate=null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            string reportdateopendate = "";  //收料开始时间
            string reportdateclosedate = "";    //收料结束时间
@@ -672,7 +672,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.MesOrderStepVerifySearch(reporttype,wo_code,partnumber,partname,partspec,reportuser,reportdateopendate,reportdateclosedate, startNum, endNum, prop, order);
            mes = ProductionManagementBLL.MesOrderStepVerifySearch(verify, wo_code,partnumber,partname,partspec,reportuser,reportdateopendate,reportdateclosedate, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

 VueWebApi/DLL/BLL/ProductionManagementBLL.cs

@@ -236,9 +236,9 @@


        #region[生产管理,修改报工数据查询接口]
        public static ToMessage MesOrderStepVerifySearch(string reporttype, string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderStepVerifySearch(string verify, string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
        {
            return ProductionManagementDAL.MesOrderStepVerifySearch(reporttype, wo_code, partnumber, partname, partspec, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
            return ProductionManagementDAL.MesOrderStepVerifySearch(verify, wo_code, partnumber, partname, partspec, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
        }
        #endregion


 VueWebApi/DLL/DAL/ProductionManagementDAL.cs

@@ -2351,22 +2351,16 @@


        #region[生产管理,修改报工数据查询接口]
        public static ToMessage MesOrderStepVerifySearch(string reporttype, string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
        public static ToMessage MesOrderStepVerifySearch(string verify, string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (reporttype != "" && reporttype != null)
                if (verify != "" && verify != null)
                {
                    if (reporttype == "BZ")
                    {
                        search += "and AA.usergroup_code<>''";
                    }
                    else
                    {
                        search += "and AA.usergroup_code='' ";
                    }
                    search += "and B.verify=@verify ";
                    dynamicParams.Add("@verify", verify);
                }
                if (wo_code != "" && wo_code != null)
                {
@@ -2411,7 +2405,7 @@
                var sql = @"select *  from(
                            select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,A.task_qty,M.wkshp_code,G.org_name as wkshp_name,A.eqp_code,E.name as eqp_name,
                            M.route_code,R.name as route_name,A.step_code,S.stepname,S.flwtype,D.first_choke,D.last_choke,T.unprice,B.usergroup_code,O.group_name as usergroup_name,B.report_person as usercode,U.username,
                            B.report_date,B.report_qty,B.ng_qty,B.bad_qty   
                            B.report_date,B.report_qty,B.ng_qty,B.bad_qty,B.verify   
                            from TK_Wrk_Record A
                            inner join TK_Wrk_RecordSub B on A.id=B.m_id
                            left join TK_Wrk_Man M on A.wo_code=M.wo_code

 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-17T02:13:35.2543186Z;True|2022-11-16T11:50:20.8332089+08:00;True|2022-11-16T10:30:15.8662476+08:00;True|2022-11-16T09:54:50.9630719+08:00;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>
    <History>True|2022-11-18T05:25:30.9305617Z;True|2022-11-17T10:13:35.2543186+08:00;True|2022-11-16T11:50:20.8332089+08:00;True|2022-11-16T10:30:15.8662476+08:00;True|2022-11-16T09:54:50.9630719+08:00;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/17/2022 10:13:29</publishTime>
      <publishTime>11/18/2022 13:25:23</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>11/17/2022 10:13:29</publishTime>
      <publishTime>11/18/2022 13:25:23</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>11/17/2022 10:13:29</publishTime>
      <publishTime>11/18/2022 13:25:23</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/17/2022 10:13:34</publishTime>
      <publishTime>11/18/2022 13:25:30</publishTime>
    </File>
  </ItemGroup>
</Project>

 VueWebApi/bin/VueWebApi.dll

Binary files differ

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/bin/VueWebApi.xml

@@ -2123,7 +2123,7 @@
            <summary>
            生产管理,修改报工数据查询接口
            </summary>
            <param name="reporttype">报工类型</param>
            <param name="verify">审核状态</param>
            <param name="wo_code">工单编号</param>
            <param name="partnumber">产品编码</param>
            <param name="partname">产品名称</param>

 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

@@ -2123,7 +2123,7 @@
            <summary>
            生产管理,修改报工数据查询接口
            </summary>
            <param name="reporttype">报工类型</param>
            <param name="verify">审核状态</param>
            <param name="wo_code">工单编号</param>
            <param name="partnumber">产品编码</param>
            <param name="partname">产品名称</param>

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

Binary files differ

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

@@ -845,6 +845,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.dll

Binary files differ

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ