1.更改菜单接口排序问题，模具待维修接口过滤问题、增加APP菜单图标 2.更改模具维修申请单、维修单据流水号反写问题 3.增加模具查询功能接口

yl

2023-10-19 f7661ec17f87c4185bbe906fe98e114435a4da5a

 VueWebCoreApi/Controllers/MouldManagerController.cs

@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -6,6 +7,7 @@
using System.Threading.Tasks;
using VueWebCoreApi.DLL.BLL;
using VueWebCoreApi.Models;
using VueWebCoreApi.Models.MouldVerify;
using VueWebCoreApi.Tools;

namespace VueWebCoreApi.Controllers
@@ -13,7 +15,7 @@
    [ApiExplorerSettings(GroupName = "模具管理")]
    [ApiController]
    [Route("api/[controller]")]
    //[ChannelActionFilter]
    [ChannelActionFilter]
    public class MouldManagerController : Controller
    {
        //定义全局信息返回变量
@@ -69,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
@@ -436,5 +437,511 @@
            return Json(mes);
        }
        #endregion


        #region[模具点检,扫描模具二维码]
        /// <summary>
        /// 模具点检,扫描模具二维码
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "CheckScanMouldQrCodeData")]
        [HttpGet]
        public JsonResult CheckScanMouldQrCodeData(string mouldcode)
        {
            mes = MouldManagerBLL.CheckScanMouldQrCodeData(mouldcode);
            return Json(mes);
        }
        #endregion

        #region[模具点检,扫描模具二维码查找点检标准]
        /// <summary>
        /// 模具点检,扫描模具二维码查找点检标准
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "CheckScanMouldTemp")]
        [HttpGet]
        public JsonResult CheckScanMouldTemp(string mouldcode)
        {
            mes = MouldManagerBLL.CheckScanMouldTemp(mouldcode);
            return Json(mes);
        }
        #endregion

        #region[模具点检,选择扫码模具、点检标准带出点检项]
        /// <summary>
        /// 模具点检,选择扫码模具、点检标准带出点检项
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <param name="checktempcode">点检标准编码</param>
        /// <returns></returns>
        [Route(template: "SelectScanMouldQrCodeItem")]
        [HttpGet]
        public JsonResult SelectScanMouldQrCodeItem(string mouldcode, string checktempcode)
        {
            mes = MouldManagerBLL.SelectScanMouldQrCodeItem(mouldcode, checktempcode);
            return Json(mes);
        }
        #endregion

        #region[模具点检、提交保存]
        /// <summary>
        /// 模具点检、提交保存
        /// </summary>
        /// <param name="menucode">功能编码</param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "MouldCheckSave")]
        [HttpPost]
        public JsonResult MouldCheckSave(string menucode,AppDevicecCheck json)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = MouldManagerBLL.MouldCheckSave(menucode,us, json);
            return Json(mes);
        }
        #endregion


        #region[模具保养,扫描模具二维码]
        /// <summary>
        /// 模具保养,扫描模具二维码
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "RepairScanMouldQrCodeData")]
        [HttpGet]
        public JsonResult RepairScanMouldQrCodeData(string mouldcode)
        {
            mes = MouldManagerBLL.RepairScanMouldQrCodeData(mouldcode);
            return Json(mes);
        }
        #endregion

        #region[模具保养,扫描模具二维码查找保养标准]
        /// <summary>
        /// 模具保养,扫描模具二维码查找保养标准
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "RepairScanMouldTemp")]
        [HttpGet]
        public JsonResult RepairScanMouldTemp(string mouldcode)
        {
            mes = MouldManagerBLL.RepairScanMouldTemp(mouldcode);
            return Json(mes);
        }
        #endregion

        #region[模具保养,选择扫码模具列表带出保养项]
        /// <summary>
        /// 模具保养,选择扫码模具列表带出保养项
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <param name="repartempcode">保养标准编码</param>
        /// <returns></returns>
        [Route(template: "RepairSelectScanMouldQrCodeItem")]
        [HttpGet]
        public JsonResult RepairSelectScanMouldQrCodeItem(string mouldcode, string repartempcode)
        {
            mes = MouldManagerBLL.RepairSelectScanMouldQrCodeItem(mouldcode, repartempcode);
            return Json(mes);
        }
        #endregion

        #region[模具保养,提交保存]
        /// <summary>
        /// 模具保养,提交保存
        /// </summary>
        /// <param name="menucode">功能编码</param>
        /// <param name="json">提交数据</param>
        /// <returns></returns>
        [Route(template: "MouldRepairSave")]
        [HttpPost]
        public JsonResult MouldRepairSave(string menucode, AppDevicecCheck json)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = MouldManagerBLL.MouldRepairSave(menucode, us, json);
            return Json(mes);
        }
        #endregion


        #region[模具信息查询,扫描模具二维码]
        /// <summary>
        /// 模具信息查询,扫描模具二维码
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "ScanMouldQrCodeMessageData")]
        [HttpGet]
        public JsonResult ScanMouldQrCodeMessageData(string mouldcode)
        {
            mes = MouldManagerBLL.ScanMouldQrCodeMessageData(mouldcode);
            return Json(mes);
        }
        #endregion

        #region[模具信息查询明细]
        /// <summary>
        /// 模具信息查询明细
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "ScanMouldQrCodeMessageSubData")]
        [HttpGet]
        public JsonResult ScanMouldQrCodeMessageSubData(string mouldcode)
        {
            mes = MouldManagerBLL.ScanMouldQrCodeMessageSubData(mouldcode);
            return Json(mes);
        }
        #endregion


        #region[模具维修申请,扫描模具二维码]
        /// <summary>
        /// 模具维修申请,扫描模具二维码
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "MaintainScanMouldApplyQrCodeData")]
        [HttpGet]
        public JsonResult MaintainScanMouldApplyQrCodeData(string mouldcode)
        {
            mes = MouldManagerBLL.MaintainScanMouldApplyQrCodeData(mouldcode);
            return Json(mes);
        }
        #endregion

        #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([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());
            var files = Request.Form.Files; // 获取传输的文件列表
            mes = MouldManagerBLL.MaintainScanMouldApplySave(menucode, mouldcode, faultsourcecode, faultdescr, us, files);
            mes.Message = menucode;
            return Json(mes);
        }
        #endregion


        #region[模具待维修信息列表]
        /// <summary>
        /// 模具待维修信息列表
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "RepairScanMouldQrCodeDataList")]
        [HttpGet]
        public JsonResult RepairScanMouldQrCodeDataList(string mouldcode)
        {
            mes = MouldManagerBLL.RepairScanMouldQrCodeDataList(mouldcode);
            return Json(mes);
        }
        #endregion

        #region[模具维修提交]
        /// <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([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());
            var files = Request.Form.Files; // 获取传输的文件列表
            mes = MouldManagerBLL.RepairScanMouldSave(menucode, docu_code, mouldcode, faultdescr, is_stoprepair, repaircontent, us, files);
            return Json(mes);
        }
        #endregion


        #region[模具维修待验证列表]
        /// <summary>
        /// 模具维修待验证列表
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "RepairVerificationScanMouldData")]
        [HttpGet]
        public JsonResult RepairVerificationScanMouldData(string mouldcode)
        {
            mes = MouldManagerBLL.RepairVerificationScanMouldData(mouldcode);
            return Json(mes);
        }
        #endregion

        #region[模具维修待验证详情信息]
        /// <summary>
        /// 模具维修待验证详情信息
        /// </summary>
        /// <param name="repair_code">维修单号</param>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "RepairVerificationScanMouldDataSub")]
        [HttpGet]
        public JsonResult RepairVerificationScanMouldDataSub(string repair_code, string mouldcode)
        {
            mes = MouldManagerBLL.RepairVerificationScanMouldDataSub(repair_code, mouldcode);
            return Json(mes);
        }
        #endregion

        #region[模具维修验证提交]
        /// <summary>
        /// 模具维修验证提交
        /// </summary>
        /// <param name="obj">提交数据</param>
        /// <returns></returns>
        [Route(template: "RepairVerificationScanMouldSave")]
        [HttpPost]
        public JsonResult RepairVerificationScanMouldSave([FromBody] JObject obj)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string repairwo = obj["repairwo"].ToString(); //维修单号
            string mouldcode = obj["mouldcode"].ToString(); //模具编码
            string result = obj["result"].ToString(); //验证结果
            string surp_life = obj["surp_life"].ToString(); //维修后剩余寿命
            mes = MouldManagerBLL.RepairVerificationScanMouldSave(repairwo, mouldcode,result, surp_life,us);
            return Json(mes);
        }
        #endregion


        #region[模具上机,扫描模具编码]
        /// <summary>
        /// 模具上机,扫描模具编码
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "MouldUpQrCodeData")]
        [HttpGet]
        public JsonResult MouldUpQrCodeData(string mouldcode)
        {
            mes = MouldManagerBLL.MouldUpQrCodeData(mouldcode);
            return Json(mes);
        }
        #endregion

        #region[模具上机提交]
        /// <summary>
        /// 模具上机提交
        /// </summary>
        /// <param name="obj">提交数据</param>
        /// <returns></returns>
        [Route(template: "MouldUpSave")]
        [HttpPost]
        public JsonResult MouldUpSave([FromBody] JObject obj)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string mouldcode = obj["mouldcode"].ToString(); //模具编码
            string eqp_code = obj["eqp_code"].ToString(); //设备编码
            string description = obj["description"].ToString(); //上机描述
            mes = MouldManagerBLL.MouldUpSave(mouldcode, eqp_code, description, us);
            return Json(mes);
        }
        #endregion


        #region[模具下机,扫描模具编码]
        /// <summary>
        /// 模具下机,扫描模具编码
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "MouldDownQrCodeData")]
        [HttpGet]
        public JsonResult MouldDownQrCodeData(string mouldcode)
        {
            mes = MouldManagerBLL.MouldDownQrCodeData(mouldcode);
            return Json(mes);
        }
        #endregion

        #region[模具下机提交]
        /// <summary>
        /// 模具下机提交
        /// </summary>
        /// <param name="obj">提交数据</param>
        /// <returns></returns>
        [Route(template: "MouldDownSave")]
        [HttpPost]
        public JsonResult MouldDownSave([FromBody] JObject obj)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string mouldcode = obj["mouldcode"].ToString(); //模具编码
            string eqp_code = obj["eqp_code"].ToString(); //设备编码
            string usecount_life = obj["usecount_life"].ToString(); //本次使用寿命(次)
            string description = obj["description"].ToString(); //下机描述
            mes = MouldManagerBLL.MouldDownSave(mouldcode, eqp_code, usecount_life, description, us);
            return Json(mes);
        }
        #endregion


        #region[模具外借,扫描模具编码]
        /// <summary>
        /// 模具外借,扫描模具编码
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "MouldLendOutQrCodeData")]
        [HttpGet]
        public JsonResult MouldLendOutQrCodeData(string mouldcode)
        {
            mes = MouldManagerBLL.MouldLendOutQrCodeData(mouldcode);
            return Json(mes);
        }
        #endregion

        #region[模具外借提交]
        /// <summary>
        /// 模具外借提交
        /// </summary>
        /// <param name="obj">提交数据</param>
        /// <returns></returns>
        [Route(template: "MouldLendOutSave")]
        [HttpPost]
        public JsonResult MouldLendOutSave([FromBody] JObject obj)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string mouldcode = obj["mouldcode"].ToString(); //模具编码
            string description = obj["description"].ToString(); //外借描述
            mes = MouldManagerBLL.MouldLendOutSave(mouldcode, description, us);
            return Json(mes);
        }
        #endregion


        #region[模具归还,扫描模具编码]
        /// <summary>
        /// 模具归还,扫描模具编码
        /// </summary>
        /// <param name="mouldcode">模具编码</param>
        /// <returns></returns>
        [Route(template: "MouldReturnQrCodeData")]
        [HttpGet]
        public JsonResult MouldReturnQrCodeData(string mouldcode)
        {
            mes = MouldManagerBLL.MouldReturnQrCodeData(mouldcode);
            return Json(mes);
        }
        #endregion

        #region[模具归还提交]
        /// <summary>
        /// 模具归还提交
        /// </summary>
        /// <param name="obj">提交数据</param>
        /// <returns></returns>
        [Route(template: "MouldReturnSave")]
        [HttpPost]
        public JsonResult MouldReturnSave([FromBody] JObject obj)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string mouldcode = obj["mouldcode"].ToString(); //模具编码
            string description = obj["description"].ToString(); //归还描述
            mes = MouldManagerBLL.MouldReturnSave(mouldcode, description, us);
            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
    }
}