富尔达Api
上一版本: 04a14d3a | 补丁 | 提交 | 忽略空白
yl
2023-03-06 88cf209956e5cb2bf5e4048c793c8bb5048808d4 
新增MES工单报废补单选源单接口
已修改17个文件
166 ■■■■■ 文件已修改
.vs/VueWebApi/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Controllers/ProductionManagementController.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/BLL/ProductionManagementBLL.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/ProductionManagementDAL.cs 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.dll 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | 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 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/TransformWebConfig/original/Web.config 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config 2 ●●●●● 补丁 | 查看 | 原始文档 | 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/ProductionManagementController.cs


@@ -133,7 +133,7 @@


        /// <returns></returns>


        [Route(template: "MesOrderSearch")]


        [HttpGet]


        public HttpResponseMessage MesOrderSearch(string mesorderstus = null, string mesordercode = null,string sourceorder=null,string ordertype=null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)


        public HttpResponseMessage MesOrderSearch(int page, int rows, string prop, string order,string mesorderstus = null, string mesordercode = null,string sourceorder=null,string ordertype=null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)


        {


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


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


@@ -142,6 +142,33 @@


        }


        #endregion




        #region[MES报废补单工单查询]


        /// <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>


        [Route(template: "MesBadOrderSearch")]


        [HttpGet]


        public HttpResponseMessage MesBadOrderSearch(int page, int rows, string prop, string order, string mesordercode = null, string sourceorder = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)


        {


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


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


            mes = ProductionManagementBLL.MesBadOrderSearch(mesordercode, sourceorder, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);


            return TJson.toJson(mes);


        }


        #endregion




        #region[产品编码查找工艺路线下拉接口]


        /// <summary>


        /// 产品编码查找工艺路线下拉接口




 VueWebApi/DLL/BLL/ProductionManagementBLL.cs


@@ -41,6 +41,13 @@


        }


        #endregion




        #region[MES报废补单工单查询]


        public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)


        {


            return ProductionManagementDAL.MesBadOrderSearch(mesordercode, sourceorder, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);


        }


        #endregion




        #region[产品编码查找工艺路线下拉接口]


        public static ToMessage PartSelectRoute(string partcode)


        {




 VueWebApi/DLL/DAL/ProductionManagementDAL.cs


@@ -385,6 +385,82 @@


        }


        #endregion




        #region[MES报废补单工单查询]


        public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)


        {


            var dynamicParams = new DynamicParameters();


            string search = "";


            try


            {


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


                {


                    search += "and A.wo_code like '%'+@mesordercode+'%' ";


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


                }


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


                {


                    search += "and A.m_po like '%'+@sourceorder+'%' ";


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


                }


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


                {


                    search += "and A.materiel_code like '%'+@partcode+'%' ";


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


                }


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


                {


                    search += "and B.partname like '%'+@partname+'%' ";


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


                }


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


                {


                    search += "and B.partspec like '%'+@partspec+'%' ";


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


                }


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


                {


                    search += "and CONVERT(varchar(100),A.lm_date,23)=@createdate ";


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


                }


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


                {


                    search += "and U.username like '%'+@creatuser+'%' ";


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


                }




                if (search == "")


                {


                    search = "and 1=1 ";


                }


                // --------------查询指定数据--------------


                var total = 0; //总条数


                var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.org_name as wkshp_name,


                            A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,U.username as lm_user,A.lm_date


                            from TK_Wrk_Man A


                            left join TMateriel_Info B on A.materiel_code=B.partcode


                            left join TOrganization C on A.wkshp_code=C.org_code


                            left join T_Sec_Stck D on A.stck_code=D.code 


                            left join TFlw_Rout E on A.route_code=E.code


                            left join T_Sec_Stck F on A.stck_code=F.code 


                            left join TUser U on A.lm_user=U.usercode 


                            where A.is_delete<>'1'  and A.status='START' and A.wotype='PO' " + search;


                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);


                mes.code = "200";


                mes.Message = "查询成功!";


                mes.count = total;


                mes.data = data.ToList();


            }


            catch (Exception e)


            {


                mes.code = "300";


                mes.count = 0;


                mes.Message = e.Message;


                mes.data = null;


            }


            return mes;


        }


        #endregion




        #region[产品编码查找工艺路线下拉接口]


        public static ToMessage PartSelectRoute(string partcode)


        {




 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-06T06:40:55.5044464Z;True|2023-03-04T16:07:14.5197891+08:00;True|2023-03-04T14:41:42.0976052+08:00;True|2023-03-03T16:02:52.7528225+08:00;True|2023-02-20T19:50:29.9610176+08:00;True|2022-12-02T09:48:15.8632783+08:00;True|2022-12-02T09:39:45.8161756+08:00;True|2022-12-02T08:40:39.6638743+08:00;True|2022-12-01T14:57:53.4186199+08:00;True|2022-11-30T15:59:10.4273430+08:00;True|2022-11-30T14:04:20.4425530+08:00;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>


    <History>True|2023-03-06T09:51:38.0075626Z;True|2023-03-06T14:40:55.5044464+08:00;True|2023-03-04T16:07:14.5197891+08:00;True|2023-03-04T14:41:42.0976052+08:00;True|2023-03-03T16:02:52.7528225+08:00;True|2023-02-20T19:50:29.9610176+08:00;True|2022-12-02T09:48:15.8632783+08:00;True|2022-12-02T09:39:45.8161756+08:00;True|2022-12-02T08:40:39.6638743+08:00;True|2022-12-01T14:57:53.4186199+08:00;True|2022-11-30T15:59:10.4273430+08:00;True|2022-11-30T14:04:20.4425530+08:00;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>03/06/2023 14:40:40</publishTime>


      <publishTime>03/06/2023 17:51:30</publishTime>


    </File>


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


      <publishTime>03/06/2023 14:40:40</publishTime>


      <publishTime>03/06/2023 17:51:30</publishTime>


    </File>


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


      <publishTime>03/06/2023 14:40:40</publishTime>


      <publishTime>03/06/2023 17:51:30</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>03/06/2023 14:40:54</publishTime>


      <publishTime>03/06/2023 17:51:37</publishTime>


    </File>


  </ItemGroup>


</Project>




 VueWebApi/bin/VueWebApi.dll

Binary files differ



 VueWebApi/bin/VueWebApi.pdb

Binary files differ



 VueWebApi/bin/VueWebApi.xml


@@ -1949,7 +1949,7 @@


            <param name="erpordercode">订单号</param>


            <returns></returns>


        </member>


        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(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)">


        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(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>


            MES工单查询


            </summary>


@@ -1968,6 +1968,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/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_dd;User ID=sa;Password=xkd@20220602;pooling=false" />


    <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_fed;User ID=sa;Password=xkd@20230101;pooling=false" />


    <!--大岛服务器环境-->


    <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->


    <!--redis企业配置-->




 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


@@ -1949,7 +1949,7 @@


            <param name="erpordercode">订单号</param>


            <returns></returns>


        </member>


        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(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)">


        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(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>


            MES工单查询


            </summary>


@@ -1968,6 +1968,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/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_dd;User ID=sa;Password=xkd@20220602;pooling=false" />


        <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_fed;User ID=sa;Password=xkd@20230101;pooling=false" />


        <!--大岛服务器环境-->


        <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->


        <!--redis企业配置-->




 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_dd;User ID=sa;Password=xkd@20220602;pooling=false" />


    <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_fed;User ID=sa;Password=xkd@20230101;pooling=false" />


    <!--大岛服务器环境-->


    <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />-->


    <!--redis企业配置-->




 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