VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -383,8 +383,8 @@
            var dynamicParams = new DynamicParameters();
            try
            {
                //获取当前扫码设备是否申请维修记录
                sql = @"select *  from TEqp_RepairRequest where eqp_code=@eqpcode and status='REPA' or status='COMP'";
                //获取当前扫码设备是否存在已申请或已维修状态数据
                sql = @"select *  from TEqp_RepairRequest where eqp_code=@eqpcode and status<>'CONFIR'";
                dynamicParams.Add("@eqpcode", eqpcode);
                var data0 = DapperHelper.selectdata(sql, dynamicParams);
                if (data0.Rows.Count > 0)
@@ -607,7 +607,7 @@
                        string imgPath1 = "", imgPath2 = "", AbsolutePath = "";
                        HttpPostedFile file = files[i];
                        string imgName = DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString();
                        string keyname = files.AllKeys[i].ToString();
                        string keyname = files.AllKeys[i].ToString().Substring(0, files.AllKeys[i].ToString().IndexOf(";"));
                        if (keyname == "files1")
                        {
                            imgPath1 = "/DeviceImage/image1/" + imgName + file.FileName;     //通过此对象获取文件名
@@ -618,7 +618,6 @@
                            imgPath2 = "/DeviceImage/image2/" + imgName + file.FileName;     //通过此对象获取文件名
                            AbsolutePath = System.Web.HttpContext.Current.Server.MapPath(imgPath2);
                        }
                        file.SaveAs(AbsolutePath); //将上传的东西保存
                                                   //循环写维修记录对应图片表
                        sql = @"insert into  TEqp_RepairImage(source_wo,wo_type,img1url,img2url) 
@@ -1086,7 +1085,7 @@
            try
            {
                //获取对应设备及所属车间的安灯呼叫记录
                sql = @"select A.eqp_code,B.name as eqp_name,T.org_name,A.type as typecode,D.name as typename
                sql = @"select A.eqp_code,B.name as eqp_name,T.org_code as wksp_code,T.org_name as wksp_name,A.type as typecode,D.name as typename
                        from TAnDon_Task_Info A
                        left join  TEqpInfo B on A.eqp_code=B.code
                        left join  TOrganization T on B.wksp_code=T.org_code
@@ -1128,7 +1127,7 @@
            try
            {
                list.Clear();
                for (int i = 1; i <= json.Count; i++)
                for (int i = 0; i <json.Count; i++)
                {
                    string code = json[i].code.ToString();
                    string name = json[i].name.ToString();