1.ERP订单关闭增加单据id关联 2.MES工单关闭增加源单id关联 3.增加订单反关闭功能 4.增加工单反关闭功能

yl

2024-04-15 4931d20186936f0fa01589630e14f7848917378e

 VueWebCoreApi/Controllers/WorkOrderController.cs

@@ -131,6 +131,24 @@
        }
        #endregion

        #region[ERP订单反关闭]
        /// <summary>
        /// ERP订单反关闭
        /// </summary>
        /// <param name="erporderid">订单id</param>
        /// <param name="erpordercode">订单号</param>
        /// <returns></returns>
        [Route(template: "ReverseClosedErpOrder")]
        [HttpPost]
        public JsonResult ReverseClosedErpOrder(string erporderid, string erpordercode)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = WorkOrderBLL.ReverseClosedErpOrder(erporderid, erpordercode, us);
            return Json(mes);
        }
        #endregion

        #region[ERP订单删除]
        /// <summary>
        /// ERP订单删除
@@ -365,6 +383,23 @@
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = WorkOrderBLL.MesOrderBitchClosedSeave(us, wocodelist);
            return Json(mes);
        }
        #endregion

        #region[MES工单反关闭提交]
        /// <summary>
        /// MES工单反关闭提交
        /// </summary>
        /// <param name="wocodelist">工单号数组</param>
        /// <returns></returns>
        [Route(template: "MesOrderBitchReverseClosedSeave")]
        [HttpPost]
        public JsonResult MesOrderBitchReverseClosedSeave([FromBody] string[] wocodelist)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = WorkOrderBLL.MesOrderBitchReverseClosedSeave(us, wocodelist);
            return Json(mes);
        }
        #endregion
@@ -670,6 +705,7 @@
        /// <summary>
        /// 生产执行,报工审核列表数据查询接口
        /// </summary>
        /// <param name="reviewstatus">审核状态</param>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="wo_code">工单编号</param>
        /// <param name="partnumber">产品编码</param>
@@ -685,7 +721,7 @@
        /// <returns></returns>
        [Route(template: "MesOrderStepReportVerifySearch")]
        [HttpGet]
        public JsonResult MesOrderStepReportVerifySearch(string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null,string stepname=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
        public JsonResult MesOrderStepReportVerifySearch(string reviewstatus=null, string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null,string stepname=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            string reportdateopendate = "";  //报工开始时间
            string reportdateclosedate = "";    //报工结束时间
@@ -696,7 +732,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = WorkOrderBLL.MesOrderStepReportVerifySearch(wkshopcode,wo_code, partnumber, partname, partspec,stepname,reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
            mes = WorkOrderBLL.MesOrderStepReportVerifySearch(reviewstatus,wkshopcode, wo_code, partnumber, partname, partspec,stepname,reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
            return Json(mes);
        }
        #endregion
@@ -717,5 +753,23 @@
            return Json(mes);
        }
        #endregion

        #region[生产执行,报工弃审数据提交]
        /// <summary>
        /// 生产执行,报工弃审数据提交
        /// </summary>
        /// <param name="id">报工记录id</param>
        /// <param name="steptype">工序类型</param>
        /// <returns></returns>
        [Route(template: "MesOrderStepReportNotVerifySeave")]
        [HttpPost]
        public JsonResult MesOrderStepReportNotVerifySeave(string id,string steptype)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = WorkOrderBLL.MesOrderStepReportNotVerifySeave(us, id, steptype);
            return Json(mes);
        }
        #endregion
    }
}