yl
2022-08-17 43d31c2e56da8954828be4a7e027c6ad0aaf038a
设备点检项目、保养项目接口(查询、新增、编辑、删除、导入)
已添加2个文件
已修改10个文件
965 ■■■■ 文件已修改
.vs/VueWebApi/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Controllers/DeviceManagerController.cs 130 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/BLL/DeviceManagerBLL.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/DeviceManagerDAL.cs 374 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/ExcelCheckDAL.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Excel/设备保养项目.xls 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Excel/设备点检项目.xls 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Tools/ExcelList.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Tools/ImportExcelData.cs 377 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/VueWebApi.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
.vs/VueWebApi/v16/.suo
Binary files differ
VueWebApi/Controllers/DeviceManagerController.cs
@@ -267,5 +267,135 @@
        }
        #endregion
        #region[设备点检项列表查询]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€é¡¹åˆ—表查询
        /// </summary>
        /// <param name="checkitemcode">点检部位编码</param>
        /// <param name="checkitemname">点检部位名称</param>
        /// <param name="checkdescr">点检要求</param>
        /// <param name="isqrcode">选中扫码</param>
        /// <param name="cycle">点检周期</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "DeviceCheckItemSearch")]
        [HttpGet]
        public HttpResponseMessage DeviceCheckItemSearch(string checkitemcode = null, string checkitemname = null, string checkdescr = null, string isqrcode = null,string cycle=null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceCheckItemSearch(checkitemcode, checkitemname, checkdescr, isqrcode, cycle, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
        #region[设备点检项新增编辑]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€é¡¹æ–°å¢žç¼–辑
        /// </summary>
        /// <param name="obj">提交数据对象</param>
        /// <returns></returns>
        [Route(template: "AddUpdateDeviceCheckItem")]
        [HttpPost]
        public HttpResponseMessage AddUpdateDeviceCheckItem([FromBody] JObject obj)
        {
            string checkitemid = obj["id"].ToString();    //设备点检项id(主键)
            string checkitemcode = obj["checkitemcode"].ToString(); //设备点检部位编码
            string checkitemname = obj["checkitemname"].ToString(); //设备点检部位名称
            string checkitemdescr = obj["checkitemdescr"].ToString(); //设备点检部位要求
            string cycle = obj["cycle"].ToString(); //设备点检部位周期
            string isqrcode = obj["isqrcode"].ToString(); //是否扫码
            var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
            string OperType = obj["OperType"].ToString();  //操作类型
            mes = DeviceManagerBLL.AddUpdateDeviceCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, cycle, isqrcode, usercode, OperType);
            return TJson.toJson(mes);
        }
        #endregion
        #region[设备点检项删除]
        /// <summary>
        /// è®¾å¤‡ç‚¹æ£€é¡¹åˆ é™¤
        /// </summary>
        /// <param name="checkitemcode">设备点检项目(部位)编码</param>
        /// <returns></returns>
        [Route(template: "DeleteDeviceCheckItem")]
        [HttpPost]
        public HttpResponseMessage DeleteDeviceCheckItem(string checkitemcode)
        {
            mes = DeviceManagerBLL.DeleteDeviceCheckItem(checkitemcode);
            return TJson.toJson(mes);
        }
        #endregion
        #region[设备保养项列表查询]
        /// <summary>
        /// è®¾å¤‡ä¿å…»é¡¹åˆ—表查询
        /// </summary>
        /// <param name="maiitemcode">保养部位编码</param>
        /// <param name="maiitemname">保养部位名称</param>
        /// <param name="maidescr">保养要求</param>
        /// <param name="isqrcode">选中扫码</param>
        /// <param name="cycle">保养周期</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "DeviceMaiItemSearch")]
        [HttpGet]
        public HttpResponseMessage DeviceMaiItemSearch(string maiitemcode = null, string maiitemname = null, string maidescr = null, string isqrcode = null, string cycle = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = DeviceManagerBLL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, cycle, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
        #region[设备保养项新增编辑]
        /// <summary>
        /// è®¾å¤‡ä¿å…»é¡¹æ–°å¢žç¼–辑
        /// </summary>
        /// <param name="obj">提交数据对象</param>
        /// <returns></returns>
        [Route(template: "AddUpdateDeviceMaiItem")]
        [HttpPost]
        public HttpResponseMessage AddUpdateDeviceMaiItem([FromBody] JObject obj)
        {
            string maiitemid = obj["id"].ToString();    //设备保养项id(主键)
            string maiitemcode = obj["maiitemcode"].ToString(); //设备保养部位编码
            string maiitemname = obj["maiitemname"].ToString(); //设备保养部位名称
            string maiitemdescr = obj["maiitemdescr"].ToString(); //设备保养部位要求
            string cycle = obj["cycle"].ToString(); //设备点检部位周期
            string isqrcode = obj["isqrcode"].ToString(); //是否扫码
            var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
            string OperType = obj["OperType"].ToString();  //操作类型
            mes = DeviceManagerBLL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, cycle, isqrcode, usercode, OperType);
            return TJson.toJson(mes);
        }
        #endregion
        #region[设备保养项删除]
        /// <summary>
        /// è®¾å¤‡ä¿å…»é¡¹åˆ é™¤
        /// </summary>
        /// <param name="maiitemcode">设备保养项目(部位)编码</param>
        /// <returns></returns>
        [Route(template: "DeleteDeviceMaiItem")]
        [HttpPost]
        public HttpResponseMessage DeleteDeviceMaiItem(string maiitemcode)
        {
            mes = DeviceManagerBLL.DeleteDeviceMaiItem(maiitemcode);
            return TJson.toJson(mes);
        }
        #endregion
    }
}
VueWebApi/DLL/BLL/DeviceManagerBLL.cs
@@ -102,5 +102,51 @@
            return DeviceManagerDAL.DeleteDeviceManger(devicecode);
        }
        #endregion
        #region[设备点检项列表查询]
        public static ToMessage DeviceCheckItemSearch(string checkitemcode, string checkitemname, string checkdescr, string isqrcode,string cycle, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceCheckItemSearch(checkitemcode, checkitemname, checkdescr, isqrcode, cycle, startNum, endNum, prop, order);
        }
        #endregion
        #region[设备点检项新增编辑]
        public static ToMessage AddUpdateDeviceCheckItem(string checkitemid, string checkitemcode, string checkitemname, string checkitemdescr, string cycle, string isqrcode, string usercode, string operType)
        {
            return DeviceManagerDAL.AddUpdateDeviceCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, cycle, isqrcode, usercode, operType);
        }
        #endregion
        #region[设备点检项删除]
        public static ToMessage DeleteDeviceCheckItem(string checkitemcode)
        {
            return DeviceManagerDAL.DeleteDeviceCheckItem(checkitemcode);
        }
        #endregion
        #region[设备保养项列表查询]
        public static ToMessage DeviceMaiItemSearch(string maiitemcode, string maiitemname, string maidescr, string isqrcode, string cycle, int startNum, int endNum, string prop, string order)
        {
            return DeviceManagerDAL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, cycle, startNum, endNum, prop, order);
        }
        #endregion
        #region[设备保养项新增编辑]
        public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string cycle, string isqrcode, string usercode, string operType)
        {
            return DeviceManagerDAL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, cycle, isqrcode, usercode, operType);
        }
        #endregion
        #region[设备保养项删除]
        public static ToMessage DeleteDeviceMaiItem(string maiitemcode)
        {
            return DeviceManagerDAL.DeleteDeviceMaiItem(maiitemcode);
        }
        #endregion
    }
}
VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -644,5 +644,379 @@
            return mes;
        }
        #endregion
        #region[设备点检项列表查询]
        public static ToMessage DeviceCheckItemSearch(string checkitemcode, string checkitemname, string checkdescr, string isqrcode,string cycle, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (checkitemcode != "" && checkitemcode != null)
                {
                    search += "and code like '%'+@checkitemcode+'%' ";
                    dynamicParams.Add("@checkitemcode", checkitemcode);
                }
                if (checkitemname != "" && checkitemname != null)
                {
                    search += "and name like '%'+@checkitemname+'%' ";
                    dynamicParams.Add("@checkitemname", checkitemname);
                }
                if (checkdescr != "" && checkdescr != null)
                {
                    search += "and description=@checkdescr ";
                    dynamicParams.Add("@checkdescr", checkdescr);
                }
                if (isqrcode != "" && isqrcode != null)
                {
                    search += "and isscan=@isqrcode ";
                    dynamicParams.Add("@isqrcode", isqrcode);
                }
                if (cycle != "" && cycle != null)
                {
                    search += "and isscan=@cycle ";
                    dynamicParams.Add("@cycle", cycle);
                }
                if (search == "")
                {
                    search = "and 1=1 ";
                }
                //search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select id,code,name,description,isscan,cycle,lm_user,lm_date
                            from TEqpchk_Item where is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.count = total;
                mes.data = data.ToList();
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
        #region[设备点检项新增编辑]
        public static ToMessage AddUpdateDeviceCheckItem(string checkitemid, string checkitemcode, string checkitemname, string checkitemdescr, string cycle, string isqrcode, string usercode, string operType)
        {
            var dynamicParams = new DynamicParameters();
            try
            {
                if (operType == "Add")
                {
                    var sql = @"insert into TEqpchk_Item(code,name,description,isscan,cycle,lm_user,lm_date)
                              values(@checkitemcode,@checkitemname,@checkitemdescr,@isqrcode,@cycle,@usercode,@CreateDate)";
                    dynamicParams.Add("@checkitemcode", checkitemcode);
                    dynamicParams.Add("@checkitemname", checkitemname);
                    dynamicParams.Add("@checkitemdescr", checkitemdescr);
                    dynamicParams.Add("@isqrcode", isqrcode);
                    dynamicParams.Add("@cycle", cycle);
                    dynamicParams.Add("@usercode", usercode);
                    dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
                    int cont = DapperHelper.SQL(sql, dynamicParams);
                    if (cont > 0)
                    {
                        mes.code = "200";
                        mes.count = 0;
                        mes.Message = "新增操作成功!";
                        mes.data = null;
                    }
                    else
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "新增操作失败!";
                        mes.data = null;
                    }
                }
                if (operType == "Update")
                {
                    var sql = @"update TEqpchk_Item set name=@checkitemname,description=@checkitemdescr,isscan=@isqrcode,cycle=@cycle,
                                lm_user=@usercode,lm_date=@CreateDate
                                where id=@checkitemid";
                    dynamicParams.Add("@checkitemid", checkitemid);
                    dynamicParams.Add("@checkitemname", checkitemname);
                    dynamicParams.Add("@checkitemdescr", checkitemdescr);
                    dynamicParams.Add("@isqrcode", isqrcode);
                    dynamicParams.Add("@cycle", cycle);
                    dynamicParams.Add("@usercode", usercode);
                    dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
                    int cont = DapperHelper.SQL(sql, dynamicParams);
                    if (cont > 0)
                    {
                        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 DeleteDeviceCheckItem(string checkitemcode)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                //判断点检标准项目是否有关联点检标准,不允许删除
                sql = @"select *  from TEqpchk_Deta
                        where  code=@checkitemcode";
                dynamicParams.Add("@checkitemcode", checkitemcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "当前点检项目已关联标准,不允许删除!";
                    mes.data = null;
                    return mes;
                }
                //删除点检项目
                sql = @"delete TEqpchk_Item  where code=@checkitemcode";
                list.Add(new { str = sql, parm = new { checkitemcode = checkitemcode } });
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    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 DeviceMaiItemSearch(string maiitemcode, string maiitemname, string maidescr, string isqrcode, string cycle, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
            try
            {
                if (maiitemcode != "" && maiitemcode != null)
                {
                    search += "and code like '%'+@maiitemcode+'%' ";
                    dynamicParams.Add("@maiitemcode", maiitemcode);
                }
                if (maiitemname != "" && maiitemname != null)
                {
                    search += "and name like '%'+@maiitemname+'%' ";
                    dynamicParams.Add("@maiitemname", maiitemname);
                }
                if (maidescr != "" && maidescr != null)
                {
                    search += "and description=@maidescr ";
                    dynamicParams.Add("@maidescr", maidescr);
                }
                if (isqrcode != "" && isqrcode != null)
                {
                    search += "and isscan=@isqrcode ";
                    dynamicParams.Add("@isqrcode", isqrcode);
                }
                if (cycle != "" && cycle != null)
                {
                    search += "and isscan=@cycle ";
                    dynamicParams.Add("@cycle", cycle);
                }
                if (search == "")
                {
                    search = "and 1=1 ";
                }
                //search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select id,code,name,description,isscan,cycle,lm_user,lm_date
                            from TEqpmai_Item where is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.count = total;
                mes.data = data.ToList();
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
        #region[设备保养项新增编辑]
        public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string cycle, string isqrcode, string usercode, string operType)
        {
            var dynamicParams = new DynamicParameters();
            try
            {
                if (operType == "Add")
                {
                    var sql = @"insert into TEqpmai_Item(code,name,description,isscan,cycle,lm_user,lm_date)
                              values(@maiitemcode,@maiitemname,@checkitemdescr,@isqrcode,@cycle,@usercode,@CreateDate)";
                    dynamicParams.Add("@maiitemcode", maiitemcode);
                    dynamicParams.Add("@maiitemname", maiitemname);
                    dynamicParams.Add("@maiitemdescr", maiitemdescr);
                    dynamicParams.Add("@isqrcode", isqrcode);
                    dynamicParams.Add("@cycle", cycle);
                    dynamicParams.Add("@usercode", usercode);
                    dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
                    int cont = DapperHelper.SQL(sql, dynamicParams);
                    if (cont > 0)
                    {
                        mes.code = "200";
                        mes.count = 0;
                        mes.Message = "新增操作成功!";
                        mes.data = null;
                    }
                    else
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "新增操作失败!";
                        mes.data = null;
                    }
                }
                if (operType == "Update")
                {
                    var sql = @"update TEqpmai_Item set name=@maiitemname,description=@maiitemdescr,isscan=@isqrcode,cycle=@cycle,
                                lm_user=@usercode,lm_date=@CreateDate
                                where id=@maiitemid";
                    dynamicParams.Add("@maiitemid", maiitemid);
                    dynamicParams.Add("@maiitemname", maiitemname);
                    dynamicParams.Add("@maiitemdescr", maiitemdescr);
                    dynamicParams.Add("@isqrcode", isqrcode);
                    dynamicParams.Add("@cycle", cycle);
                    dynamicParams.Add("@usercode", usercode);
                    dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
                    int cont = DapperHelper.SQL(sql, dynamicParams);
                    if (cont > 0)
                    {
                        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 DeleteDeviceMaiItem(string maiitemcode)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                //判断保养标准项目是否有关联保养标准,不允许删除
                sql = @"select *  from TEqpmai_Deta
                        where  code=@maiitemcode";
                dynamicParams.Add("@maiitemcode", maiitemcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "当前保养项目已关联标准,不允许删除!";
                    mes.data = null;
                    return mes;
                }
                //删除保养项目
                sql = @"delete TEqpmai_Item  where code=@maiitemcode";
                list.Add(new { str = sql, parm = new { maiitemcode = maiitemcode } });
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    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
    }
}
VueWebApi/DLL/DAL/ExcelCheckDAL.cs
@@ -43,10 +43,16 @@
                case "9"://设备清单
                    Message = ImportExcelData.Nine(savePath, out StuCode);
                    break;
                case "10"://设备点检
                case "10"://设备点检项目
                    Message = ImportExcelData.Ten(savePath, out StuCode);
                    break;
                case "11"://设备保养
                case "22"://设备点检标准
                    Message = ImportExcelData.Ten(savePath, out StuCode);
                    break;
                case "11"://设备保养项目
                    Message = ImportExcelData.Eleven(savePath, out StuCode);
                    break;
                case "23"://设备保养标准
                    Message = ImportExcelData.Eleven(savePath, out StuCode);
                    break;
                case "12"://工装清单
@@ -126,10 +132,16 @@
                case "9"://设备清单
                    list = ImportExcelData.NineData(savePath, out stuCode, out message, out count);
                    break;
                case "10"://设备点检
                case "10"://设备点检项目
                    list = ImportExcelData.TenData(savePath, out stuCode, out message, out count);
                    break;
                case "11"://设备保养
                case "22"://设备点检标准
                    list = ImportExcelData.TenData(savePath, out stuCode, out message, out count);
                    break;
                case "11"://设备保养项目
                    list = ImportExcelData.ElevenData(savePath, out stuCode, out message, out count);
                    break;
                case "23"://设备保养标准
                    list = ImportExcelData.ElevenData(savePath, out stuCode, out message, out count);
                    break;
                case "12"://工装清单
@@ -200,10 +212,16 @@
                case "9"://设备清单
                    Message = ImportExcelData.NineSubmit(savePath, User, out StuCode);
                    break;
                case "10"://设备点检
                case "10"://设备点检项目
                    Message = ImportExcelData.TenSubmit(savePath, User, out StuCode);
                    break;
                case "11"://设备保养
                case "22"://设备点检标准
                    Message = ImportExcelData.TenSubmit(savePath, User, out StuCode);
                    break;
                case "11"://设备保养项目
                    Message = ImportExcelData.ElevenSubmit(savePath, User, out StuCode);
                    break;
                case "23"://设备保养标准
                    Message = ImportExcelData.ElevenSubmit(savePath, User, out StuCode);
                    break;
                case "12"://工装清单
VueWebApi/Excel/É豸±£ÑøÏîÄ¿.xls
Binary files differ
VueWebApi/Excel/É豸µã¼ìÏîÄ¿.xls
Binary files differ
VueWebApi/Tools/ExcelList.cs
@@ -20,8 +20,10 @@
                new ScoreReport("7","容器定义"),
                new ScoreReport("8","存货档案"),
                new ScoreReport("9","设备清单"),
                new ScoreReport("10","设备点检"),
                new ScoreReport("11","设备保养"),
                new ScoreReport("10","设备点检项目"),
                new ScoreReport("22","设备点检标准"),
                new ScoreReport("11","设备保养项目"),
                new ScoreReport("23","设备保养标准"),
                new ScoreReport("12","工装清单"),
                new ScoreReport("13","工装点检"),
                new ScoreReport("14","工装保养"),
VueWebApi/Tools/ImportExcelData.cs
@@ -634,7 +634,7 @@
        }
        #endregion
        #region【Excel模板上传验证,设备点检模板】
        #region【Excel模板上传验证,设备点检项目模板】
        public static string Ten(string FileCode, out string code)
        {
            string Message = "";
@@ -644,82 +644,51 @@
            if (excelTable.Count != 2)
            {
                code = "300";
                Message = "模板不符合规范,缺失的Sheet";
                Message = "导入模板不符合规范,请检查sheet数";
                return Message;
            }
            else if (excelTable[0].Columns.Count != 4)
            else if (excelTable[0].Columns.Count != 6)
            {
                code = "300";
                Message = "模板不符合规范,请检查列名字段数";
            }
            else if (excelTable[1].Columns.Count != 9)
            {
                code = "300";
                Message = "模板不符合规范,请检查列名字段数";
                Message = "设备点检项目模板不符合规范,请检查列名字段数";
                return Message;
            }
            else if (excelTable[0].Columns[0].ColumnName != "序号")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "设备点检项目模板不符合规范:表头信息不符合规范,第1列应为{序号}";
                return Message;
            }
            else if (excelTable[0].Columns[1].ColumnName != "点检标准(唯一)")
            else if (excelTable[0].Columns[1].ColumnName != "点检项目编号(唯一)")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "设备点检项目模板不符合规范:表头信息不符合规范,第2列应为{点检项目编号(唯一)}";
                return Message;
            }
            else if (excelTable[0].Columns[2].ColumnName != "标准名称(唯一)")
            else if (excelTable[0].Columns[2].ColumnName != "点检项目名称")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "设备点检项目模板不符合规范:表头信息不符合规范,第3列应为{点检项目名称}";
                return Message;
            }
            else if (excelTable[0].Columns[3].ColumnName != "点检管控")
            else if (excelTable[0].Columns[3].ColumnName != "点检周期")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "设备点检项目模板不符合规范:表头信息不符合规范,第4列应为{点检周期}";
                return Message;
            }
            else if (excelTable[1].Columns[0].ColumnName != "序号")
            else if (excelTable[0].Columns[4].ColumnName != "是否扫码")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "设备点检项目模板不符合规范:表头信息不符合规范,第4列应为{是否扫码}";
                return Message;
            }
            else if (excelTable[1].Columns[1].ColumnName != "点检标准")
            else if (excelTable[0].Columns[5].ColumnName != "点检项目要求")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[2].ColumnName != "标准名称")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[3].ColumnName != "SEQ(部位顺序)")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[4].ColumnName != "部位条码(唯一)")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[5].ColumnName != "部位名称")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[6].ColumnName != "点检要求")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[7].ColumnName != "是否扫码")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[8].ColumnName != "点检周期")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "设备点检项目模板不符合规范:表头信息不符合规范,第4列应为{点检项目要求}";
                return Message;
            }
            else
            {
@@ -730,7 +699,7 @@
        }
        #endregion
        #region【Excel模板上传验证,设备保养模板】
        #region【Excel模板上传验证,设备保养项目模板】
        public static string Eleven(string FileCode, out string code)
        {
            string Message = "";
@@ -740,77 +709,51 @@
            if (excelTable.Count != 2)
            {
                code = "300";
                Message = "模板不符合规范,缺失的Sheet";
                Message = "导入模板不符合规范,请检查sheet数";
                return Message;
            }
            else if (excelTable[0].Columns.Count != 3)
            else if (excelTable[0].Columns.Count != 6)
            {
                code = "300";
                Message = "模板不符合规范,请检查列名字段数";
            }
            else if (excelTable[1].Columns.Count != 9)
            {
                code = "300";
                Message = "模板不符合规范,请检查列名字段数";
                Message = "设备保养项目模板不符合规范,请检查列名字段数";
                return Message;
            }
            else if (excelTable[0].Columns[0].ColumnName != "序号")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "设备保养项目模板不符合规范:表头信息不符合规范,第1列应为{序号}";
                return Message;
            }
            else if (excelTable[0].Columns[1].ColumnName != "保养标准(唯一)")
            else if (excelTable[0].Columns[1].ColumnName != "保养项目编号(唯一)")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "设备保养项目模板不符合规范:表头信息不符合规范,第2列应为{保养项目编号(唯一)}";
                return Message;
            }
            else if (excelTable[0].Columns[2].ColumnName != "标准名称(唯一)")
            else if (excelTable[0].Columns[2].ColumnName != "保养项目名称")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "设备保养项目模板不符合规范:表头信息不符合规范,第3列应为{保养项目名称}";
                return Message;
            }
            else if (excelTable[1].Columns[0].ColumnName != "序号")
            else if (excelTable[0].Columns[3].ColumnName != "保养周期")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "设备保养项目模板不符合规范:表头信息不符合规范,第4列应为{保养周期}";
                return Message;
            }
            else if (excelTable[1].Columns[1].ColumnName != "保养标准")
            else if (excelTable[0].Columns[4].ColumnName != "是否扫码")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "设备保养项目模板不符合规范:表头信息不符合规范,第4列应为{是否扫码}";
                return Message;
            }
            else if (excelTable[1].Columns[2].ColumnName != "标准名称")
            else if (excelTable[0].Columns[5].ColumnName != "保养项目要求")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[3].ColumnName != "SEQ(部位顺序)")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[4].ColumnName != "部位条码(唯一)")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[5].ColumnName != "部位名称")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[6].ColumnName != "保养要求")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[7].ColumnName != "是否扫码")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
            }
            else if (excelTable[1].Columns[8].ColumnName != "保养周期")
            {
                code = "300";
                Message = "模板不符合规范,请检查列名";
                Message = "设备保养项目模板不符合规范:表头信息不符合规范,第4列应为{保养项目要求}";
                return Message;
            }
            else
            {
@@ -1976,7 +1919,7 @@
        }
        #endregion
        #region【Excel上传数据验证,设备点检】
        #region【Excel上传数据验证,设备点检项目】
        public static List<ExcelErro> TenData(string FileCode, out string StuCode, out string message, out int count)
        {
@@ -1985,13 +1928,51 @@
            count = 0;
            string sql = "";
            DataTable dt;
            var dynamicParams = new DynamicParameters();
            List<ExcelErro> list = new List<ExcelErro>();
            DataTable excelTable = new DataTable();
            list = ImportExcel.ExcelToTableErro(FileCode);    //验证Excel数据必填字段是否为空、唯一字段是否重复
            excelTable = ImportExcel.ExcelToTable(FileCode);  //获取Excel数据
            for (int i = 0; i < excelTable.Rows.Count; i++)
            {
                if (excelTable.Rows[i][1].ToString().Trim() != null && excelTable.Rows[i][1].ToString().Trim() != "")
                {
                    sql = @"select code  from TEqpchk_Item where code=@code";
                    dynamicParams.Add("@code", excelTable.Rows[i][1].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{点检项目编号(唯一)}";
                        erro.ErrorCont = "设备点检项目表:{点检项目编号(唯一)}字段" + excelTable.Rows[i][1].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
            }
            if (list.Count > 0)
            {
                int index = 0;
                foreach (ExcelErro item in list)
                {
                    index++;
                    item.Seq = index.ToString();
                }
                StuCode = "301";
                message = "数据验证失败";
            }
            else
            {
                StuCode = "200";
                message = "数据验证成功";
                count = excelTable.Rows.Count;
            }
            return list;
        }
        #endregion
        #region【Excel上传数据验证,设备保养】
        #region【Excel上传数据验证,设备保养项目】
        public static List<ExcelErro> ElevenData(string FileCode, out string StuCode, out string message, out int count)
        {
            message = "";
@@ -1999,8 +1980,46 @@
            count = 0;
            string sql = "";
            DataTable dt;
            var dynamicParams = new DynamicParameters();
            List<ExcelErro> list = new List<ExcelErro>();
            DataTable excelTable = new DataTable();
            list = ImportExcel.ExcelToTableErro(FileCode);    //验证Excel数据必填字段是否为空、唯一字段是否重复
            excelTable = ImportExcel.ExcelToTable(FileCode);  //获取Excel数据
            for (int i = 0; i < excelTable.Rows.Count; i++)
            {
                if (excelTable.Rows[i][1].ToString().Trim() != null && excelTable.Rows[i][1].ToString().Trim() != "")
                {
                    sql = @"select code  from TEqpmai_Item where code=@code";
                    dynamicParams.Add("@code", excelTable.Rows[i][1].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{保养项目编号(唯一)}";
                        erro.ErrorCont = "设备保养项目表:{点检保养编号(唯一)}字段" + excelTable.Rows[i][1].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
            }
            if (list.Count > 0)
            {
                int index = 0;
                foreach (ExcelErro item in list)
                {
                    index++;
                    item.Seq = index.ToString();
                }
                StuCode = "301";
                message = "数据验证失败";
            }
            else
            {
                StuCode = "200";
                message = "数据验证成功";
                count = excelTable.Rows.Count;
            }
            return list;
        }
        #endregion
@@ -2605,14 +2624,82 @@
        }
        #endregion
        #region【Excel数据上传,设备点检】
        #region【Excel数据上传,设备点检项目】
        public static string TenSubmit(string FileCode, string User, out string StuCode)
        {
            string message = "";
            StuCode = "";
            string sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                DataTable excelTable = new DataTable();
                excelTable = ImportExcel.ExcelToTable(FileCode);
                //导入设备点检项目表
                for (int i = 0; i < excelTable.Rows.Count; i++)
                {
                    string Type = "",IsScan="";
                    switch (excelTable.Rows[i][3].ToString().Trim())
                    {
                        case "å¹´":
                            Type = "Y";
                            break;
                        case "å­£":
                            Type = "S";
                            break;
                        case "月":
                            Type = "M";
                            break;
                        case "周":
                            Type = "W";
                            break;
                        case "日":
                            Type = "D";
                            break;
                        default:
                            break;
                    }
                    switch (excelTable.Rows[i][4].ToString().Trim())
                    {
                        case "是":
                            IsScan = "Y";
                            break;
                        case "否":
                            IsScan = "N";
                            break;
                        default:
                            break;
                    }
                    sql = @"insert into TEqpchk_Item(code,name,description,isscan,cycle,lm_user,lm_date)
                            values(@code,@name,@descr,@Operator,@CreateDate)";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            code = excelTable.Rows[i][1].ToString().Trim(),
                            name = excelTable.Rows[i][2].ToString().Trim(),
                            descr = excelTable.Rows[i][5].ToString().Trim(),
                            isscan = IsScan,
                            cycle = Type,
                            Operator = User,
                            CreateDate = DateTime.Now.ToString()
                        }
                    });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    StuCode = "200";
                    message = "导入成功!";
                }
                else
                {
                    StuCode = "300";
                    message = "导入失败!";
                }
            }
            catch (Exception e)
            {
@@ -2623,14 +2710,82 @@
        }
        #endregion
        #region【Excel数据上传,设备保养】
        #region【Excel数据上传,设备保养项目】
        public static string ElevenSubmit(string FileCode, string User, out string StuCode)
        {
            string message = "";
            StuCode = "";
            string sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                DataTable excelTable = new DataTable();
                excelTable = ImportExcel.ExcelToTable(FileCode);
                //导入设备点检项目表
                for (int i = 0; i < excelTable.Rows.Count; i++)
                {
                    string Type = "", IsScan = "";
                    switch (excelTable.Rows[i][3].ToString().Trim())
                    {
                        case "å¹´":
                            Type = "Y";
                            break;
                        case "å­£":
                            Type = "S";
                            break;
                        case "月":
                            Type = "M";
                            break;
                        case "周":
                            Type = "W";
                            break;
                        case "日":
                            Type = "D";
                            break;
                        default:
                            break;
                    }
                    switch (excelTable.Rows[i][4].ToString().Trim())
                    {
                        case "是":
                            IsScan = "Y";
                            break;
                        case "否":
                            IsScan = "N";
                            break;
                        default:
                            break;
                    }
                    sql = @"insert into TEqpmai_Item(code,name,description,isscan,cycle,lm_user,lm_date)
                            values(@code,@name,@descr,@Operator,@CreateDate)";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            code = excelTable.Rows[i][1].ToString().Trim(),
                            name = excelTable.Rows[i][2].ToString().Trim(),
                            descr = excelTable.Rows[i][5].ToString().Trim(),
                            isscan = IsScan,
                            cycle = Type,
                            Operator = User,
                            CreateDate = DateTime.Now.ToString()
                        }
                    });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    StuCode = "200";
                    message = "导入成功!";
                }
                else
                {
                    StuCode = "300";
                    message = "导入失败!";
                }
            }
            catch (Exception e)
            {
VueWebApi/VueWebApi.csproj
@@ -435,6 +435,8 @@
    <Content Include="Excel\往来单位.xls" />
    <Content Include="grf\Rework.frx" />
    <Content Include="Excel\缺陷定义.xls" />
    <Content Include="Excel\设备点检项目.xls" />
    <Content Include="Excel\设备保养项目.xls" />
    <None Include="Scripts\jquery-3.4.1.intellisense.js" />
    <Content Include="Scripts\jquery-3.4.1.js" />
    <Content Include="Scripts\jquery-3.4.1.min.js" />
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ