yl
2023-10-18 37b39b9748eaaa7900271d83a94698299d53fed4
VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -7,6 +7,7 @@
using System.Threading.Tasks;
using VueWebCoreApi.DLL.BLL;
using VueWebCoreApi.Models;
using VueWebCoreApi.Models.MouldVerify;
using VueWebCoreApi.Tools;
namespace VueWebCoreApi.Controllers
@@ -70,13 +71,12 @@
            string mouldcode = obj["mouldcode"].ToString(); //模具编码
            string mouldname = obj["mouldname"].ToString(); //模具名称
            string mouldspec = obj["mouldspec"].ToString(); //模具规格
            string warehousecode = obj["warehousecode"].ToString(); //仓库编码
            string surplife = obj["surplife"].ToString(); //预计寿命
            string resilife = obj["resilife"].ToString(); //剩余寿命
            string status = obj["status"].ToString(); //模具状态
            string mouldpart = obj["mouldpart"].ToString(); //关联产品
            string opertype = obj["opertype"].ToString();  //操作类型
            mes = MouldManagerBLL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, warehousecode, surplife, resilife, status, mouldpart, opertype, us);
            mes = MouldManagerBLL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, surplife, resilife, status, mouldpart, opertype, us);
            return Json(mes);
        }
        #endregion
@@ -584,22 +584,24 @@
        }
        #endregion
        #region[设备维修申请,提交保存]
        #region[模具维修申请,提交保存]
        /// <summary>
        /// 设备维修申请,提交保存
        /// 模具维修申请,提交保存
        /// </summary>
        /// <param name="menucode">功能编号</param>
        /// <param name="mouldcode">模具编码</param>
        /// <param name="faultsourcecode">故障来源</param>
        /// <param name="faultdescr">故障描述</param>
        /// <returns></returns>
        [Route(template: "MaintainScanMouldApplySave")]
        [HttpPost]
        public JsonResult MaintainScanMouldApplySave([FromBody] JObject obj, List<IFormFile> files)
        public JsonResult MaintainScanMouldApplySave([FromForm] string menucode, [FromForm] string mouldcode,[FromForm] string faultsourcecode,[FromForm] string faultdescr)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string menucode = obj["menucode"].ToString(); //功能编码
            string mouldcode = obj["mouldcode"].ToString(); //模具编码
            string faultsourcecode = obj["faultsourcecode"].ToString(); //故障来源编码
            string faultdescr = obj["faultdescr"].ToString(); //故障描述
            mes = MouldManagerBLL.MaintainScanMouldApplySave(menucode,mouldcode, faultsourcecode, faultdescr,us, files);
            var files = Request.Form.Files; // 获取传输的文件列表
            mes = MouldManagerBLL.MaintainScanMouldApplySave(menucode, mouldcode, faultsourcecode, faultdescr, us, files);
            mes.Message = menucode;
            return Json(mes);
        }
        #endregion
@@ -624,20 +626,21 @@
        /// <summary>
        /// 模具维修提交
        /// </summary>
        /// <param name="menucode">功能编号</param>
        /// <param name="docu_code">维修申请单号</param>
        /// <param name="mouldcode">模具编码</param>
        /// <param name="faultdescr">故障描述</param>
        /// <param name="is_stoprepair">下机维修</param>
        /// <param name="repaircontent">维修内容</param>
        /// <returns></returns>
        [Route(template: "RepairScanMouldSave")]
        [HttpPost]
        public JsonResult RepairScanMouldSave([FromBody] JObject obj, List<IFormFile> files)
        public JsonResult RepairScanMouldSave([FromForm] string menucode, [FromForm] string docu_code, [FromForm] string mouldcode, [FromForm] string faultdescr, [FromForm] string is_stoprepair,[FromForm] string repaircontent)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string menucode = obj["menucode"].ToString(); //功能编号
            string docu_code = obj["docu_code"].ToString(); //维修申请单号
            string mouldcode = obj["mouldcode"].ToString(); //模具编码
            string faultdescr = obj["faultdescr"].ToString(); //故障描述
            string is_stoprepair = obj["is_stoprepair"].ToString(); //下机维修
            string repaircontent = obj["repaircontent"].ToString(); //维修内容
            mes = MouldManagerBLL.RepairScanMouldSave(menucode,docu_code, mouldcode, faultdescr, is_stoprepair, repaircontent,us, files);
            var files = Request.Form.Files; // 获取传输的文件列表
            mes = MouldManagerBLL.RepairScanMouldSave(menucode, docu_code, mouldcode, faultdescr, is_stoprepair, repaircontent, us, files);
            return Json(mes);
        }
        #endregion
@@ -700,7 +703,7 @@
        /// <summary>
        /// 模具上机,扫描模具编码
        /// </summary>
        /// <param name="mouldcode"></param>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "MouldUpQrCodeData")]
        [HttpGet]
@@ -736,7 +739,7 @@
        /// <summary>
        /// 模具下机,扫描模具编码
        /// </summary>
        /// <param name="mouldcode"></param>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "MouldDownQrCodeData")]
        [HttpGet]
@@ -773,7 +776,7 @@
        /// <summary>
        /// 模具外借,扫描模具编码
        /// </summary>
        /// <param name="mouldcode"></param>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "MouldLendOutQrCodeData")]
        [HttpGet]
@@ -808,7 +811,7 @@
        /// <summary>
        /// 模具归还,扫描模具编码
        /// </summary>
        /// <param name="mouldcode"></param>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "MouldReturnQrCodeData")]
        [HttpGet]
@@ -837,5 +840,77 @@
            return Json(mes);
        }
        #endregion
        #region[模具入库,扫描模具编码]
        /// <summary>
        /// 模具入库,扫描模具编码
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "MouldInWareHouseQrCodeData")]
        [HttpGet]
        public JsonResult MouldInWareHouseQrCodeData(string mouldcode)
        {
            mes = MouldManagerBLL.MouldInWareHouseQrCodeData(mouldcode);
            return Json(mes);
        }
        #endregion
        #region[模具入库提交]
        /// <summary>
        /// 模具入库提交
        /// </summary>
        /// <param name="obj">提交数据</param>
        /// <returns></returns>
        [Route(template: "MouldInWareHouseSave")]
        [HttpPost]
        public JsonResult MouldInWareHouseSave([FromBody] JObject obj)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string mouldcode = obj["mouldcode"].ToString(); //模具编码
            string warehousecode = obj["warehousecode"].ToString(); //仓库编码
            string description = obj["description"].ToString(); //入库描述
            mes = MouldManagerBLL.MouldInWareHouseSave(mouldcode, warehousecode,description, us);
            return Json(mes);
        }
        #endregion
        #region[模具出库,扫描模具编码]
        /// <summary>
        /// 模具出库,扫描模具编码
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "MouldOutWareHouseQrCodeData")]
        [HttpGet]
        public JsonResult MouldOutWareHouseQrCodeData(string mouldcode)
        {
            mes = MouldManagerBLL.MouldOutWareHouseQrCodeData(mouldcode);
            return Json(mes);
        }
        #endregion
        #region[模具出库提交]
        /// <summary>
        /// 模具出库提交
        /// </summary>
        /// <param name="obj">提交数据</param>
        /// <returns></returns>
        [Route(template: "MouldOutWareHouseSave")]
        [HttpPost]
        public JsonResult MouldOutWareHouseSave([FromBody] JObject obj)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string mouldcode = obj["mouldcode"].ToString(); //模具编码
            string warehousecode = obj["warehousecode"].ToString(); //仓库编码
            string description = obj["description"].ToString(); //出库描述
            mes = MouldManagerBLL.MouldOutWareHouseSave(mouldcode, warehousecode, description, us);
            return Json(mes);
        }
        #endregion
    }
}