lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/NDT/NDTBatchImport.aspx.cs
+30 -31
View File
@@ -1,5 +1,4 @@
using Aspose.Words.Lists;
using BLL;
using BLL;
using MiniExcelLibs;
using Model;
using NPOI.SS.Util;
@@ -45,7 +44,7 @@ namespace FineUIPro.Web.HJGL.NDT
public static string DataClassification = "NDTBatch";
public static List<HJGL_Batch_NDE> ndes = new List<HJGL_Batch_NDE>();
public static List<HJGL_Batch_NDEItem> ndeItems= new List<HJGL_Batch_NDEItem>();
public static List<HJGL_Batch_NDEItem> ndeItems = new List<HJGL_Batch_NDEItem>();
public enum ButtonState { Check = 0, Import = 1, Save = 2 }
@@ -102,7 +101,7 @@ namespace FineUIPro.Web.HJGL.NDT
if (!string.IsNullOrEmpty(this.TrustBatchId))
{
var trustBatch = BLL.Batch_BatchTrustService.GetBatchTrustById(this.TrustBatchId);
if (trustBatch!=null)
if (trustBatch != null)
{
if (!string.IsNullOrEmpty(trustBatch.UnitWorkId))
{
@@ -153,7 +152,7 @@ namespace FineUIPro.Web.HJGL.NDT
var batchTrustItemLists = (from x in Funs.DB.View_Batch_BatchTrustItem
where x.TrustBatchId == TrustBatchId
select x);
select x);
if (batchTrustItemLists != null)
{
newUrl = uploadfilepath.Replace("管道焊口检测结果通知单导入模板", "管道焊口检测结果通知单（" + DateTime.Now.ToString("yyyyMMdd") + ")");
@@ -204,7 +203,7 @@ namespace FineUIPro.Web.HJGL.NDT
SetCellDropdownList(sheet, 6, 6, new List<string>() { "合格", "不合格" }.ToArray());//是否合格
SetCellDropdownList(sheet, 7, 7, new List<string>() { "Ⅰ", "Ⅱ", "Ⅲ", "Ⅳ", "Ⅴ" }.ToArray());//评定级别
var defects = from x in Funs.DB.Base_Defect select x.DefectName;//缺陷
SetCellDropdownList(sheet, 8, 8, new List<string>() { string.Join(",", defects.ToList())}.ToArray());
SetCellDropdownList(sheet, 8, 8, new List<string>() { string.Join(",", defects.ToList()) }.ToArray());
//添加数据
cell = row.CreateCell(7);
@@ -252,7 +251,7 @@ namespace FineUIPro.Web.HJGL.NDT
if (!string.IsNullOrEmpty(batchTrustItemLists.FirstOrDefault().GrooveTypeCode))
{
cell.SetCellValue(batchTrustItemLists.FirstOrDefault().GrooveTypeCode);//坡口形式
}
}
cell = row5.CreateCell(7);
cell.CellStyle = cellStyle;
@@ -615,7 +614,7 @@ namespace FineUIPro.Web.HJGL.NDT
Response.Flush();
Response.Close();
File.Delete(newUrl);
}
}
}
}
@@ -667,7 +666,7 @@ namespace FineUIPro.Web.HJGL.NDT
responeData.message = "导入Excel格式错误！Excel只有" + count.ToString().Trim() + "列";
return responeData;
}
if (pds.Count-2 > 0 && pds != null)
if (pds.Count - 2 > 0 && pds != null)
{
string NDEId = string.Empty;
//string unitworkId = string.Empty;
@@ -1049,25 +1048,25 @@ namespace FineUIPro.Web.HJGL.NDT
//}
//else //补充导入
//{
AddNDE(ndes);
AddNDEItem(ndeItems);
AddNDE(ndes);
AddNDEItem(ndeItems);
//Model.HJGL_DesignBasisDataImport hJGL_DesignBasisDataImport = new Model.HJGL_DesignBasisDataImport();
//hJGL_DesignBasisDataImport.DesignBasisDataImportId = SQLHelper.GetNewID();
//hJGL_DesignBasisDataImport.ProjectId = this.CurrUser.LoginProjectId;
//hJGL_DesignBasisDataImport.UnitWorkId = unitworkId;
//hJGL_DesignBasisDataImport.ImportType = "0";
//hJGL_DesignBasisDataImport.DataClassification = DataClassification;
//hJGL_DesignBasisDataImport.FileName = FileName;
//hJGL_DesignBasisDataImport.FilePath = filePath.Replace(rootPath, ""); ;
//hJGL_DesignBasisDataImport.FileType = BLL.HJGL_DesignBasisDataImportService.GetFileType(FileName);
//hJGL_DesignBasisDataImport.Version = BLL.HJGL_DesignBasisDataImportService.GetNowVersionByUnitWorkId(unitworkId, DataClassification);
//hJGL_DesignBasisDataImport.Remark = txtRemark.Text;
//hJGL_DesignBasisDataImport.CreateMan = this.CurrUser.PersonId;
//hJGL_DesignBasisDataImport.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss");
//BLL.HJGL_DesignBasisDataImportService.AddHJGL_DesignBasisDataImport(hJGL_DesignBasisDataImport);
//Model.HJGL_DesignBasisDataImport hJGL_DesignBasisDataImport = new Model.HJGL_DesignBasisDataImport();
//hJGL_DesignBasisDataImport.DesignBasisDataImportId = SQLHelper.GetNewID();
//hJGL_DesignBasisDataImport.ProjectId = this.CurrUser.LoginProjectId;
//hJGL_DesignBasisDataImport.UnitWorkId = unitworkId;
//hJGL_DesignBasisDataImport.ImportType = "0";
//hJGL_DesignBasisDataImport.DataClassification = DataClassification;
//hJGL_DesignBasisDataImport.FileName = FileName;
//hJGL_DesignBasisDataImport.FilePath = filePath.Replace(rootPath, ""); ;
//hJGL_DesignBasisDataImport.FileType = BLL.HJGL_DesignBasisDataImportService.GetFileType(FileName);
//hJGL_DesignBasisDataImport.Version = BLL.HJGL_DesignBasisDataImportService.GetNowVersionByUnitWorkId(unitworkId, DataClassification);
//hJGL_DesignBasisDataImport.Remark = txtRemark.Text;
//hJGL_DesignBasisDataImport.CreateMan = this.CurrUser.PersonId;
//hJGL_DesignBasisDataImport.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss");
//BLL.HJGL_DesignBasisDataImportService.AddHJGL_DesignBasisDataImport(hJGL_DesignBasisDataImport);
//BLL.HJGL_DesignBasisDataImportVerSionLogService.UpdateVersion(this.CurrUser.LoginProjectId, unitworkId, (decimal)hJGL_DesignBasisDataImport.Version, DataClassification);
//BLL.HJGL_DesignBasisDataImportVerSionLogService.UpdateVersion(this.CurrUser.LoginProjectId, unitworkId, (decimal)hJGL_DesignBasisDataImport.Version, DataClassification);
//}
ShowNotify("导入成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@@ -1091,7 +1090,7 @@ namespace FineUIPro.Web.HJGL.NDT
//更新委托中的检测状态
var trustBatch = BLL.Batch_BatchTrustService.GetBatchTrustById(item.TrustBatchId);
if (trustBatch!=null)
if (trustBatch != null)
{
trustBatch.IsCheck = true;
BLL.Batch_BatchTrustService.UpdatTrustBatchtState(item.TrustBatchId, trustBatch.IsCheck);
@@ -1112,8 +1111,8 @@ namespace FineUIPro.Web.HJGL.NDT
//var ndeItem = from x in Funs.DB.HJGL_Batch_NDEItem where x.TrustBatchItemId==item.TrustBatchItemId select x;
//if (ndeItem.Count() == 0 || ndeItem == null)
//{
//item.NDEItemID = SQLHelper.GetNewID(typeof(Model.HJGL_Batch_NDEItem));
BLL.Batch_NDEItemService.AddNDEItem(item);
//item.NDEItemID = SQLHelper.GetNewID(typeof(Model.HJGL_Batch_NDEItem));
BLL.Batch_NDEItemService.AddNDEItem(item);
//}
//else
//{
@@ -1130,7 +1129,7 @@ namespace FineUIPro.Web.HJGL.NDT
if (trustBatchItemId != null)
{
var trustBatchItem = (from x in Funs.DB.View_Batch_BatchTrustItem where x.TrustBatchItemId == trustBatchItemId.ToString() select x).FirstOrDefault();
if (trustBatchItem!=null)
if (trustBatchItem != null)
{
pipelineCode = trustBatchItem.PipelineCode;
}
@@ -1170,7 +1169,7 @@ namespace FineUIPro.Web.HJGL.NDT
string result = string.Empty;
if (CheckResult != null)
{
if (CheckResult.ToString()=="1")
if (CheckResult.ToString() == "1")
{
result = "合格";
}