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

新增管道颜色标识导入功能及API控制器 

更新了多个服务和页面，增加了导入管道颜色标识数据的功能，并实现了包装管理、车次管理、管道组件和焊口信息的API控制器。修正了文件路径错误，优化了分页和排序逻辑，删除了不再使用的API方法。
This commit is contained in:
李鹏飞 2025-10-24 10:04:03 +08:00
parent 55b798135c
commit c23d113eae
55 changed files with 1502 additions and 817 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/SGGL_SeDin_New.slnx/v18/.wsuo Normal file
View File

Binary file not shown.

79
.vs/SGGL_SeDin_New.slnx/v18/DocumentLayout.backup.json Normal file
View File

@ -0,0 +1,79 @@
{
"Version": 1,
"WorkspaceRootPath": "D:\\\u6570\u636E\\\u8BFA\u5FC5\u8FBE\\\u8D5B\u9F0E\\SGGL_SeDin_New\\",
"Documents": [],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": -1,
"Children": [
{
"$type": "Bookmark",
"Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
},
{
"$type": "Bookmark",
"Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:1:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
},
{
"$type": "Bookmark",
"Name": "ST:131:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
},
{
"$type": "Bookmark",
"Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
},
{
"$type": "Bookmark",
"Name": "ST:2:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
},
{
"$type": "Bookmark",
"Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
},
{
"$type": "Bookmark",
"Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}"
},
{
"$type": "Bookmark",
"Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}"
},
{
"$type": "Bookmark",
"Name": "ST:137:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
},
{
"$type": "Bookmark",
"Name": "ST:138:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
},
{
"$type": "Bookmark",
"Name": "ST:136:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:2:0:{b9f91511-5ca5-40ec-9726-f3e3a7e534e2}"
},
{
"$type": "Bookmark",
"Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
}
]
}
]
}
]
}

95
.vs/SGGL_SeDin_New.slnx/v18/DocumentLayout.json Normal file
View File

@ -0,0 +1,95 @@
{
"Version": 1,
"WorkspaceRootPath": "D:\\\u6570\u636E\\\u8BFA\u5FC5\u8FBE\\\u8D5B\u9F0E\\SGGL_SeDin_New\\",
"Documents": [],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": -1,
"Children": [
{
"$type": "Bookmark",
"Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
},
{
"$type": "Bookmark",
"Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:1:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
},
{
"$type": "Bookmark",
"Name": "ST:131:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
},
{
"$type": "Bookmark",
"Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
},
{
"$type": "Bookmark",
"Name": "ST:2:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
},
{
"$type": "Bookmark",
"Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
},
{
"$type": "Bookmark",
"Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}"
},
{
"$type": "Bookmark",
"Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}"
},
{
"$type": "Bookmark",
"Name": "ST:137:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
},
{
"$type": "Bookmark",
"Name": "ST:138:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
},
{
"$type": "Bookmark",
"Name": "ST:136:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:2:0:{b9f91511-5ca5-40ec-9726-f3e3a7e534e2}"
},
{
"$type": "Bookmark",
"Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
},
{
"$type": "Bookmark",
"Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
}
]
}
]
}
]
}

BIN
.vs/SGGL_SeDin_New/v17/.wsuo
View File

Binary file not shown.

102
SGGL/BLL/API/HJGL/APIPackagingManageService.cs
View File

@ -6,30 +6,96 @@ using System.Linq;
namespace BLL
{
public class APIPackagingManageService
{
public static List<Model.PackagingManageDetailItem> GetPackagingManageList(string projectId)
public static List<Model.PackagingManageDetailItem> GetPackagingManageList(PackagingManageInput filter, int pageIndex, int pageSize, out int totalCount)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var q = (from x in db.HJGL_PackagingManage
join n in db.Base_Project on x.ProjectId equals n.ProjectId
join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt
from t in tt.DefaultIfEmpty()
where x.ProjectId == projectId
// base join query to include project and receive person
var baseQuery = from x in db.HJGL_PackagingManage
join n in db.Base_Project on x.ProjectId equals n.ProjectId
join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt
from t in tt.DefaultIfEmpty()
select new { x, n, t };
if (filter != null)
{
if (!string.IsNullOrEmpty(filter.PackagingManageId))
{
baseQuery = baseQuery.Where(z => z.x.PackagingManageId == filter.PackagingManageId);
}
if (!string.IsNullOrEmpty(filter.PackagingCode))
{
baseQuery = baseQuery.Where(z => z.x.PackagingCode.Contains(filter.PackagingCode));
}
if (!string.IsNullOrEmpty(filter.ProjectId))
{
baseQuery = baseQuery.Where(z => z.x.ProjectId == filter.ProjectId);
}
if (!string.IsNullOrEmpty(filter.ProjectName))
{
baseQuery = baseQuery.Where(z => z.n.ProjectName.Contains(filter.ProjectName));
}
if (!string.IsNullOrEmpty(filter.ContactName))
{
baseQuery = baseQuery.Where(z => z.x.ContactName.Contains(filter.ContactName));
}
if (!string.IsNullOrEmpty(filter.ContactPhone))
{
baseQuery = baseQuery.Where(z => z.x.ContactPhone.Contains(filter.ContactPhone));
}
if (!string.IsNullOrEmpty(filter.StackingPosition))
{
baseQuery = baseQuery.Where(z => z.x.StackingPosition.Contains(filter.StackingPosition));
}
if (filter.State != null)
{
baseQuery = baseQuery.Where(z => z.x.State == filter.State);
}
if (!string.IsNullOrEmpty(filter.ReceiveMan))
{
baseQuery = baseQuery.Where(z => z.x.ReceiveMan == filter.ReceiveMan || (z.t != null && z.t.PersonName.Contains(filter.ReceiveMan)));
}
if (!string.IsNullOrEmpty(filter.ReceiveDate))
{
DateTime dt;
if (DateTime.TryParse(filter.ReceiveDate, out dt))
{
var start = dt.Date;
var end = start.AddDays(1);
baseQuery = baseQuery.Where(z => z.x.ReceiveDate != null && z.x.ReceiveDate >= start && z.x.ReceiveDate < end);
}
}
if (!string.IsNullOrEmpty(filter.TrainNumberId))
{
baseQuery = baseQuery.Where(z => z.x.TrainNumber != null && z.x.TrainNumber.Contains(filter.TrainNumberId));
}
}
baseQuery = baseQuery.OrderByDescending(z => (z.x.ReceiveDate ?? DateTime.MinValue)).ThenBy(z => z.x.PackagingCode);
var q = (from z in baseQuery
select new PackagingManageDetailItem
{
PackagingManageId = x.PackagingManageId,
PackagingCode = x.PackagingCode,
ProjectName = n.ProjectName,
ContactName = x.ContactName,
ContactPhone = x.ContactPhone,
StackingPosition = x.StackingPosition,
State = x.State,
ReceiveMan = t.PersonName,
ReceiveDate = string.Format("{0:g}", x.ReceiveDate),
TrainNumber = x.TrainNumber,
PackagingManageId = z.x.PackagingManageId,
PackagingCode = z.x.PackagingCode,
ProjectName = z.n.ProjectName,
ContactName = z.x.ContactName,
ContactPhone = z.x.ContactPhone,
StackingPosition = z.x.StackingPosition,
State = z.x.State,
ReceiveMan = z.t.PersonName,
ReceiveDate = string.Format("{0:g}", z.x.ReceiveDate),
TrainNumber = z.x.TrainNumber,
}).Distinct();
return q.ToList();
totalCount = q.Count();
if (pageIndex <=0) pageIndex =1;
if (pageSize <=0) pageSize =20;
return q.Skip((pageIndex -1) * pageSize).Take(pageSize).ToList();
}
}
@ -190,8 +256,6 @@ namespace BLL
}
}
}
public static string GetNewPackagingCode(string projectId)
{
return HJGLPackagingmanageService.GetNewPackagingCode(projectId);

94
SGGL/BLL/HJGL/BaseInfo/Base_MaterialColorService.cs
View File

@ -1,5 +1,8 @@
using EmitMapper;
using FineUIPro;
using MiniExcelLibs;
using Model;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@ -190,5 +193,96 @@ namespace BLL
}
public static ResponeData ImportData( string path, string projectid)
{
var responeData = new ResponeData();
try
{
List<BaseMaterialcolorDataIn> temeplateDtoIns = MiniExcel.Query<BaseMaterialcolorDataIn>(path, startCell: "A1").ToList();
if (temeplateDtoIns == null || temeplateDtoIns.Count ==0)
{
responeData.code =0;
responeData.message = "导入数据为空！";
return responeData;
}
// 提取材质编码并验证非空
var materialCodes = new List<string>();
foreach (var row in temeplateDtoIns)
{
var code = (row.MaterialCode ?? string.Empty).Trim();
if (string.IsNullOrWhiteSpace(code))
{
responeData.code =0;
responeData.message = "导入数据中材质列不能为空！";
return responeData;
}
materialCodes.Add(code);
}
var materialCodeList = materialCodes.Distinct().ToList();
// 从数据库验证这些材质编码是否存在
var existMaterials = (from m in Funs.DB.Base_Material
where materialCodeList.Contains(m.MaterialCode)
select new { m.MaterialCode, m.MaterialId }).ToList();
var existCodes = existMaterials.Select(x => x.MaterialCode).ToList();
var notExist = materialCodeList.Except(existCodes).ToList();
if (notExist.Count >0)
{
responeData.code =0;
responeData.message = string.Join(",", notExist) + " 材质不存在！";
return responeData;
}
// 插入数据
foreach (var row in temeplateDtoIns)
{
var code = (row.MaterialCode ?? string.Empty).Trim();
var mat = existMaterials.FirstOrDefault(x => x.MaterialCode == code);
if (mat == null)
{
responeData.code =0;
responeData.message = code + " 材质不存在！";
return responeData;
}
var colorName = string.IsNullOrWhiteSpace(row.ColorName) ? "—" : row.ColorName.Trim();
var colorCardNo = string.IsNullOrWhiteSpace(row.ColorCardNo) ? "—" : row.ColorCardNo.Trim();
var rgb = string.IsNullOrWhiteSpace(row.RGB) ? null : row.RGB.Trim();
var remark = string.IsNullOrWhiteSpace(row.Remark) ? null : row.Remark.Trim();
Model.Base_MaterialColor table = new Model.Base_MaterialColor
{
MaterialColorId = BLL.SQLHelper.GetNewID(typeof(Model.Base_MaterialColor)),
UnitId = string.Empty,
ProjectId = projectid,
MaterialId = mat.MaterialId,
ColorName = colorName,
ColorCardNo = colorCardNo,
RGB = rgb,
Remark = remark
};
Funs.DB.Base_MaterialColor.InsertOnSubmit(table);
}
Funs.DB.SubmitChanges();
responeData.code =1;
responeData.message = "导入成功！";
responeData.data = temeplateDtoIns.Count;
return responeData;
}
catch (Exception ex)
{
responeData.code =0;
responeData.message = "导入失败：" + ex.ToString();
return responeData;
}
}
}
}

25
SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
View File

@ -35,7 +35,12 @@ namespace BLL
{ "预制散件" ,(int)TypeInt.预制散件},
{ "其他材料" ,(int)TypeInt.其他材料},
};
public static Dictionary<string, int> CategoryIntMap = new Dictionary<string, int>
{
{ "打捆" ,(int)CategoryInt.打捆},
{ "装箱" ,(int)CategoryInt.装箱},
{ "散装" ,(int)CategoryInt.散装},
};
#endregion Fields
#region Enums
@ -46,6 +51,12 @@ namespace BLL
预制散件 = 20,
其他材料 = 30,
}
public enum CategoryInt : int
{
打捆 = 10,
装箱 = 20,
散装 = 30,
}
#endregion Enums
@ -73,6 +84,7 @@ namespace BLL
TrainNumber = newtable.TrainNumber,
TrainNumberId = newtable.TrainNumberId,
TypeInt = newtable.TypeInt,
CategoryInt = newtable.CategoryInt,
CompileMan = newtable.CompileMan,
CompileDate = newtable.CompileDate
};
@ -227,7 +239,9 @@ namespace BLL
StackingPosition = x.StackingPosition,
State = x.State,
TypeInt = x.TypeInt,
CategoryInt = x.CategoryInt,
TypeString = GetTypeString(x.TypeInt),
CategoryString = GetCategoryString(x.CategoryInt),
ReceiveMan = train.ContactName,//t.PersonName,
ReceiveDate = x.ReceiveDate.HasValue ? string.Format("{0:g}", x.ReceiveDate) : "",
PlanStartDate = GetMinPlanStartDate(x.PackagingManageId),
@ -261,7 +275,10 @@ namespace BLL
{
return TypeIntMap.FirstOrDefault(c => c.Value == TypeInt).Key;
}
public static string GetCategoryString(int? CategoryInt)
{
return CategoryIntMap.FirstOrDefault(c => c.Value == CategoryInt).Key;
}
/// <summary>
/// 管线下拉框
/// </summary>
@ -313,6 +330,7 @@ namespace BLL
table.TrainNumber = newtable.TrainNumber;
table.TrainNumberId = newtable.TrainNumberId;
table.TypeInt = newtable.TypeInt;
table.CategoryInt = newtable.CategoryInt;
db1.SubmitChanges();
}
}
@ -344,6 +362,9 @@ namespace BLL
public string TrainNumberOld { get; set; }
public int? TypeInt { get; set; }
public string TypeString { get; set; }
public int? CategoryInt { get; set; }
public string CategoryString { get; set; }
#endregion Properties
}

22
SGGL/BLL/HJGL/PreDesign/TrainNumberManageService.cs
View File

@ -1,19 +1,11 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
namespace BLL
{
public static class TrainNumberManageService
{
/// <summary>
/// 记录数
/// </summary>
public static int Count
{
get;
set;
}
{
private static IQueryable<Model.HJGL_TrainNumberManage> GetByQueryModle(Model.HJGL_TrainNumberManage table)
{
var q = from x in Funs.DB.HJGL_TrainNumberManage select x;
@ -71,11 +63,11 @@ namespace BLL
return GetByQueryModle(table).ToList();
}
public static (List<Model.HJGL_TrainNumberManage> Data, int Total) GetListByQueryModle(Model.HJGL_TrainNumberManage table, int pageIndex = 0, int pageSize = 20)
public static (List<Model.HJGL_TrainNumberManage> Data, int Total) GetListByQueryModle(Model.HJGL_TrainNumberManage table, int pageIndex = 1, int pageSize = 20)
{
var baseQuery = GetByQueryModle(table);
var pagedData = baseQuery
.Skip((pageIndex) * pageSize)
.Skip((pageIndex-1) * pageSize)
.Take(pageSize)
.ToList();
@ -94,10 +86,10 @@ namespace BLL
public static string GetNewTrainNumber(string ProjectId)
{
var q = from x in Funs.DB.HJGL_TrainNumberManage
where x.ProjectId == ProjectId
where x.ProjectId == ProjectId
select x.TrainNumber;
var max = q.Count();
var NewTrainNumber = (max + 1).ToString().PadLeft(2, '0');
var NewTrainNumber = string.Format("{0:yyyyMMdd}", DateTime.Now)+"-"+(max + 1).ToString().PadLeft(3, '0');
return NewTrainNumber;
}

40
SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs
View File

@ -353,13 +353,15 @@ namespace BLL
dt.Columns.Add("PipelineCode");
dt.Columns.Add("ManterialCode");
dt.Columns.Add("Specification");
dt.Columns.Add("MaterialColor");
for (int i = 0; i < tb.Rows.Count; i++)
{
var newRows = dt.NewRow();
newRows["PipelineCode"] = tb.Rows[i]["PipelineCode"].ToString();
newRows["ManterialCode"] = getMaterialCodeByPipelineId(tb.Rows[i]["PipelineId"].ToString());
newRows["ManterialCode"] = getMaterialCodeByPipelineId(tb.Rows[i]["PipelineId"].ToString(),out string MaterialColor);
newRows["Specification"] = getSpecificationByPipelineId(tb.Rows[i]["PipelineId"].ToString());
newRows["MaterialColor"] = MaterialColor;
dt.Rows.Add(newRows);
}
@ -878,18 +880,47 @@ namespace BLL
#region 格式化字符串
public static string getMaterialCodeByPipelineId(string pipelineId)
public static string getMaterialCodeByPipelineId(string pipelineId, out string materialColor)
{
string materialCode = string.Empty;
materialColor = string.Empty;
if (!string.IsNullOrEmpty(pipelineId))
{
var weldjoint = (from x in Funs.DB.HJGL_WeldJoint
join y in Funs.DB.Base_Material on x.Material1Id equals y.MaterialId
join z in Funs.DB.Base_Material on x.Material2Id equals z.MaterialId
where x.PipelineId == pipelineId
select new { MaterialCode1 = y.MaterialCode, MaterialCode2 = z.MaterialCode }).FirstOrDefault();
select new
{
MaterialId1 = y.MaterialId,
MaterialCode1 = y.MaterialCode,
MaterialId2 = z.MaterialId,
MaterialCode2 = z.MaterialCode,
x.ProjectId,
}).FirstOrDefault();
if (weldjoint != null)
{
if (!string.IsNullOrEmpty(weldjoint.MaterialId1))
{
var projectSet = Project_SysSetService.GetSysSetBySetId("11", weldjoint.ProjectId);
Model.BaseMaterialcolorOutput queryModel = new Model.BaseMaterialcolorOutput();
queryModel.ProjectId = weldjoint.ProjectId;
queryModel.MaterialId = weldjoint.MaterialId1;
var material1 = BLL.BaseMaterialcolorService.GetListByQueryModle(queryModel).FirstOrDefault();
if (material1 != null)
{
if (projectSet != null && projectSet.SetValue == "1")
{
materialColor = material1.ColorName;
}
else
{
materialColor= material1.ColorCardNo;
}
}
}
if (!string.IsNullOrEmpty(weldjoint.MaterialCode1) && !string.IsNullOrEmpty(weldjoint.MaterialCode2))
{
materialCode = weldjoint.MaterialCode1 + "/" + weldjoint.MaterialCode2;
@ -908,8 +939,7 @@ namespace BLL
}
}
return materialCode;
}
}
public static string getSpecificationByPipelineId(string pipelineId)
{
string spcificaation = string.Empty;

1
SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
View File

@ -497,6 +497,7 @@ namespace BLL
Model.SGGLDB db = Funs.DB;
var q = (from x in db.HJGL_Pipeline_Component
join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId
orderby y.PipelineCode,x.PipelineComponentCode
where y.ProjectId.Contains(projectId) && x.State.Equals(State1) &&
(string.IsNullOrEmpty(pipelineCode) || y.PipelineCode.Contains(pipelineCode)) &&
(string.IsNullOrEmpty(pipelineComponentCode) || x.PipelineComponentCode.Contains(pipelineComponentCode)) &&

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/管道颜色标识库导入模板.xlsx Normal file
View File

Binary file not shown.

28
SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道压力试验技术要求.frx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 10:54:01" ReportInfo.Modified="07/10/2025 11:05:43" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 10:54:01" ReportInfo.Modified="10/20/2025 18:54:19" ReportInfo.CreatorVersion="2017.1.16.0">
<Dictionary/>
<ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" LeftMargin="20" TopMargin="25" RightMargin="20" BottomMargin="20" FirstPageSource="4" OtherPagesSource="4" Guides="0,964.11,84.21,65.31,74.76,169.26,103.11,486.36,794.85,187.32,271.53,336.84,411.6,570.57,654.78,720.09">
<PageHeaderBand Name="PageHeader1" Width="971.46" Height="604.93" Guides="0,604.93,30.08,90.24,60.16,129.77,169.3,208.83,248.36,287.89,327.42,366.95,237.98">
@ -56,15 +56,15 @@
</TableRow>
<TableRow Name="Row4" Height="39.53">
<TableCell Name="Cell16" Border.Lines="All" Text="液压试验" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell17" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell18" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell19" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell20" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell44" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell45" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell46" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell47" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell48" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell17" Border.Lines="All" Text="冷凝水, 苯酚, 双酚A" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell18" Border.Lines="All" Text="20 GB/8163" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell19" Border.Lines="All" Text="15.1" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell20" Border.Lines="All" Text="1.05" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell44" Border.Lines="All" Text="215/215" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell45" Border.Lines="All" Text="清洁水" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell46" Border.Lines="All" Text="1.73" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell47" Border.Lines="All" Text="25" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell48" Border.Lines="All" Text="10/30" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell49" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
</TableRow>
<TableRow Name="Row5" Height="39.53">
@ -74,7 +74,7 @@
<TableCell Name="Cell24" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell25" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell50" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell51" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell51" Border.Lines="All" Text="空气" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell52" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell53" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell54" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
@ -87,7 +87,7 @@
<TableCell Name="Cell59" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell60" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell61" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell62" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell62" Border.Lines="All" Text="水-空气" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell63" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell64" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell65" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
@ -100,7 +100,7 @@
<TableCell Name="Cell70" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell71" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell72" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell73" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell73" Border.Lines="All" Text="空气" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell74" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell75" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell76" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
@ -113,7 +113,7 @@
<TableCell Name="Cell81" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell82" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell83" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell84" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell84" Border.Lines="All" Text="空气" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell85" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell86" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
<TableCell Name="Cell87" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>

15
SGGL/FineUIPro.Web/File/Fastreport/JGZL/管道材料材质标识检查记录.frx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 23:00:23" ReportInfo.Modified="09/18/2025 09:57:11" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/10/2025 23:00:23" ReportInfo.Modified="10/24/2025 10:01:55" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -42,11 +42,12 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRF9V3vp1e4jkmMexvV+/syL">
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREvkfDKV6KbUlDGWyOEseoj">
<TableDataSource Name="Data" DataType="System.Int32" PropName="Accident_AccidentHandle" Enabled="true" TableName="Data">
<Column Name="PipelineCode" DataType="System.String" PropName="AccidentHandleId"/>
<Column Name="ManterialCode" DataType="System.String" PropName="ProjectId"/>
<Column Name="Specification" DataType="System.String" PropName="AccidentHandleCode"/>
<Column Name="MaterialColor" DataType="System.Int32" PropName="Column" Calculated="true" Expression=""/>
</TableDataSource>
</MsSqlDataConnection>
<Parameter Name="ProjectName" DataType="System.String"/>
@ -107,7 +108,7 @@ namespace FastReport
</TableRow>
</TableObject>
</PageHeaderBand>
<DataBand Name="Data1" Top="154.32" Width="623.7" Height="47.25" Guides="0,47.25">
<DataBand Name="Data1" Top="155.2" Width="623.7" Height="47.25" Guides="0,47.25">
<TableObject Name="Table2" Width="623.53" Height="47.25" Border.Lines="Left, Right, Bottom" ManualBuildEvent="Table2_ManualBuild">
<TableColumn Name="Column12" Width="122.85"/>
<TableColumn Name="Column13" Width="28.35"/>
@ -125,7 +126,7 @@ namespace FastReport
<TableCell Name="Cell67" Border.Lines="All" Text="[Data.ManterialCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell68" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell69" Border.Lines="All" Text="[Data.Specification]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell70" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell70" Border.Lines="All" Text="[Data.MaterialColor]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell71" Border.Lines="All" Text="完整" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
<TableCell Name="Cell72" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
<TableCell Name="Cell73" Border.Lines="All" Text="弯头、三通、半管接头、大小头、法兰" HorzAlign="Center" VertAlign="Center" Font="楷体, 9pt"/>
@ -135,8 +136,8 @@ namespace FastReport
</TableRow>
</TableObject>
</DataBand>
<ColumnFooterBand Name="ColumnFooter1" Top="255.07" Width="623.7">
<ChildBand Name="Child1" Top="204.7" Width="623.7" Height="47.25" Guides="0,47.25" FillUnusedSpace="true">
<ColumnFooterBand Name="ColumnFooter1" Top="257.7" Width="623.7">
<ChildBand Name="Child1" Top="206.45" Width="623.7" Height="47.25" Guides="0,47.25" FillUnusedSpace="true">
<TableObject Name="Table3" Width="623.53" Height="47.25" Border.Lines="Left, Right, Bottom">
<TableColumn Name="Column23" Width="122.85"/>
<TableColumn Name="Column24" Width="28.35"/>
@ -165,7 +166,7 @@ namespace FastReport
</TableObject>
</ChildBand>
</ColumnFooterBand>
<PageFooterBand Name="PageFooter1" Top="258.2" Width="623.7" Height="111.01" Guides="0,111.01,38.56,79.51">
<PageFooterBand Name="PageFooter1" Top="261.7" Width="623.7" Height="111.01" Guides="0,111.01,38.56,79.51">
<TableObject Name="Table4" Width="623.7" Height="111.01" Border.Lines="Left, Top">
<TableColumn Name="Column34" Width="311.85"/>
<TableColumn Name="Column35" Width="311.85"/>

4
SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="03/13/2022 11:00:20" ReportInfo.Modified="09/29/2025 10:46:03" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="03/13/2022 11:00:20" ReportInfo.Modified="10/20/2025 10:51:41" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -42,7 +42,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREGG2jpnNd1x+f84FNsJb9q"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFlf1WEwspad7DkFpDk3K8w"/>
<TableDataSource Name="Data" ReferenceName="Data" DataType="System.Int32" Enabled="true">
<Column Name="PipelineComponentId" DataType="System.String"/>
<Column Name="PipelineComponentCode" DataType="System.String"/>

13
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -1487,7 +1487,7 @@
<Content Include="HJGL\BaseInfo\MaterialCodeLibIn.aspx" />
<Content Include="HJGL\BaseInfo\MaterialColor.aspx" />
<Content Include="HJGL\BaseInfo\MaterialColorEdit.aspx" />
<Content Include="HJGL\BaseInfo\MaterialColorInaspx.aspx" />
<Content Include="HJGL\BaseInfo\MaterialColorIn.aspx" />
<Content Include="HJGL\BaseInfo\MaterialEdit.aspx" />
<Content Include="HJGL\BaseInfo\MaterialView.aspx" />
<Content Include="HJGL\BaseInfo\Medium.aspx" />
@ -10108,12 +10108,12 @@
<Compile Include="HJGL\BaseInfo\MaterialColorEdit.aspx.designer.cs">
<DependentUpon>MaterialColorEdit.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\BaseInfo\MaterialColorInaspx.aspx.cs">
<DependentUpon>MaterialColorInaspx.aspx</DependentUpon>
<Compile Include="HJGL\BaseInfo\MaterialColorIn.aspx.cs">
<DependentUpon>MaterialColorIn.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HJGL\BaseInfo\MaterialColorInaspx.aspx.designer.cs">
<DependentUpon>MaterialColorInaspx.aspx</DependentUpon>
<Compile Include="HJGL\BaseInfo\MaterialColorIn.aspx.designer.cs">
<DependentUpon>MaterialColorIn.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\BaseInfo\MaterialEdit.aspx.cs">
<DependentUpon>MaterialEdit.aspx</DependentUpon>
@ -16835,12 +16835,11 @@
<VersionMinor>3</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

9
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColor.aspx
View File

@ -43,9 +43,12 @@
<f:Button ID="btnNew" ToolTip="新增" Text="新增" Hidden="true" Icon="Add" runat="server"
OnClick="btnNew_Click">
</f:Button>
<f:Button ID="btnImport" Text="导入" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@ -57,7 +60,7 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材质id" TextAlign="Left" HeaderTextAlign="Center" >
FieldType="String" HeaderText="材质" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ColorName" DataField="ColorName" SortField="ColorName"
FieldType="String" HeaderText="颜色名称" TextAlign="Left" HeaderTextAlign="Center" >
@ -66,7 +69,7 @@
FieldType="String" HeaderText="色卡号" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="RGB" DataField="RGB" SortField="RGB"
FieldType="String" HeaderText="" TextAlign="Left" HeaderTextAlign="Center" >
FieldType="String" HeaderText="RGB" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center" >

9
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColor.aspx.cs
View File

@ -238,6 +238,13 @@ namespace FineUIPro.Web.HJGL.BaseInfo
return sb.ToString();
}
#endregion
#endregion
#region 导入按钮
protected void btnImport_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MaterialColorIn.aspx?", "导入 - ")));
}
#endregion
}
}

9
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColor.aspx.designer.cs generated
View File

@ -68,6 +68,15 @@ namespace FineUIPro.Web.HJGL.BaseInfo
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnImport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnOut 控件。
/// </summary>

35
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorIn.aspx Normal file
View File

@ -0,0 +1,35 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MaterialColorIn.aspx.cs" Inherits="FineUIPro.Web.HJGL.BaseInfo.MaterialColorIn" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>管道颜色标识库导入</title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Toolbars>
<f:Toolbar ID="Toolbar1" runat="server" Position="Bottom">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnImport" Icon="DoorIn" runat="server" Text="导入" ToolTip="数据导入" ValidateForms="SimpleForm1"
OnClick="btnImport_Click">
</f:Button>
<f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" Text="下载模板" ToolTip="下载模板" OnClick="btnDownLoad_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="请选择导入的Eexce文件" Width="500px">
</f:FileUpload>
<f:HiddenField ID="hdFileName" runat="server"></f:HiddenField>
</Items>
</f:Panel>
</form>
</body>
</html>

142
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorIn.aspx.cs Normal file
View File

@ -0,0 +1,142 @@
using BLL;
using Model;
using System;
using System.IO;
using System.Text;
using System.Web;
namespace FineUIPro.Web.HJGL.BaseInfo
{
public partial class MaterialColorIn : PageBase
{
#region 加载
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
}
}
#endregion
#region 导入
/// <summary>
/// 导入
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnImport_Click(object sender, EventArgs e)
{
var message = string.Empty;
errorInfos = string.Empty;
if (fuAttachUrl.HasFile == false)
{
ShowNotify("请选择Excel文件!", MessageBoxIcon.Warning);
return;
}
var IsXls = Path.GetExtension(fuAttachUrl.FileName).Trim().ToLower();
if (IsXls != ".xlsx")
{
ShowNotify("只能选择Excel文件!", MessageBoxIcon.Warning);
return;
}
if (!string.IsNullOrEmpty(errorInfos)) errorInfos = string.Empty;
var rootPath = Server.MapPath("~/");
var initFullPath = rootPath + initPath;
if (!Directory.Exists(initFullPath)) Directory.CreateDirectory(initFullPath);
//指定上传文件名称
hdFileName.Text = Funs.GetNewFileName() + IsXls;
//上传文件路径
var filePath = initFullPath + hdFileName.Text;
//文件上传服务器
fuAttachUrl.PostedFile.SaveAs(filePath);
//文件上传服务器后的名称
var fileName = rootPath + initPath + hdFileName.Text;
ResponeData responeData;
responeData = TwInOutplanmasterService.ImportData(fuAttachUrl.FileName, fileName, this.CurrUser.LoginProjectId, this.CurrUser.PersonId);
if (responeData.code == 1)
{
ShowNotify("数据导入成功!", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
else
{
Alert alert = new Alert();
alert.Message = responeData.message;
alert.MessageBoxIcon = MessageBoxIcon.Error;
alert.Show();
}
}
#endregion
#region 定义项
/// <summary>
/// 上传预设的虚拟路径
/// </summary>
private readonly string initPath = Const.ExcelUrl; //"File\\Excel\\DataIn\\";
/// <summary>
/// 错误集合
/// </summary>
public static string errorInfos = string.Empty;
#endregion
#region 模板下载
/// <summary>
/// 模板下载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnDownLoad_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Confirm.GetShowReference("确定要下载模板吗?", string.Empty,
MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"),
PageManager1.GetCustomEventReference("Confirm_Cancel")));
}
/// <summary>
/// 下载导入模板
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
{
if (e.EventArgument == "Confirm_OK")
{
var rootPath = Server.MapPath("~/");
var uploadfilepath = rootPath + Const.Tw_InPlanMasteTemplateUrl;
var filePath = Const.Tw_InPlanMasteTemplateUrl;
var fileName = Path.GetFileName(filePath);
var info = new FileInfo(uploadfilepath);
var fileSize = info.Length;
Response.ClearContent();
Response.AddHeader("Content-Disposition",
"attachment;filename=" + HttpUtility.UrlEncode(fileName, Encoding.UTF8));
Response.ContentType = "excel/plain";
Response.ContentEncoding = Encoding.UTF8;
Response.AddHeader("Content-Length", fileSize.ToString().Trim());
Response.TransmitFile(uploadfilepath, 0, fileSize);
Response.End();
}
}
#endregion
}
}

98
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorIn.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,98 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.BaseInfo
{
public partial class MaterialColorIn
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnImport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnDownLoad 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDownLoad;
/// <summary>
/// fuAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FileUpload fuAttachUrl;
/// <summary>
/// hdFileName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdFileName;
}
}

16
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorInaspx.aspx
View File

@ -1,16 +0,0 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MaterialColorInaspx.aspx.cs" Inherits="FineUIPro.Web.HJGL.BaseInfo.MaterialColorInaspx" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
</head>
<body>
<form id="form1" runat="server">
<div>
</div>
</form>
</body>
</html>

12
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorInaspx.aspx.cs
View File

@ -1,12 +0,0 @@
using System;
namespace FineUIPro.Web.HJGL.BaseInfo
{
public partial class MaterialColorInaspx : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}

26
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorInaspx.aspx.designer.cs generated
View File

@ -1,26 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码是由工具生成的。
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.BaseInfo
{
public partial class MaterialColorInaspx
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
}
}

22
SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx
View File

@ -22,6 +22,7 @@
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线号"
EmptyText="输入查询条件" Width="280px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>
</Items>
</f:Toolbar>
@ -56,6 +57,11 @@
EmptyText="输入查询条件"
Width="240px" LabelWidth="100px" LabelAlign="Right">
</f:TextBox>
<f:DropDownList ID="drpTypeStr" runat="server" Label="类型" Width="280px" LabelWidth="80px" LabelAlign="Right">
<f:ListItem Text="全部" Value=""></f:ListItem>
<f:ListItem Text="预制组件" Value="预制组件"></f:ListItem>
<f:ListItem Text="预制散件" Value="预制散件"></f:ListItem>
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSearch" Icon="SystemSearch" Text="查询"
@ -69,9 +75,9 @@
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="组件信息" ForceFit="false"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="id" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="id"
AllowSorting="true" SortField="PipelineCode,PipelineComponentCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="Id"
AllowSorting="true" SortField="PipelineCode,Code" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
@ -80,15 +86,15 @@
FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
TextAlign="Left" Locked="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Stype" DataField="Stype" SortField="Stype"
<f:RenderField Width="100px" ColumnID="TypeStr" DataField="TypeStr" SortField="TypeStr"
FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
TextAlign="Left" Locked="true">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="PipelineComponentCode" DataField="PipelineComponentCode" SortField="PipelineComponentCode"
FieldType="String" HeaderText="组件编号" HeaderTextAlign="Center"
<f:RenderField Width="120px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="组件编号/材料编码" HeaderTextAlign="Center"
TextAlign="Left" Locked="true">
</f:RenderField>
<f:RenderField Width="320px" ColumnID="matdef" DataField="matdef"
<f:RenderField Width="320px" ColumnID="Matdef" DataField="Matdef"
FieldType="String" HeaderText="预制散件材料描述" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
@ -104,7 +110,7 @@
FieldType="String" HeaderText="车次" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="FlowingSection" DataField="FlowingSection"
<f:RenderField Width="150px" ColumnID="FlowingSection" DataField="FlowingSection"
FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>

108
SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs
View File

@ -1,5 +1,6 @@
using BLL;
using MiniExcelLibs;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
@ -12,7 +13,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
public partial class InstallList : PageBase
{
public int pageSize = 20;
public static DataTable GridDataTable = new DataTable();
public static IQueryable<View_HJGL_InstallData> GridDataTable = null;
protected void Page_Load(object sender, EventArgs e)
{
@ -213,11 +214,10 @@ namespace FineUIPro.Web.HJGL.PreDesign
private void BindGrid()
{
if (tvControlItem.SelectedNode == null) return;
DataTable tb = BindData();
GridDataTable = tb;
// 2.获取当前分页数据
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
var view_HJGL_InstallDatas = BindData(Grid1.PageIndex+1, Grid1.PageSize,out int totalCount);
// 2.获取当前分页数据
Grid1.RecordCount = totalCount;
var table = view_HJGL_InstallDatas;
Grid1.DataSource = table;
Grid1.DataBind();
}
@ -226,63 +226,33 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 查询数据
/// </summary>
/// <returns></returns>
private DataTable BindData()
private List<View_HJGL_InstallData> BindData(int pageIndex, int pageSize, out int totalCount)
{
string strSql = @"WITH cte as (select newid()as id,pipeline.PipelineCode as PipelineCode,
comonent.PipelineComponentCode as PipelineComponentCode,
'预制组件' as Stype,
'' as matdef,
packdetail.Number as Number,
pack.PackagingCode as PackagingCode,
trainnumber.TrainNumber as TrainNumber,
pipeline.FlowingSection as FlowingSection,
pipeline.UnitWorkId as UnitWorkId
from HJGL_Pipeline pipeline
left join HJGL_PackagingManageDetail packdetail on pipeline.PipelineId = packdetail.PipelineId
left join HJGL_Pipeline_Component comonent
on packdetail.PipelineComponentId = comonent.PipelineComponentId
left join HJGL_PackagingManage pack on packdetail.PackagingManageId = pack.PackagingManageId
left join HJGL_TrainNumberManage trainnumber on pack.TrainNumberId = TrainNumber.Id
where (packdetail.PipelineComponentId is not null or packdetail.PipelineComponentId != '')
union all
select newid()as id,pipeline.PipelineCode as PipelineCode,
packdetail.MaterialCode as PipelineComponentCode,
'预制散件' as Stype,
matlib.MaterialDef as matdef,
packdetail.Number as Number,
pack.PackagingCode as PackagingCode,
trainnumber.TrainNumber as TrainNumber,
pipeline.FlowingSection as FlowingSection,
pipeline.UnitWorkId as UnitWorkId
from HJGL_Pipeline pipeline
left join HJGL_PackagingManageDetail packdetail on pipeline.PipelineId = packdetail.PipelineId
left join HJGL_MaterialCodeLib matlib on packdetail.MaterialCode = matlib.MaterialCode
left join HJGL_PackagingManage pack on packdetail.PackagingManageId = pack.PackagingManageId
left join HJGL_TrainNumberManage trainnumber on pack.TrainNumberId = TrainNumber.Id
where (packdetail.PipelineComponentId is null or packdetail.PipelineComponentId = ''))
SELECT * FROM cte WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
var baseQuery=from x in Funs.DB.View_HJGL_InstallData
where x.ProjectId == this.CurrUser.LoginProjectId
select x;
if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2)
{
strSql += " and cte.UnitWorkId =@UnitWorkId";
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
baseQuery = baseQuery.Where(x => x.UnitWorkId == tvControlItem.SelectedNode.NodeID);
}
else if (tvControlItem.SelectedNode.CommandName == "流水段")
{
strSql += " and cte.FlowingSection = @FlowingSection ";
listStr.Add(new SqlParameter("@FlowingSection", this.tvControlItem.SelectedNode.Text));
}
baseQuery = baseQuery.Where(x => x.UnitWorkId == tvControlItem.SelectedNode.ParentNode.NodeID && x.FlowingSection == tvControlItem.SelectedNode.Text);
}
if (!string.IsNullOrEmpty(txtPipelineCode2.Text))
{
strSql += " AND cte.PipelineCode like @PipelineCode";
listStr.Add(new SqlParameter("@PipelineCode", "%" + this.txtPipelineCode2.Text.Trim() + "%"));
}
baseQuery = baseQuery.Where(x => x.PipelineCode.Contains(txtPipelineCode2.Text.Trim()));
}
if (!string.IsNullOrEmpty(txtPipelineComponentCode.Text))
{
strSql += " AND cte.PipelineComponentCode like @PipelineComponentCode";
listStr.Add(new SqlParameter("@PipelineComponentCode", "%" + this.txtPipelineComponentCode.Text.Trim() + "%"));
baseQuery = baseQuery.Where(x => x.Code.Contains(txtPipelineComponentCode.Text.Trim()));
}
if (!string.IsNullOrEmpty(drpTypeStr.SelectedValue))
{
baseQuery = baseQuery.Where(x => x.TypeStr.Contains(drpTypeStr.SelectedValue));
}
//if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.SelectedValue != Const._Null)
//{
@ -291,13 +261,17 @@ namespace FineUIPro.Web.HJGL.PreDesign
//}
if (!string.IsNullOrEmpty(txtPipelineCode.Text))
{
strSql += " AND cte.PipelineCode like @pipeline";
listStr.Add(new SqlParameter("@pipeline", "%" + this.txtPipelineCode.Text.Trim() + "%"));
}
strSql += " ORDER BY PipelineCode,PipelineComponentCode ";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
return tb;
baseQuery = baseQuery.Where(x => x.PipelineCode.Contains(txtPipelineCode.Text.Trim()));
}
baseQuery = baseQuery.OrderBy(x => x.PipelineCode).ThenBy(x => x.Code);
totalCount = baseQuery.Count();
GridDataTable = baseQuery;
// 分页保护
if (pageIndex <= 0) pageIndex = 1;
if (pageSize <= 0) pageSize = 10;
var query = baseQuery.Skip((pageIndex - 1) * pageSize).Take(pageSize).ToList();
return query;
}
#endregion
@ -392,17 +366,17 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
if (GridDataTable != null)
{
var q = (from x in GridDataTable.AsEnumerable()
var q = (from x in GridDataTable
select new
{
管线号 = x.Field<string>("PipelineCode"),
类型 = x.Field<string>("Stype"),
组件编号 = x.Field<string>("PipelineComponentCode"),
预制散件材料描述 = !string.IsNullOrWhiteSpace(x.Field<string>("matdef")) ? x.Field<string>("matdef") : "-",
数量 = x.Field<decimal?>("Number"),
所在包装编号 = x.Field<string>("PackagingCode"),
车次 = x.Field<string>("TrainNumber"),
流水段 = x.Field<string>("FlowingSection")
管线号 = x.PipelineCode,
类型 = x.TypeStr,
编号 = x.Code,
预制散件材料描述 = x.Matdef??"-",
数量 = x.Number,
所在包装编号 = x.PackagingCode,
车次 = x.TrainNumber,
流水段 = x.FlowingSection
});
string path = Funs.RootPath + @"File\Excel\Temp\PrePipelineInstallList.xlsx";
path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd}", DateTime.Now) + ".xlsx");

9
SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.designer.cs generated
View File

@ -131,6 +131,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// </remarks>
protected global::FineUIPro.TextBox txtPipelineComponentCode;
/// <summary>
/// drpTypeStr 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpTypeStr;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>

3
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
View File

@ -43,6 +43,9 @@
<f:RenderField Width="250px" ColumnID="PackagingCode" DataField="PackagingCode"
FieldType="String" HeaderText="包装编号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CategoryString" DataField="CategoryString"
FieldType="String" HeaderText="包装分类" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="TypeString" DataField="TypeString"
FieldType="String" HeaderText="货物类型" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>

16
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx
View File

@ -17,11 +17,19 @@
<f:TextBox ID="txtPackagingCode" runat="server" Label="包装编号" LabelAlign="Right"
LabelWidth="140px">
</f:TextBox>
<f:DropDownList ID="drpTypeInt" runat="server" Label="货物类型" ColumnWidth="20%" OnSelectedIndexChanged="drpTypeInt_SelectedIndexChanged" AutoPostBack="true"
LabelWidth="140px" LabelAlign="Right" Width="170px">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="droCategoryInt" runat="server" Label="包装分类" ColumnWidth="20%" AutoSelectFirstItem="false" EmptyText="-请选择-" Required="true" ShowRedStar="true"
LabelWidth="140px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:DropDownList ID="drpTypeInt" runat="server" Label="货物类型" ColumnWidth="20%" OnSelectedIndexChanged="drpTypeInt_SelectedIndexChanged" AutoPostBack="true"
LabelWidth="140px" LabelAlign="Right" Width="170px" EmptyText="-请选择-" >
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="dropPipelineComponentCode" EmptyText="请从下拉表格中选择" Label="预制组件" LabelWidth="140px" LabelAlign="Right" EnableMultiSelect="true" MatchFieldWidth="false" Hidden="true">
@ -77,7 +85,7 @@
<%-- <f:TextBox ID="txtTrainNumber" runat="server" Label="车次" LabelAlign="Right"
LabelWidth="180px">
</f:TextBox>--%>
<f:DropDownList runat="server" ID="drpTrainNumber" EnableEdit="true" ForceSelection="false" Label="车次" LabelWidth="140px" LabelAlign="Right">
<f:DropDownList runat="server" ID="drpTrainNumber" EnableEdit="true" ForceSelection="false" Label="发货编号" LabelWidth="140px" LabelAlign="Right" AutoSelectFirstItem="false" EmptyText="-请选择-">
</f:DropDownList>
</Items>
</f:FormRow>

8
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs
View File

@ -30,7 +30,10 @@ namespace FineUIPro.Web.HJGL.PreDesign
drpTypeInt.DataSource = HJGLPackagingmanageService.TypeIntMap;
drpTypeInt.DataBind();
droCategoryInt.DataTextField = "Key";
droCategoryInt.DataValueField = "Value";
droCategoryInt.DataSource = HJGLPackagingmanageService.CategoryIntMap;
droCategoryInt.DataBind();
btnClose.OnClientClick = ActiveWindow.GetHideReference();
if (!string.IsNullOrEmpty(PackagingManageId))
{
@ -41,6 +44,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
txtStackingPosition.Text = model.StackingPosition;
drpTrainNumber.SelectedValue = model.TrainNumberId;
drpTypeInt.SelectedValue = model.TypeInt.ToString();
droCategoryInt.SelectedValue = model.CategoryInt.ToString();
if (model.State == HJGLPackagingmanageService.state_0)
{
btnSave.Hidden = false;
@ -92,6 +96,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
//table.ContactPhone = txtContactPhone.Text;
table.TrainNumberId = drpTrainNumber.SelectedValue;
table.TypeInt = int.Parse(drpTypeInt.SelectedValue);
table.CategoryInt = int.Parse(droCategoryInt.SelectedValue);
table.CompileMan = this.CurrUser.PersonId;
table.CompileDate = DateTime.Now;
if (drpTypeInt.SelectedValue == ((int)HJGLPackagingmanageService.TypeInt.预制组件).ToString())
@ -115,6 +120,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
//table.ContactPhone =txtContactPhone.Text;
table.TrainNumberId = drpTrainNumber.SelectedValue;
table.TypeInt = int.Parse(drpTypeInt.SelectedValue);
table.CategoryInt = int.Parse(droCategoryInt.SelectedValue);
if (drpTypeInt.SelectedValue == ((int)HJGLPackagingmanageService.TypeInt.预制组件).ToString())
{
table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values);

9
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.designer.cs generated
View File

@ -50,6 +50,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// </remarks>
protected global::FineUIPro.TextBox txtPackagingCode;
/// <summary>
/// droCategoryInt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList droCategoryInt;
/// <summary>
/// drpTypeInt 控件。
/// </summary>

2
SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManageEdit.aspx
View File

@ -17,7 +17,7 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtTrainNumber" runat="server" Label="车次" MaxLength="200">
<f:TextBox ID="txtTrainNumber" runat="server" Label="发货编号" MaxLength="200">
</f:TextBox>
<f:TextBox ID="txtLicensePlateNumber" runat="server" Label="车牌号" MaxLength="200">
</f:TextBox>

2
SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManageEdit.aspx.cs
View File

@ -50,7 +50,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
else
{
this.txtTrainNumber.Text = TrainNumberManageService.GetNewTrainNumber(this.CurrUser.LoginProjectId);
this.txtTrainNumber.Text = TrainNumberManageService.GetNewTrainNumber(this.CurrUser.LoginProjectId);
}
}
}

2
SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx
View File

@ -58,7 +58,7 @@
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="TrainNumber" DataField="TrainNumber" SortField="TrainNumber"
FieldType="String" HeaderText="车次" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="发货编号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="DriverName" DataField="DriverName" SortField="DriverName"
FieldType="String" HeaderText="驾驶员姓名" TextAlign="Left" HeaderTextAlign="Center">

2
SGGL/FineUIPro.Web/HJGL/PreDesign/TrainNumberManager.aspx.cs
View File

@ -31,7 +31,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
Model.HJGL_TrainNumberManage table = new Model.HJGL_TrainNumberManage();
table.ProjectId = this.CurrUser.LoginProjectId;
var tb = BLL.TrainNumberManageService.GetListByQueryModle(table, Grid1.PageIndex, Grid1.PageSize);
var tb = BLL.TrainNumberManageService.GetListByQueryModle(table, Grid1.PageIndex+1, Grid1.PageSize);
Grid1.RecordCount = tb.Total;
Grid1.DataSource = tb.Data;
Grid1.DataBind();

8
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs
View File

@ -134,6 +134,10 @@ namespace FineUIPro.Web.HJGL.TestPackage
tn1.Text = q.UnitWorkName + "(已完成" + unitWorkTestPackagePassPercent + "%)";
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = "单位工程";
if (unitWorkTestPackagePassPercent==100)
{
tn1.CssClass = "Green";
}
rootNode1.Nodes.Add(tn1);
var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
BindNodes(tn1, testPackageUnitList);
@ -151,6 +155,10 @@ namespace FineUIPro.Web.HJGL.TestPackage
tn2.Text = q.UnitWorkName + "(已完成" + unitWorkTestPackagePassPercent + "%)";
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = "单位工程";
if (unitWorkTestPackagePassPercent == 100)
{
tn2.CssClass = "Green";
}
rootNode2.Nodes.Add(tn2);
var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
BindNodes(tn2, testPackageUnitList);

23
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx
View File

@ -14,7 +14,7 @@
<f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox"
BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server" AutoScroll="true">
<Items>
<f:GroupPanel ID="GroupPanel2" Layout="Anchor" Title="焊接环境设置" runat="server" >
<f:GroupPanel ID="GroupPanel2" Layout="Anchor" Title="焊接环境设置" runat="server">
<Items>
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="false" Layout="VBox"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
@ -49,7 +49,15 @@
<Items>
<f:CheckBox ID="ckPressMustCheckBItem" runat="server" Label="压力试验尾项条件" Text="必须B项整改完成" LabelWidth="200">
</f:CheckBox>
</Items>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:RadioButtonList ID="rbMaterialColorAttribute" runat="server" Label="材质标识关联属性" LabelWidth="200">
<f:RadioItem Value="1" Text="颜色名称" Selected="true" />
<f:RadioItem Value="2" Text="色卡号" />
</f:RadioButtonList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
@ -99,8 +107,8 @@
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
<f:GroupPanel ID="GroupPanel3" Layout="Anchor" Title="模型颜色设置" runat="server">
</f:GroupPanel>
<f:GroupPanel ID="GroupPanel3" Layout="Anchor" Title="模型颜色设置" runat="server">
<Items>
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true"
Layout="VBox" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
@ -109,16 +117,16 @@
<f:FormRow runat="server">
<Items>
<f:NumberBox ID="txtPipelineNOComplete" Label="未完成(透明显示)" runat="server" MaxValue="100" Hidden="true"
LabelWidth="180px" NoNegative="true" NoDecimal="true">
LabelWidth="180px" NoNegative="true" NoDecimal="true">
</f:NumberBox>
<f:NumberBox ID="txtPipelineComplete" Label="已完成(透明显示)" runat="server" MaxValue="100" Hidden="true"
LabelWidth="180px" NoNegative="true" NoDecimal="true">
LabelWidth="180px" NoNegative="true" NoDecimal="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:DropDownList ID="drpJointNOCompleteColor" Label="未完成(颜色)" runat="server" LabelWidth="180px">
<f:DropDownList ID="drpJointNOCompleteColor" Label="未完成(颜色)" runat="server" LabelWidth="180px">
<f:ListItem Value="#FF0000" Text="红" />
<f:ListItem Value="#FFFF00" Text="黄" />
<f:ListItem Value="#00FF00" Text="绿" />
@ -131,7 +139,6 @@
</f:DropDownList>
<%--<f:TextBox ID="txtJointNOCompleteColor" runat="server" Label="焊口未完成" LabelWidth="180px"></f:TextBox>
<f:TextBox ID="txtJointCompleteColor" runat="server" Label="焊口已完成" LabelWidth="180px"></f:TextBox>--%>
</Items>
</f:FormRow>
</Rows>

827
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs
View File

@ -1,6 +1,8 @@
using BLL;
using System;
using System.Linq;
using System.Collections.Generic;
using FineUIPro;
namespace FineUIPro.Web.common.ProjectSet
{
@ -48,595 +50,292 @@ namespace FineUIPro.Web.common.ProjectSet
ShowNotify("请选择项目！", MessageBoxIcon.Warning);
return;
}
#region 焊接
// 焊接
Model.Project_Sys_Set dayReport = BLL.Project_SysSetService.GetSysSetBySetId("1", projectId);
Model.Project_Sys_Set point = BLL.Project_SysSetService.GetSysSetBySetId("2", projectId);
Model.Project_Sys_Set trust = BLL.Project_SysSetService.GetSysSetBySetId("3", projectId);
Model.Project_Sys_Set pdms = BLL.Project_SysSetService.GetSysSetBySetId("4", projectId);
Model.Project_Sys_Set batch = BLL.Project_SysSetService.GetSysSetBySetId("5", projectId);
Model.Project_Sys_Set jointB = BLL.Project_SysSetService.GetSysSetBySetId("6", projectId);
Model.Project_Sys_Set thickness = BLL.Project_SysSetService.GetSysSetBySetId("7", projectId);
Model.Project_Sys_Set pressUnit = BLL.Project_SysSetService.GetSysSetBySetId("8", projectId);
Model.Project_Sys_Set AvevaNetUrl = BLL.Project_SysSetService.GetSysSetBySetId("9", projectId);
Model.Project_Sys_Set PressMustCheckBItem = BLL.Project_SysSetService.GetSysSetBySetId("10", projectId);
if (PressMustCheckBItem != null)
{
if (this.ckPressMustCheckBItem.Checked)
{
PressMustCheckBItem.IsAuto = true;
}
else
{
PressMustCheckBItem.IsAuto = false;
}
BLL.Project_SysSetService.UpdateSet(PressMustCheckBItem);
}
else
{
Model.Project_Sys_Set newPressMustCheckBItem = new Model.Project_Sys_Set();
newPressMustCheckBItem.SetId = "10";
newPressMustCheckBItem.ProjectId = projectId;
if (this.ckPressMustCheckBItem.Checked)
{
newPressMustCheckBItem.IsAuto = true;
}
else
{
newPressMustCheckBItem.IsAuto = false;
}
BLL.Project_SysSetService.AddSet(newPressMustCheckBItem);
}
if (jointB != null)
{
if (this.ckbJointB.Checked)
{
jointB.IsAuto = true;
}
else
{
jointB.IsAuto = false;
}
BLL.Project_SysSetService.UpdateSet(jointB);
}
else
{
Model.Project_Sys_Set newJointB = new Model.Project_Sys_Set();
newJointB.SetId = "6";
newJointB.ProjectId = projectId;
if (this.ckbJointB.Checked)
{
newJointB.IsAuto = true;
}
else
{
newJointB.IsAuto = false;
}
BLL.Project_SysSetService.AddSet(newJointB);
}
if (pressUnit != null)
{
pressUnit.SetValue = this.rblPressUnit.SelectedValue;
BLL.Project_SysSetService.UpdateSet(pressUnit);
}
else
{
Model.Project_Sys_Set newPressUnit = new Model.Project_Sys_Set();
newPressUnit.SetId = "8";
newPressUnit.SetValue = this.rblPressUnit.SelectedValue;
newPressUnit.ProjectId = projectId;
BLL.Project_SysSetService.AddSet(newPressUnit);
}
if (AvevaNetUrl != null)
{
AvevaNetUrl.SetValue = this.AvevaNetUrl.Text.Trim();
BLL.Project_SysSetService.UpdateSet(AvevaNetUrl);
}
else
{
Model.Project_Sys_Set newAvevaNetUrl = new Model.Project_Sys_Set();
newAvevaNetUrl.SetId = "9";
newAvevaNetUrl.SetName = "AVEVA NET 地址";
newAvevaNetUrl.SetValue = this.AvevaNetUrl.Text.Trim();
newAvevaNetUrl.ProjectId = projectId;
BLL.Project_SysSetService.AddSet(newAvevaNetUrl);
}
if (thickness != null)
{
if (this.ckbThickness.Checked)
{
thickness.IsAuto = true;
}
else
{
thickness.IsAuto = false;
}
BLL.Project_SysSetService.UpdateSet(thickness);
}
else
{
Model.Project_Sys_Set newThickness = new Model.Project_Sys_Set();
newThickness.SetId = "7";
newThickness.ProjectId = projectId;
if (this.ckbThickness.Checked)
{
newThickness.IsAuto = true;
}
else
{
newThickness.IsAuto = false;
}
BLL.Project_SysSetService.AddSet(newThickness);
}
if (this.ckbPdms.Checked)
{
pdms.IsAuto = true;
}
else
{
pdms.IsAuto = false;
}
if (ckbDayReport.Checked)
{
dayReport.IsAuto = true;
}
else
{
dayReport.IsAuto = false;
}
SaveWeldingSettings(projectId);
SaveColorModelSettings(projectId);
SaveQualitySettings(projectId);
if (ckbPoint.Checked)
{
point.IsAuto = true;
}
else
{
point.IsAuto = false;
}
if (robStandard.SelectedValue == "1")
{
trust.IsAuto = true;
trust.SetValue = null;
}
else if (robStandard.SelectedValue == "2")
{
trust.IsAuto = false;
trust.SetValue = null;
}
else
{
trust.IsAuto = null;
trust.SetValue = robStandard.SelectedValue;
}
string lists = string.Empty;
if (cb1.Checked)
{
lists += "1|";
}
if (cb2.Checked)
{
lists += "2|";
}
if (cb3.Checked)
{
lists += "3|";
}
if (cb4.Checked)
{
lists += "4|";
}
if (cb5.Checked)
{
lists += "5|";
}
if (cb6.Checked)
{
lists += "6|";
}
if (cb7.Checked)
{
lists += "7|";
}
if (!string.IsNullOrEmpty(lists))
{
lists = lists.Substring(0, lists.LastIndexOf('|'));
batch.IsAuto = true;
batch.SetValue = lists;
}
BLL.Project_SysSetService.UpdateSet(dayReport);
BLL.Project_SysSetService.UpdateSet(point);
BLL.Project_SysSetService.UpdateSet(pdms);
BLL.Project_SysSetService.UpdateSet(trust);
BLL.Project_SysSetService.UpdateSet(batch);
//this.Show(projectId);
#endregion
#region 颜色模型设置
Model.Project_Sys_Set Model_PipelineNOComplete = BLL.Project_SysSetService.GetSysSetBySetName("管线未完成", this.CurrUser.LoginProjectId);
if (Model_PipelineNOComplete != null)
{
if (!string.IsNullOrEmpty(this.txtPipelineNOComplete.Text.Trim()))
{
Model_PipelineNOComplete.SetValue = this.txtPipelineNOComplete.Text.Trim();
BLL.Project_SysSetService.UpdateSet(Model_PipelineNOComplete);
}
}
else
{
if (!string.IsNullOrEmpty(this.txtPipelineNOComplete.Text.Trim()))
{
Model.Project_Sys_Set newModel_PipelineNOComplete = new Model.Project_Sys_Set()
{
SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)),
ProjectId = this.CurrUser.LoginProjectId,
SetName = "管线未完成",
SetValue = this.txtPipelineNOComplete.Text.Trim(),
};
BLL.Project_SysSetService.AddSet(newModel_PipelineNOComplete);
}
}
Model.Project_Sys_Set Model_PipelineComplete = BLL.Project_SysSetService.GetSysSetBySetName("管线已完成", this.CurrUser.LoginProjectId);
if (Model_PipelineComplete != null)
{
if (!string.IsNullOrEmpty(this.txtPipelineComplete.Text.Trim()))
{
Model_PipelineComplete.SetValue = this.txtPipelineComplete.Text.Trim();
BLL.Project_SysSetService.UpdateSet(Model_PipelineComplete);
}
}
else
{
if (!string.IsNullOrEmpty(this.txtPipelineComplete.Text.Trim()))
{
Model.Project_Sys_Set newModel = new Model.Project_Sys_Set()
{
SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)),
ProjectId = this.CurrUser.LoginProjectId,
SetName = "管线已完成",
SetValue = this.txtPipelineComplete.Text.Trim(),
};
BLL.Project_SysSetService.AddSet(newModel);
}
}
Model.Project_Sys_Set Model_JointNOCompleteColor = BLL.Project_SysSetService.GetSysSetBySetName("焊口未完成", this.CurrUser.LoginProjectId);
if (Model_JointNOCompleteColor != null)
{
if (!string.IsNullOrEmpty(this.drpJointNOCompleteColor.SelectedValue.Trim()))
{
Model_JointNOCompleteColor.SetValue = this.drpJointNOCompleteColor.SelectedValue.Trim();
BLL.Project_SysSetService.UpdateSet(Model_JointNOCompleteColor);
}
}
else
{
if (!string.IsNullOrEmpty(this.drpJointNOCompleteColor.SelectedValue.Trim()))
{
Model.Project_Sys_Set newModel = new Model.Project_Sys_Set()
{
SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)),
ProjectId = this.CurrUser.LoginProjectId,
SetName = "焊口未完成",
SetValue = this.drpJointNOCompleteColor.SelectedValue.Trim(),
};
BLL.Project_SysSetService.AddSet(newModel);
}
}
Model.Project_Sys_Set Model_JointCompleteColor = BLL.Project_SysSetService.GetSysSetBySetName("焊口已完成", this.CurrUser.LoginProjectId);
if (Model_JointCompleteColor != null)
{
if (!string.IsNullOrEmpty(this.drpJointCompleteColor.SelectedValue.Trim()))
{
Model_JointCompleteColor.SetValue = this.drpJointCompleteColor.SelectedValue.Trim();
BLL.Project_SysSetService.UpdateSet(Model_JointCompleteColor);
}
}
else
{
if (!string.IsNullOrEmpty(this.drpJointCompleteColor.SelectedValue.Trim()))
{
Model.Project_Sys_Set newModel = new Model.Project_Sys_Set()
{
SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)),
ProjectId = this.CurrUser.LoginProjectId,
SetName = "焊口已完成",
SetValue = this.drpJointCompleteColor.SelectedValue.Trim(),
};
BLL.Project_SysSetService.AddSet(newModel);
}
}
#endregion
#region 质量
Model.Project_Sys_Set CheckEquipmentDay = BLL.Project_SysSetService.GetSysSetBySetName("检试验设备到期提醒天数", this.CurrUser.LoginProjectId);
if (CheckEquipmentDay != null)
{
if (!string.IsNullOrEmpty(this.txtRemindDay.Text.Trim()))
{
CheckEquipmentDay.SetValue = this.txtRemindDay.Text.Trim();
BLL.Project_SysSetService.UpdateSet(CheckEquipmentDay);
}
}
else
{
if (!string.IsNullOrEmpty(this.txtRemindDay.Text.Trim()))
{
Model.Project_Sys_Set newCheckEquipmentDay = new Model.Project_Sys_Set();
newCheckEquipmentDay.SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set));
newCheckEquipmentDay.ProjectId = this.CurrUser.LoginProjectId;
newCheckEquipmentDay.SetName = "检试验设备到期提醒天数";
newCheckEquipmentDay.SetValue = this.txtRemindDay.Text.Trim();
BLL.Project_SysSetService.AddSet(newCheckEquipmentDay);
}
}
Model.Project_Sys_Set CheckMonthStartDay = BLL.Project_SysSetService.GetSysSetBySetName("月报开始日期", this.CurrUser.LoginProjectId);
if (CheckMonthStartDay != null)
{
if (!string.IsNullOrEmpty(this.txtStarTime.Text.Trim()))
{
CheckMonthStartDay.SetValue = this.txtStarTime.Text.Trim();
BLL.Project_SysSetService.UpdateSet(CheckMonthStartDay);
}
}
else
{
if (!string.IsNullOrEmpty(this.txtStarTime.Text.Trim()))
{
Model.Project_Sys_Set newCheckEquipmentDay = new Model.Project_Sys_Set();
newCheckEquipmentDay.SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set));
newCheckEquipmentDay.ProjectId = this.CurrUser.LoginProjectId;
newCheckEquipmentDay.SetName = "月报开始日期";
newCheckEquipmentDay.SetValue = this.txtStarTime.Text.Trim();
BLL.Project_SysSetService.AddSet(newCheckEquipmentDay);
}
}
Model.Project_Sys_Set CheckMonthEndDay = BLL.Project_SysSetService.GetSysSetBySetName("月报结束日期", this.CurrUser.LoginProjectId);
if (CheckMonthEndDay != null)
{
if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
{
CheckMonthEndDay.SetValue = this.txtEndTime.Text.Trim();
BLL.Project_SysSetService.UpdateSet(CheckMonthEndDay);
}
}
else
{
if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
{
Model.Project_Sys_Set newCheckEquipmentDay = new Model.Project_Sys_Set();
newCheckEquipmentDay.SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set));
newCheckEquipmentDay.ProjectId = this.CurrUser.LoginProjectId;
newCheckEquipmentDay.SetName = "月报结束日期";
newCheckEquipmentDay.SetValue = this.txtEndTime.Text.Trim();
BLL.Project_SysSetService.AddSet(newCheckEquipmentDay);
}
}
#endregion
// 刷新界面
this.Show(projectId);
//BLL.Sys_LogService.AddLog(BLL.Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, "提交项目环境设置");
Alert.ShowInTop("提交成功！", MessageBoxIcon.Success);
}
private void SaveWeldingSettings(string projectId)
{
// Booleans stored in IsAuto
UpsertIsAutoById("1", projectId, this.ckbDayReport.Checked);
UpsertIsAutoById("2", projectId, this.ckbPoint.Checked);
// trust (id 3) uses special mapping: 1->IsAuto=true, 2->IsAuto=false, otherwise IsAuto=null and SetValue holds value
UpsertTrustSetting("3", projectId, this.robStandard.SelectedValue);
UpsertIsAutoById("4", projectId, this.ckbPdms.Checked);
// batch (id 5) is a list of checked items
UpsertBatchSetting("5", projectId);
UpsertIsAutoById("6", projectId, this.ckbJointB.Checked);
UpsertIsAutoById("7", projectId, this.ckbThickness.Checked);
UpsertValueById("8", projectId, this.rblPressUnit.SelectedValue);
UpsertValueById("9", projectId, this.AvevaNetUrl.Text.Trim(), setName: "AVEVA NET 地址");
UpsertIsAutoById("10", projectId, this.ckPressMustCheckBItem.Checked);
UpsertValueById("11", projectId, this.rbMaterialColorAttribute.SelectedValue);
}
private void SaveColorModelSettings(string projectId)
{
UpsertByName("管线未完成", projectId, this.txtPipelineNOComplete.Text.Trim());
UpsertByName("管线已完成", projectId, this.txtPipelineComplete.Text.Trim());
UpsertByName("焊口未完成", projectId, this.drpJointNOCompleteColor.SelectedValue.Trim());
UpsertByName("焊口已完成", projectId, this.drpJointCompleteColor.SelectedValue.Trim());
}
private void SaveQualitySettings(string projectId)
{
UpsertByName("检试验设备到期提醒天数", projectId, this.txtRemindDay.Text.Trim());
UpsertByName("月报开始日期", projectId, this.txtStarTime.Text.Trim());
UpsertByName("月报结束日期", projectId, this.txtEndTime.Text.Trim());
}
#endregion
#region Upsert Helpers
private void UpsertIsAutoById(string setId, string projectId, bool value)
{
var existing = BLL.Project_SysSetService.GetSysSetBySetId(setId, projectId);
if (existing != null)
{
existing.IsAuto = value;
BLL.Project_SysSetService.UpdateSet(existing);
}
else
{
var newSet = new Model.Project_Sys_Set
{
SetId = setId,
ProjectId = projectId,
IsAuto = value
};
BLL.Project_SysSetService.AddSet(newSet);
}
}
private void UpsertValueById(string setId, string projectId, string value, string setName = null)
{
if (string.IsNullOrEmpty(value)) return;
var existing = BLL.Project_SysSetService.GetSysSetBySetId(setId, projectId);
if (existing != null)
{
existing.SetValue = value;
if (!string.IsNullOrEmpty(setName)) existing.SetName = setName;
BLL.Project_SysSetService.UpdateSet(existing);
}
else
{
var newSet = new Model.Project_Sys_Set
{
SetId = setId,
ProjectId = projectId,
SetValue = value,
SetName = setName
};
BLL.Project_SysSetService.AddSet(newSet);
}
}
private void UpsertByName(string setName, string projectId, string value)
{
if (string.IsNullOrEmpty(value)) return;
var existing = BLL.Project_SysSetService.GetSysSetBySetName(setName, projectId);
if (existing != null)
{
existing.SetValue = value;
BLL.Project_SysSetService.UpdateSet(existing);
}
else
{
var newSet = new Model.Project_Sys_Set
{
SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)),
ProjectId = projectId,
SetName = setName,
SetValue = value
};
BLL.Project_SysSetService.AddSet(newSet);
}
}
private void UpsertTrustSetting(string setId, string projectId, string selectedValue)
{
var existing = BLL.Project_SysSetService.GetSysSetBySetId(setId, projectId);
if (existing != null)
{
if (selectedValue == "1")
{
existing.IsAuto = true;
existing.SetValue = null;
}
else if (selectedValue == "2")
{
existing.IsAuto = false;
existing.SetValue = null;
}
else
{
existing.IsAuto = null;
existing.SetValue = selectedValue;
}
BLL.Project_SysSetService.UpdateSet(existing);
}
else
{
var newSet = new Model.Project_Sys_Set
{
SetId = setId,
ProjectId = projectId
};
if (selectedValue == "1")
{
newSet.IsAuto = true;
}
else if (selectedValue == "2")
{
newSet.IsAuto = false;
}
else
{
newSet.IsAuto = null;
newSet.SetValue = selectedValue;
}
BLL.Project_SysSetService.AddSet(newSet);
}
}
private void UpsertBatchSetting(string setId, string projectId)
{
var items = new List<string>();
if (cb1.Checked) items.Add("1");
if (cb2.Checked) items.Add("2");
if (cb3.Checked) items.Add("3");
if (cb4.Checked) items.Add("4");
if (cb5.Checked) items.Add("5");
if (cb6.Checked) items.Add("6");
if (cb7.Checked) items.Add("7");
if (items.Count == 0) return;
var lists = string.Join("|", items);
var existing = BLL.Project_SysSetService.GetSysSetBySetId(setId, projectId);
if (existing != null)
{
existing.IsAuto = true;
existing.SetValue = lists;
BLL.Project_SysSetService.UpdateSet(existing);
}
else
{
var newSet = new Model.Project_Sys_Set
{
SetId = setId,
ProjectId = projectId,
IsAuto = true,
SetValue = lists
};
BLL.Project_SysSetService.AddSet(newSet);
}
}
#endregion
#region 页面呈现
/// <summary>
///
/// 页面呈现
/// </summary>
private void Show(string projectId)
{
var q = from x in Funs.DB.Project_Sys_Set where x.ProjectId == projectId select x;
if (q.Count() > 0)
if (q.Any())
{
foreach (var s in q)
{
if (s.SetId == "1")
{
if (s.IsAuto == true)
{
this.ckbDayReport.Checked = true;
}
else
{
this.ckbDayReport.Checked = false;
}
}
else if (s.SetId == "2")
{
if (s.IsAuto == true)
{
this.ckbPoint.Checked = true;
}
else
{
this.ckbPoint.Checked = false;
}
}
else if (s.SetId == "3")
{
if (s.IsAuto == true)
{
this.robStandard.SelectedValue = "1";
}
if (s.IsAuto == false)
{
this.robStandard.SelectedValue = "2";
}
if (s.SetValue == "3")
{
this.robStandard.SelectedValue = "3";
}
if (s.SetValue == "4")
{
this.robStandard.SelectedValue = "4";
}
}
else if (s.SetId == "4")
{
if (s.IsAuto == true)
{
this.ckbPdms.Checked = true;
}
else
{
this.ckbPdms.Checked = false;
}
}
else if (s.SetId == "5")
{
cb4.Checked = false;
cb5.Checked = false;
cb6.Checked = false;
cb7.Checked = false;
var lists = s.SetValue.Split('|');
foreach (var item in lists)
{
if (item == "1")
{
cb1.Checked = true;
}
else if (item == "2")
{
cb2.Checked = true;
}
else if (item == "3")
{
cb3.Checked = true;
}
else if (item == "4")
{
cb4.Checked = true;
}
else if (item == "5")
{
cb5.Checked = true;
}
else if (item == "6")
{
cb6.Checked = true;
}
else if (item == "7")
{
cb7.Checked = true;
}
}
}
else if (s.SetId == "6")
{
if (s.IsAuto == true)
{
this.ckbJointB.Checked = true;
}
else
{
this.ckbJointB.Checked = false;
}
}
else if (s.SetId == "7")
{
if (s.IsAuto == true)
{
this.ckbThickness.Checked = true;
}
else
{
this.ckbThickness.Checked = false;
}
}
else if (s.SetId == "8")
{
if (s.SetValue == "1")
{
this.rblPressUnit.SelectedValue = "1";
}
else
{
this.rblPressUnit.SelectedValue = "2";
}
}
else if (s.SetId == "9")
{
var dict = q.ToDictionary(x => x.SetId, x => x);
this.AvevaNetUrl.Text = s.SetValue;
}
else if (s.SetId == "10")
{
if (s.IsAuto == true)
{
this.ckPressMustCheckBItem.Checked = true;
}
else
{
this.ckPressMustCheckBItem.Checked = false;
}
}
}
SetCheckFromDict(dict, "1", this.ckbDayReport);
SetCheckFromDict(dict, "2", this.ckbPoint);
SetRobStandardFromDict(dict, "3");
SetCheckFromDict(dict, "4", this.ckbPdms);
SetBatchFromDict(dict, "5");
SetCheckFromDict(dict, "6", this.ckbJointB);
SetCheckFromDict(dict, "7", this.ckbThickness);
SetRadioValueFromDict(dict, "8", this.rblPressUnit, defaultValue: "2");
if (dict.ContainsKey("9")) this.AvevaNetUrl.Text = dict["9"].SetValue;
SetCheckFromDict(dict, "10", this.ckPressMustCheckBItem);
if (dict.ContainsKey("11")) this.rbMaterialColorAttribute.SelectedValue = dict["11"].SetValue == "1" ? "1" : "2";
}
//颜色模型设置
Model.Project_Sys_Set Model_PipelineNOComplete = BLL.Project_SysSetService.GetSysSetBySetName("管线未完成", this.CurrUser.LoginProjectId);
if (Model_PipelineNOComplete != null)
{
this.txtPipelineNOComplete.Text = Model_PipelineNOComplete.SetValue;
}
Model.Project_Sys_Set Model_PipelineComplete = BLL.Project_SysSetService.GetSysSetBySetName("管线已完成", this.CurrUser.LoginProjectId);
if (Model_PipelineComplete != null)
{
this.txtPipelineComplete.Text = Model_PipelineComplete.SetValue;
}
Model.Project_Sys_Set Model_JointNOCompleteColor = BLL.Project_SysSetService.GetSysSetBySetName("焊口未完成", this.CurrUser.LoginProjectId);
if (Model_JointNOCompleteColor != null)
{
this.drpJointNOCompleteColor.SelectedValue = Model_JointNOCompleteColor.SetValue;
}
Model.Project_Sys_Set Model_JointCompleteColor = BLL.Project_SysSetService.GetSysSetBySetName("焊口已完成", this.CurrUser.LoginProjectId);
if (Model_JointCompleteColor != null)
{
this.drpJointCompleteColor.SelectedValue = Model_JointCompleteColor.SetValue;
}
var m1 = BLL.Project_SysSetService.GetSysSetBySetName("管线未完成", this.CurrUser.LoginProjectId);
if (m1 != null) this.txtPipelineNOComplete.Text = m1.SetValue;
var m2 = BLL.Project_SysSetService.GetSysSetBySetName("管线已完成", this.CurrUser.LoginProjectId);
if (m2 != null) this.txtPipelineComplete.Text = m2.SetValue;
var m3 = BLL.Project_SysSetService.GetSysSetBySetName("焊口未完成", this.CurrUser.LoginProjectId);
if (m3 != null) this.drpJointNOCompleteColor.SelectedValue = m3.SetValue;
var m4 = BLL.Project_SysSetService.GetSysSetBySetName("焊口已完成", this.CurrUser.LoginProjectId);
if (m4 != null) this.drpJointCompleteColor.SelectedValue = m4.SetValue;
///质量页面呈现
Model.Project_Sys_Set CheckEquipmentDay = BLL.Project_SysSetService.GetSysSetBySetName("检试验设备到期提醒天数", this.CurrUser.LoginProjectId);
if (CheckEquipmentDay != null)
var c1 = BLL.Project_SysSetService.GetSysSetBySetName("检试验设备到期提醒天数", this.CurrUser.LoginProjectId);
if (c1 != null) this.txtRemindDay.Text = c1.SetValue;
var c2 = BLL.Project_SysSetService.GetSysSetBySetName("月报开始日期", this.CurrUser.LoginProjectId);
if (c2 != null) this.txtStarTime.Text = c2.SetValue; else this.txtStarTime.Text = "25";
var c3 = BLL.Project_SysSetService.GetSysSetBySetName("月报结束日期", this.CurrUser.LoginProjectId);
if (c3 != null) this.txtEndTime.Text = c3.SetValue; else this.txtEndTime.Text = "24";
}
private void SetCheckFromDict(Dictionary<string, Model.Project_Sys_Set> dict, string setId, CheckBox checkBox)
{
if (!dict.ContainsKey(setId)) return;
var s = dict[setId];
checkBox.Checked = s.IsAuto == true;
}
private void SetRobStandardFromDict(Dictionary<string, Model.Project_Sys_Set> dict, string setId)
{
if (!dict.ContainsKey(setId)) return;
var s = dict[setId];
if (s.IsAuto == true) this.robStandard.SelectedValue = "1";
else if (s.IsAuto == false) this.robStandard.SelectedValue = "2";
else if (s.SetValue == "3") this.robStandard.SelectedValue = "3";
else if (s.SetValue == "4") this.robStandard.SelectedValue = "4";
}
private void SetBatchFromDict(Dictionary<string, Model.Project_Sys_Set> dict, string setId)
{
if (!dict.ContainsKey(setId)) return;
// reset some checkboxes first
cb1.Checked = cb2.Checked = cb3.Checked = cb4.Checked = cb5.Checked = cb6.Checked = cb7.Checked = false;
var s = dict[setId];
if (string.IsNullOrEmpty(s.SetValue)) return;
var items = s.SetValue.Split('|');
foreach (var item in items)
{
this.txtRemindDay.Text = CheckEquipmentDay.SetValue;
switch (item)
{
case "1": cb1.Checked = true; break;
case "2": cb2.Checked = true; break;
case "3": cb3.Checked = true; break;
case "4": cb4.Checked = true; break;
case "5": cb5.Checked = true; break;
case "6": cb6.Checked = true; break;
case "7": cb7.Checked = true; break;
}
}
Model.Project_Sys_Set CheckMonthStartDay = BLL.Project_SysSetService.GetSysSetBySetName("月报开始日期", this.CurrUser.LoginProjectId);
if (CheckMonthStartDay != null)
}
private void SetRadioValueFromDict(Dictionary<string, Model.Project_Sys_Set> dict, string setId, RadioButtonList rbl, string defaultValue = null)
{
if (!dict.ContainsKey(setId))
{
this.txtStarTime.Text = CheckMonthStartDay.SetValue;
}
else
{
this.txtStarTime.Text = "25";
}
Model.Project_Sys_Set CheckMonthEndDay = BLL.Project_SysSetService.GetSysSetBySetName("月报结束日期", this.CurrUser.LoginProjectId);
if (CheckMonthEndDay != null)
{
this.txtEndTime.Text = CheckMonthEndDay.SetValue;
}
else
{
this.txtEndTime.Text = "24";
if (defaultValue != null) rbl.SelectedValue = defaultValue;
return;
}
var s = dict[setId];
rbl.SelectedValue = s.SetValue ?? defaultValue;
}
#endregion
}

9
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs generated
View File

@ -113,6 +113,15 @@ namespace FineUIPro.Web.common.ProjectSet
/// </remarks>
protected global::FineUIPro.CheckBox ckPressMustCheckBItem;
/// <summary>
/// rbMaterialColorAttribute 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbMaterialColorAttribute;
/// <summary>
/// ckbDayReport 控件。
/// </summary>

37
SGGL/Model/HJGL/BaseInfo/BaseMaterialcolorDataIn.cs Normal file
View File

@ -0,0 +1,37 @@
using MiniExcelLibs.Attributes;
namespace Model
{
/// <summary>
/// 管道材质颜色导入实体
/// </summary>
public class BaseMaterialcolorDataIn
{
/// <summary>
/// 材质
/// </summary>
[ExcelColumnIndex("A")]
public string MaterialCode { get; set; }
/// <summary>
/// 颜色名称
/// </summary>
[ExcelColumnIndex("B")]
public string ColorName { get; set; }
/// <summary>
/// 色卡号
/// </summary>
[ExcelColumnIndex("C")]
public string ColorCardNo { get; set; }
/// <summary>
/// RGB
/// </summary>
[ExcelColumnIndex("D")]
public string RGB { get; set; }
/// <summary>
/// 备注
/// </summary>
[ExcelColumnIndex("E")]
public string Remark { get; set; }
}
}

0
SGGL/Model/HJGL/BaseMaterialcolorOutput.cs → SGGL/Model/HJGL/BaseInfo/BaseMaterialcolorOutput.cs
View File

0
SGGL/Model/HJGL/MaterialStockItem.cs → SGGL/Model/HJGL/PreDesign/Material/MaterialStockItem.cs
View File

59
SGGL/Model/HJGL/PreDesign/PackagingManage/PackagingManageInput.cs Normal file
View File

@ -0,0 +1,59 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Model
{
/// <summary>
/// 包装管理输入参数
/// </summary>
public class PackagingManageInput
{
/// <summary>
/// 主键
/// </summary>
public string PackagingManageId { get; set; }
/// <summary>
/// 包装编号
/// </summary>
public string PackagingCode { get; set; }
/// <summary>
/// 项目id
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 项目名称
/// </summary>
public string ProjectName { get; set; }
/// <summary>
/// 联系人姓名
/// </summary>
public string ContactName { get; set; }
/// <summary>
/// 联系人电话
/// </summary>
public string ContactPhone { get; set; }
/// <summary>
/// 预制工作包
/// </summary>
public string StackingPosition { get; set; }
/// <summary>
/// 状态
/// </summary>
public int? State { get; set; }
/// <summary>
/// 接收人
/// </summary>
public string ReceiveMan { get; set; }
/// <summary>
/// 接收时间
/// </summary>
public string ReceiveDate { get; set; }
/// <summary>
/// 车次id
/// </summary>
public string TrainNumberId { get; set; }
}
}

0
SGGL/Model/HJGL/PackagingManagePrintOutput.cs → SGGL/Model/HJGL/PreDesign/PackagingManage/PackagingManagePrintOutput.cs
View File

0
SGGL/Model/HJGL/PipelineComponentPrintDto.cs → SGGL/Model/HJGL/PreDesign/PipelineComponent/PipelineComponentPrintDto.cs
View File

0
SGGL/Model/HJGL/Pipeline_ComponentQRCodeItem.cs → SGGL/Model/HJGL/PreDesign/PipelineComponent/Pipeline_ComponentQRCodeItem.cs
View File

239
SGGL/Model/Model.cs
View File

@ -6921,6 +6921,14 @@ namespace Model
}
}
public System.Data.Linq.Table<View_HJGL_InstallData> View_HJGL_InstallData
{
get
{
return this.GetTable<View_HJGL_InstallData>();
}
}
public System.Data.Linq.Table<View_HJGL_JointInfoQuery> View_HJGL_JointInfoQuery
{
get
@ -97820,6 +97828,8 @@ namespace Model
private System.Nullable<System.DateTime> _CompileDate;
private System.Nullable<int> _CategoryInt;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -97856,6 +97866,8 @@ namespace Model
partial void OnCompileManChanged();
partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
partial void OnCompileDateChanged();
partial void OnCategoryIntChanging(System.Nullable<int> value);
partial void OnCategoryIntChanged();
#endregion
public HJGL_PackagingManage()
@ -98183,6 +98195,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CategoryInt", DbType="Int")]
public System.Nullable<int> CategoryInt
{
get
{
return this._CategoryInt;
}
set
{
if ((this._CategoryInt != value))
{
this.OnCategoryIntChanging(value);
this.SendPropertyChanging();
this._CategoryInt = value;
this.SendPropertyChanged("CategoryInt");
this.OnCategoryIntChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -290556,6 +290588,213 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_InstallData")]
public partial class View_HJGL_InstallData
{
private string _Id;
private string _PipelineCode;
private string _Code;
private string _TypeStr;
private string _Matdef;
private System.Nullable<decimal> _Number;
private string _PackagingCode;
private string _TrainNumber;
private string _FlowingSection;
private string _UnitWorkId;
private string _ProjectId;
public View_HJGL_InstallData()
{
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string Id
{
get
{
return this._Id;
}
set
{
if ((this._Id != value))
{
this._Id = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")]
public string PipelineCode
{
get
{
return this._PipelineCode;
}
set
{
if ((this._PipelineCode != value))
{
this._PipelineCode = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Code", DbType="NVarChar(50)")]
public string Code
{
get
{
return this._Code;
}
set
{
if ((this._Code != value))
{
this._Code = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeStr", DbType="VarChar(8) NOT NULL", CanBeNull=false)]
public string TypeStr
{
get
{
return this._TypeStr;
}
set
{
if ((this._TypeStr != value))
{
this._TypeStr = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Matdef", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string Matdef
{
get
{
return this._Matdef;
}
set
{
if ((this._Matdef != value))
{
this._Matdef = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Number", DbType="Decimal(18,2)")]
public System.Nullable<decimal> Number
{
get
{
return this._Number;
}
set
{
if ((this._Number != value))
{
this._Number = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackagingCode", DbType="NVarChar(50)")]
public string PackagingCode
{
get
{
return this._PackagingCode;
}
set
{
if ((this._PackagingCode != value))
{
this._PackagingCode = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumber", DbType="NVarChar(50)")]
public string TrainNumber
{
get
{
return this._TrainNumber;
}
set
{
if ((this._TrainNumber != value))
{
this._TrainNumber = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FlowingSection", DbType="NVarChar(200)")]
public string FlowingSection
{
get
{
return this._FlowingSection;
}
set
{
if ((this._FlowingSection != value))
{
this._FlowingSection = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(50)")]
public string UnitWorkId
{
get
{
return this._UnitWorkId;
}
set
{
if ((this._UnitWorkId != value))
{
this._UnitWorkId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this._ProjectId = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_JointInfoQuery")]
public partial class View_HJGL_JointInfoQuery
{

15
SGGL/Model/Model.csproj
View File

@ -212,11 +212,11 @@
<Compile Include="Chart\DataSourcePoint.cs" />
<Compile Include="Chart\DataSourceTeam.cs" />
<Compile Include="CLGL\Tw_ArrivalStatisticsOutPut.cs" />
<Compile Include="CLGL\Tw_InputDataIn.cs" />
<Compile Include="CLGL\Tw_PipeMatMatchOutput.cs" />
<Compile Include="CLGL\Tw_PrintModel.cs" />
<Compile Include="CLGL\Tw_InOutDetailOutput.cs" />
<Compile Include="CLGL\Tw_InOutMasterOutput.cs" />
<Compile Include="CLGL\Tw_InputDataIn.cs" />
<Compile Include="CLGL\Tw_MaterialStockOutput.cs" />
<Compile Include="CLGL\Tw_PipeLineMat.cs" />
<Compile Include="ConstructionLogCQMS.cs" />
@ -233,14 +233,16 @@
<Compile Include="FastReportItem.cs" />
<Compile Include="HandleStep.cs" />
<Compile Include="HJGL\3DParameter.cs" />
<Compile Include="HJGL\BaseMaterialcolorOutput.cs" />
<Compile Include="HJGL\MaterialStockItem.cs" />
<Compile Include="HJGL\BaseInfo\BaseMaterialcolorDataIn.cs" />
<Compile Include="HJGL\BaseInfo\BaseMaterialcolorOutput.cs" />
<Compile Include="HJGL\PreDesign\Material\MaterialStockItem.cs" />
<Compile Include="APIItem\HJGL\PackagingManageItem.cs" />
<Compile Include="HJGL\PackagingManagePrintOutput.cs" />
<Compile Include="HJGL\PipelineComponentPrintDto.cs" />
<Compile Include="HJGL\PreDesign\PackagingManage\PackagingManageInput.cs" />
<Compile Include="HJGL\PreDesign\PackagingManage\PackagingManagePrintOutput.cs" />
<Compile Include="HJGL\PreDesign\PipelineComponent\PipelineComponentPrintDto.cs" />
<Compile Include="HJGL\PipeLineIdCodeItem.cs" />
<Compile Include="HJGL\PipelinePrefabricatedComponentsItem.cs" />
<Compile Include="HJGL\Pipeline_ComponentQRCodeItem.cs" />
<Compile Include="HJGL\PreDesign\PipelineComponent\Pipeline_ComponentQRCodeItem.cs" />
<Compile Include="HJGL\PointBatch.cs" />
<Compile Include="HJGL\PointBatchItem.cs" />
<Compile Include="HJGL\PrePipelineItem.cs" />
@ -299,6 +301,7 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

23
SGGL/WebAPI/Controllers/HJGL/PackagingManageController.cs → SGGL/WebAPI/Controllers/HJGL/PreDesign/PackagingManageController.cs
View File

@ -1,4 +1,5 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
@ -13,8 +14,6 @@ namespace WebAPI.Controllers
/// </summary>
public class PackagingManageController : ApiController
{
#region Methods
/// <summary>
/// 获取指定包装信息
/// </summary>
@ -61,23 +60,20 @@ namespace WebAPI.Controllers
/// <summary>
/// 获取包装信息列表
/// </summary>
/// <param name="projectid">项目ID</param>
/// <param name="filter">过滤条件</param>
/// <param name="pagesize">每页数量</param>
/// <param name="pageindex">页码（从1开始）</param>
/// <returns>包装信息分页列表</returns>
public Model.ResponeData GetPackagingInformationList(string projectid, int pagesize, int pageindex)
public Model.ResponeData GetPackagingInformationList([FromUri]PackagingManageInput filter, int pagesize, int pageindex)
{
var responeData = new Model.ResponeData();
try
{
var getDataList = BLL.APIPackagingManageService.GetPackagingManageList(projectid);
int pageCount = getDataList.Count();
if (pageCount > 0 && pageindex > 0)
{
getDataList = getDataList.Skip(pagesize * (pageindex - 1)).Take(pagesize).ToList();
}
responeData.data = new { pageCount, getDataList };
}
var getDataList = BLL.APIPackagingManageService.GetPackagingManageList(filter, pageindex, pagesize, out int totalCount);
responeData.data = new { totalCount, getDataList };
}
catch (Exception ex)
{
responeData.code = 0;
@ -186,7 +182,6 @@ namespace WebAPI.Controllers
}
return responeData;
}
#endregion Methods
}
}

0
SGGL/WebAPI/Controllers/HJGL/PipelineComponentController.cs → SGGL/WebAPI/Controllers/HJGL/PreDesign/PipelineComponentController.cs
View File

10
SGGL/WebAPI/Controllers/HJGL/TrainNumberManageController.cs → SGGL/WebAPI/Controllers/HJGL/PreDesign/TrainNumberManageController.cs
View File

@ -61,18 +61,16 @@ namespace WebAPI.Controllers
/// <summary>
/// 获取发货列表
/// </summary>
/// <param name="projectId"></param>
/// <param name="filter"></param>
/// <param name="pagesize"></param>
/// <param name="pageindex"></param>
/// <returns></returns>
public Model.ResponeData GetTrainNumberList(string projectId, int pagesize, int pageindex)
public Model.ResponeData GetTrainNumberList([FromUri] Model.HJGL_TrainNumberManage filter , int pagesize, int pageindex)
{
var responeData = new Model.ResponeData();
try
{
Model.HJGL_TrainNumberManage table = new Model.HJGL_TrainNumberManage();
table.ProjectId = projectId;
var result = TrainNumberManageService.GetListByQueryModle(table, pageindex, pagesize);
{
var result = TrainNumberManageService.GetListByQueryModle(filter, pageindex, pagesize);
var getDataList = result.Data;
int pageCount = result.Total;
responeData.data = new { pageCount, getDataList };

0
SGGL/WebAPI/Controllers/HJGL/PipeJointController.cs → SGGL/WebAPI/Controllers/HJGL/WeldingManage/PipeJointController.cs
View File

0
SGGL/WebAPI/Controllers/HJGL/PreWeldingDailyController.cs → SGGL/WebAPI/Controllers/HJGL/WeldingManage/PreWeldingDailyController.cs
View File

0
SGGL/WebAPI/Controllers/HJGL/ReportQueryController.cs → SGGL/WebAPI/Controllers/HJGL/WeldingManage/ReportQueryController.cs
View File

12
SGGL/WebAPI/WebAPI.csproj
View File

@ -187,9 +187,9 @@
<Compile Include="Controllers\DataSync\CNCECServerController.cs" />
<Compile Include="Controllers\DataSync\EnvironmentalController.cs" />
<Compile Include="Controllers\HJGL\HJGLIndexController.cs" />
<Compile Include="Controllers\HJGL\PackagingManageController.cs" />
<Compile Include="Controllers\HJGL\PipelineComponentController.cs" />
<Compile Include="Controllers\HJGL\TrainNumberManageController.cs" />
<Compile Include="Controllers\HJGL\PreDesign\PackagingManageController.cs" />
<Compile Include="Controllers\HJGL\PreDesign\PipelineComponentController.cs" />
<Compile Include="Controllers\HJGL\PreDesign\TrainNumberManageController.cs" />
<Compile Include="Controllers\HTGL\HTGLPersonController.cs" />
<Compile Include="Controllers\Person\PersonCheckController.cs" />
<Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />
@ -205,9 +205,9 @@
<Compile Include="Controllers\CQMS\TechnicalContactController.cs" />
<Compile Include="Controllers\HJGL\HotProcessHardController.cs" />
<Compile Include="Controllers\HJGL\NDETrustController.cs" />
<Compile Include="Controllers\HJGL\PipeJointController.cs" />
<Compile Include="Controllers\HJGL\PreWeldingDailyController.cs" />
<Compile Include="Controllers\HJGL\ReportQueryController.cs" />
<Compile Include="Controllers\HJGL\WeldingManage\PipeJointController.cs" />
<Compile Include="Controllers\HJGL\WeldingManage\PreWeldingDailyController.cs" />
<Compile Include="Controllers\HJGL\WeldingManage\ReportQueryController.cs" />
<Compile Include="Controllers\HJGL\TestPackageController.cs" />
<Compile Include="Controllers\HSSE\ChartAnalysisController.cs" />
<Compile Include="Controllers\HSSE\CheckSpecialController.cs" />