正清河MesApi
上一版本: 8b3020c9 | 补丁 | 提交 | 忽略空白
yl
2023-11-22 bfa0a4079b2ac3f363826b7e329115f88b4bf0f5 
生产开报工查询增加销售单号查询
已修改10个文件
已删除1个文件
40 ■■■■■ 文件已修改
.vs/VueWebApi/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Controllers/ProductionManagementController.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/BLL/ProductionManagementBLL.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/ProductionManagementDAL.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史 
 .vs/VueWebApi/v16/.suo

Binary files differ



 VueWebApi/Controllers/ProductionManagementController.cs


@@ -436,6 +436,7 @@


        /// 生产开报工扫码获取工单对应工序任务(自制)


        /// </summary>


        /// <param name="wocode">工单号</param>


        /// <param name="saleOrderCode">销售订单号</param>


        /// <param name="partcode">产品编码</param>


        /// <param name="partname">产品名称</param>


        /// <param name="partspec">规格型号</param>


@@ -446,13 +447,13 @@


        /// <returns></returns>


        [Route(template: "MesOrderStepSearch")]


        [HttpGet]


        public HttpResponseMessage MesOrderStepSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)


        public HttpResponseMessage MesOrderStepSearch(string wocode = null,string saleOrderCode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)


        {


            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织


            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型


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


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


            mes = ProductionManagementBLL.MesOrderStepSearch(stu_torgcode, stu_torgtypecode, wocode,partcode,partname,partspec, startNum, endNum, prop, order);


            mes = ProductionManagementBLL.MesOrderStepSearch(stu_torgcode, stu_torgtypecode, wocode, saleOrderCode, partcode,partname,partspec, startNum, endNum, prop, order);


            return TJson.toJson(mes);


        }


        #endregion




 VueWebApi/DLL/BLL/ProductionManagementBLL.cs


@@ -156,9 +156,9 @@


        #endregion




        #region[生产开报工扫码获取工单对应工序任务]


        public static ToMessage MesOrderStepSearch(string stu_torgcode,string stu_torgtypecode, string wocode,string partcode,string partname,string partspec, int startNum, int endNum, string prop, string order)


        public static ToMessage MesOrderStepSearch(string stu_torgcode,string stu_torgtypecode, string wocode,string saleOrderCode, string partcode,string partname,string partspec, int startNum, int endNum, string prop, string order)


        {


            return ProductionManagementDAL.MesOrderStepSearch(stu_torgcode, stu_torgtypecode, wocode, partcode, partname, partspec, startNum, endNum, prop, order);


            return ProductionManagementDAL.MesOrderStepSearch(stu_torgcode, stu_torgtypecode, wocode, saleOrderCode, partcode, partname, partspec, startNum, endNum, prop, order);


        }


        #endregion






 VueWebApi/DLL/DAL/ProductionManagementDAL.cs


@@ -1591,7 +1591,7 @@


        #endregion




        #region[生产开报工扫码获取工单对应工序任务(自制)]


        public static ToMessage MesOrderStepSearch(string stu_torgcode, string stu_torgtypecode, string wocode,string partcode,string partname,string partspec, int startNum, int endNum, string prop, string order)


        public static ToMessage MesOrderStepSearch(string stu_torgcode, string stu_torgtypecode, string wocode, string saleOrderCode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)


        {


            var sql = "";


            string search = "";


@@ -1659,6 +1659,11 @@


                        break;


                    default:


                        break;


                }


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


                {


                    search += "and W.saleOrderCode like '%'+@saleOrderCode+'%' ";


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


                }


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


                {


@@ -2429,12 +2434,12 @@


                {


                    //修改开报工记录表(开工数量)


                    sql = @"update  TK_Wrk_Record set start_qty=start_qty+@startqty where wo_code=@mesordercode and step_seq=@stepseq and step_code=@stepcode and materiel_code=@partcode and style=@style";


                    list.Add(new { str = sql, parm = new { mesordercode = mesordercode, stepseq = stepseq, stepcode = stepcode, partcode = partcode, startqty = startqty, style = "S"} });


                    list.Add(new { str = sql, parm = new { mesordercode = mesordercode, stepseq = stepseq, stepcode = stepcode, partcode = partcode, startqty = startqty, style = "S" } });


                    //修改工单工序表(开工数量)


                    sql = @"update  TK_Wrk_Step set start_qty=start_qty+@startqty where wo_code=@mesordercode and step_code=@stepcode";


                    list.Add(new { str = sql, parm = new { mesordercode = mesordercode,stepcode = stepcode, startqty = startqty } });


                    list.Add(new { str = sql, parm = new { mesordercode = mesordercode, stepcode = stepcode, startqty = startqty } });


                }


                else 


                else


                {


                    //写入开报工记录表


                    sql = @"insert into  TK_Wrk_Record(wo_code,step_seq,step_code,eqp_code,materiel_code,open_person,open_time,task_qty,start_qty,style,lm_user,lm_date) 


@@ -2449,7 +2454,7 @@


                    list.Add(new { str = sql, parm = new { mesordercode = mesordercode } });


                }




               






                bool aa = DapperHelper.DoTransaction(list);


                if (aa)




 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-11-20T02:49:12.5383967Z;True|2023-11-14T09:40:54.4312378+08:00;True|2023-11-14T09:40:10.8006338+08:00;True|2023-11-14T09:13:25.3929022+08:00;True|2023-11-14T09:10:50.7065424+08:00;True|2023-11-14T08:40:49.3427048+08:00;True|2023-11-13T17:14:18.8132307+08:00;True|2023-11-13T17:03:53.7755485+08:00;True|2023-11-13T16:59:15.1429785+08:00;True|2023-11-13T16:54:21.4762275+08:00;True|2023-11-13T16:11:03.4596175+08:00;True|2023-11-13T15:20:57.4191158+08:00;True|2023-11-10T13:01:23.2795198+08:00;True|2023-11-09T16:18:47.9473781+08:00;True|2023-11-09T14:46:45.7310735+08:00;True|2023-11-09T14:36:57.4272880+08:00;True|2023-11-02T18:28:55.6712926+08:00;True|2023-11-02T18:25:31.3074727+08:00;True|2023-11-02T16:25:20.2217266+08:00;True|2023-11-02T14:59:12.9729377+08:00;True|2023-11-02T14:03:21.3142180+08:00;True|2023-11-02T13:10:06.4259793+08:00;True|2023-11-02T13:04:59.2726100+08:00;True|2023-10-30T17:10:12.6270482+08:00;True|2023-10-30T14:52:35.6311299+08:00;True|2023-10-30T11:08:33.1712753+08:00;True|2023-10-13T12:07:07.3822225+08:00;True|2023-10-10T10:34:01.3167190+08:00;True|2023-10-10T10:28:48.9531906+08:00;True|2023-10-10T09:54:43.0218459+08:00;True|2023-10-10T09:43:57.3542420+08:00;True|2023-09-27T07:47:41.5372303+08:00;True|2023-09-21T18:22:16.9575605+08:00;True|2023-09-21T18:09:09.2828591+08:00;True|2023-09-21T17:57:05.3919457+08:00;True|2023-09-21T17:40:17.7722883+08:00;True|2023-09-21T17:24:20.7004108+08:00;True|2023-09-21T17:14:30.5230341+08:00;True|2023-09-21T15:14:11.3019288+08:00;True|2023-09-20T09:47:15.7375677+08:00;True|2023-09-12T14:37:37.0665432+08:00;True|2023-08-16T16:52:02.7063729+08:00;True|2023-08-11T10:35:11.9236725+08:00;True|2023-08-07T10:34:44.0844087+08:00;True|2023-08-07T10:28:56.2230477+08:00;True|2023-07-31T11:18:06.9546379+08:00;True|2023-07-03T10:38:22.8080444+08:00;True|2023-06-26T08:15:27.3611577+08:00;True|2023-06-25T15:36:41.8736654+08:00;True|2023-06-25T14:33:49.5287543+08:00;True|2023-06-13T10:24:59.6876648+08:00;</History>


    <History>True|2023-11-22T02:45:30.7546341Z;True|2023-11-22T10:39:54.0192245+08:00;True|2023-11-20T10:49:12.5383967+08:00;True|2023-11-14T09:40:54.4312378+08:00;True|2023-11-14T09:40:10.8006338+08:00;True|2023-11-14T09:13:25.3929022+08:00;True|2023-11-14T09:10:50.7065424+08:00;True|2023-11-14T08:40:49.3427048+08:00;True|2023-11-13T17:14:18.8132307+08:00;True|2023-11-13T17:03:53.7755485+08:00;True|2023-11-13T16:59:15.1429785+08:00;True|2023-11-13T16:54:21.4762275+08:00;True|2023-11-13T16:11:03.4596175+08:00;True|2023-11-13T15:20:57.4191158+08:00;True|2023-11-10T13:01:23.2795198+08:00;True|2023-11-09T16:18:47.9473781+08:00;True|2023-11-09T14:46:45.7310735+08:00;True|2023-11-09T14:36:57.4272880+08:00;True|2023-11-02T18:28:55.6712926+08:00;True|2023-11-02T18:25:31.3074727+08:00;True|2023-11-02T16:25:20.2217266+08:00;True|2023-11-02T14:59:12.9729377+08:00;True|2023-11-02T14:03:21.3142180+08:00;True|2023-11-02T13:10:06.4259793+08:00;True|2023-11-02T13:04:59.2726100+08:00;True|2023-10-30T17:10:12.6270482+08:00;True|2023-10-30T14:52:35.6311299+08:00;True|2023-10-30T11:08:33.1712753+08:00;True|2023-10-13T12:07:07.3822225+08:00;True|2023-10-10T10:34:01.3167190+08:00;True|2023-10-10T10:28:48.9531906+08:00;True|2023-10-10T09:54:43.0218459+08:00;True|2023-10-10T09:43:57.3542420+08:00;True|2023-09-27T07:47:41.5372303+08:00;True|2023-09-21T18:22:16.9575605+08:00;True|2023-09-21T18:09:09.2828591+08:00;True|2023-09-21T17:57:05.3919457+08:00;True|2023-09-21T17:40:17.7722883+08:00;True|2023-09-21T17:24:20.7004108+08:00;True|2023-09-21T17:14:30.5230341+08:00;True|2023-09-21T15:14:11.3019288+08:00;True|2023-09-20T09:47:15.7375677+08:00;True|2023-09-12T14:37:37.0665432+08:00;True|2023-08-16T16:52:02.7063729+08:00;True|2023-08-11T10:35:11.9236725+08:00;True|2023-08-07T10:34:44.0844087+08:00;True|2023-08-07T10:28:56.2230477+08:00;True|2023-07-31T11:18:06.9546379+08:00;True|2023-07-03T10:38:22.8080444+08:00;True|2023-06-26T08:15:27.3611577+08:00;True|2023-06-25T15:36:41.8736654+08:00;True|2023-06-25T14:33:49.5287543+08:00;True|2023-06-13T10:24:59.6876648+08:00;</History>


  </PropertyGroup>


  <ItemGroup>


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


@@ -750,13 +750,13 @@


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


    </File>


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


      <publishTime>11/20/2023 10:49:02</publishTime>


      <publishTime>11/22/2023 10:45:23</publishTime>


    </File>


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


      <publishTime>11/20/2023 10:49:02</publishTime>


      <publishTime>11/22/2023 10:45:23</publishTime>


    </File>


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


      <publishTime>11/20/2023 10:49:02</publishTime>


      <publishTime>11/22/2023 10:45:22</publishTime>


    </File>


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


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


@@ -1161,7 +1161,7 @@


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


    </File>


    <File Include="Web.config">


      <publishTime>11/20/2023 10:49:11</publishTime>


      <publishTime>11/22/2023 10:45:30</publishTime>


    </File>


  </ItemGroup>


</Project>




 VueWebApi/bin/VueWebApi.pdb

Binary files differ



 VueWebApi/bin/VueWebApi.xml


@@ -2737,11 +2737,12 @@


            <param name="orderstepqrcode">扫描的二维码信息</param>


            <returns></returns>


        </member>


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


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


            <summary>


            生产开报工扫码获取工单对应工序任务(自制)


            </summary>


            <param name="wocode">工单号</param>


            <param name="saleOrderCode">销售订单号</param>


            <param name="partcode">产品编码</param>


            <param name="partname">产品名称</param>


            <param name="partspec">规格型号</param>




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

Binary files differ



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


@@ -2737,11 +2737,12 @@


            <param name="orderstepqrcode">扫描的二维码信息</param>


            <returns></returns>


        </member>


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


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


            <summary>


            生产开报工扫码获取工单对应工序任务(自制)


            </summary>


            <param name="wocode">工单号</param>


            <param name="saleOrderCode">销售订单号</param>


            <param name="partcode">产品编码</param>


            <param name="partname">产品名称</param>


            <param name="partspec">规格型号</param>




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

Binary files differ



 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ