diff --git a/DataBase/hjglDB_7_2024.06.13（本机）.rar b/DataBase/hjglDB_7_2024.06.13（本机）.rar deleted file mode 100644 index b5220eb..0000000 Binary files a/DataBase/hjglDB_7_2024.06.13（本机）.rar and /dev/null differ diff --git a/DataBase/hjglDB_7_2024.06.14-02.rar b/DataBase/hjglDB_7_2024.06.14-02.rar deleted file mode 100644 index caeca8f..0000000 Binary files a/DataBase/hjglDB_7_2024.06.14-02.rar and /dev/null differ diff --git a/DataBase/hjglDB_7_2024.06.17.rar b/DataBase/hjglDB_7_2024.06.17.rar deleted file mode 100644 index a263460..0000000 Binary files a/DataBase/hjglDB_7_2024.06.17.rar and /dev/null differ diff --git a/DataBase/hjglDB_7_2024.06.25.rar b/DataBase/hjglDB_7_2024.06.27.rar similarity index 77% rename from DataBase/hjglDB_7_2024.06.25.rar rename to DataBase/hjglDB_7_2024.06.27.rar index b389741..909cb8f 100644 Binary files a/DataBase/hjglDB_7_2024.06.25.rar and b/DataBase/hjglDB_7_2024.06.27.rar differ diff --git a/DataBase/hjglDB_7_2024.06.20.rar b/DataBase/hjglDB_7_2024.06.28.rar similarity index 75% rename from DataBase/hjglDB_7_2024.06.20.rar rename to DataBase/hjglDB_7_2024.06.28.rar index e85ccd6..c803e75 100644 Binary files a/DataBase/hjglDB_7_2024.06.20.rar and b/DataBase/hjglDB_7_2024.06.28.rar differ diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index ca7fba3..aca6da5 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs index 679d7f4..4d82384 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using Model; using System; using System.Collections.Generic; using System.Data; @@ -30,8 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage (CASE WHEN IsWelderFirst=1 THEN '是' ELSE '否' END) AS IsWelderFirst, JLAudit,GLGSAudit,QTAudit,IsPointAudit FROM dbo.View_Batch_PointBatchItem - WHERE PointState IS NOT NULL AND TrustBatchItemId IS NULL - AND PointDate>'2024-06-24 23:59:59'"; + WHERE PointState IS NOT NULL AND TrustBatchItemId IS NULL"; List listStr = new List(); if (!string.IsNullOrEmpty(this.txtPipeCode.Text)) { @@ -75,11 +75,9 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage } SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - - Grid1.RecordCount = tb.Rows.Count; - // tb = GetFilteredTable(Grid1.FilteredData, tb); - var table = this.GetPagedDataTable(Grid1, tb); + DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = dt.Rows.Count; + var table = this.GetPagedDataTable(Grid1, dt); Grid1.DataSource = table; Grid1.DataBind(); } @@ -216,127 +214,136 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage { if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_PointManageMenuId, Const.BtnHandGenerate)) { - List selectRow = new List(); - - foreach (string pitem in Grid1.SelectedRowIDArray) + bool isAudit = true; + string[] selectedRowIDArray = Grid1.SelectedRowIDArray; + foreach (string rowId in selectedRowIDArray) { - selectRow.Add(pitem); + var q =from x in Funs.DB.Batch_PointBatchItem where x.PointBatchItemId== rowId && (x.JLAudit==null || x.GLGSAudit==null) select x; + if (q.Count() > 0) + { + isAudit=false; + break; + } } - - if (selectRow.Count() > 0) + if (!isAudit) { - List weldMot = new List(); - List grooveType = new List(); - List IsFist = new List(); - List pointBatchIds = new List(); - string error = string.Empty; + Alert.ShowInTop("有未审核的焊口！", MessageBoxIcon.Warning); + return; + } - foreach (string pointItemId in selectRow) + string PointBatchItemList = string.Join(",", selectedRowIDArray); + if (selectedRowIDArray.Length > 0) + { + string strSql = @"SELECT pItem.PointBatchId,jot.WeldingMethodId,jot.GrooveTypeId, + (CASE WHEN pItem.IsWelderFirst=1 THEN 1 ELSE 0 END) AS IsWelderFirst + FROM Batch_PointBatchItem AS pItem + LEFT JOIN Pipeline_WeldJoint AS jot ON jot.WeldJointId=pItem.WeldJointId + WHERE CHARINDEX(PointBatchItemId,@PointBatchItemList)>0 + GROUP BY pItem.PointBatchId, jot.WeldingMethodId,jot.GrooveTypeId, + (CASE WHEN pItem.IsWelderFirst=1 THEN 1 ELSE 0 END)"; + + List listStr = new List(); + listStr.Add(new SqlParameter("@PointBatchItemList", PointBatchItemList)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter); + if (dt.Rows.Count > 0) { - var pointItem = BLL.Batch_PointBatchItemService.GetPointBatchItemByPointBatchItemId(pointItemId); - var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(pointItem.WeldJointId); - weldMot.Add(jot.WeldingMethodId); - grooveType.Add(jot.GrooveTypeId); - IsFist.Add(pointItem.IsWelderFirst == true ? true : false); - pointBatchIds.Add(pointItem.PointBatchId); - } - - if (pointBatchIds.Distinct().Count() > 1) - { - error = "勾选的焊口不在一个批次中，"; - } - if (weldMot.Distinct().Count() > 1) - { - error = "勾选的焊口焊接方法不一至，"; - } - if (grooveType.Distinct().Count() > 1) - { - error = error + "勾选的焊口坡口类型不一至，"; - } - if (IsFist.Distinct().Count() > 1) - { - error = error + "勾选的焊口是否首三不一至，"; - } - - if (error == string.Empty) - { - var point = BLL.Batch_PointBatchService.GetPointBatchById(pointBatchIds[0]); - var iso = BLL.Pipeline_PipelineService.GetPipelineByPipelineId(point.PipelineId); - var project = BLL.Base_ProjectService.GetProjectByProjectId(point.ProjectId); - var unit = BLL.Base_UnitService.GetUnit(point.UnitId); - var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(point.DetectionTypeId); - var work = BLL.Project_WorkAreaService.GetProject_WorkAreaByWorkAreaId(iso.WorkAreaId); - - Model.Batch_BatchTrust newBatchTrust = new Model.Batch_BatchTrust(); - string perfix = string.Empty; - //perfix = unit.UnitCode + "-" + ins.InstallationCode + "-GD-" + ndt.DetectionTypeCode + "-"; - perfix = ndt.DetectionTypeCode + "-" + unit.UnitCode + "-" + work.WorkAreaCode + "-PI" + "-"; - newBatchTrust.TrustBatchCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode", "dbo.Batch_BatchTrust", "TrustBatchCode", project.ProjectId, perfix); - - string trustBatchId = SQLHelper.GetNewID(typeof(Model.Batch_BatchTrust)); - newBatchTrust.TrustBatchId = trustBatchId; - - newBatchTrust.TrustDate = DateTime.Now; - newBatchTrust.ProjectId = point.ProjectId; - newBatchTrust.UnitId = point.UnitId; - newBatchTrust.InstallationId = point.InstallationId; - newBatchTrust.WorkAreaId = iso.WorkAreaId; - newBatchTrust.WeldingMethodId = weldMot[0]; - newBatchTrust.GrooveTypeId = grooveType[0]; - newBatchTrust.IsWelderFirst = IsFist[0]; - newBatchTrust.DetectionTypeId = point.DetectionTypeId; - newBatchTrust.PipelineId = point.PipelineId; - - BLL.Batch_BatchTrustService.AddBatchTrust(newBatchTrust); // 新增委托单 - - // 生成委托明细，并回写点口明细信息 - string toPointBatch = string.Empty; - foreach (string pointItemId in selectRow) + foreach (DataRow r in dt.Rows) { - var pointItem = BLL.Batch_PointBatchItemService.GetPointBatchItemByPointBatchItemId(pointItemId); - if (BLL.Batch_PointBatchService.GetIsGenerateTrust(pointItem.PointBatchItemId)) ////生成委托单的条件判断 + var point = BLL.Batch_PointBatchService.GetPointBatchById(r["PointBatchId"].ToString()); + var iso = BLL.Pipeline_PipelineService.GetPipelineByPipelineId(point.PipelineId); + var project = BLL.Base_ProjectService.GetProjectByProjectId(point.ProjectId); + var unit = BLL.Base_UnitService.GetUnit(point.UnitId); + var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(point.DetectionTypeId); + var work = BLL.Project_WorkAreaService.GetProject_WorkAreaByWorkAreaId(iso.WorkAreaId); + + Model.Batch_BatchTrust newBatchTrust = new Model.Batch_BatchTrust(); + string perfix = string.Empty; + perfix = ndt.DetectionTypeCode + "-" + unit.UnitCode + "-" + work.WorkAreaCode + "-PI" + "-"; + newBatchTrust.TrustBatchCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode", "dbo.Batch_BatchTrust", "TrustBatchCode", project.ProjectId, perfix); + + string trustBatchId = SQLHelper.GetNewID(typeof(Model.Batch_BatchTrust)); + newBatchTrust.TrustBatchId = trustBatchId; + + newBatchTrust.TrustDate = DateTime.Now; + newBatchTrust.ProjectId = point.ProjectId; + newBatchTrust.UnitId = point.UnitId; + newBatchTrust.InstallationId = point.InstallationId; + newBatchTrust.WorkAreaId = iso.WorkAreaId; + newBatchTrust.WeldingMethodId = r["WeldingMethodId"].ToString(); + newBatchTrust.GrooveTypeId = r["GrooveTypeId"].ToString(); + newBatchTrust.IsWelderFirst = Convert.ToBoolean(r["IsWelderFirst"]); + newBatchTrust.DetectionTypeId = point.DetectionTypeId; + newBatchTrust.PipelineId = point.PipelineId; + + BLL.Batch_BatchTrustService.AddBatchTrust(newBatchTrust); // 新增委托单 + + // 生成委托明细，并回写点口明细信息 + + + string itemSql = @"SELECT pItem.PointBatchItemId,pItem.PointBatchId,jot.WeldingMethodId, + jot.GrooveTypeId,(CASE WHEN pItem.IsWelderFirst=1 THEN 1 ELSE 0 END) AS IsWelderFirst + FROM Batch_PointBatchItem AS pItem + LEFT JOIN Pipeline_WeldJoint AS jot ON jot.WeldJointId=pItem.WeldJointId + WHERE CHARINDEX(PointBatchItemId,@PointBatchItemList)>0 + AND PointBatchId=@PointBatchId AND jot.WeldingMethodId=@WeldingMethodId + AND jot.GrooveTypeId=@GrooveTypeId + AND (CASE WHEN pItem.IsWelderFirst=1 THEN '1' ELSE '0' END)=@IsWelderFirst"; + + List param = new List(); + param.Add(new SqlParameter("@PointBatchItemList", PointBatchItemList)); + param.Add(new SqlParameter("@PointBatchId", r["PointBatchId"].ToString())); + param.Add(new SqlParameter("@WeldingMethodId", newBatchTrust.WeldingMethodId)); + param.Add(new SqlParameter("@GrooveTypeId", newBatchTrust.GrooveTypeId)); + param.Add(new SqlParameter("@IsWelderFirst", r["IsWelderFirst"].ToString())); + SqlParameter[] paramList = param.ToArray(); + DataTable dtItem = SQLHelper.GetDataTableRunText(itemSql, paramList); + + string toPointBatch = string.Empty; + foreach (DataRow item in dtItem.Rows) { - if (!toPointBatch.Contains(pointItem.PointBatchId)) + //str pointItemId = ""; + var pointItem = BLL.Batch_PointBatchItemService.GetPointBatchItemByPointBatchItemId(item["PointBatchItemId"].ToString()); + if (BLL.Batch_PointBatchService.GetIsGenerateTrust(pointItem.PointBatchItemId)) // 生成委托单的条件判断 { - toPointBatch = toPointBatch + pointItem.PointBatchId + ","; + if (!toPointBatch.Contains(pointItem.PointBatchId)) + { + toPointBatch = toPointBatch + pointItem.PointBatchId + ","; + } + + Model.Batch_BatchTrustItem trustItem = new Model.Batch_BatchTrustItem + { + TrustBatchItemId = SQLHelper.GetNewID(typeof(Model.Batch_BatchTrustItem)), + TrustBatchId = trustBatchId, + PointBatchItemId = pointItem.PointBatchItemId, + WeldJointId = pointItem.WeldJointId, + //FilmNum = fileNum, + CreateDate = DateTime.Now + }; + Batch_BatchTrustItemService.AddBatchTrustItem(trustItem); } - Model.Batch_BatchTrustItem trustItem = new Model.Batch_BatchTrustItem - { - TrustBatchItemId = SQLHelper.GetNewID(typeof(Model.Batch_BatchTrustItem)), - TrustBatchId = trustBatchId, - PointBatchItemId = pointItem.PointBatchItemId, - WeldJointId = pointItem.WeldJointId, - //FilmNum = fileNum, - CreateDate = DateTime.Now - }; - Batch_BatchTrustItemService.AddBatchTrustItem(trustItem); + //Model.Batch_PointBatchItem pointBatchItem = Funs.DB.Batch_PointBatchItem.FirstOrDefault(e => e.PointBatchItemId == item.PointBatchItemId); + + pointItem.IsBuildTrust = true; + Funs.DB.SubmitChanges(); } - //Model.Batch_PointBatchItem pointBatchItem = Funs.DB.Batch_PointBatchItem.FirstOrDefault(e => e.PointBatchItemId == item.PointBatchItemId); - - pointItem.IsBuildTrust = true; - Funs.DB.SubmitChanges(); - } - - // 回写委托批对应点口信息 - if (!string.IsNullOrEmpty(toPointBatch)) - { - toPointBatch = toPointBatch.Substring(0, toPointBatch.Length - 1); - var updateTrut = BLL.Batch_BatchTrustService.GetBatchTrustById(trustBatchId); - if (updateTrut != null) + // 回写委托批对应点口信息 + if (!string.IsNullOrEmpty(toPointBatch)) { - updateTrut.TopointBatch = toPointBatch; - BLL.Batch_BatchTrustService.UpdateBatchTrust(updateTrut); + toPointBatch = toPointBatch.Substring(0, toPointBatch.Length - 1); + var updateTrut = BLL.Batch_BatchTrustService.GetBatchTrustById(trustBatchId); + if (updateTrut != null) + { + updateTrut.TopointBatch = toPointBatch; + BLL.Batch_BatchTrustService.UpdateBatchTrust(updateTrut); + } } } - + BindGrid(); Alert.ShowInTop("委托单已生成！", MessageBoxIcon.Success); } - else - { - Alert.ShowInTop(error + "不能组成一个委托单！", MessageBoxIcon.Warning); - } } else { @@ -348,6 +355,141 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); return; } + + #region 不用了改为自动分组 + // List selectRow = new List(); + + // foreach (string pitem in Grid1.SelectedRowIDArray) + // { + // selectRow.Add(pitem); + // } + + // if (selectRow.Count() > 0) + // { + // List weldMot = new List(); + // List grooveType = new List(); + // List IsFist = new List(); + // List pointBatchIds = new List(); + // string error = string.Empty; + + // foreach (string pointItemId in selectRow) + // { + // var pointItem = BLL.Batch_PointBatchItemService.GetPointBatchItemByPointBatchItemId(pointItemId); + // var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(pointItem.WeldJointId); + // weldMot.Add(jot.WeldingMethodId); + // grooveType.Add(jot.GrooveTypeId); + // IsFist.Add(pointItem.IsWelderFirst == true ? true : false); + // pointBatchIds.Add(pointItem.PointBatchId); + // } + + // if (pointBatchIds.Distinct().Count() > 1) + // { + // error = "勾选的焊口不在一个批次中，"; + // } + // if (weldMot.Distinct().Count() > 1) + // { + // error = "勾选的焊口焊接方法不一至，"; + // } + // if (grooveType.Distinct().Count() > 1) + // { + // error = error + "勾选的焊口坡口类型不一至，"; + // } + // if (IsFist.Distinct().Count() > 1) + // { + // error = error + "勾选的焊口是否首三不一至，"; + // } + + // if (error == string.Empty) + // { + // var point = BLL.Batch_PointBatchService.GetPointBatchById(pointBatchIds[0]); + // var iso = BLL.Pipeline_PipelineService.GetPipelineByPipelineId(point.PipelineId); + // var project = BLL.Base_ProjectService.GetProjectByProjectId(point.ProjectId); + // var unit = BLL.Base_UnitService.GetUnit(point.UnitId); + // var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(point.DetectionTypeId); + // var work = BLL.Project_WorkAreaService.GetProject_WorkAreaByWorkAreaId(iso.WorkAreaId); + + // Model.Batch_BatchTrust newBatchTrust = new Model.Batch_BatchTrust(); + // string perfix = string.Empty; + // //perfix = unit.UnitCode + "-" + ins.InstallationCode + "-GD-" + ndt.DetectionTypeCode + "-"; + // perfix = ndt.DetectionTypeCode + "-" + unit.UnitCode + "-" + work.WorkAreaCode + "-PI" + "-"; + // newBatchTrust.TrustBatchCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode", "dbo.Batch_BatchTrust", "TrustBatchCode", project.ProjectId, perfix); + + // string trustBatchId = SQLHelper.GetNewID(typeof(Model.Batch_BatchTrust)); + // newBatchTrust.TrustBatchId = trustBatchId; + + // newBatchTrust.TrustDate = DateTime.Now; + // newBatchTrust.ProjectId = point.ProjectId; + // newBatchTrust.UnitId = point.UnitId; + // newBatchTrust.InstallationId = point.InstallationId; + // newBatchTrust.WorkAreaId = iso.WorkAreaId; + // newBatchTrust.WeldingMethodId = weldMot[0]; + // newBatchTrust.GrooveTypeId = grooveType[0]; + // newBatchTrust.IsWelderFirst = IsFist[0]; + // newBatchTrust.DetectionTypeId = point.DetectionTypeId; + // newBatchTrust.PipelineId = point.PipelineId; + + // BLL.Batch_BatchTrustService.AddBatchTrust(newBatchTrust); // 新增委托单 + + // // 生成委托明细，并回写点口明细信息 + // string toPointBatch = string.Empty; + // foreach (string pointItemId in selectRow) + // { + // var pointItem = BLL.Batch_PointBatchItemService.GetPointBatchItemByPointBatchItemId(pointItemId); + // if (BLL.Batch_PointBatchService.GetIsGenerateTrust(pointItem.PointBatchItemId)) ////生成委托单的条件判断 + // { + // if (!toPointBatch.Contains(pointItem.PointBatchId)) + // { + // toPointBatch = toPointBatch + pointItem.PointBatchId + ","; + // } + + // Model.Batch_BatchTrustItem trustItem = new Model.Batch_BatchTrustItem + // { + // TrustBatchItemId = SQLHelper.GetNewID(typeof(Model.Batch_BatchTrustItem)), + // TrustBatchId = trustBatchId, + // PointBatchItemId = pointItem.PointBatchItemId, + // WeldJointId = pointItem.WeldJointId, + // //FilmNum = fileNum, + // CreateDate = DateTime.Now + // }; + // Batch_BatchTrustItemService.AddBatchTrustItem(trustItem); + // } + + // //Model.Batch_PointBatchItem pointBatchItem = Funs.DB.Batch_PointBatchItem.FirstOrDefault(e => e.PointBatchItemId == item.PointBatchItemId); + + // pointItem.IsBuildTrust = true; + // Funs.DB.SubmitChanges(); + // } + + // // 回写委托批对应点口信息 + // if (!string.IsNullOrEmpty(toPointBatch)) + // { + // toPointBatch = toPointBatch.Substring(0, toPointBatch.Length - 1); + // var updateTrut = BLL.Batch_BatchTrustService.GetBatchTrustById(trustBatchId); + // if (updateTrut != null) + // { + // updateTrut.TopointBatch = toPointBatch; + // BLL.Batch_BatchTrustService.UpdateBatchTrust(updateTrut); + // } + // } + + // Alert.ShowInTop("委托单已生成！", MessageBoxIcon.Success); + // } + // else + // { + // Alert.ShowInTop(error + "不能组成一个委托单！", MessageBoxIcon.Warning); + // } + // } + // else + // { + // Alert.ShowInTop("请勾选要生成委托单的焊口！", MessageBoxIcon.Warning); + // } + //} + //else + //{ + // ShowNotify(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning); + // return; + //} + #endregion } } } \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx index f9456b7..5489308 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx @@ -129,8 +129,8 @@ - + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs index 801c14d..50d1a9a 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs @@ -1145,6 +1145,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage } } + BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_PointManageMenuId, "日报完成点口", string.Empty); ShowNotify("批量点口完成", MessageBoxIcon.Success); } else diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs index fd93eab..4ce1df2 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs @@ -96,9 +96,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport } if (drpAudit.SelectedValue!= Const._Null && drpAudit.SelectedValue != "全部") { - int status = drpAudit.SelectedValue == "已审核" ? 1 : 0; - strSql += " AND weldJoint.AuditStatus=@AuditStatus"; - listStr.Add(new SqlParameter("@AuditStatus", status)); + strSql += " AND (case weldJoint.AuditStatus when 1 then '已审核' else '未审核' end )=@AuditStatus"; + listStr.Add(new SqlParameter("@AuditStatus", drpAudit.SelectedValue)); } if (this.drpWorkAreaId.SelectedValue != Const._Null && this.drpWorkAreaId.SelectedValue != null) { diff --git a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache index 9671693..ce269f2 100644 Binary files a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache and b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache differ