Sop文件接口修改

yl

2022-12-05 3004bd5c7daa7d85ed691818ab96bde207aeeedc

 VueWebApi/Controllers/ProductionManagementController.cs

@@ -17,7 +17,7 @@
{
    [RoutePrefix(prefix: "api/ProductionManagement")]
    [ControllerGroup("生产管理", "在线接口")]
    //[ChannelActionFilter]
    [ChannelActionFilter]
    public class ProductionManagementController : ApiController
    {
        //定义全局信息返回变量
@@ -209,11 +209,9 @@
            string planstartdate = obj["planstartdate"].ToString(); //计划开始时间
            string planenddate = obj["planenddate"].ToString();     //计划完成时间
            string orderlev = obj["orderlev"].ToString(); //工单等级
            string is_aps = obj["is_aps"].ToString(); //是否排产
            string bom_id = obj["bom_id"].ToString(); //Bom主id
            string opertype = obj["OperType"].ToString();  //操作类型
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, sourceorder, ordertype, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype, is_aps);
            mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, sourceorder, ordertype, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype);
            return TJson.toJson(mes);
        }
        #endregion
@@ -264,6 +262,23 @@
        public HttpResponseMessage SearchWorkStep(string wo_code)
        {
            mes = ProductionManagementBLL.SearchWorkStep(wo_code);
            return TJson.toJson(mes);
        }
        #endregion

        #region[MES工单工序任务查看SOP,获取SOP文件下拉列表]
        /// <summary>
        /// MES工单工序任务查看SOP,获取SOP文件下拉列表
        /// </summary>
        /// <param name="partcode">产品编码</param>
        /// <param name="routecode">工艺路线编码</param>
        /// <param name="stepcode">工序编码</param>
        /// <returns></returns>
        [Route(template: "SearchWorkStepSopList")]
        [HttpGet]
        public HttpResponseMessage SearchWorkStepSopList(string partcode,string routecode,string stepcode)
        {
            mes = ProductionManagementBLL.SearchWorkStepSopList(partcode, routecode, stepcode);
            return TJson.toJson(mes);
        }
        #endregion
@@ -645,6 +660,108 @@
        #endregion


        #region[生产管理,修改报工数据查询接口]
        /// <summary>
        /// 生产管理,修改报工数据查询接口
        /// </summary>
        /// <param name="verify">审核状态</param>
        /// <param name="wo_code">工单编号</param>
        /// <param name="partnumber">产品编码</param>
        /// <param name="partname">产品名称</param>
        /// <param name="partspec">产品规格</param>
        /// <param name="reportuser">报工人员</param>
        /// <param name="reportdate">报工时间</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "MesOrderStepVerifySearch")]
        [HttpGet]
        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 = "";    //收料结束时间
            if (reportdate != "" && reportdate != null)
            {
                reportdateopendate = reportdate.Split('~')[0].ToString();
                reportdateclosedate = reportdate.Split('~')[1].ToString();
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.MesOrderStepVerifySearch(verify, wo_code,partnumber,partname,partspec,reportuser,reportdateopendate,reportdateclosedate, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

        #region[生产管理,修改报工数据提交]
        /// <summary>
        /// 生产管理,修改报工数据提交
        /// </summary>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "MesOrderStepUpdateSeave")]
        [HttpPost]
        public HttpResponseMessage MesOrderStepUpdateSeave(List<UpdateProductReport> json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.MesOrderStepUpdateSeave(username, json);
            return TJson.toJson(mes);
        }
        #endregion

        #region[生产管理,修改报工审核提交]
        /// <summary>
        /// 生产管理,修改报工审核提交
        /// </summary>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "MesOrderStepVerifySeave")]
        [HttpPost]
        public HttpResponseMessage MesOrderStepVerifySeave(List<UpdateProductReport> json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.MesOrderStepVerifySeave(username, json);
            return TJson.toJson(mes);
        }
        #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





        #region[MES工单批量关闭查询]
        /// <summary>
        /// MES工单查询