点检记录导出接口报错优化、不良明细查询接口优化 安灯系统PC端接口开发

yl

2022-09-22 59d429fd2caa1ecb879abfd21e9be17d42a39ee0

点检记录导出接口报错优化、不良明细查询接口优化
安灯系统PC端接口开发

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/Controllers/AppDeviceManageController.cs

@@ -113,6 +113,22 @@
        #endregion


        #region[设备维修,扫描工位/设备二维码]
        /// <summary>
        /// 设备维修,扫描工位/设备二维码
        /// </summary>
        /// <param name="eqpcode">设备编码</param>
        /// <returns></returns>
        [Route(template: "MaintainScanDeviceQrCodeData")]
        [HttpGet]
        public HttpResponseMessage MaintainScanDeviceQrCodeData(string eqpcode)
        {
            mes = AppDeviceManageBLL.MaintainScanDeviceQrCodeData(eqpcode);
            return TJson.toJson(mes);
        }
        #endregion


        #region[测试安灯呼叫]
        [Route(template: "AppDeviceAnDengCallSave")]
        [HttpPost]

 VueWebApi/Controllers/BasicSettingController.cs

@@ -2,6 +2,7 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Net;
@@ -642,5 +643,142 @@
            return TJson.toJson(mes);
        }
        #endregion


        #region[安灯系统/自定义安灯呼叫类型查询]
        /// <summary>
        /// 安灯系统/自定义安灯呼叫类型查询
        /// </summary>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "AnDengTypeSearch")]
        [HttpGet]
        public HttpResponseMessage AnDengTypeSearch(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 = BasicSettingBLL.AnDengTypeSearch(startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

        #region[安灯系统/自定义安灯呼叫类型新增]
        /// <summary>
        /// 安灯系统/自定义安灯呼叫类型新增
        /// </summary>
        /// <param name="json">提交数据对象</param>
        /// <returns></returns>
        [Route(template: "AddUpdateAnDengType")]
        [HttpPost]
        public HttpResponseMessage AddUpdateAnDengType(List<ObjectData> json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
            mes = BasicSettingBLL.AddUpdateAnDengType(json, username);
            return TJson.toJson(mes);
        }
        #endregion

        #region[安灯系统/自定义安灯呼叫类型删除]
        /// <summary>
        /// 安灯系统/自定义安灯呼叫类型删除
        /// </summary>
        /// <param name="andengtypecode">安灯呼叫类型编码</param>
        /// <returns></returns>
        [Route(template: "DeleteAnDengType")]
        [HttpPost]
        public HttpResponseMessage DeleteAnDengType(string andengtypecode)
        {
            mes = BasicSettingBLL.DeleteAnDengType(andengtypecode);
            return TJson.toJson(mes);
        }
        #endregion

        #region[安灯系统/查询绑定的响应人员]
        /// <summary>
        /// 安灯系统/查询绑定的响应人员
        /// </summary>
        /// <param name="wkshopcode">选中的车间编码</param>
        /// <param name="calltypecode">选中的呼叫类型编码</param>
        /// <returns></returns>
        [Route(template: "AnDengResponUserSearch")]
        [HttpGet]
        public HttpResponseMessage AnDengResponUserSearch(string wkshopcode,string calltypecode)
        {
            mes = BasicSettingBLL.AnDengResponUserSearch(wkshopcode, calltypecode);
            return TJson.toJson(mes);
        }
        #endregion

        #region[安灯系统/新增响应人员查询已绑定的响应人员]
        /// <summary>
        /// 安灯系统/新增响应人员查询已绑定的响应人员
        /// </summary>
        /// <param name="wkshopcode">选中的车间编码</param>
        /// <param name="calltypecode">选中的呼叫类型编码</param>
        /// <returns></returns>
        [Route(template: "AnDengDigoResponUserSearch")]
        [HttpGet]
        public HttpResponseMessage AnDengDialogResponUserSearch(string wkshopcode, string calltypecode)
        {
            mes = BasicSettingBLL.AnDengDialogResponUserSearch(wkshopcode, calltypecode);
            return TJson.toJson(mes);
        }
        #endregion

        #region[安灯系统/新增响应人员提交]
        /// <summary>
        /// 安灯系统/新增响应人员提交
        /// </summary>
        /// <param name="wkshopcode">选中的车间编码</param>
        /// <param name="calltypecode">选中的呼叫类型编码</param>
        /// <param name="enable">允许关闭</param>
        /// <param name="json">响应人员数据</param>
        /// <returns></returns>
        [Route(template: "AnDengDigoResponUserSeave")]
        [HttpPost]
        public HttpResponseMessage AnDengDigoResponUserSeave(string wkshopcode, string calltypecode,string enable,DataTable json)
        {
            var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
            mes = BasicSettingBLL.AnDengDigoResponUserSeave(wkshopcode, calltypecode, enable, usercode,json);
            return TJson.toJson(mes);
        }
        #endregion

        #region[安灯系统/响应人员允许关闭]
        /// <summary>
        /// 安灯系统/响应人员允许关闭
        /// </summary>
        /// <param name="wkshopcode">选中的车间编码</param>
        /// <param name="calltypecode">选中的呼叫类型编码</param>
        /// <param name="enable">允许关闭</param>
        /// <returns></returns>
        [Route(template: "AnDengResponUserCloseSeave")]
        [HttpPost]
        public HttpResponseMessage AnDengResponUserCloseSeave(string wkshopcode, string calltypecode, string enable)
        {
            var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
            mes = BasicSettingBLL.AnDengResponUserCloseSeave(wkshopcode, calltypecode, enable, usercode);
            return TJson.toJson(mes);
        }
        #endregion

        #region[安灯系统/响应人员删除]
        /// <summary>
        /// 安灯系统/响应人员删除
        /// </summary>
        /// <param name="id">子id</param>
        /// <param name="ando_cogfigid">主id</param>
        /// <returns></returns>
        [Route(template: "AnDengResponUserDeleteSeave")]
        [HttpPost]
        public HttpResponseMessage AnDengResponUserDeleteSeave(string id, string ando_cogfigid)
        {
            mes = BasicSettingBLL.AnDengResponUserDeleteSeave(id, ando_cogfigid);
            return TJson.toJson(mes);
        }
        #endregion
    }
}

 VueWebApi/DLL/BLL/AppDeviceManageBLL.cs

@@ -55,6 +55,18 @@
        #endregion



        #region[设备维修,扫描工位/设备二维码]
        public static ToMessage MaintainScanDeviceQrCodeData(string eqpcode)
        {
            return AppDeviceManageDAL.MaintainScanDeviceQrCodeData(eqpcode);
        }
        #endregion





        #region[测试安灯呼叫]
        public static ToMessage AppDeviceAnDengCallSave(string eqpcode)
        {

 VueWebApi/DLL/BLL/BasicSettingBLL.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web;
using VueWebApi.DLL.DAL;
@@ -226,5 +227,63 @@
            return BasicSettingDAL.DeleteCurrentUnit(unitcode);
        }
        #endregion



        #region[安灯系统/自定义安灯呼叫类型查询]
        public static ToMessage AnDengTypeSearch(int startNum, int endNum, string prop, string order)
        {
            return BasicSettingDAL.AnDengTypeSearch(startNum,endNum,prop,order);
        }
        #endregion

        #region[安灯系统/自定义安灯呼叫类型新增]
        public static ToMessage AddUpdateAnDengType(List<ObjectData> json, string username)
        {
            return BasicSettingDAL.AddUpdateAnDengType(json, username);
        }
        #endregion

        #region[安灯系统/自定义安灯呼叫类型删除]
        public static ToMessage DeleteAnDengType(string andengtypecode)
        {
            return BasicSettingDAL.DeleteAnDengType(andengtypecode);
        }
        #endregion

        #region[安灯系统/查询绑定的响应人员]
        public static ToMessage AnDengResponUserSearch(string wkshopcode, string calltypecode)
        {
            return BasicSettingDAL.AnDengResponUserSearch(wkshopcode,calltypecode);
        }
        #endregion

        #region[安灯系统/新增响应人员查询已绑定的响应人员]
        public static ToMessage AnDengDialogResponUserSearch(string wkshopcode, string calltypecode)
        {
            return BasicSettingDAL.AnDengDialogResponUserSearch(wkshopcode, calltypecode);
        }
        #endregion

        #region[安灯系统/新增响应人员提交]
        public static ToMessage AnDengDigoResponUserSeave(string wkshopcode, string calltypecode,string enable, string usercode, DataTable json)
        {
            return BasicSettingDAL.AnDengDigoResponUserSeave(wkshopcode, calltypecode, enable, usercode, json);
        }
        #endregion

        #region[安灯系统/响应人员允许关闭]
        public static ToMessage AnDengResponUserCloseSeave(string wkshopcode, string calltypecode, string enable, string usercode)
        {
            return BasicSettingDAL.AnDengResponUserCloseSeave(wkshopcode, calltypecode, enable, usercode);
        }
        #endregion

        #region[安灯系统/响应人员删除]
        public static ToMessage AnDengResponUserDeleteSeave(string id,string ando_cogfigid)
        {
            return BasicSettingDAL.AnDengResponUserDeleteSeave(id, ando_cogfigid);
        }
        #endregion
    }
}

 VueWebApi/DLL/DAL/AppDeviceManageDAL.cs

@@ -104,7 +104,7 @@
        public static ToMessage AppDeviceCheckSave(string username, AppDevicecCheck json)
        {
            var sql = "";
            string djwo = "";
            string djwo = "",numvalue="";
            List<object> list = new List<object>();
            try
            {
@@ -118,7 +118,7 @@
                {
                    List<string> wo = (List<string>)mes.data;
                    djwo = wo[0].ToString(); //获取单号
                    
                    numvalue= wo[1].ToString(); //获取流水号
                }
                if (json == null || json.children.Count <= 0)
                {
@@ -164,6 +164,9 @@
                        }
                    }); ;
                }
                //回写字典表,更新当前流水号
                sql = @"update T_CodeRules set value=@cunm2  where rightcode=@RightCode";
                list.Add(new { str = sql, parm = new { cunm2 = numvalue, RightCode = "1027" } });

                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
@@ -279,7 +282,7 @@
        public static ToMessage AppDeviceRepairSave(string username,string maintcyc, AppDevicecCheck json)
        {
            var sql = "";
            string djwo = "";
            string bywo = "", numvalue = "";
            List<object> list = new List<object>();
            try
            {
@@ -291,7 +294,9 @@
                }
                else
                {
                    djwo = mes.data.GetType().GetProperty("Encode").GetValue(mes.data, null).ToString(); //获取单号
                    List<string> wo = (List<string>)mes.data;
                    bywo = wo[0].ToString(); //获取单号
                    numvalue = wo[1].ToString(); //获取流水号
                }
                if (json == null || json.children.Count <= 0)
                {
@@ -304,13 +309,13 @@

                //写入保养记录主表
                sql = @"insert into TEqpmaint_Proc_Main(bywo,eqp_code,eqpmaint_code,maint_cyc,maint_result,maint_user,maint_date) 
                        values(@djwo,@eqp_code,@eqpmaint_code,@maintcyc,@maint_result,@lm_user,@lm_date)";
                        values(@bywo,@eqp_code,@eqpmaint_code,@maintcyc,@maint_result,@lm_user,@lm_date)";
                list.Add(new
                {
                    str = sql,
                    parm = new
                    {
                        djwo = djwo,
                        bywo = bywo,
                        eqp_code = json.code,
                        eqpmaint_code = json.standcode,
                        maintcyc= maintcyc,
@@ -323,14 +328,14 @@
                for (int i = 0; i < json.children.Count; i++)
                {
                    sql = @"insert into TEqpmaint_Proc_Deta(seq,bywo,eqpmaideta_code,result,maint_cyc,maint_value) 
                            values(@seq,@djwo,@eqpmaideta_code,@maint_cyc,@result,@maint_value)";
                            values(@seq,@bywo,@eqpmaideta_code,@maint_cyc,@result,@maint_value)";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            seq = json.children[i].seq,
                            djwo = djwo,
                            bywo = bywo,
                            eqpmaideta_code = json.children[i].itemcode,
                            maint_cyc = json.children[i].cycle,
                            result = json.children[i].result,
@@ -338,7 +343,9 @@
                        }
                    }); ;
                }

                //回写字典表,更新当前流水号
                sql = @"update T_CodeRules set value=@cunm2  where rightcode=@RightCode";
                list.Add(new { str = sql, parm = new { cunm2 = numvalue, RightCode = "1028" } });
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
@@ -368,6 +375,51 @@



        #region[设备维修,扫描工位/设备二维码]
        public static ToMessage MaintainScanDeviceQrCodeData(string eqpcode)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                //获取对应设备及所属车间
                sql = @"select A.code,A.name,T.org_code as wksp_code,T.org_name as wksp_name,E.eqpchkmain_code  
                        from TEqpInfo A
                        left join TOrganization T on A.wksp_code=T.org_code
                        left join TEqpchk_Eqp E on A.code=E.eqp_code
                        where A.code=@eqpcode and A.enable='Y' and T.description='W'";
                dynamicParams.Add("@eqpcode", eqpcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "200";
                    mes.Message = "查询成功!";
                    mes.data = data;
                }
                else
                {
                    mes.code = "300";
                    mes.Message = "当前设备/工位不存在或异常!";
                    mes.data = data;
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion







        #region[测试安灯呼叫]
        public static ToMessage AppDeviceAnDengCallSave(string eqpcode)
        {

 VueWebApi/DLL/DAL/BasicSettingDAL.cs

@@ -703,7 +703,11 @@
                        {
                            sql = @"insert into TUser(usercode,username,enable,password,mobile,email,lm_user,lm_date,wagetype,stu_torgcode)
                                    values(@usercode,@username,@enable,@password,@mobile,@email,@lm_user,@lm_date,@wagetype,@stu_torgcode)";
                            list.Add(new { str = sql, parm = new {
                            list.Add(new
                            {
                                str = sql,
                                parm = new
                                {
                                usercode = ds.Rows[i][1].ToString(),
                                username = ds.Rows[i][2].ToString(),
                                enable = ds.Rows[i][3].ToString(),
@@ -1393,7 +1397,8 @@
                {
                    list.Add(SeachEncode.RightLocation(rolecode, type));
                }
                else {
                else
                {
                    list.Add(SeachEncode.RightLocation(rolecode, type));
                }
                mes.code = "200";
@@ -1442,10 +1447,15 @@
                            for (int k = 0; k < json[i].children[j].children.Count; k++) //二级菜单
                            {
                                sql = @"insert into TRoleRightRelation(role_code,right_code,lm_user,lm_date) values(@role_code,@right_code,@lm_user,@lm_date)";
                                list.Add(new { str = sql, parm = new { 
                                list.Add(new
                                {
                                    str = sql,
                                    parm = new
                                    {
                                    role_code = rolecode, 
                                    right_code= json[i].children[j].children[k].code, 
                                    lm_user= usercode, lm_date= DateTime.Now.ToString() 
                                        lm_user = usercode,
                                        lm_date = DateTime.Now.ToString()
                                } 
                                });
                            }
@@ -1686,5 +1696,412 @@
            return mes;
        }
        #endregion


        #region[安灯系统/自定义安灯呼叫类型查询]
        public static ToMessage AnDengTypeSearch(int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            try
            {
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select id, code,name 
                            from TAnDonType 
                            where  is_delete<>'1' ";
                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 AddUpdateAnDengType(List<ObjectData> json, string username)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                //循环写入呼叫类型表
                for (int i = 0; i < json.Count; i++)
                {
                    sql = @"insert into TAnDonType(code,name,lm_user,lm_date) values(@code,@name,@username,@createdate)";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            code = json[i].code,
                            name = json[i].name,
                            username = username,
                            createdate = DateTime.Now.ToString()
                        }
                    });
                }
                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 DeleteAnDengType(string andengtypecode)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                //判断呼叫类型下是否关联
                sql = @"select *  from TAnDon_Roul_ConFig where andotype_code=@andengtypecode and is_delete<>'1'";
                dynamicParams.Add("@andengtypecode", andengtypecode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "当前呼叫类型已关联呼叫配置,不允许删除!";
                    mes.data = null;
                }
                else
                {
                    sql = @"delete TAnDonType where code=@andengtypecode";
                    list.Add(new { str = sql, parm = new { andengtypecode = andengtypecode } });
                    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 AnDengResponUserSearch(string wkshopcode, string calltypecode)
        {
            var sql = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                sql = @"select B.id,B.ando_cogfigid,U.usercode,U.username,A.enable  from TAnDon_Roul_ConFig A
                        inner join TAnDon_Roul_ConFigUser B on A.id=B.ando_cogfigid
                        left  join TUser U on B.usercode=U.usercode
                        where A.wkshp_code=@wkshopcode and A.andotype_code=@calltypecode";
                dynamicParams.Add("@wkshopcode", wkshopcode);
                dynamicParams.Add("@calltypecode", calltypecode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "查询成功!";
                    mes.data = data;
                }
                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 AnDengDialogResponUserSearch(string wkshopcode, string calltypecode)
        {
            var sql = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                sql = @"select B.user_code as code,U.username as name,(case when C.usercode is null then 'N' else 'Y' end) flag from TUserRoleRelation B 
                            left join(
                            select B.usercode from TAnDon_Roul_ConFig A
                            inner join TAnDon_Roul_ConFigUser B on A.id=B.ando_cogfigid
                            where A.wkshp_code=@wkshopcode and A.andotype_code=@calltypecode
                            )  C  on B.user_code=C.usercode
                            left  join TUser U on B.user_code=U.usercode";
                dynamicParams.Add("@wkshopcode", wkshopcode);
                dynamicParams.Add("@calltypecode", calltypecode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "查询成功!";
                    mes.data = data;
                }
                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 AnDengDigoResponUserSeave(string wkshopcode, string calltypecode, string enable, string usercode, DataTable json)
        {
            var sql = "";
            int mid = 0;
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                //判断呼叫类型下是否关联
                sql = @"select isnull(id,0) id  from TAnDon_Roul_ConFig where wkshp_code=@wkshopcode and  andotype_code=@calltypecode and is_delete<>'1'";
                dynamicParams.Add("@wkshopcode", wkshopcode);
                dynamicParams.Add("@calltypecode", calltypecode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mid = Convert.ToInt32(data.Rows[0]["ID"].ToString());
                if (json == null || json.Rows.Count <= 0)
                {
                    //清除安灯、设备任务配置表数据
                    sql = @"delete TAnDon_Roul_ConFig where id=@mid";
                    list.Add(new { str = sql, parm = new { mid = mid } });
                    //清除安灯、设备任务配置关联人员表数据
                    sql = @"delete TAnDon_Roul_ConFigUser  where ando_cogfigid=@mid";
                    list.Add(new { str = sql, parm = new { mid = mid } });
                }
                else
                {
                    //清除安灯、设备任务配置表数据
                    sql = @"delete TAnDon_Roul_ConFig where id=@mid";
                    list.Add(new { str = sql, parm = new { mid = mid } });
                    //清除安灯、设备任务配置关联人员表数据
                    sql = @"delete TAnDon_Roul_ConFigUser  where ando_cogfigid=@mid";
                    list.Add(new { str = sql, parm = new { mid = mid } });


                    //获取主表最大ID
                    sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_Record')+1,1) as id";
                    var dt = DapperHelper.selecttable(sql);

                    //写入安灯、设备任务配置表数据
                    sql = @"insert into TAnDon_Roul_ConFig(wkshp_code,andotype_code,lm_user,lm_date,enable) values(@wkshp_code,@andotype_code,@lm_user,@lm_date,@enable)";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            wkshp_code = wkshopcode,
                            andotype_code = calltypecode,
                            lm_user = usercode,
                            lm_date = DateTime.Now.ToString(),
                            enable = enable
                        }
                    });
                    //循环写入安灯、设备任务配置关联人员表
                    for (int i = 0; i < json.Rows.Count; i++)
                    {
                        sql = @"insert into TAnDon_Roul_ConFigUser(ando_cogfigid,user_code) values(@usercode,@role_code)";
                        list.Add(new { str = sql, parm = new { ando_cogfigid = mid, role_code = json.Rows[i]["CODE"].ToString() } });
                    }
                }
                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 AnDengResponUserCloseSeave(string wkshopcode, string calltypecode, string enable, string usercode)
        {
            var sql = "";
            List<object> list = new List<object>();
            try
            {
                list.Clear();
                //更新安灯、设备任务配置表状态
                sql = @"update TAnDon_Roul_ConFig set enable=@enable,lm_user=@lm_user,lm_date=@lm_date  where wkshp_code=@wkshp_code and andotype_code=@andengtypecode";
                list.Add(new
                {
                    str = sql,
                    parm = new
                    {
                        wkshp_code = wkshopcode,
                        andengtypecode=calltypecode,
                        lm_user=usercode,
                        lm_date = DateTime.Now.ToString(),
                        enable = enable
                    }
                });
                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 AnDengResponUserDeleteSeave(string id,string ando_cogfigid)
        {
            var sql = "";
            List<object> list = new List<object>();
            var dynamicParams = new DynamicParameters();
            try
            {
                list.Clear();
                //查询安灯、设备任务配置表
                sql = @"select id  from TAnDon_Roul_ConFigUser where ando_cogfigid=@ando_cogfigid";
                dynamicParams.Add("@ando_cogfigid", ando_cogfigid);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 1)
                {
                    //根据子表id删除对应子表人员
                    sql = @"delete TAnDon_Roul_ConFigUser   where id=@id";
                    list.Add(new { str = sql, parm = new { id = id } });
                }
                else 
                {
                    //根据子表id删除对应子表人员
                    sql = @"delete TAnDon_Roul_ConFigUser   where id=@id";
                    list.Add(new { str = sql, parm = new { id = id } });
                    //根据主表id删除主表数据
                    sql = @"delete TAnDon_Roul_ConFig   where id=@id";
                    list.Add(new { str = sql, parm = new { id = ando_cogfigid } });
                }
                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/DeviceManagerDAL.cs

@@ -2041,7 +2041,7 @@
                {
                    search = "and 1=1 ";
                }
                search = search.Substring(3);//截取索引2后面的字符
                //search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select 

 VueWebApi/DLL/DAL/KanBanManagerentDAL.cs

@@ -331,7 +331,7 @@
            try
            {
                //获取仓库生产加工单待入库列表
                sql = @"select * from h_v_DDKanBan_WareHouseTopLeft";
                sql = @"select * from h_v_DDKanBan_WareHouseTopLeft order by voucherdate";
                var data = DapperHelper.selecttable(sql);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -355,7 +355,7 @@
            try
            {
                //获取仓库生产加工单待入库列表
                sql = @"select * from h_v_DDKanBan_WareHouseTopBottom";
                sql = @"select * from h_v_DDKanBan_WareHouseTopBottom order by voucherdate";
                var data = DapperHelper.selecttable(sql);
                mes.code = "200";
                mes.Message = "查询成功!";

 VueWebApi/DLL/DAL/ReportManagerDAL.cs

@@ -628,12 +628,12 @@
                }
                if (defectcode != "" && defectcode != null)
                {
                    search += "and T.stepcode like '%'+@defectcode+'%' ";
                    search += "and F.code like '%'+@defectcode+'%' ";
                    dynamicParams.Add("@defectcode", defectcode);
                }
                if (defectname != "" && defectname != null)
                {
                    search += "and T.stepname like '%'+@defectname+'%' ";
                    search += "and F.name like '%'+@defectname+'%' ";
                    dynamicParams.Add("@defectname", defectname);
                }
                if (reportname != "" && reportname != null)
@@ -715,12 +715,12 @@
                }
                if (defectcode != "" && defectcode != null)
                {
                    search += "and T.stepcode like '%'+@defectcode+'%' ";
                    search += "and F.code like '%'+@defectcode+'%' ";
                    dynamicParams.Add("@defectcode", defectcode);
                }
                if (defectname != "" && defectname != null)
                {
                    search += "and T.stepname like '%'+@defectname+'%' ";
                    search += "and F.name like '%'+@defectname+'%' ";
                    dynamicParams.Add("@defectname", defectname);
                }
                if (reportname != "" && reportname != null)

 VueWebApi/Logs/2022-09-22.TXT

 VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\XKDMesApi</_PublishTargetUrl>
    <History>True|2022-09-16T06:31:58.5334673Z;True|2022-09-16T09:04:53.3449040+08:00;True|2022-09-15T15:15:18.3159768+08:00;True|2022-09-14T17:46:23.0171281+08:00;True|2022-09-14T17:43:44.4370239+08:00;True|2022-09-14T17:34:30.3167863+08:00;True|2022-09-14T17:33:00.5148855+08:00;True|2022-09-14T17:06:32.0879029+08:00;True|2022-09-14T16:50:12.7189783+08:00;True|2022-09-14T16:47:48.3868826+08:00;True|2022-09-14T16:42:35.3830356+08:00;True|2022-09-14T16:41:37.8545801+08:00;True|2022-09-14T16:36:47.0944090+08:00;True|2022-09-14T16:26:00.8638173+08:00;True|2022-09-14T16:13:43.6329252+08:00;True|2022-09-14T16:04:16.8093275+08:00;True|2022-09-14T16:02:54.4702614+08:00;True|2022-09-14T15:57:15.9623104+08:00;True|2022-09-14T15:54:23.8745601+08:00;True|2022-09-14T15:49:40.1730864+08:00;True|2022-09-14T15:42:08.2811334+08:00;True|2022-09-14T15:26:40.0417771+08:00;True|2022-09-14T15:24:30.2187269+08:00;True|2022-09-14T15:16:30.3856771+08:00;True|2022-09-14T15:09:22.4313367+08:00;True|2022-09-14T14:59:14.3795036+08:00;True|2022-09-14T14:53:26.8923244+08:00;True|2022-09-14T14:44:00.6688344+08:00;True|2022-09-14T14:41:53.3908108+08:00;True|2022-09-14T14:40:40.3787118+08:00;True|2022-09-14T14:28:39.2273279+08:00;True|2022-09-14T14:27:13.3566861+08:00;True|2022-09-14T14:25:25.4360688+08:00;True|2022-09-14T14:20:42.9734032+08:00;True|2022-09-14T13:51:39.1303401+08:00;True|2022-09-14T13:25:34.8906041+08:00;True|2022-09-14T13:19:28.9172079+08:00;True|2022-09-14T13:18:09.5900815+08:00;True|2022-09-14T10:58:58.0910068+08:00;True|2022-09-14T10:57:11.4834444+08:00;True|2022-09-14T10:45:39.8943674+08:00;True|2022-09-14T10:38:15.2282286+08:00;True|2022-09-14T10:36:54.8259640+08:00;True|2022-09-14T10:14:12.1218790+08:00;True|2022-09-14T10:13:20.0625618+08:00;True|2022-09-14T10:10:15.3538379+08:00;True|2022-09-14T10:07:09.4796434+08:00;True|2022-09-14T10:06:02.0382235+08:00;True|2022-09-14T09:57:12.0082796+08:00;True|2022-09-14T09:52:29.4689029+08:00;True|2022-09-14T09:47:26.7205193+08:00;True|2022-09-14T09:38:56.4089520+08:00;True|2022-09-14T09:32:34.9863473+08:00;True|2022-09-12T13:07:40.5119225+08:00;True|2022-09-09T15:21:48.4251654+08:00;True|2022-09-09T14:45:54.9315147+08:00;True|2022-09-09T11:01:18.2619729+08:00;True|2022-09-09T09:35:40.9779148+08:00;True|2022-09-09T09:26:51.9854326+08:00;True|2022-09-09T09:11:48.8023373+08:00;True|2022-09-09T09:05:45.5528883+08:00;True|2022-09-08T17:47:35.2628987+08:00;True|2022-09-08T17:43:32.6700813+08:00;True|2022-09-08T17:01:23.6259930+08:00;True|2022-09-08T16:55:57.2305777+08:00;True|2022-09-08T16:35:37.3631720+08:00;True|2022-09-08T16:19:13.9122228+08:00;True|2022-09-08T16:04:07.7348285+08:00;True|2022-09-08T16:00:49.9961701+08:00;True|2022-09-08T15:16:03.0110619+08:00;True|2022-09-08T10:19:46.2872822+08:00;True|2022-09-08T10:11:15.5386438+08:00;True|2022-09-08T08:19:02.5242539+08:00;True|2022-09-08T08:18:11.7308721+08:00;True|2022-09-07T11:39:27.2463573+08:00;True|2022-09-07T10:40:57.8877369+08:00;True|2022-09-07T10:37:10.1517098+08:00;True|2022-09-07T10:30:08.7782107+08:00;True|2022-09-07T10:23:52.8534200+08:00;True|2022-09-07T10:09:31.6994230+08:00;True|2022-09-07T10:01:16.2683112+08:00;True|2022-09-07T09:51:47.6282546+08:00;True|2022-09-06T19:11:45.1701913+08:00;True|2022-09-06T18:29:29.2671862+08:00;True|2022-09-06T16:41:04.2719822+08:00;True|2022-09-06T14:17:31.6896132+08:00;True|2022-09-06T13:14:39.9657702+08:00;True|2022-09-05T13:34:47.0627238+08:00;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
    <History>True|2022-09-22T09:31:41.3605592Z;True|2022-09-22T17:25:44.2386416+08:00;True|2022-09-22T09:47:22.9767826+08:00;True|2022-09-16T14:31:58.5334673+08:00;True|2022-09-16T09:04:53.3449040+08:00;True|2022-09-15T15:15:18.3159768+08:00;True|2022-09-14T17:46:23.0171281+08:00;True|2022-09-14T17:43:44.4370239+08:00;True|2022-09-14T17:34:30.3167863+08:00;True|2022-09-14T17:33:00.5148855+08:00;True|2022-09-14T17:06:32.0879029+08:00;True|2022-09-14T16:50:12.7189783+08:00;True|2022-09-14T16:47:48.3868826+08:00;True|2022-09-14T16:42:35.3830356+08:00;True|2022-09-14T16:41:37.8545801+08:00;True|2022-09-14T16:36:47.0944090+08:00;True|2022-09-14T16:26:00.8638173+08:00;True|2022-09-14T16:13:43.6329252+08:00;True|2022-09-14T16:04:16.8093275+08:00;True|2022-09-14T16:02:54.4702614+08:00;True|2022-09-14T15:57:15.9623104+08:00;True|2022-09-14T15:54:23.8745601+08:00;True|2022-09-14T15:49:40.1730864+08:00;True|2022-09-14T15:42:08.2811334+08:00;True|2022-09-14T15:26:40.0417771+08:00;True|2022-09-14T15:24:30.2187269+08:00;True|2022-09-14T15:16:30.3856771+08:00;True|2022-09-14T15:09:22.4313367+08:00;True|2022-09-14T14:59:14.3795036+08:00;True|2022-09-14T14:53:26.8923244+08:00;True|2022-09-14T14:44:00.6688344+08:00;True|2022-09-14T14:41:53.3908108+08:00;True|2022-09-14T14:40:40.3787118+08:00;True|2022-09-14T14:28:39.2273279+08:00;True|2022-09-14T14:27:13.3566861+08:00;True|2022-09-14T14:25:25.4360688+08:00;True|2022-09-14T14:20:42.9734032+08:00;True|2022-09-14T13:51:39.1303401+08:00;True|2022-09-14T13:25:34.8906041+08:00;True|2022-09-14T13:19:28.9172079+08:00;True|2022-09-14T13:18:09.5900815+08:00;True|2022-09-14T10:58:58.0910068+08:00;True|2022-09-14T10:57:11.4834444+08:00;True|2022-09-14T10:45:39.8943674+08:00;True|2022-09-14T10:38:15.2282286+08:00;True|2022-09-14T10:36:54.8259640+08:00;True|2022-09-14T10:14:12.1218790+08:00;True|2022-09-14T10:13:20.0625618+08:00;True|2022-09-14T10:10:15.3538379+08:00;True|2022-09-14T10:07:09.4796434+08:00;True|2022-09-14T10:06:02.0382235+08:00;True|2022-09-14T09:57:12.0082796+08:00;True|2022-09-14T09:52:29.4689029+08:00;True|2022-09-14T09:47:26.7205193+08:00;True|2022-09-14T09:38:56.4089520+08:00;True|2022-09-14T09:32:34.9863473+08:00;True|2022-09-12T13:07:40.5119225+08:00;True|2022-09-09T15:21:48.4251654+08:00;True|2022-09-09T14:45:54.9315147+08:00;True|2022-09-09T11:01:18.2619729+08:00;True|2022-09-09T09:35:40.9779148+08:00;True|2022-09-09T09:26:51.9854326+08:00;True|2022-09-09T09:11:48.8023373+08:00;True|2022-09-09T09:05:45.5528883+08:00;True|2022-09-08T17:47:35.2628987+08:00;True|2022-09-08T17:43:32.6700813+08:00;True|2022-09-08T17:01:23.6259930+08:00;True|2022-09-08T16:55:57.2305777+08:00;True|2022-09-08T16:35:37.3631720+08:00;True|2022-09-08T16:19:13.9122228+08:00;True|2022-09-08T16:04:07.7348285+08:00;True|2022-09-08T16:00:49.9961701+08:00;True|2022-09-08T15:16:03.0110619+08:00;True|2022-09-08T10:19:46.2872822+08:00;True|2022-09-08T10:11:15.5386438+08:00;True|2022-09-08T08:19:02.5242539+08:00;True|2022-09-08T08:18:11.7308721+08:00;True|2022-09-07T11:39:27.2463573+08:00;True|2022-09-07T10:40:57.8877369+08:00;True|2022-09-07T10:37:10.1517098+08:00;True|2022-09-07T10:30:08.7782107+08:00;True|2022-09-07T10:23:52.8534200+08:00;True|2022-09-07T10:09:31.6994230+08:00;True|2022-09-07T10:01:16.2683112+08:00;True|2022-09-07T09:51:47.6282546+08:00;True|2022-09-06T19:11:45.1701913+08:00;True|2022-09-06T18:29:29.2671862+08:00;True|2022-09-06T16:41:04.2719822+08:00;True|2022-09-06T14:17:31.6896132+08:00;True|2022-09-06T13:14:39.9657702+08:00;True|2022-09-05T13:34:47.0627238+08:00;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="Areas/HelpPage/HelpPage.css">
@@ -720,16 +720,16 @@
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>09/16/2022 14:31:51</publishTime>
      <publishTime>09/22/2022 17:31:35</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll.config">
      <publishTime>06/15/2022 15:31:43</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>09/16/2022 14:31:51</publishTime>
      <publishTime>09/22/2022 17:31:35</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>09/16/2022 14:31:51</publishTime>
      <publishTime>09/22/2022 17:31:35</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>
@@ -1521,7 +1521,7 @@
      <publishTime>06/10/2022 08:20:24</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>09/16/2022 14:31:57</publishTime>
      <publishTime>09/22/2022 17:31:40</publishTime>
    </File>
  </ItemGroup>
</Project>

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/bin/VueWebApi.xml

@@ -741,6 +741,13 @@
            <param name="json">提交数据</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.AppDeviceManageController.MaintainScanDeviceQrCodeData(System.String)">
            <summary>
            设备维修,扫描工位/设备二维码
            </summary>
            <param name="eqpcode">设备编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.OrganizationSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            组织架构查询
@@ -996,6 +1003,73 @@
            <param name="unitcode">往来单位编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengTypeSearch(System.Int32,System.Int32,System.String,System.String)">
            <summary>
            安灯系统/自定义安灯呼叫类型查询
            </summary>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AddUpdateAnDengType(System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
            <summary>
            安灯系统/自定义安灯呼叫类型新增
            </summary>
            <param name="json">提交数据对象</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.DeleteAnDengType(System.String)">
            <summary>
            安灯系统/自定义安灯呼叫类型删除
            </summary>
            <param name="andengtypecode">安灯呼叫类型编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengResponUserSearch(System.String,System.String)">
            <summary>
            安灯系统/查询绑定的响应人员
            </summary>
            <param name="wkshopcode">选中的车间编码</param>
            <param name="calltypecode">选中的呼叫类型编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengDialogResponUserSearch(System.String,System.String)">
            <summary>
            安灯系统/新增响应人员查询已绑定的响应人员
            </summary>
            <param name="wkshopcode">选中的车间编码</param>
            <param name="calltypecode">选中的呼叫类型编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengDigoResponUserSeave(System.String,System.String,System.String,System.Data.DataTable)">
            <summary>
            安灯系统/新增响应人员提交
            </summary>
            <param name="wkshopcode">选中的车间编码</param>
            <param name="calltypecode">选中的呼叫类型编码</param>
            <param name="enable">允许关闭</param>
            <param name="json">响应人员数据</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengResponUserCloseSeave(System.String,System.String,System.String)">
            <summary>
            安灯系统/响应人员允许关闭
            </summary>
            <param name="wkshopcode">选中的车间编码</param>
            <param name="calltypecode">选中的呼叫类型编码</param>
            <param name="enable">允许关闭</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengResponUserDeleteSeave(System.String,System.String)">
            <summary>
            安灯系统/响应人员删除
            </summary>
            <param name="id">子id</param>
            <param name="ando_cogfigid">主id</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceTypeSearch(System.Int32,System.Int32,System.String,System.String)">
            <summary>
            设备类型查询

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml

@@ -741,6 +741,13 @@
            <param name="json">提交数据</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.AppDeviceManageController.MaintainScanDeviceQrCodeData(System.String)">
            <summary>
            设备维修,扫描工位/设备二维码
            </summary>
            <param name="eqpcode">设备编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.OrganizationSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            组织架构查询
@@ -996,6 +1003,73 @@
            <param name="unitcode">往来单位编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengTypeSearch(System.Int32,System.Int32,System.String,System.String)">
            <summary>
            安灯系统/自定义安灯呼叫类型查询
            </summary>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AddUpdateAnDengType(System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
            <summary>
            安灯系统/自定义安灯呼叫类型新增
            </summary>
            <param name="json">提交数据对象</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.DeleteAnDengType(System.String)">
            <summary>
            安灯系统/自定义安灯呼叫类型删除
            </summary>
            <param name="andengtypecode">安灯呼叫类型编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengResponUserSearch(System.String,System.String)">
            <summary>
            安灯系统/查询绑定的响应人员
            </summary>
            <param name="wkshopcode">选中的车间编码</param>
            <param name="calltypecode">选中的呼叫类型编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengDialogResponUserSearch(System.String,System.String)">
            <summary>
            安灯系统/新增响应人员查询已绑定的响应人员
            </summary>
            <param name="wkshopcode">选中的车间编码</param>
            <param name="calltypecode">选中的呼叫类型编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengDigoResponUserSeave(System.String,System.String,System.String,System.Data.DataTable)">
            <summary>
            安灯系统/新增响应人员提交
            </summary>
            <param name="wkshopcode">选中的车间编码</param>
            <param name="calltypecode">选中的呼叫类型编码</param>
            <param name="enable">允许关闭</param>
            <param name="json">响应人员数据</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengResponUserCloseSeave(System.String,System.String,System.String)">
            <summary>
            安灯系统/响应人员允许关闭
            </summary>
            <param name="wkshopcode">选中的车间编码</param>
            <param name="calltypecode">选中的呼叫类型编码</param>
            <param name="enable">允许关闭</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.AnDengResponUserDeleteSeave(System.String,System.String)">
            <summary>
            安灯系统/响应人员删除
            </summary>
            <param name="id">子id</param>
            <param name="ando_cogfigid">主id</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceTypeSearch(System.Int32,System.Int32,System.String,System.String)">
            <summary>
            设备类型查询

 VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache

Binary files differ

 VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt

@@ -281,7 +281,6 @@
D:\新凯迪MES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\新凯迪MES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\新凯迪MES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
D:\新凯迪MES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\新凯迪MES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\新凯迪MES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\新凯迪MES\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ