yl
2022-11-18 2a1c73ffedfbdb08d8aa016987f413de7911dfe4
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=null, 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
@@ -681,7 +681,7 @@
        /// <summary>
        /// 生产管理,修改报工数据提交
        /// </summary>
        /// <param name="json"></param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "MesOrderStepUpdateSeave")]
        [HttpPost]
@@ -694,6 +694,11 @@
        #endregion
        #region[生产管理,修改报工审核提交]
        /// <summary>
        /// 生产管理,修改报工审核提交
        /// </summary>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "MesOrderStepVerifySeave")]
        [HttpPost]
        public HttpResponseMessage MesOrderStepVerifySeave(List<UpdateProductReport> json)
@@ -704,6 +709,38 @@
        }
        #endregion
        #region[生产管理,修改报工反审核提交]
        /// <summary>
        /// 生产管理,修改报工反审核提交
        /// </summary>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "MesOrderStepNoVerifySeave")]
        [HttpPost]
        public HttpResponseMessage MesOrderStepNoVerifySeave(List<UpdateProductReport> json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.MesOrderStepNoVerifySeave(username, json);
            return TJson.toJson(mes);
        }
        #endregion
        #region[生产管理,删除报工记录]
        /// <summary>
        /// 生产管理,删除报工记录
        /// </summary>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "MesOrderStepDeleteSeave")]
        [HttpPost]
        public HttpResponseMessage MesOrderStepDeleteSeave(List<UpdateProductReport> json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.MesOrderStepDeleteSeave(username, json);
            return TJson.toJson(mes);
        }
        #endregion