1.模具扫码入库、出库功能接口 2.模具维修图片上传接口修改

yl

2023-10-18 37b39b9748eaaa7900271d83a94698299d53fed4

1.模具扫码入库、出库功能接口
2.模具维修图片上传接口修改

 VueWebCoreApi/Controllers/LoginController.cs

@@ -191,7 +191,7 @@
        {
            try
            {
                var token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyY29kZSI6Ijk5OSIsInVzZXJuYW1lIjoi5rWL6K-V6LSm5Y-3Iiwic3RvcmdfY29kZSI6IlNDQjAxXzEiLCJzdG9yZ19uYW1lIjoi55Sf5Lqn5LiA6YOoIiwiaXNfc3lzdGVtX2FkbWluIjoiTiIsInJvbGVfY29kZSI6IlIyMzA4MjMwMiw5OTk5Iiwicm9sZV9kYXRhcGVybWlzc2lvbnMiOiIiLCJ1c2VydHlwZSI6IkFQUCIsInJlZGlza2V5IjoiTmV3TUVTTG9naW5Vc2VySURBUFA5OTkiLCJ0aW1lb3V0IjoiMjAyMy0xMC0xN1QxMjozMjozOC40NTYzMTE0KzA4OjAwIn0.BX_axVR1-IT3L5SP6D5o7EhPbdW9SbZcp55C3PYy5eE"; //HttpContext.Request.Headers["Token"].ToString();
                var token = HttpContext.Request.Headers["Token"].ToString();
                User us = JwtTools.Denocode(token.ToString());
                mes = LoginBLL.LoginMenu(usercode, usertype,us);
            }

 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
    }
}

 VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs

@@ -19,9 +19,9 @@
        #endregion

        #region[模具清单新增编辑]
        public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, string warehousecode, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
        public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
        {
            return MouldManagerDAL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, warehousecode, surplife, resilife, status, mouldpart, opertype, us);
            return MouldManagerDAL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, surplife, resilife, status, mouldpart, opertype, us);
        }
        #endregion

@@ -229,7 +229,7 @@
        #endregion

        #region[设备维修申请,提交保存]
        public static ToMessage MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, User us, List<IFormFile> files)
        public static ToMessage MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, User us, IFormFileCollection files)
        {
            return MouldManagerDAL.MaintainScanMouldApplySave(menucode,mouldcode, faultsourcecode,faultdescr,us,files);
        }
@@ -244,7 +244,7 @@
        #endregion

        #region[模具维修提交]
        public static ToMessage RepairScanMouldSave(string menucode, string docu_code, string mouldcode, string faultdescr, string is_stoprepair, string repaircontent, User us, List<IFormFile> files)
        public static ToMessage RepairScanMouldSave(string menucode, string docu_code, string mouldcode, string faultdescr, string is_stoprepair, string repaircontent, User us, IFormFileCollection files)
        {
            return MouldManagerDAL.RepairScanMouldSave(menucode,docu_code, mouldcode,faultdescr,is_stoprepair,repaircontent,us,files);
        }
@@ -280,14 +280,12 @@
        }
        #endregion


        #region[模具上机提交]
        public static ToMessage MouldUpSave(string mouldcode, string eqp_code, string description, User us)
        {
            return MouldManagerDAL.MouldUpSave(mouldcode,eqp_code,description,us);
        }
        #endregion



        #region[模具下机,扫描模具编码]
@@ -303,7 +301,6 @@
            return MouldManagerDAL.MouldDownSave(mouldcode, eqp_code, usecount_life, description, us);
        }
        #endregion



        #region[模具外借,扫描模具编码]
@@ -334,5 +331,35 @@
            return MouldManagerDAL.MouldReturnSave(mouldcode, description,us);
        }
        #endregion


        #region[模具入库,扫描模具编码]
        public static ToMessage MouldInWareHouseQrCodeData(string mouldcode)
        {
            return MouldManagerDAL.MouldInWareHouseQrCodeData(mouldcode);
        }
        #endregion

        #region[模具入库提交]
        public static ToMessage MouldInWareHouseSave(string mouldcode, string warehousecode, string description, User us)
        {
            return MouldManagerDAL.MouldInWareHouseSave(mouldcode, warehousecode, description, us);
        }
        #endregion


        #region[模具出库,扫描模具编码]
        public static ToMessage MouldOutWareHouseQrCodeData(string mouldcode)
        {
            return MouldManagerDAL.MouldOutWareHouseQrCodeData(mouldcode);
        }
        #endregion

        #region[模具出库提交]
        public static ToMessage MouldOutWareHouseSave(string mouldcode, string warehousecode, string description, User us)
        {
            return MouldManagerDAL.MouldOutWareHouseSave(mouldcode, warehousecode, description, us);
        }
        #endregion
    }
}

 VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs

@@ -72,19 +72,20 @@
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.status,A.usestatus,A.code,A.name,A.spec,A.warehousecode,S.name as warehousename,
                            A.surp_life,'0' as serlife,A.resi_life,(case when isnull(M.mouldcode,'')='' then 'N' else 'Y' end) as is_part,
                            STUFF((SELECT ',' + B.partcode
                            from TMouldInfoPart B
                            where A.code = B.mouldcode
                            FOR XML PATH('')), 1, 1, '') AS partcode,
                            A.lm_user as usercode,U.username,A.lm_date   
                            from TMouldInfo A
                            left join TSecStck S on A.warehousecode=S.code
                            left join (
                            select distinct mouldcode from TMouldInfoPart 
                            )  M on A.code=M.mouldcode
                            left join TUser U on A.lm_user=U.usercode 
                            where 1=1 " + search;
                           A.surp_life,(select isnull(sum(usecount_life),0)   from TMould_UpDownReord R where R.mould_code=A.code) as serlife,
                           A.resi_life,(case when isnull(M.mouldcode,'')='' then 'N' else 'Y' end) as is_part,
                           STUFF((SELECT ',' + B.partcode
                           from TMouldInfoPart B
                           where A.code = B.mouldcode
                           FOR XML PATH('')), 1, 1, '') AS partcode,
                           A.lm_user as usercode,U.username,A.lm_date   
                           from TMouldInfo A
                           left join TSecStck S on A.warehousecode=S.code
                           left join (
                           select distinct mouldcode from TMouldInfoPart 
                           )  M on A.code=M.mouldcode
                           left join TUser U on A.lm_user=U.usercode 
                           where 1=1 " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -103,7 +104,7 @@
        #endregion

        #region[模具清单新增编辑]
        public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, string warehousecode, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
        public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
        {
            var sql = "";
            var dynamicParams = new DynamicParameters();
@@ -113,8 +114,8 @@
                if (opertype == "Add")
                {
                    //写入模具清单表                                     
                    sql = @"insert into TMouldInfo(code,name,spec,status,usestatus,warehousecode,surp_life,resi_life,lm_user,lm_date) 
                               values(@code,@name,@spec,@status,@usestatus,@warehousecode,@surp_life,@resi_life,@lm_user,@lm_date)";
                    sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date) 
                               values(@code,@name,@spec,@status,@surp_life,@resi_life,@lm_user,@lm_date)";
                    list.Add(new
                    {
                        str = sql,
@@ -124,8 +125,6 @@
                            name = mouldname,
                            spec = mouldspec,
                            status = status,
                            usestatus = "0",//使用状态：在库/出库/上机/下机/ç»´ä¿®/外借(0,1,2,3,4,5)
                            warehousecode = warehousecode,
                            surp_life = surplife,
                            resi_life = resilife,
                            lm_user = us.usercode,
@@ -171,7 +170,7 @@
                if (opertype == "Update")
                {
                    //修改模具清单表
                    sql = @"update TMouldInfo set name=@name,spec=@spec,status=@status,warehousecode=@warehousecode,
                    sql = @"update TMouldInfo set name=@name,spec=@spec,status=@status,
                            surp_life=@surp_life,resi_life=@resi_life,lm_user=@lm_user,lm_date=@lm_date where code=@code";
                    list.Add(new
                    {
@@ -182,7 +181,6 @@
                            name = mouldname,
                            spec = mouldspec,
                            status = status,
                            warehousecode = warehousecode,
                            surp_life = surplife,
                            resi_life = resilife,
                            lm_user = us.usercode,
@@ -1814,7 +1812,7 @@

                //写入保养记录主表
                sql = @"insert into TMouldmaint_Proc_Main(bywo,mould_code,mouldmaint_code,maint_result,maint_user,maint_date) 
                        values(@bywo,@mould_code,@mouldmaint_code,@maint_result,@lm_user,@lm_date)";
                        values(@bywo,@mould_code,@mouldmaint_code,@maint_result,@maint_user,@maint_date)";
                list.Add(new
                {
                    str = sql,
@@ -1823,15 +1821,15 @@
                        bywo = bywo,
                        mould_code = json.code,
                        mouldmaint_code = json.standcode,
                        lm_user = us.usercode,
                        lm_date = DateTime.Now.ToString(),
                        maint_user = us.usercode,
                        maint_date = DateTime.Now.ToString(),
                        maint_result = json.result
                    }
                });
                //循环写入保养记录子表
                for (int i = 0; i < json.children.Count; i++)
                {
                    sql = @"insert into TEqpmaint_Proc_Deta(seq,m_id,mouldmaideta_code,result,maint_value,lm_user,lm_date) 
                    sql = @"insert into TMouldmaint_Proc_Deta(seq,m_id,mouldmaideta_code,result,maint_value,lm_user,lm_date) 
                            values(@seq,CONVERT(INT,IDENT_CURRENT('TMouldmaint_Proc_Main')),@mouldmaideta_code,@result,@maint_value,@lm_user,@lm_date)";
                    list.Add(new
                    {
@@ -1976,8 +1974,8 @@
        }
        #endregion

        #region[设备维修申请,提交保存]
        public static ToMessage MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, User us, List<IFormFile> files)
        #region[模具维修申请,提交保存]
        public static ToMessage MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, User us, IFormFileCollection files)
        {
            var sql = "";
            string sqwo = "", numvalue = "";
@@ -2001,16 +1999,20 @@
                {
                    for (int i = 0; i < files.Count; i++)
                    {
                        IFormFile file = files[i];
                        string imgName = "SQ" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString();
                        string filePath = "wwwroot/MouldRecordImage/" + imgName + file.FileName;     //通过此对象获取文件名

                        // ç”Ÿæˆæ–‡ä»¶å
                        var fileName = "SQ" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
                        //var fileName = "SQ" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);

                        // æ‹¼æŽ¥æ–‡ä»¶ä¿å­˜è·¯å¾„
                        var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);
                        //var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);

                        // ä¿å­˜æ–‡ä»¶
                        // ä¿å­˜æ–‡ä»¶var stream = new FileStream(filePath, FileMode.Create)
                        using (var stream = new FileStream(filePath, FileMode.Create))
                        {
                            files[i].CopyToAsync(stream);
                            files[i].CopyTo(stream);
                        }
                        //循环写维修记录对应图片表
                        sql = @"insert into  TMould_RepairImage(source_wo,wo_type,img1url) 
@@ -2124,7 +2126,7 @@
        #endregion

        #region[模具维修提交]
        public static ToMessage RepairScanMouldSave(string menucode, string docu_code, string mouldcode, string faultdescr, string is_stoprepair, string repaircontent, User us, List<IFormFile> files)
        public static ToMessage RepairScanMouldSave(string menucode, string docu_code, string mouldcode, string faultdescr, string is_stoprepair, string repaircontent, User us, IFormFileCollection files)
        {
            var sql = "";
            string wxwo = "", numvalue = "";
@@ -2148,16 +2150,20 @@
                {
                    for (int i = 0; i < files.Count; i++)
                    {
                        IFormFile file = files[i];
                        string imgName = "WX" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString();
                        string filePath = "wwwroot/MouldRecordImage/" + imgName + file.FileName;     //通过此对象获取文件名

                        // ç”Ÿæˆæ–‡ä»¶å
                        var fileName = "WX" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
                        //var fileName = "WX" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);

                        // æ‹¼æŽ¥æ–‡ä»¶ä¿å­˜è·¯å¾„
                        var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);
                        //var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);

                        // ä¿å­˜æ–‡ä»¶
                        // ä¿å­˜æ–‡ä»¶var stream = new FileStream(filePath, FileMode.Create)
                        using (var stream = new FileStream(filePath, FileMode.Create))
                        {
                            files[i].CopyToAsync(stream);
                            files[i].CopyTo(stream);
                        }
                        //循环写维修记录对应图片表
                        sql = @"insert into  TMould_RepairImage(source_wo,wo_type,img1url) 
@@ -2413,7 +2419,6 @@
            return mes;
        }
        #endregion



        #region[模具上机,扫描模具编码]
@@ -2942,5 +2947,261 @@
            return mes;
        }
        #endregion


        #region[模具入库,扫描模具编码]
        public static ToMessage MouldInWareHouseQrCodeData(string mouldcode)
        {
            string sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                //判断当前模具当前使用状态
                sql = @"select code,name,spec,status,usestatus,surp_life,resi_life   
                        from TMouldInfo where code=@mouldcode";
                dynamicParams.Add("@mouldcode", mouldcode);
                var dt = DapperHelper.selectdata(sql, dynamicParams);
                if (dt.Rows.Count > 0)
                {
                    if (dt.Rows[0]["status"].ToString() == "Y")
                    {
                        switch (dt.Rows[0]["usestatus"].ToString())
                        {
                            case "0": //在库
                                mes.code = "300";
                                mes.Message = "当前模具在库状态,不符合入库操作!";
                                mes.data = null;
                                return mes;
                            case "2": //上机
                                mes.code = "300";
                                mes.Message = "当前模具上机状态,不符合入库操作!";
                                mes.data = null;
                                return mes;
                            case "7": //外借
                                mes.code = "300";
                                mes.Message = "当前模具外借状态,不符合入库操作!";
                                mes.data = null;
                                return mes;
                            default:
                                mes.code = "200";
                                mes.Message = "查询成功!";
                                mes.data = dt;
                                break;
                        }
                    }
                    else
                    {
                        mes.code = "300";
                        mes.Message = "模具故障或维修中,不允许入库操作!";
                        mes.data = null;
                        return mes;
                    }
                }
                else
                {
                    mes.code = "300";
                    mes.Message = "无效的模具二维码信息!";
                    mes.data = null;
                    return mes;
                }

            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion

        #region[模具入库提交]
        public static ToMessage MouldInWareHouseSave(string mouldcode, string warehousecode, string description, User us)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                //写入模具出入库记录表(入库操作)
                sql = @"insert into  TMould_InOutReord(mould_code,type,warehouse_code,description,lm_user,lm_date) 
                        values(@mould_code,@type,@warehouse_code,@description,@lm_user,@lm_date)";
                list.Add(new
                {
                    str = sql,
                    parm = new
                    {
                        mould_code = mouldcode,
                        type = "IN",
                        warehouse_code = warehousecode,
                        description = description,
                        lm_user = us.usercode,
                        lm_date = DateTime.Now.ToString()
                    }
                });

                //回写模具清单,使用状态(入库),仓库编码
                sql = @"update TMouldInfo set usestatus='0',warehousecode=@warehousecode  where code=@mouldcode";
                list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode = warehousecode } });

                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    //写入操作记录表
                    LogHelper.DbOperateLog(us.usercode, "模具入库", "模具:" + mouldcode, us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "模具入库成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "模具入库失败!";
                    mes.data = null;
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion


        #region[模具出库,扫描模具编码]
        public static ToMessage MouldOutWareHouseQrCodeData(string mouldcode)
        {
            string sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                //判断当前模具当前使用状态
                sql = @"select *   from TMouldInfo where code=@mouldcode ";
                dynamicParams.Add("@mouldcode", mouldcode);
                var dt = DapperHelper.selectdata(sql, dynamicParams);
                if (dt.Rows.Count > 0)
                {
                    if (dt.Rows[0]["status"].ToString() == "Y")
                    {
                        //判断当前模具是否在外借状态
                        sql = @"select M.code as mould_code,M.name as mould_name,M.spec as mould_spec,
                                M.surp_life,M.resi_life,M.warehousecode,C.name as  warehousename 
                                from TMouldInfo M 
                                left join TSecStck C on M.warehousecode=C.code
                                where M.code=@mouldcode and M.usestatus='0'";
                        dynamicParams.Add("@mouldcode", mouldcode);
                        var data = DapperHelper.selectdata(sql, dynamicParams);
                        if (data.Rows.Count > 0)
                        {
                            mes.code = "200";
                            mes.Message = "查询成功!";
                            mes.data = data;
                            return mes;
                        }
                        else
                        {
                            mes.code = "300";
                            mes.Message = "当前模具未在库,不符合出库操作!";
                            mes.data = null;
                            return mes;
                        }
                    }
                    else
                    {
                        mes.code = "300";
                        mes.Message = "模具故障或维修中,不符合出库操作!";
                        mes.data = null;
                        return mes;
                    }
                }
                else
                {
                    mes.code = "300";
                    mes.Message = "无效的模具二维码信息!";
                    mes.data = null;
                    return mes;
                }

            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion

        #region[模具出库提交]
        public static ToMessage MouldOutWareHouseSave(string mouldcode, string warehousecode, string description, User us)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                //写入模具出入库记录表(出库操作)
                sql = @"insert into  TMould_InOutReord(mould_code,type,warehouse_code,description,lm_user,lm_date) 
                        values(@mould_code,@type,@warehouse_code,@description,@lm_user,@lm_date)";
                list.Add(new
                {
                    str = sql,
                    parm = new
                    {
                        mould_code = mouldcode,
                        type = "OUT",
                        warehouse_code = warehousecode,
                        description = description,
                        lm_user = us.usercode,
                        lm_date = DateTime.Now.ToString()
                    }
                });

                //回写模具清单,使用状态(出库),清除仓库编码
                sql = @"update TMouldInfo set usestatus='1',warehousecode=@warehousecode  where code=@mouldcode";
                list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode ="" } });

                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    //写入操作记录表
                    LogHelper.DbOperateLog(us.usercode, "模具出库", "模具:" + mouldcode, us.usertype);
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "模具出库成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "模具出库失败!";
                    mes.data = null;
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
    }
}

 VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs

@@ -32,10 +32,10 @@
                        union ALL
                        select e.menucode, e.parent_id, e.menuname,e.menu_seq,e.Type  
                        from TMenu e
                        inner join RecursiveCTE r ON e.menucode = r.parent_id
                        inner join RecursiveCTE r ON e.menucode = r.parent_id 
                        )
                        select menucode, parent_id, menuname,Type
                        from RecursiveCTE order by menu_seq";
                        select distinct menucode, parent_id, menuname,Type,menu_seq
                        from RecursiveCTE order by menucode, parent_id,Type,menu_seq";
                var data = DapperHelper.selecttable(sql);
                if (data.Rows.Count > 0)
                {

 VueWebCoreApi/Models/MouldVerify/MouldModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
using Microsoft.AspNetCore.Http;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;

namespace VueWebCoreApi.Models.MouldVerify
{
    public class MouldModel
    {
        /// <summary>
        /// åŠŸèƒ½ç¼–码
        /// </summary>
        public string menucode { get; set; }
        /// <summary>
        /// æ¨¡å…·ç¼–码
        /// </summary>
        public string mouldcode { get; set; }
        /// <summary>
        /// æ•…障来源
        /// </summary>
        public string faultsourcecode { get; set; }
        /// <summary>
        /// æ•…障描述
        /// </summary>
        public string faultdescr { get; set; }
        /// <summary>
        /// æ•…障图片
        /// </summary>
        public List<IFormFile> files { get; set; }
    }
}

 VueWebCoreApi/Tools/ImportExcelData.cs

@@ -1045,7 +1045,7 @@
                return Message;

            }
            else if (excelTable[0].Columns.Count != 7)
            else if (excelTable[0].Columns.Count != 6)
            {
                code = "301";
                Message = "模具清单模板不符合规范,请检查列名字段数";
@@ -1081,22 +1081,16 @@
                Message = "模具清单模板：表头信息不符合规范,第4列应为{*状态}";
                return Message;
            }
            else if (excelTable[0].Columns[4].ColumnName != "*仓库编码")
            else if (excelTable[0].Columns[4].ColumnName != "预计寿命(次)")
            {
                code = "301";
                Message = "模具清单模板：表头信息不符合规范,第5列应为{*仓库编码}";
                Message = "模具清单模板：表头信息不符合规范,第5列应为{预计寿命(次)}";
                return Message;
            }
            else if (excelTable[0].Columns[5].ColumnName != "预计寿命(次)")
            else if (excelTable[0].Columns[5].ColumnName != "剩余寿命(次)")
            {
                code = "301";
                Message = "模具清单模板：表头信息不符合规范,第6列应为{预计寿命(次)}";
                return Message;
            }
            else if (excelTable[0].Columns[6].ColumnName != "剩余寿命(次)")
            {
                code = "301";
                Message = "模具清单模板：表头信息不符合规范,第7列应为{剩余寿命(次)}";
                Message = "模具清单模板：表头信息不符合规范,第6列应为{剩余寿命(次)}";
                return Message;
            }
            else if (excelTable[1].Columns[0].ColumnName != "模具编码")
@@ -5395,8 +5389,8 @@
                //导入模具清单
                for (int k = 0; k < excelTable[0].Rows.Count; k++)
                {
                    sql = @"insert into TMouldInfo(code,name,spec,status,usestatus,warehousecode,surp_life,resi_life,lm_user,lm_date) 
                               values(@code,@name,@spec,@status,@usestatus,@warehousecode,@surp_life,@resi_life,@lm_user,@lm_date)";
                    sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date) 
                               values(@code,@name,@spec,@status,@usestatus,@surp_life,@resi_life,@lm_user,@lm_date)";
                    list.Add(new
                    {
                        str = sql,
@@ -5405,11 +5399,9 @@
                            code = excelTable[0].Rows[k][0].ToString().Trim(),
                            name = excelTable[0].Rows[k][1].ToString().Trim(),
                            spec = excelTable[0].Rows[k][2].ToString().Trim(),
                            status = excelTable[0].Rows[k][3].ToString().Trim()=="正常"?"Y":"N",
                            usestatus = "0",//使用状态：在库/出库/上机/下机/ç»´ä¿®/外借(0,1,2,3,4,5)
                            warehousecode = excelTable[0].Rows[k][4].ToString().Trim(),
                            surp_life =decimal.Parse(excelTable[0].Rows[k][5].ToString().Trim()),
                            resi_life = decimal.Parse(excelTable[0].Rows[k][6].ToString().Trim()),
                            status = excelTable[0].Rows[k][3].ToString().Trim(),
                            surp_life =decimal.Parse(excelTable[0].Rows[k][4].ToString().Trim()==""?"0": excelTable[0].Rows[k][4].ToString().Trim()),
                            resi_life = decimal.Parse(excelTable[0].Rows[k][5].ToString().Trim()==""?"0":excelTable[0].Rows[k][5].ToString().Trim()),
                            lm_user = us.usercode,
                            lm_date = DateTime.Now.ToString()
                        }

 VueWebCoreApi/wwwroot/Excel/Ä£¾ßÇåµ¥.xls

Binary files differ