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

Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SHJ

Browse Source
This commit is contained in:
李超
2026-05-27 23:13:47 +08:00
parent 2006a1af5c 13bff0fc63
commit c690b541a3
66 changed files with 1796 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
+24 -2
View File
@@ -70,6 +70,9 @@ namespace BLL
StockNum = m == null ? 0 : (decimal)m.StockNum,
NeedNum = x == null ? 0 : x.NeedNum,
RealNum = y == null ? 0 : y.RealNum,
Code = z == null ? null : z.Code,
HeatNo = z == null ? null : z.HeatNo,
BatchNo = z == null ? null : z.BatchNo,
MaterialName = z == null ? null : z.MaterialName,
MaterialSpec = z == null ? null : z.MaterialSpec,
MaterialUnit = z == null ? null : z.MaterialUnit,
@@ -213,6 +216,9 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc
PipelineCode = z.PipelineCode,
PrefabricatedComponents = x.PrefabricatedComponents,
MaterialCode = x.MaterialCode,
Code = y.Code,
HeatNo = y.HeatNo,
BatchNo = y.BatchNo,
MaterialName = y.MaterialName,
MaterialSpec = y.MaterialSpec,
MaterialUnit = y.MaterialUnit,
@@ -240,7 +246,7 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc
/// <param name="pipelineIds"></param>
/// <param name="warehouseCode"></param>
/// <returns></returns>
public static List<Tw_PipeMatMatchOutput> GetPipeMatMatch(string projectId, List<string> pipelineIds, string warehouseCode)
public static List<Tw_PipeMatMatchOutput> GetPipeMatMatch(string projectId, List<string> pipelineIds, string warehouseCode, Dictionary<string, List<string>> priorityComponents = null)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
@@ -261,6 +267,9 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc
UnitWorkName = m.UnitWorkName,
PrefabricatedComponents = x.PrefabricatedComponents,
MaterialCode = x.MaterialCode,
Code = y.Code,
HeatNo = y.HeatNo,
BatchNo = y.BatchNo,
MaterialName = y.MaterialName,
MaterialSpec = y.MaterialSpec,
MaterialUnit = y.MaterialUnit,
@@ -271,7 +280,20 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc
var newRequiredMaterials = new List<Tw_PipeMatMatchOutput>();
foreach (string id in pipelineIds)
{
newRequiredMaterials.AddRange(requiredMaterials.Where(x => x.PipelineId == id));
var pipelineMaterials = requiredMaterials.Where(x => x.PipelineId == id).ToList();
if (priorityComponents != null && priorityComponents.ContainsKey(id) && priorityComponents[id] != null && priorityComponents[id].Any())
{
var components = priorityComponents[id];
newRequiredMaterials.AddRange(pipelineMaterials
.Where(x => components.Contains(x.PrefabricatedComponents))
.OrderBy(x => components.IndexOf(x.PrefabricatedComponents)));
newRequiredMaterials.AddRange(pipelineMaterials
.Where(x => !components.Contains(x.PrefabricatedComponents)));
}
else
{
newRequiredMaterials.AddRange(pipelineMaterials);
}
}
results = GetMatMatchOutput(newRequiredMaterials, warehouseCode, projectId);
return results;
SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs
+8 -2
View File
@@ -66,6 +66,9 @@ namespace BLL
y.PipelineCode,
x.InOutPlanMasterId,
x.MaterialCode,
Code = mat.Code,
mat.HeatNo,
mat.BatchNo,
x.PrefabricatedComponents,
x.Number,
mat.MaterialName,
@@ -219,7 +222,10 @@ namespace BLL
出库单编号 = master.CusBillCode,
管线号 = pipe.PipelineCode,
预制组件号 = x.PrefabricatedComponents,
材料编码 = x.MaterialCode,
材料主编码 = x.MaterialCode,
材料编码 = y.Code,
炉号 = y.HeatNo,
批号 = y.BatchNo,
材料名称 = y.MaterialName,
材料描述 = y.MaterialDef,
单位 = y.MaterialUnit,
@@ -228,4 +234,4 @@ namespace BLL
return q;
}
}
}
}
SGGL/BLL/CLGL/TwInOutplandetailService.cs
+8 -3
View File
@@ -43,13 +43,16 @@ namespace BLL
InOutPlanMasterId = x.InOutPlanMasterId,
PipelineComponentId = x.PipelineComponentId,
MaterialCode = x.MaterialCode,
Code = mat.Code,
HeatNo = x.HeatNo,
BatchNo = x.BatchNo,
PlanNum = x.PlanNum,
ActNum = x.ActNum,
PipelineComponentCode = y.PipelineComponentCode,
MaterialName = mat.MaterialName,
MaterialDef = mat.MaterialDef,
StockNum = stock.StockNum ?? 0,
DeliveryDate = x.DeliveryDate,
}
;
@@ -117,11 +120,13 @@ namespace BLL
Id = SQLHelper.GetNewID(),
InOutPlanMasterId = inoutPlanMasterId,
PipelineComponentId = item.PipelineComponentId,
MaterialCode = item.MaterialCode,
MaterialCode = item.MaterialCode + "-" + item.HeatNo + "-" + item.BatchNo,
PlanNum = item.PlanNum,
ActNum = item.ActNum,
SortIndex = sortIndex,
HeatNo = item.HeatNo
HeatNo = item.HeatNo,
BatchNo = item.BatchNo,
DeliveryDate = item.DeliveryDate
};
sortIndex++;
details.Add(table);
@@ -196,4 +201,4 @@ namespace BLL
}
}
}
}
SGGL/BLL/CLGL/TwInOutplanmasterService.cs
+54 -18
View File
@@ -275,9 +275,9 @@ namespace BLL
{
//if (temeplateDtoIns.Count == 0)
//{
responeData.code = 0;
responeData.message = errorWarehouseCode + "仓库不存在！";
return responeData;
responeData.code = 0;
responeData.message = errorWarehouseCode + "仓库不存在！";
return responeData;
//}
}
var typeString = temeplateDtoIns.Select(x => x.TypeString).Distinct().ToList(); //获取导入文件的类型
@@ -293,7 +293,20 @@ namespace BLL
responeData.message = errorWarehouseCode + "每次只能导入一种类型！";
return responeData;
}
var dateTypeString = temeplateDtoIns.Select(x => x.DeliveryDate).Distinct().ToList(); //获取导入文件的类型
foreach (var item in dateTypeString)
{
try
{
DateTime date = Convert.ToDateTime(item);
}
catch (Exception)
{
responeData.code = 0;
responeData.message = errorWarehouseCode + "到货时间[" + item + "]格式错误！";
return responeData;
}
}
//var materialCodeList = temeplateDtoIns.Select(x => x.MaterialCode).Distinct().ToList(); //获取导入文件的材料编码
//var IsExitMaterialCode =
@@ -707,18 +720,41 @@ namespace BLL
return;
}
var pipelineList = db.View_HJGL_WeldingTask.Where(e => e.UnitWorkId == unitworkid && e.UnitId == unitid && e.TaskDate.Value.Date == date.Date && e.SerialNumber == serialNumber).OrderBy(x => x.PipeLineSortIndex).Select(x => x.PipelineId).Distinct().ToList();
var taskWeldJointIds = db.View_HJGL_WeldingTask
.Where(e => e.UnitWorkId == unitworkid && e.UnitId == unitid && e.TaskDate.Value.Date == date.Date && e.SerialNumber == serialNumber && e.WeldJointId != null)
.Select(e => e.WeldJointId)
.Distinct()
.ToList();
var taskComponents = (from relation in db.HJGL_Pipeline_ComponentJoint
join component in db.HJGL_Pipeline_Component on relation.PipelineComponentId equals component.PipelineComponentId into componentJoin
from componentItem in componentJoin.DefaultIfEmpty()
join weldJointItem in db.HJGL_WeldJoint on relation.WeldJointId equals weldJointItem.WeldJointId
where taskWeldJointIds.Contains(relation.WeldJointId)
&& weldJointItem.PipelineId != null
&& (relation.PipelineComponentCode != null || (componentItem != null && componentItem.PipelineComponentCode != null))
select new
{
PipelineId = weldJointItem.PipelineId,
PipelineComponentCode = componentItem != null && componentItem.PipelineComponentCode != null ? componentItem.PipelineComponentCode : relation.PipelineComponentCode
}).Distinct().ToList();
//领料出库需要排除散件材料
var MaterDatial = from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
where pipelineList.Contains(x.PipelineId) && x.PrefabricatedComponents != null
select new
{
x.PipelineId,
x.PrefabricatedComponents,
x.MaterialCode,
x.Number,
y.MaterialUnit,
};
var allMaterDatial = (from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
where pipelineList.Contains(x.PipelineId) && x.PrefabricatedComponents != null
select new
{
x.PipelineId,
x.PrefabricatedComponents,
x.MaterialCode,
x.Number,
y.MaterialUnit,
}).ToList();
var componentPipelineIds = taskComponents.Select(x => x.PipelineId).Distinct().ToList();
var MaterDatial = taskComponents.Any()
? allMaterDatial.Where(mat => !componentPipelineIds.Contains(mat.PipelineId)
|| taskComponents.Any(component => component.PipelineId == mat.PipelineId
&& component.PipelineComponentCode == mat.PrefabricatedComponents)).ToList()
: allMaterDatial;
//var outMateriaList = from x in db.HJGL_PipeLineMat
// join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
// where pipelineList.Contains(x.PipelineId)
@@ -774,7 +810,7 @@ namespace BLL
};
TwInOutplandetailService.Add(detail);
}
var twinoutplandetailRelationList = MaterDatial.ToList().Select(x => new Tw_InOutPlanDetail_Relation
var twinoutplandetailRelationList = MaterDatial.Select(x => new Tw_InOutPlanDetail_Relation
{
PipelineId = x.PipelineId,
MaterialCode = x.MaterialCode,
@@ -813,7 +849,7 @@ namespace BLL
};
TwInOutplandetailService.Add(detail);
}
var twinoutplandetailRelationList = MaterDatial.ToList().Select(x => new Tw_InOutPlanDetail_Relation
var twinoutplandetailRelationList = MaterDatial.Select(x => new Tw_InOutPlanDetail_Relation
{
PipelineId = x.PipelineId,
MaterialCode = x.MaterialCode,
@@ -828,4 +864,4 @@ namespace BLL
}
}
}
SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs
+3
View File
@@ -45,6 +45,9 @@ namespace BLL
InputMasterId = x.InputMasterId,
CusBillCode = master.CusBillCode,
MaterialCode = x.MaterialCode,
Code = mat.Code,
HeatNo = mat.HeatNo,
BatchNo = mat.BatchNo,
MaterialName = mat.MaterialName,
MaterialDef = mat.MaterialDef,
BarCode = x.BarCode
SGGL/BLL/CLGL/TwInputdetailService.cs
+7 -1
View File
@@ -40,6 +40,9 @@ namespace BLL
InputMasterId = x.InputMasterId,
PipelineComponentId = x.PipelineComponentId,
MaterialCode = x.MaterialCode,
Code = mat.Code,
HeatNo = mat.HeatNo,
BatchNo = mat.BatchNo,
PlanNum = x.PlanNum,
ActNum = x.ActNum,
PipelineComponentCode = y.PipelineComponentCode,
@@ -135,7 +138,10 @@ namespace BLL
select new
{
入库单编号 = y.CusBillCode,
材料编码 = x.MaterialCode,
材料主编码 = x.MaterialCode,
材料编码 = mat.Code,
炉号 = mat.HeatNo,
批号 = mat.BatchNo,
材料名称 = mat.MaterialName,
材料描述 = mat.MaterialDef,
计划数量 = x.PlanNum,
SGGL/BLL/CLGL/TwMaterialstockService.cs
+4 -1
View File
@@ -42,6 +42,9 @@ namespace BLL
PipeLineMatCode = x.PipeLineMatCode,
StockNum = x.StockNum,
ProjectId = x.ProjectId,
Code = mat.Code,
HeatNo = mat.HeatNo,
BatchNo = mat.BatchNo,
MaterialName = mat.MaterialName,
MaterialSpec = mat.MaterialSpec,
MaterialUnit = mat.MaterialUnit,
@@ -158,4 +161,4 @@ namespace BLL
}
}
}
}
}
SGGL/BLL/CLGL/TwOutputdetailService..cs
+8 -2
View File
@@ -44,6 +44,9 @@ namespace BLL
TypeInt = master.TypeInt,
PipelineComponentId = x.PipelineComponentId,
MaterialCode = x.MaterialCode,
Code = mat.Code,
HeatNo = mat.HeatNo,
BatchNo = mat.BatchNo,
PlanNum = x.PlanNum,
ActNum = x.ActNum,
PipelineComponentCode = y.PipelineComponentCode,
@@ -155,7 +158,10 @@ namespace BLL
select new
{
出库单编号 = master.CusBillCode,
材料编码 = x.MaterialCode,
材料主编码 = x.MaterialCode,
材料编码 = y.Code,
炉号 = y.HeatNo,
批号 = y.BatchNo,
材料名称 = y.MaterialName,
材料描述 = y.MaterialDef,
计划数量 = x.PlanNum,
@@ -165,4 +171,4 @@ namespace BLL
}
}
}
}
SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs
+22 -10
View File
@@ -30,13 +30,15 @@
{
MaterialCode = codeLib.MaterialCode,
HeatNo = codeLib.HeatNo,
BatchNo = codeLib.BatchNo,
MaterialName = codeLib.MaterialName,
MaterialSpec = codeLib.MaterialSpec,
MaterialMade = codeLib.MaterialMade,
MaterialDef = codeLib.MaterialDef,
PipeGrade = codeLib.PipeGrade,
MaterialUnit = codeLib.MaterialUnit,
ProjectId = codeLib.ProjectId
ProjectId = codeLib.ProjectId,
Code = codeLib.Code
};
db.HJGL_MaterialCodeLib.InsertOnSubmit(newCodeLib);
db.SubmitChanges();
@@ -58,12 +60,14 @@
if (newCodeLib != null)
{
newCodeLib.HeatNo = codeLib.HeatNo;
newCodeLib.BatchNo = codeLib.BatchNo;
newCodeLib.MaterialName = codeLib.MaterialName;
newCodeLib.MaterialSpec = codeLib.MaterialSpec;
newCodeLib.MaterialMade = codeLib.MaterialMade;
newCodeLib.MaterialDef = codeLib.MaterialDef;
newCodeLib.PipeGrade = codeLib.PipeGrade;
newCodeLib.MaterialUnit = codeLib.MaterialUnit;
newCodeLib.Code = codeLib.Code;
db.SubmitChanges();
}
}
@@ -94,20 +98,28 @@
{
var materialCodes = from x in db.HJGL_MaterialCodeLib select x.MaterialCode;
var ls = from x in list
where !materialCodes.Contains(x.MaterialCode)
where !materialCodes.Contains(x.MaterialCode + "-" + x.HeatNo + "-" + x.BatchNo)
select x;
List<string> codes = new List<string>();
List<Model.HJGL_MaterialCodeLib> details = new List<Model.HJGL_MaterialCodeLib>();
foreach (var item in ls)
{
Model.HJGL_MaterialCodeLib table = new Model.HJGL_MaterialCodeLib
if (!codes.Contains(item.MaterialCode + "-" + item.HeatNo + "-" + item.BatchNo))
{
MaterialCode = item.MaterialCode,
HeatNo = item.HeatNo,
MaterialName = item.MaterialName,
MaterialSpec = item.MaterialSpec,
MaterialUnit = item.MaterialUnit
};
details.Add(table);
Model.HJGL_MaterialCodeLib table = new Model.HJGL_MaterialCodeLib
{
MaterialCode = item.MaterialCode + "-" + item.HeatNo + "-" + item.BatchNo,
HeatNo = item.HeatNo,
BatchNo = item.BatchNo,
MaterialName = item.MaterialName,
MaterialSpec = item.MaterialSpec,
MaterialUnit = item.MaterialUnit,
MaterialDef = item.MaterialDef,
Code = item.MaterialCode
};
details.Add(table);
codes.Add(table.MaterialCode);
}
}
db.HJGL_MaterialCodeLib.InsertAllOnSubmit(details);
SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs
+8 -2
View File
@@ -108,6 +108,9 @@ namespace BLL
public static DataTable GetSHOPStockDt(string projectid)
{
string strSql = @" SELECT mat.MaterialCode,
lib.Code,
lib.HeatNo,
lib.BatchNo,
lib.MaterialName,
lib.MaterialSpec,
lib.MaterialUnit,
@@ -157,7 +160,7 @@ namespace BLL
GROUP BY stockused.MaterialCode,stockused.MaterialName,stockused.MaterialUnit,stockused.MaterialSpec,stockused.MaterialMade ) AS aa
ON mat.MaterialCode=aa.MaterialCode
WHERE mat.projectid=@projectid
GROUP BY mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num
GROUP BY mat.MaterialCode,lib.Code,lib.HeatNo,lib.BatchNo,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num
";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -171,6 +174,9 @@ namespace BLL
{
string strSql = @"
SELECT mat.MaterialCode,
lib.Code,
lib.HeatNo,
lib.BatchNo,
lib.MaterialName,
lib.MaterialSpec,
lib.MaterialUnit,
@@ -223,7 +229,7 @@ namespace BLL
ON mat.MaterialCode=aa.MaterialCode
WHERE mat.projectid=@Projectid
AND Ins.State=@State
GROUP BY mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num ";
GROUP BY mat.MaterialCode,lib.Code,lib.HeatNo,lib.BatchNo,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@Projectid", projectid));
listStr.Add(new SqlParameter("@PipeArea", BLL.PipelineService.PipeArea_SHOP));
SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx
+9
View File
@@ -61,8 +61,17 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx
+15 -6
View File
@@ -140,7 +140,7 @@
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="true" Title="入库申请明细表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode"
SortDirection="DESC" EnableColumnLines="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="10000" EnableTextSelection="True" >
@@ -158,21 +158,30 @@
<asp:Label ID="Label1" runat="server" Text='<%# Grid2.PageIndex * Grid2.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center" >
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉批号" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<%--<f:RenderField Width="300px" ColumnID="MaterialDef" DataField="MaterialDef" SortField="MaterialDef"
<f:RenderField Width="300px" ColumnID="MaterialDef" DataField="MaterialDef" SortField="MaterialDef"
FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center" ExpandUnusedSpace="True">
</f:RenderField>--%>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
FieldType="String" HeaderText="数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DeliveryDate" DataField="DeliveryDate" SortField="DeliveryDate" Renderer="Date"
RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="到货时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx
+12
View File
@@ -66,8 +66,17 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
@@ -81,6 +90,9 @@
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DeliveryDate" DataField="DeliveryDate" SortField="DeliveryDate" Renderer="Date"
RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="到货时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
SGGL/FineUIPro.Web/CLGL/InputMaster.aspx
+18
View File
@@ -144,8 +144,17 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
@@ -179,8 +188,17 @@
FieldType="String" HeaderText="入库单编号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx
+9
View File
@@ -65,8 +65,17 @@
FieldType="String" HeaderText="仓库编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PipeLineMatCode" DataField="PipeLineMatCode" SortField="PipeLineMatCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx
+35 -2
View File
@@ -178,8 +178,17 @@
<Columns>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
@@ -211,10 +220,22 @@
FieldType="String" HeaderText="预制组件号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" HeaderTextAlign="Center"
TextAlign="Left">
@@ -262,10 +283,22 @@
FieldType="String" HeaderText="预制组件号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" HeaderTextAlign="Center"
TextAlign="Left">
SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx
+18
View File
@@ -81,8 +81,17 @@
FieldType="String" HeaderText="管线号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
@@ -118,8 +127,17 @@
FieldType="String" HeaderText="管线号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx
+9
View File
@@ -61,8 +61,17 @@
FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx
+9
View File
@@ -87,8 +87,17 @@
</Toolbars>
<Columns>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs
+4 -1
View File
@@ -233,6 +233,9 @@ namespace FineUIPro.Web.CLGL
x.PipeLineMatId,
x.PipelineId,
x.MaterialCode,
lib.Code,
lib.HeatNo,
lib.BatchNo,
lib.MaterialName,
lib.MaterialSpec,
lib.MaterialUnit,
@@ -358,4 +361,4 @@ namespace FineUIPro.Web.CLGL
#endregion
}
}
}
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelectStock.aspx
+9
View File
@@ -64,8 +64,17 @@
FieldType="String" HeaderText="仓库编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PipeLineMatCode" DataField="PipeLineMatCode" SortField="PipeLineMatCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx
+9
View File
@@ -177,8 +177,17 @@
FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>--%>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/File/Excel/DataIn/PipelineMat.xlsx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx
+3 -3
View File
File diff suppressed because one or more lines are too long
SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="04/14/2026 16:15:36" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="05/26/2026 23:52:36" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFvoS/O78nkZZeky9BsAtP/"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaXj7MTwVWd+W15ZHXWbvUTygn/8kT7Dd8PAtwcQdvSWlUEyCU1xPvJPbQKwTsqQwLM+O2fcBJVGvSTxsXNEsa1vy5JNdjQE5XXU2qh41PMt4c4Lp/j2o5C6htb8mS4/JfQOgej7CCf0JujCt3dJ+YxXEWyCrPCgKDiJnuZPz/cQN"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="PipelineComponentId" DataType="System.String"/>
<Column Name="PipelineComponentCode" DataType="System.String"/>
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+8
View File
@@ -1637,6 +1637,7 @@
<Content Include="HJGL\PreDesign\PackagingManageSelectStock.aspx" />
<Content Include="HJGL\PreDesign\PackagingManageView.aspx" />
<Content Include="HJGL\PreDesign\InstallList.aspx" />
<Content Include="HJGL\PreDesign\PrePipelineComponentJointIn.aspx" />
<Content Include="HJGL\PreDesign\PrePipelineQRCodeIn.aspx" />
<Content Include="HJGL\PreDesign\ProductionSchedulingPlan.aspx" />
<Content Include="HJGL\PreDesign\TrainNumberManager.aspx" />
@@ -10975,6 +10976,13 @@
<Compile Include="HJGL\PreDesign\PrePipelineQRCodeIn.aspx.designer.cs">
<DependentUpon>PrePipelineQRCodeIn.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\PreDesign\PrePipelineComponentJointIn.aspx.cs">
<DependentUpon>PrePipelineComponentJointIn.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HJGL\PreDesign\PrePipelineComponentJointIn.aspx.designer.cs">
<DependentUpon>PrePipelineComponentJointIn.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\PreDesign\ProductionSchedulingPlan.aspx.cs">
<DependentUpon>ProductionSchedulingPlan.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx
+9 -5
View File
@@ -22,7 +22,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtMaterialCode" runat="server" Label="材料编码"
<f:TextBox ID="txtCode" runat="server" Label="材料编码"
EmptyText="输入查询条件" Width="300px" LabelWidth="120px"
LabelAlign="Right">
</f:TextBox>
@@ -44,14 +44,18 @@
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="200px" ColumnID="MaterialCode" DataField="MaterialCode"
<f:RenderField Width="200px" ColumnID="Code" DataField="Code"
FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center"
TextAlign="Left" SortField="MaterialCode">
TextAlign="Left" SortField="Code">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="HeatNo" DataField="HeatNo"
FieldType="String" HeaderText="炉批号" HeaderTextAlign="Center"
FieldType="String" HeaderText="炉号" HeaderTextAlign="Center"
TextAlign="Left" SortField="HeatNo">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="BatchNo" DataField="BatchNo"
FieldType="String" HeaderText="批号" HeaderTextAlign="Center"
TextAlign="Left" SortField="BatchNo">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="MaterialName" DataField="MaterialName"
FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
TextAlign="Left" SortField="MaterialName">
@@ -93,7 +97,7 @@
</f:Panel>
<f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close"
IsModal="true" Width="700px" Height="400px">
IsModal="true" Width="700px" Height="450px">
</f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx.cs
+3 -3
View File
@@ -36,10 +36,10 @@ namespace FineUIPro.Web.HJGL.BaseInfo
WHERE 1=1";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtMaterialCode.Text.Trim()))
if (!string.IsNullOrEmpty(this.txtCode.Text.Trim()))
{
strSql += " AND MaterialCode LIKE @MaterialCode";
listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text.Trim() + "%"));
strSql += " AND Code LIKE @Code";
listStr.Add(new SqlParameter("@Code", "%" + this.txtCode.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtMaterialName.Text.Trim()))
{
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx.designer.cs
Generated
+2 -2
View File
@@ -58,13 +58,13 @@ namespace FineUIPro.Web.HJGL.BaseInfo {
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtMaterialCode 控件。
/// txtCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMaterialCode;
protected global::FineUIPro.TextBox txtCode;
/// <summary>
/// txtMaterialName 控件。
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx
+9 -2
View File
@@ -15,14 +15,21 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtMaterialCode" runat="server" Label="材料编码"
<f:TextBox ID="txtCode" runat="server" Label="材料编码"
Required="true" MaxLength="50" ShowRedStar="true" FocusOnPageLoad="true" LabelWidth="100px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtHeatNo" runat="server" Label="炉批号"
<f:TextBox ID="txtHeatNo" runat="server" Label="炉号"
Required="true" MaxLength="50" ShowRedStar="true" LabelWidth="100px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtBatchNo" runat="server" Label="批号"
Required="true" MaxLength="50" ShowRedStar="true" LabelWidth="100px">
</f:TextBox>
</Items>
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.cs
+10 -7
View File
@@ -23,18 +23,19 @@ namespace FineUIPro.Web.HJGL.BaseInfo
Model.HJGL_MaterialCodeLib lib = BLL.MaterialCodeLibService.GetMaterialCodeLib(materialCode);
if (lib != null)
{
this.txtMaterialCode.Text = materialCode;
this.txtCode.Text = lib.Code;
this.txtMaterialMade.Text = lib.MaterialMade;
this.txtHeatNo.Text = lib.HeatNo;
this.txtBatchNo.Text = lib.BatchNo;
this.txtMaterialName.Text = lib.MaterialName;
txtMaterialSpec.Text = lib.MaterialSpec;
txtMaterialDef.Text = lib.MaterialDef;
txtMaterialUnit.Text = lib.MaterialUnit;
txtMaterialCode.Enabled = false;
//txtMaterialCode.Enabled = false;
}
else
{
txtMaterialCode.Enabled = true;
//txtMaterialCode.Enabled = true;
}
}
}
@@ -52,23 +53,25 @@ namespace FineUIPro.Web.HJGL.BaseInfo
string materialCode = Request.Params["MaterialCode"];
if (string.IsNullOrEmpty(materialCode))
{
var q = Funs.DB.HJGL_MaterialCodeLib.FirstOrDefault(x => x.MaterialCode == this.txtMaterialCode.Text.Trim());
var q = Funs.DB.HJGL_MaterialCodeLib.FirstOrDefault(x => x.MaterialCode == materialCode);
if (q != null)
{
Alert.ShowInTop("此材料编码已存在！", MessageBoxIcon.Warning);
Alert.ShowInTop("此材料编码、炉号、批号已存在！", MessageBoxIcon.Warning);
return;
}
}
Model.HJGL_MaterialCodeLib newLib = new Model.HJGL_MaterialCodeLib
{
MaterialCode = this.txtMaterialCode.Text.Trim(),
MaterialCode = this.txtCode.Text.Trim() + "-" + this.txtHeatNo.Text.Trim() + "-" + this.txtBatchNo.Text.Trim(),
HeatNo = this.txtHeatNo.Text.Trim(),
BatchNo = this.txtBatchNo.Text.Trim(),
MaterialName = this.txtMaterialName.Text.Trim(),
MaterialSpec = this.txtMaterialSpec.Text.Trim(),
MaterialMade = this.txtMaterialMade.Text.Trim(),
MaterialDef = this.txtMaterialDef.Text.Trim(),
MaterialUnit = txtMaterialUnit.Text.Trim()
MaterialUnit = txtMaterialUnit.Text.Trim(),
Code = this.txtCode.Text.Trim()
};
if (!string.IsNullOrEmpty(materialCode))
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.designer.cs
Generated
+11 -2
View File
@@ -40,13 +40,13 @@ namespace FineUIPro.Web.HJGL.BaseInfo {
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtMaterialCode 控件。
/// txtCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMaterialCode;
protected global::FineUIPro.TextBox txtCode;
/// <summary>
/// txtHeatNo 控件。
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.HJGL.BaseInfo {
/// </remarks>
protected global::FineUIPro.TextBox txtHeatNo;
/// <summary>
/// txtBatchNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtBatchNo;
/// <summary>
/// txtMaterialName 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
+40 -4
View File
@@ -119,9 +119,21 @@
FieldType="String" HeaderText="预制组件" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField HeaderText="材料编码" ColumnID="MaterialCode"
<f:RenderField HeaderText="材料主编码" ColumnID="MaterialCode"
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="材料编码" ColumnID="Code"
DataField="Code" SortField="Code" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="炉号" ColumnID="HeatNo"
DataField="HeatNo" SortField="HeatNo" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="批号" ColumnID="BatchNo"
DataField="BatchNo" SortField="BatchNo" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialSpec" DataField="MaterialSpec" SortField="MaterialSpec"
@@ -166,10 +178,22 @@
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="材料编码" ColumnID="MaterialCode"
<f:RenderField HeaderText="材料主编码" ColumnID="MaterialCode"
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="材料编码" ColumnID="Code"
DataField="Code" SortField="Code" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="炉号" ColumnID="HeatNo"
DataField="HeatNo" SortField="HeatNo" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="批号" ColumnID="BatchNo"
DataField="BatchNo" SortField="BatchNo" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialSpec" DataField="MaterialSpec" SortField="MaterialSpec"
FieldType="String" HeaderText="规格" HeaderTextAlign="Center"
TextAlign="Left">
@@ -211,10 +235,22 @@
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="材料编码" ColumnID="MaterialCode"
<f:RenderField HeaderText="材料主编码" ColumnID="MaterialCode"
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="材料编码" ColumnID="Code"
DataField="Code" SortField="Code" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="炉号" ColumnID="HeatNo"
DataField="HeatNo" SortField="HeatNo" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="批号" ColumnID="BatchNo"
DataField="BatchNo" SortField="BatchNo" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialSpec" DataField="MaterialSpec" SortField="MaterialSpec"
FieldType="String" HeaderText="规格" HeaderTextAlign="Center"
TextAlign="Left">
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
+103 -60
View File
@@ -90,26 +90,7 @@ namespace FineUIPro.Web.HJGL.DataImport
{
foreach (var q in unitWork1)
{
string strSql = " SELECT DISTINCT [t0].[PipelineId] FROM [dbo].[HJGL_Pipeline] AS [t0]\r\nleft JOIN [dbo].[HJGL_PipeLineMat] AS [t1] ON [t0].[PipelineId] = [t1].[PipelineId]";
strSql += "where [t0].[UnitWorkId] =@UnitWorkId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId));
if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
{
strSql += " and [t1].[MaterialCode] like @MaterialCode";
listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(tvPipeCode.Text.Trim()))
{
strSql += " and [t0].[PipelineCode] like @PipelineCode";
listStr.Add(new SqlParameter("@PipelineCode", "%" + tvPipeCode.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
var a = dt.Rows.Count;
var a = GetUnitWorkTestPackagePipelineCount(q.UnitWorkId);
//int a = (from x in DBpipeline
// join y in dbpipeLineMat on x.PipelineId equals y.PipelineId
@@ -121,16 +102,13 @@ namespace FineUIPro.Web.HJGL.DataImport
tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn1.CommandName = "单位工程";
tn1.EnableExpandEvent = true;
tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1);
if (a > 0)
{
// BindNodes(tn1);
TreeNode newNode = new TreeNode();
newNode.Text = "加载管线...";
newNode.NodeID = "加载管线...";
tn1.Nodes.Add(newNode);
BindTestPackageNodes(tn1);
}
}
}
@@ -139,27 +117,7 @@ namespace FineUIPro.Web.HJGL.DataImport
foreach (var q in unitWork2)
{
string strSql = " SELECT DISTINCT [t0].[PipelineId] FROM [dbo].[HJGL_Pipeline] AS [t0]\r\nleft JOIN [dbo].[HJGL_PipeLineMat] AS [t1] ON [t0].[PipelineId] = [t1].[PipelineId]";
strSql += "where [t0].[UnitWorkId] =@UnitWorkId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId));
if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
{
strSql += " and [t1].[MaterialCode] like @MaterialCode";
listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(tvPipeCode.Text.Trim()))
{
strSql += " and [t0].[PipelineCode] like @PipelineCode";
listStr.Add(new SqlParameter("@PipelineCode", "%" + tvPipeCode.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
var a = dt.Rows.Count;
var a = GetUnitWorkTestPackagePipelineCount(q.UnitWorkId);
//var b = (from x in Funs.DB.HJGL_Pipeline
// join y in Funs.DB.HJGL_PipeLineMat on x.PipelineId equals y.PipelineId
@@ -184,18 +142,14 @@ namespace FineUIPro.Web.HJGL.DataImport
// tn2.Expanded = true;
//}
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.CommandName = "单位工程";
tn2.EnableExpandEvent = true;
tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2);
if (a > 0)
{
// BindNodes(tn2);
TreeNode newNode = new TreeNode();
newNode.Text = "加载管线...";
newNode.NodeID = "加载管线...";
tn2.Nodes.Add(newNode);
BindTestPackageNodes(tn2);
}
}
}
@@ -205,10 +159,99 @@ namespace FineUIPro.Web.HJGL.DataImport
#region 暂不有
private void BindNodes(TreeNode node)
{
BLL.PipelineService.BindTreeNodes(node, this.tvPipeCode.Text.Trim(), txtMaterialCode.Text.Trim(), this.CurrUser.LoginProjectId, pageSize);
var pipeline = GetTestPackagePipelineList(node.NodeID);
var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
int pageindex = int.Parse(node.CommandName.Split('|')[0]);
int pageCount = int.Parse(node.CommandName.Split('|')[1]);
if (pageindex <= pageCount)
{
pipeline = pipeline.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList();
foreach (var item in pipeline)
{
var jotCount = (from x in hJGL_WeldJoints where x.PipelineId == item.PipelineId select x).Count();
TreeNode newNode = new TreeNode();
newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
newNode.NodeID = item.PipelineId;
newNode.CommandName = "管线";
newNode.EnableClickEvent = true;
node.Nodes.Add(newNode);
}
if (pageindex < pageCount)
{
TreeNode newNode = new TreeNode();
newNode.Text = "加载";
newNode.NodeID = SQLHelper.GetNewID();
newNode.CommandName = "加载";
newNode.Icon = Icon.ArrowDown;
newNode.EnableClickEvent = true;
node.Nodes.Add(newNode);
}
}
}
#endregion
private int GetUnitWorkTestPackagePipelineCount(string unitWorkId)
{
return (from x in Funs.DB.HJGL_Pipeline
join y in Funs.DB.PTP_PipelineList on x.PipelineId equals y.PipelineId
join z in Funs.DB.PTP_TestPackage on y.PTP_ID equals z.PTP_ID
join m in Funs.DB.HJGL_PipeLineMat.Where(e => e.MaterialCode.Contains(txtMaterialCode.Text.Trim()))
on x.PipelineId equals m.PipelineId into temp
from m in temp.DefaultIfEmpty()
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == unitWorkId
&& z.UnitWorkId == unitWorkId
&& x.PipelineCode.Contains(tvPipeCode.Text.Trim())
&& (string.IsNullOrEmpty(txtMaterialCode.Text.Trim()) || m != null)
select x.PipelineId).Distinct().Count();
}
private void BindTestPackageNodes(TreeNode unitWorkNode)
{
var testPackages = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == unitWorkNode.NodeID
orderby x.TestPackageNo
select x).ToList();
foreach (var item in testPackages)
{
int pipelineCount = GetTestPackagePipelineList(item.PTP_ID).Count();
if (pipelineCount == 0)
{
continue;
}
TreeNode newNode = new TreeNode();
newNode.Text = (string.IsNullOrEmpty(item.TestPackageNo) ? "未知" : item.TestPackageNo) + "【" + pipelineCount.ToString() + "】管线";
newNode.NodeID = item.PTP_ID;
newNode.CommandName = 1 + "|" + Funs.GetEndPageNumber(pipelineCount, pageSize);
newNode.EnableClickEvent = true;
newNode.EnableExpandEvent = true;
unitWorkNode.Nodes.Add(newNode);
TreeNode loadNode = new TreeNode();
loadNode.Text = "加载管线...";
loadNode.NodeID = "加载管线...";
newNode.Nodes.Add(loadNode);
}
}
private List<Model.HJGL_Pipeline> GetTestPackagePipelineList(string ptpId)
{
return (from x in Funs.DB.HJGL_Pipeline
join y in Funs.DB.PTP_PipelineList on x.PipelineId equals y.PipelineId
join m in Funs.DB.HJGL_PipeLineMat.Where(e => e.MaterialCode.Contains(txtMaterialCode.Text.Trim()))
on x.PipelineId equals m.PipelineId into temp
from m in temp.DefaultIfEmpty()
where y.PTP_ID == ptpId
&& x.ProjectId == this.CurrUser.LoginProjectId
&& x.PipelineCode.Contains(tvPipeCode.Text.Trim())
&& (string.IsNullOrEmpty(txtMaterialCode.Text.Trim()) || m != null)
orderby x.PipelineCode
select x).Distinct().ToList();
}
protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
{
if (e.Node.Nodes[0].NodeID == "加载管线...")
@@ -246,7 +289,7 @@ namespace FineUIPro.Web.HJGL.DataImport
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
this.hdUnitWorkId.Text = pipeline.UnitWorkId;
this.BindGrid1(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
this.BindGrid2(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
@@ -277,7 +320,7 @@ namespace FineUIPro.Web.HJGL.DataImport
/// </summary>
private void BindGrid1(string pipelineId, string unitworkid)
{
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.MaterialName,lib.MaterialUnit,
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.Code,lib.HeatNo,lib.BatchNo,lib.MaterialName,lib.MaterialUnit,
lib.MaterialSpec,lib.MaterialMade,lib.MaterialDef,pipe.Number,pipe.PrefabricatedComponents
FROM dbo.HJGL_PipeLineMat pipe
LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode
@@ -312,7 +355,7 @@ namespace FineUIPro.Web.HJGL.DataImport
}
private void BindGrid2(string pipelineId, string unitworkid)
{
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.MaterialName,lib.MaterialUnit,
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.Code,lib.HeatNo,lib.BatchNo,lib.MaterialName,lib.MaterialUnit,
lib.MaterialSpec,lib.MaterialMade,lib.MaterialDef,pipe.Number
FROM dbo.HJGL_PipeLineMat pipe
LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode
@@ -343,7 +386,7 @@ namespace FineUIPro.Web.HJGL.DataImport
private void BindGrid3(string pipelineId, string unitworkid)
{
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.MaterialName,lib.MaterialUnit,
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.Code,lib.HeatNo,lib.BatchNo,lib.MaterialName,lib.MaterialUnit,
lib.MaterialSpec,lib.MaterialMade,lib.MaterialDef,pipe.Number,pipe.PrefabricatedComponents
FROM dbo.HJGL_PipeLineMat pipe
LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode
@@ -696,7 +739,7 @@ namespace FineUIPro.Web.HJGL.DataImport
protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
{
string pipelineid = "";
if (this.tvControlItem.SelectedNode != null && this.tvControlItem.SelectedNode.CommandName != "单位工程")
if (this.tvControlItem.SelectedNode != null && this.tvControlItem.SelectedNode.CommandName == "管线")
{
pipelineid = this.tvControlItem.SelectedNodeID;
}
@@ -1021,4 +1064,4 @@ namespace FineUIPro.Web.HJGL.DataImport
}
}
}
}
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialStock.aspx
+13 -1
View File
@@ -34,9 +34,21 @@
</Toolbars>
<Columns>
<f:RenderField Width="200px" ColumnID="MaterialCode" DataField="MaterialCode"
FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center"
FieldType="String" HeaderText="材料主编码" HeaderTextAlign="Center"
TextAlign="Left" SortField="MaterialCode">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code"
FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center"
TextAlign="Left" SortField="Code">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo"
FieldType="String" HeaderText="炉号" HeaderTextAlign="Center"
TextAlign="Left" SortField="HeatNo">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo"
FieldType="String" HeaderText="批号" HeaderTextAlign="Center"
TextAlign="Left" SortField="BatchNo">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="MaterialNum" DataField="MaterialNum"
FieldType="String" HeaderText="数量" HeaderTextAlign="Center"
TextAlign="Left" SortField="MaterialNum">
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
+2
View File
@@ -88,6 +88,8 @@
</f:Button>
<f:Button ID="btnImportQRCode" Text="导入二维码信息" ToolTip="导入二维码信息" Icon="PackageIn" runat="server" OnClick="btnImportQRCode_Click">
</f:Button>
<f:Button ID="btnImportComponentJoint" Text="导入组件焊口信息" ToolTip="导入组件焊口信息" Icon="PackageIn" runat="server" OnClick="btnImportComponentJoint_Click">
</f:Button>
<f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd" Hidden="true"
runat="server" OnClick="btnBatchAdd_Click">
</f:Button>
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+85 -20
View File
@@ -89,23 +89,19 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
foreach (var q in unitWork1)
{
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x).Count();
int a = GetUnitWorkTestPackagePipelineCount(q.UnitWorkId);
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn1.CommandName = "单位工程";
tn1.EnableClickEvent = true;
tn1.EnableExpandEvent = true;
rootNode1.Nodes.Add(tn1);
if (a > 0)
{
// BindNodes(tn1);
TreeNode newNode = new TreeNode();
newNode.Text = "加载管线...";
newNode.NodeID = "加载管线...";
tn1.Nodes.Add(newNode);
BindTestPackageNodes(tn1);
}
//if (a > 0)
//{
@@ -117,7 +113,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
foreach (var q in unitWork2)
{
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x).Count();
int a = GetUnitWorkTestPackagePipelineCount(q.UnitWorkId);
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
@@ -127,17 +123,13 @@ namespace FineUIPro.Web.HJGL.PreDesign
tn2.Expanded = true;
}
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.CommandName = "单位工程";
tn2.EnableClickEvent = true;
tn2.EnableExpandEvent = true;
rootNode2.Nodes.Add(tn2);
if (a > 0)
{
// BindNodes(tn1);
TreeNode newNode = new TreeNode();
newNode.Text = "加载管线...";
newNode.NodeID = "加载管线...";
tn2.Nodes.Add(newNode);
BindTestPackageNodes(tn2);
}
//if (a > 0)
//{
@@ -152,10 +144,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
List<Model.HJGL_Pipeline> pipeline = new List<Model.HJGL_Pipeline>();
var pipelines = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.PipeArea == "1" select x;
pipeline = (from x in pipelines
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID
join y in Funs.DB.PTP_PipelineList on x.PipelineId equals y.PipelineId
where y.PTP_ID == node.NodeID
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
orderby x.PipelineCode
select x).ToList();
select x).Distinct().ToList();
int pageindex = int.Parse(node.CommandName.Split('|')[0]);
int pageCount = int.Parse(node.CommandName.Split('|')[1]);
if (pageindex <= pageCount)
@@ -187,6 +180,61 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
private int GetUnitWorkTestPackagePipelineCount(string unitWorkId)
{
return (from x in Funs.DB.HJGL_Pipeline
join y in Funs.DB.PTP_PipelineList on x.PipelineId equals y.PipelineId
join z in Funs.DB.PTP_TestPackage on y.PTP_ID equals z.PTP_ID
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == unitWorkId
&& z.UnitWorkId == unitWorkId
&& x.PipeArea == "1"
&& x.PipelineCode.Contains(txtPipelineCode.Text.Trim())
select x.PipelineId).Distinct().Count();
}
private void BindTestPackageNodes(TreeNode unitWorkNode)
{
var testPackages = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == unitWorkNode.NodeID
orderby x.TestPackageNo
select x).ToList();
foreach (var item in testPackages)
{
int pipelineCount = GetTestPackagePipelineCount(item.PTP_ID);
if (pipelineCount == 0)
{
continue;
}
TreeNode newNode = new TreeNode();
newNode.Text = (string.IsNullOrEmpty(item.TestPackageNo) ? "未知" : item.TestPackageNo) + "【" + pipelineCount.ToString() + "】管线";
newNode.NodeID = item.PTP_ID;
newNode.CommandName = 1 + "|" + Funs.GetEndPageNumber(pipelineCount, pageSize);
newNode.EnableClickEvent = true;
newNode.EnableExpandEvent = true;
unitWorkNode.Nodes.Add(newNode);
TreeNode loadNode = new TreeNode();
loadNode.Text = "加载管线...";
loadNode.NodeID = "加载管线...";
newNode.Nodes.Add(loadNode);
}
}
private int GetTestPackagePipelineCount(string ptpId)
{
return (from x in Funs.DB.HJGL_Pipeline
join y in Funs.DB.PTP_PipelineList on x.PipelineId equals y.PipelineId
where y.PTP_ID == ptpId
&& x.ProjectId == this.CurrUser.LoginProjectId
&& x.PipeArea == "1"
&& x.PipelineCode.Contains(txtPipelineCode.Text.Trim())
select x.PipelineId).Distinct().Count();
}
#endregion
protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
{
@@ -205,20 +253,26 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// <param name="e"></param>
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{
if (e.CommandName.Split('|').Length == 2)
if (e.CommandName == "单位工程")
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID;
WeldingDailyService.InitDownListByUnitWortId(drpWeldingDailyCode, true, this.tvControlItem.SelectedNodeID);
}
else if (e.CommandName.Split('|').Length == 2)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
WeldingDailyService.InitDownListByUnitWortId(drpWeldingDailyCode, true, this.hdUnitWorkId.Text);
}
else if (e.CommandName == "管线")
{
Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
this.hdUnitWorkId.Text = pipeline.UnitWorkId;
}
}
else if (e.CommandName == "加载")
@@ -255,12 +309,17 @@ namespace FineUIPro.Web.HJGL.PreDesign
List<SqlParameter> listStr = new List<SqlParameter>();
if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2)
if (tvControlItem.SelectedNode.CommandName == "单位工程")
{
strSql += " and pipe.UnitWorkId =@UnitWorkId";
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
}
else if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2)
{
strSql += " and exists(select 1 from PTP_PipelineList ptpPipe where ptpPipe.PipelineId = pipe.PipelineId and ptpPipe.PTP_ID = @PTP_ID)";
listStr.Add(new SqlParameter("@PTP_ID", this.tvControlItem.SelectedNodeID));
}
else if (tvControlItem.SelectedNode.CommandName == "管线")
{
strSql += " and com.PipelineId = @PipelineId ";
@@ -594,6 +653,12 @@ if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.
{
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PrePipelineQRCodeIn.aspx?", "导入 - ")));
}
protected void btnImportComponentJoint_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PrePipelineComponentJointIn.aspx?", "导入 - ")));
}
protected void btnSinglePreview_Click(object sender, EventArgs e)
{
@@ -708,4 +773,4 @@ if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.
}
}
}
}
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
Generated
+9
View File
@@ -239,6 +239,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// </remarks>
protected global::FineUIPro.Button btnImportQRCode;
/// <summary>
/// btnImportComponentJoint 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImportComponentJoint;
/// <summary>
/// btnBatchAdd 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineComponentJointIn.aspx
+89
View File
@@ -0,0 +1,89 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PrePipelineComponentJointIn.aspx.cs" Inherits="FineUIPro.Web.HJGL.PreDesign.PrePipelineComponentJointIn" %>
<!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="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:HiddenField ID="hdFileName" runat="server">
</f:HiddenField>
<f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" Text="下载模板" OnClick="btnDownLoad_Click" EnablePostBack="true" EnableAjax="false">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" Text="审核" ValidateForms="SimpleForm1"
OnClick="btnAudit_Click">
</f:Button>
<f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" Text="导入" ValidateForms="SimpleForm1"
OnClick="btnImport_Click">
</f:Button>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="提交" Text="提交" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Rows>
<f:FormRow>
<Items>
<f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
LabelWidth="150px">
</f:FileUpload>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="组件焊口信息"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldJointId" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="WeldJointId"
AllowSorting="true" SortField="PipelineCode" SortDirection="ASC"
AllowPaging="true" IsDatabasePaging="true" PageSize="15"
EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField Width="180px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="PipelineComponentCode" DataField="PipelineComponentCode" SortField="PipelineComponentCode"
FieldType="String" HeaderText="预制组件" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="WeldJointCode" DataField="WeldJointCode" SortField="WeldJointCode"
FieldType="String" HeaderText="焊口号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="10000" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</form>
</body>
</html>
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineComponentJointIn.aspx.cs
+336
View File
@@ -0,0 +1,336 @@
using BLL;
using MiniExcelLibs;
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
namespace FineUIPro.Web.HJGL.PreDesign
{
public partial class PrePipelineComponentJointIn : PageBase
{
private string initPath = Const.ExcelUrl;
public static List<ComponentJointImportItem> ComponentJointList = new List<ComponentJointImportItem>();
public static string errorInfos = string.Empty;
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.hdFileName.Text = string.Empty;
if (ComponentJointList != null)
{
ComponentJointList.Clear();
}
errorInfos = string.Empty;
}
}
protected void btnAudit_Click(object sender, EventArgs e)
{
try
{
if (this.fuAttachUrl.HasFile == false)
{
ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning);
return;
}
string isXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
if (isXls != ".xlsx")
{
ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning);
return;
}
ComponentJointList.Clear();
errorInfos = string.Empty;
string rootPath = Server.MapPath("~/");
string initFullPath = rootPath + initPath;
if (!Directory.Exists(initFullPath))
{
Directory.CreateDirectory(initFullPath);
}
this.hdFileName.Text = BLL.Funs.GetNewFileName() + isXls;
string filePath = initFullPath + this.hdFileName.Text;
this.fuAttachUrl.PostedFile.SaveAs(filePath);
ImportXlsToData(filePath);
}
catch (Exception ex)
{
Alert alert = new Alert
{
Message = "'" + ex.Message + "'",
Target = Target.Self
};
alert.Show();
}
}
private void ImportXlsToData(string fileName)
{
var rows = MiniExcel.QueryAsDataTable(fileName, useHeaderRow: true);
Model.ResponeData responeData = AddDatasetToSQL(rows, 3);
if (responeData.code == 1)
{
ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success);
}
else
{
Alert alert = new Alert
{
Message = responeData.message,
Target = Target.Self
};
alert.Show();
}
}
private Model.ResponeData AddDatasetToSQL(DataTable pds, int cols)
{
Model.ResponeData responeData = new Model.ResponeData();
List<string> result = new List<string>();
if (pds == null)
{
responeData.code = 0;
responeData.message = "导入数据为空！";
return responeData;
}
int ic = pds.Columns.Count;
int ir = pds.Rows.Count;
if (ic < cols || !pds.Columns.Contains("管线号") || !pds.Columns.Contains("预制组件") || !pds.Columns.Contains("焊口号"))
{
responeData.code = 0;
responeData.message = "导入Excel格式错误！模板列必须包含：管线号、预制组件、焊口号";
return responeData;
}
if (ir == 0)
{
responeData.code = 0;
responeData.message = "导入数据为空！";
return responeData;
}
var getPipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId select x;
List<ComponentJointImportItem> importItems = new List<ComponentJointImportItem>();
for (int i = 0; i < ir; i++)
{
string pipelineCode = GetCellValue(pds.Rows[i], "管线号");
string pipelineComponentCode = GetCellValue(pds.Rows[i], "预制组件");
string weldJointCode = GetCellValue(pds.Rows[i], "焊口号");
if (string.IsNullOrEmpty(pipelineCode) && string.IsNullOrEmpty(pipelineComponentCode) && string.IsNullOrEmpty(weldJointCode))
{
continue;
}
if (string.IsNullOrEmpty(pipelineCode))
{
result.Add("第" + (i + 2).ToString() + "行,管线号,此项为必填项！");
continue;
}
if (string.IsNullOrEmpty(pipelineComponentCode))
{
result.Add("第" + (i + 2).ToString() + "行,预制组件,此项为必填项！");
continue;
}
if (string.IsNullOrEmpty(weldJointCode))
{
result.Add("第" + (i + 2).ToString() + "行,焊口号,此项为必填项！");
continue;
}
var pipeline = getPipeline.FirstOrDefault(x => x.PipelineCode == pipelineCode);
if (pipeline == null)
{
result.Add("第" + (i + 2).ToString() + "行,不存在此管线号-" + pipelineCode);
continue;
}
var pipelineComponent = HJGL_PipelineComponentService.GetPipelineComponentByCodeandpipelineId(pipelineComponentCode, pipeline.PipelineId);
if (pipelineComponent == null)
{
result.Add("第" + (i + 2).ToString() + "行,不存在此预制组件-" + pipelineComponentCode);
continue;
}
var weldJoint = WeldJointService.GetWeldJointsByWeldJointCode(pipeline.PipelineId, weldJointCode);
if (weldJoint == null)
{
result.Add("第" + (i + 2).ToString() + "行,不存在此焊口号-" + weldJointCode);
continue;
}
importItems.Add(new ComponentJointImportItem
{
PipelineId = pipeline.PipelineId,
PipelineCode = pipeline.PipelineCode,
PipelineComponentId = pipelineComponent.PipelineComponentId,
PipelineComponentCode = pipelineComponent.PipelineComponentCode,
WeldJointId = weldJoint.WeldJointId,
WeldJointCode = weldJoint.WeldJointCode
});
}
var conflictWeldJoints = importItems
.GroupBy(x => x.WeldJointId)
.Where(x => x.Select(y => y.PipelineComponentId).Distinct().Count() > 1)
.Select(x => x.First().PipelineCode + "-" + x.First().WeldJointCode)
.ToList();
if (conflictWeldJoints.Count > 0)
{
result.Add("同一焊口不能导入到多个组件：" + string.Join("、", conflictWeldJoints));
}
if (result.Count > 0)
{
ComponentJointList.Clear();
errorInfos = string.Join("|", result.Distinct());
responeData.code = 0;
responeData.message = errorInfos;
return responeData;
}
ComponentJointList = importItems
.GroupBy(x => new { x.PipelineComponentId, x.WeldJointId })
.Select(x => x.First())
.ToList();
errorInfos = string.Empty;
responeData.code = ComponentJointList.Count > 0 ? 1 : 0;
responeData.message = ComponentJointList.Count > 0 ? string.Empty : "导入数据为空！";
return responeData;
}
protected void btnImport_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(errorInfos))
{
if (!string.IsNullOrEmpty(this.hdFileName.Text))
{
if (ComponentJointList.Count > 0)
{
this.Grid1.Hidden = false;
this.Grid1.DataIDField = "WeldJointId";
this.Grid1.DataSource = ComponentJointList;
this.Grid1.DataBind();
Grid1.RecordCount = ComponentJointList.Count;
}
}
else
{
ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
}
}
protected void btnSave_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(errorInfos))
{
ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
return;
}
if (ComponentJointList.Count > 0)
{
foreach (var item in ComponentJointList)
{
var componentJoint = BLL.HJGL_PipelineComponentjointService.GetHJGL_Pipeline_ComponentJointByWeldJointId(item.WeldJointId);
if (componentJoint != null)
{
componentJoint.PipelineComponentCode = item.PipelineComponentCode;
componentJoint.PipelineComponentId = item.PipelineComponentId;
componentJoint.WeldJointCode = item.WeldJointCode;
componentJoint.WeldJointId = item.WeldJointId;
HJGL_PipelineComponentjointService.UpdateHJGL_Pipeline_ComponentJoint(componentJoint);
}
else
{
Model.HJGL_Pipeline_ComponentJoint newComponentJoint = new Model.HJGL_Pipeline_ComponentJoint();
newComponentJoint.Id = SQLHelper.GetNewID();
newComponentJoint.PipelineComponentCode = item.PipelineComponentCode;
newComponentJoint.PipelineComponentId = item.PipelineComponentId;
newComponentJoint.WeldJointCode = item.WeldJointCode;
newComponentJoint.WeldJointId = item.WeldJointId;
newComponentJoint.State = 0;
HJGL_PipelineComponentjointService.AddHJGL_Pipeline_ComponentJoint(newComponentJoint);
}
}
}
string rootPath = Server.MapPath("~/");
string filePath = rootPath + initPath + this.hdFileName.Text;
if (filePath != string.Empty && System.IO.File.Exists(filePath))
{
System.IO.File.Delete(filePath);
}
ShowNotify("导入成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
protected void btnDownLoad_Click(object sender, EventArgs e)
{
string rootPath = Server.MapPath("~/");
string tempDirectory = rootPath + @"File\Excel\Temp\";
if (!Directory.Exists(tempDirectory))
{
Directory.CreateDirectory(tempDirectory);
}
string tempPath = tempDirectory + "组件焊口信息导入模板" + string.Format("{0:yyyyMMddHHmmss}", DateTime.Now) + ".xlsx";
DataTable template = new DataTable();
template.Columns.Add("管线号");
template.Columns.Add("预制组件");
template.Columns.Add("焊口号");
MiniExcel.SaveAs(tempPath, template);
FileInfo info = new FileInfo(tempPath);
long fileSize = info.Length;
Response.ClearContent();
Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("组件焊口信息导入模板.xlsx", System.Text.Encoding.UTF8));
Response.ContentType = "excel/plain";
Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.AddHeader("Content-Length", fileSize.ToString().Trim());
Response.TransmitFile(tempPath, 0, fileSize);
Response.Flush();
Response.Close();
File.Delete(tempPath);
}
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
this.Grid1.DataSource = ComponentJointList;
this.Grid1.DataBind();
Grid1.RecordCount = ComponentJointList.Count;
}
private string GetCellValue(DataRow row, string columnName)
{
return Convert.ToString(row[columnName]).Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", "").Trim();
}
public class ComponentJointImportItem
{
public string PipelineId { get; set; }
public string PipelineCode { get; set; }
public string PipelineComponentId { get; set; }
public string PipelineComponentCode { get; set; }
public string WeldJointId { get; set; }
public string WeldJointCode { get; set; }
}
}
}
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineComponentJointIn.aspx.designer.cs
Generated
+143
View File
@@ -0,0 +1,143 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.PreDesign
{
public partial class PrePipelineComponentJointIn
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// hdFileName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdFileName;
/// <summary>
/// btnDownLoad 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDownLoad;
/// <summary>
/// btnAudit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAudit;
/// <summary>
/// btnImport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// fuAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FileUpload fuAttachUrl;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+89 -49
View File
@@ -86,31 +86,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
int a = 0;
if (cbAllPipeline.Checked)
{
a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count();
a = GetUnitWorkTestPackagePipelineCount(q.UnitWorkId);
}
else
{
a = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
&& (from y in Funs.DB.HJGL_WeldJoint where y.PipelineId == x.PipelineId && y.IsTwoJoint == true select y).Count() > 0
select x).Count();
a = GetUnitWorkTestPackagePipelineCount(q.UnitWorkId);
}
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn1.CommandName = "单位工程";
tn1.EnableClickEvent = true;
tn1.EnableExpandEvent = true;
rootNode1.Nodes.Add(tn1);
if (a > 0)
{
// BindNodes(tn1);
TreeNode newNode = new TreeNode();
newNode.Text = "加载管线...";
newNode.NodeID = "加载管线...";
tn1.Nodes.Add(newNode);
BindTestPackageNodes(tn1);
}
}
}
@@ -121,14 +114,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
int a = 0;
if (cbAllPipeline.Checked)
{
a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count();
a = GetUnitWorkTestPackagePipelineCount(q.UnitWorkId);
}
else
{
a = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
&& (from y in Funs.DB.HJGL_WeldJoint where y.PipelineId == x.PipelineId && y.IsTwoJoint == true select y).Count() > 0
select x).Count();
a = GetUnitWorkTestPackagePipelineCount(q.UnitWorkId);
}
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode();
@@ -139,17 +129,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
tn2.Expanded = true;
}
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.CommandName = "单位工程";
tn2.EnableClickEvent = true;
tn2.EnableExpandEvent = true;
rootNode2.Nodes.Add(tn2);
if (a > 0)
{
// BindNodes(tn1);
TreeNode newNode = new TreeNode();
newNode.Text = "加载管线...";
newNode.NodeID = "加载管线...";
tn2.Nodes.Add(newNode);
BindTestPackageNodes(tn2);
}
}
}
@@ -158,27 +144,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
private void BindNodes(TreeNode node)
{
List<Model.HJGL_Pipeline> pipeline = new List<Model.HJGL_Pipeline>();
pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
orderby x.PipelineCode
select x).ToList();
if (cbAllPipeline.Checked)
{
pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
orderby x.PipelineCode
select x).ToList();
pipeline = GetTestPackagePipelineList(node.NodeID);
}
else
{
pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
&& (from y in Funs.DB.HJGL_WeldJoint where y.PipelineId == x.PipelineId && y.IsTwoJoint == true select y).Count() > 0
orderby x.PipelineCode
select x).ToList();
pipeline = GetTestPackagePipelineList(node.NodeID);
}
var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
@@ -224,6 +196,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
newNode.ToolTip = "管线号【焊口数】";
newNode.NodeID = item.PipelineId;
newNode.CommandName = "管线";
newNode.EnableClickEvent = true;
node.Nodes.Add(newNode);
}
@@ -240,6 +213,65 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
private int GetUnitWorkTestPackagePipelineCount(string unitWorkId)
{
var testPackages = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == unitWorkId
select x.PTP_ID).ToList();
return testPackages.Select(x => GetTestPackagePipelineList(x).Count()).Sum();
}
private void BindTestPackageNodes(TreeNode unitWorkNode)
{
var testPackages = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == unitWorkNode.NodeID
orderby x.TestPackageNo
select x).ToList();
foreach (var item in testPackages)
{
int pipelineCount = GetTestPackagePipelineList(item.PTP_ID).Count();
if (pipelineCount == 0)
{
continue;
}
TreeNode newNode = new TreeNode();
newNode.Text = (string.IsNullOrEmpty(item.TestPackageNo) ? "未知" : item.TestPackageNo) + "【" + pipelineCount.ToString() + "】管线";
newNode.NodeID = item.PTP_ID;
newNode.CommandName = 1 + "|" + Funs.GetEndPageNumber(pipelineCount, pageSize);
newNode.EnableClickEvent = true;
newNode.EnableExpandEvent = true;
unitWorkNode.Nodes.Add(newNode);
TreeNode loadNode = new TreeNode();
loadNode.Text = "加载管线...";
loadNode.NodeID = "加载管线...";
newNode.Nodes.Add(loadNode);
}
}
private List<Model.HJGL_Pipeline> GetTestPackagePipelineList(string ptpId)
{
var pipeline = (from x in Funs.DB.HJGL_Pipeline
join y in Funs.DB.PTP_PipelineList on x.PipelineId equals y.PipelineId
where y.PTP_ID == ptpId
&& x.ProjectId == this.CurrUser.LoginProjectId
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
orderby x.PipelineCode
select x).Distinct().ToList();
if (!cbAllPipeline.Checked)
{
pipeline = pipeline.Where(x => (from y in Funs.DB.HJGL_WeldJoint where y.PipelineId == x.PipelineId && y.IsTwoJoint == true select y).Count() > 0).ToList();
}
return pipeline;
}
#region 点击TreeView
/// <summary>
/// 点击TreeView
@@ -263,12 +295,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
if (pipeline != null)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
this.hdUnitWorkId.Text = pipeline.UnitWorkId;
this.BindGrid();
}
else
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID;
this.hdUnitWorkId.Text = e.CommandName.Split('|').Length == 2 ? this.tvControlItem.SelectedNode.ParentNode.NodeID : this.tvControlItem.SelectedNodeID;
NoAuditBindGrid();
}
@@ -362,8 +394,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
WHERE IsTwoJoint = 1";
List<SqlParameter> listStr = new List<SqlParameter> { };
strSql += " AND UnitWorkId =@UnitWorkId";
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
if (this.tvControlItem.SelectedNode.CommandName.Split('|').Length == 2)
{
strSql += " AND EXISTS(SELECT 1 FROM PTP_PipelineList ptpPipe WHERE ptpPipe.PipelineId = View_HJGL_WeldJoint.PipelineId AND ptpPipe.PTP_ID = @PTP_ID)";
listStr.Add(new SqlParameter("@PTP_ID", this.tvControlItem.SelectedNodeID));
}
else
{
strSql += " AND UnitWorkId =@UnitWorkId";
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
}
if (!string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()))
{
@@ -417,12 +457,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
this.hdUnitWorkId.Text = pipeline.UnitWorkId;
this.BindGrid();
}
else
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID;
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.CommandName.Split('|').Length == 2 ? this.tvControlItem.SelectedNode.ParentNode.NodeID : this.tvControlItem.SelectedNodeID;
NoAuditBindGrid();
}
@@ -1228,12 +1268,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
this.hdUnitWorkId.Text = pipeline.UnitWorkId;
this.BindGrid();
}
else
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID;
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.CommandName.Split('|').Length == 2 ? this.tvControlItem.SelectedNode.ParentNode.NodeID : this.tvControlItem.SelectedNodeID;
NoAuditBindGrid();
}
}
@@ -1244,14 +1284,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
this.hdUnitWorkId.Text = pipeline.UnitWorkId;
this.BindGrid();
}
else
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID;
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.CommandName.Split('|').Length == 2 ? this.tvControlItem.SelectedNode.ParentNode.NodeID : this.tvControlItem.SelectedNodeID;
NoAuditBindGrid();
}
}
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs
+24 -205
View File
@@ -133,207 +133,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
#endregion
#region 将Dataset的数据导入数据库
/// <summary>
/// 将Dataset的数据导入数据库
/// </summary>
/// <param name="pds">数据集</param>
/// <param name="Cols">数据集行数</param>
/// <returns></returns>
private Model.ResponeData AddDatasetToSQL(DataTable pds, int Cols)
{
Model.ResponeData responeData = new Model.ResponeData();
List<string> result = new List<string>();
int ic, ir;
ic = pds.Columns.Count;
ir = pds.Rows.Count;
if (ic < Cols)
{
responeData.code = 0;
responeData.message = "导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列";
return responeData;
}
// DataRow[] dv = pds.Select("主项编号 <>'' and 管线号 <>'' and 材料编码 <>'' and 数量 <>''and 管线划分<>'' ");
DataRow[] dv = pds.Select(" 管线号 <>'' and 材料编码 <>'' and 数量 <>'' ");
//导入数据库
if (dv.Length > 0)
{
for (int i = 0; i < dv.Length; i++)
{
HJGL_PipeLineMat item = new HJGL_PipeLineMat();
#region 数据验证和赋值
string unitworkId = string.Empty;
unitworkId = Request.Params["UnitWorkId"];
string PipeArea = string.Empty;//管线划分 1工厂预制 2现场施工
if (dv[i]["管线号"] != null && !string.IsNullOrEmpty(dv[i]["管线号"].ToString()))
{
var pipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == unitworkId && x.PipelineCode == dv[i]["管线号"].ToString().Trim() select x;
if (pipeline.Count() > 0)
{
item.PipelineId = pipeline.First().PipelineId;
PipeArea = pipeline.First().PipeArea;
}
else
{
// errorInfos += (i + 2) + "Line,"+ dv[i]["管线号"].ToString() + " [管线号] 不存在</br>";
result.Add("不存在此管线号-" + dv[i]["管线号"].ToString());
}
}
else
{
//errorInfos += (i + 2) + "Line, [管线号] 不能为空</br>";
result.Add((i + 2) + "Line, [管线号] 不能为空</br>");
}
//if (dv[i]["管线划分"] != null && !string.IsNullOrEmpty(dv[i]["管线划分"].ToString()))
//{
// string txtPipeArea = "";
// switch (PipeArea)
// {
// case "1":
// txtPipeArea = "工厂预制";
// break;
// case "2":
// txtPipeArea = "现场施工";
// break;
// default:
// txtPipeArea = "无";
// break;
// }
// if (!Equals(txtPipeArea, dv[i]["管线划分"].ToString().Trim()))
// {
// errorInfos += (i + 2) + "Line, [管线划分] 不匹配</br>";
// }
//}
//else
//{
// errorInfos += (i + 2) + "Line, [管线划分] 不能为空</br>";
//}
if (dv[i]["材料编码"] != null && !string.IsNullOrEmpty(dv[i]["材料编码"].ToString()))
{
var lib = from x in Funs.DB.HJGL_MaterialCodeLib where x.MaterialCode == dv[i]["材料编码"].ToString() select x;
if (lib.Count() > 0)
{
item.MaterialCode = dv[i]["材料编码"].ToString();
}
else
{
//errorInfos += (i + 2) + "Line," + dv[i]["材料编码"].ToString() + " [材料编码] 不存在</br>";
result.Add("不存在此材料编码-" + dv[i]["材料编码"].ToString());
}
}
else
{
//errorInfos += (i + 2) + "Line, [材料编码] 不能为空</br>";
result.Add((i + 2) + "Line, [材料编码] 不能为空</br>");
}
if (dv[i]["数量"] != null && !string.IsNullOrEmpty(dv[i]["数量"].ToString()))
{
try
{
var number = Funs.GetNewDecimal(dv[i]["数量"].ToString());
item.Number = number;
}
catch (Exception)
{
//errorInfos += "第" + (i + 2).ToString() + "行," + "数量格式输入有误</br>";
result.Add("第" + (i + 2).ToString() + "行," + "数量格式输入有误</br>");
}
}
else
{
//errorInfos += (i + 2) + "Line, [数量] 不能为空</br>";
result.Add((i + 2) + "Line, [数量] 不能为空</br>");
}
if (PipeArea == "1")
{
if (dv[i]["预制组件"] != null && !string.IsNullOrEmpty(dv[i]["预制组件"].ToString()))
{
item.PrefabricatedComponents = dv[i]["预制组件"].ToString();
}
else
{
result.Add((i + 2) + "Line, [预制组件] 不能为空</br>");
}
}
var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode && x.PrefabricatedComponents == item.PrefabricatedComponents);
if (model.Count() == 0)
{
matList.Add(item);
}
//if (PipeArea == "1")//工厂预制
//{
// var model= matList.Where(x => x.PrefabricatedComponents == item.PrefabricatedComponents && x.MaterialCode == item.MaterialCode);
// if (model.Count()==0)
// {
// matList.Add(item);
// }
//} else if (PipeArea == "2")//现场施工
//{
// var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode);
// if (model.Count() == 0)
// {
// matList.Add(item);
// }
//}
//item.PipeLineMatId= SQLHelper.GetNewID(typeof(Model.HJGL_PipeLineMat));
//if (!matList.Select(x => x.MaterialCode).Contains(item.MaterialCode))
//{
// matList.Add(item);
//}
#endregion
}
}
else
{
responeData.code = 0;
responeData.message = "没有数据";
}
if (result.Count > 0)
{
// result = result.Substring(0, result.LastIndexOf("|"));
errorInfos = string.Join("|", result.Distinct());
//Alert alert = new Alert();
//alert.Message = result;
//alert.Target = Target.Self;
//alert.Show();
responeData.code = 0;
responeData.message = errorInfos;
}
return responeData;
}
private Model.ResponeData AddDatasetToSQL(List<dynamic> pds, int count)
{
Model.ResponeData responeData = new Model.ResponeData();
List<string> result = new List<string>();
if (count < 4)
if (count < 6)
{
responeData.code = 0;
responeData.message = "导入Excel格式错误！Excel只有" + count.ToString().Trim() + "列";
@@ -377,16 +182,30 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (pds[i].C != null && !string.IsNullOrEmpty(pds[i].C.ToString()))
{
string materialCode = pds[i].C.ToString();
var lib = from x in Funs.DB.HJGL_MaterialCodeLib where x.MaterialCode == materialCode select x;
if (lib.Count() > 0)
string materialCode = pds[i].C.ToString().Trim();
string furnaceNo = pds[i].D == null ? string.Empty : pds[i].D.ToString().Trim();
string batchNo = pds[i].E == null ? string.Empty : pds[i].E.ToString().Trim();
if (pds[i].D == null || string.IsNullOrEmpty(pds[i].D.ToString()))
{
item.MaterialCode = pds[i].C.ToString();
result.Add((i + 2) + "Line, [炉号] 不能为空</br>");
}
else
if (pds[i].E == null || string.IsNullOrEmpty(pds[i].E.ToString()))
{
result.Add("不存在此材料编码-" + pds[i].C.ToString());
result.Add((i + 2) + "Line, [批号] 不能为空</br>");
}
if (!string.IsNullOrEmpty(materialCode) && !string.IsNullOrEmpty(furnaceNo) && !string.IsNullOrEmpty(batchNo))
{
string fullMaterialCode = materialCode + "-" + furnaceNo + "-" + batchNo;
var lib = from x in Funs.DB.HJGL_MaterialCodeLib where x.MaterialCode == fullMaterialCode select x;
if (lib.Count() > 0)
{
item.MaterialCode = fullMaterialCode;
}
else
{
result.Add("不存在此材料:" + fullMaterialCode);
}
}
}
@@ -395,11 +214,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
result.Add((i + 2) + "Line, [材料编码] 不能为空</br>");
}
if (pds[i].D != null && !string.IsNullOrEmpty(pds[i].D.ToString()))
if (pds[i].F != null && !string.IsNullOrEmpty(pds[i].F.ToString()))
{
try
{
var number = Funs.GetNewDecimal(pds[i].D.ToString());
var number = Funs.GetNewDecimal(pds[i].F.ToString());
item.Number = number;
}
catch (Exception)
@@ -674,4 +493,4 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
+10 -3
View File
@@ -34,6 +34,11 @@
background-color: green;
}
.f-grid-row.priority {
background-color: #1e88e5;
color: #fff;
}
.f-grid-row {
font-size: smaller;
}
@@ -138,7 +143,9 @@
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:Label ID="lbRate" runat="server" LabelWidth="100px" Hidden="true"></f:Label>
<f:Label ID="lbNote" runat="server" LabelWidth="100px" Text="绿色为匹配率100%，红色为匹配率小于100%"></f:Label>
<f:Label ID="lbNote" runat="server" LabelWidth="100px" Text="绿色为匹配率100%，红色为匹配率小于100%，蓝色为手动优先组件"></f:Label>
<f:Button ID="btnPriorityComponents" Text="优先匹配选中组件" Icon="TabGo" runat="server" OnClick="btnPriorityComponents_Click">
</f:Button>
<f:Button ID="btnGenTask" ToolTip="生成任务单" Icon="ApplicationViewIcons" runat="server" OnClick="btnGenTask_Click" ConfirmText="确定生成任务单吗？">
</f:Button>
<f:CheckBox ID="cbSelectCom" ShowLabel="false" runat="server" Text="默认勾选匹配100%" Checked="true">
@@ -174,9 +181,9 @@
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="材料匹配明细" EnableRowClickEvent="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id,PipelineId,PrefabricatedComponents" ForceFit="true"
EnableColumnLines="true" DataIDField="Id" AllowSorting="true" OnRowDataBound="Grid1_RowDataBound"
SortField="Id" SortDirection="ASC" OnSort="Grid1_Sort">
SortField="Id" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true">
<Columns>
<f:RenderField Width="200px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+254 -58
View File
@@ -70,6 +70,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
public Dictionary<string, HashSet<string>> priorityComponents
{
get
{
var value = ViewState["priorityComponents"] as Dictionary<string, HashSet<string>>;
if (value == null)
{
value = new Dictionary<string, HashSet<string>>();
ViewState["priorityComponents"] = value;
}
return value;
}
set
{
ViewState["priorityComponents"] = value;
}
}
protected void Page_Load(object sender, EventArgs e)
{
@@ -86,6 +104,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
; HJGL_MaterialService.materialStockItems_FIELD = new List<Model.MaterialStockItem>();
HJGL_MaterialService.materialStockItems_SHOP = new List<Model.MaterialStockItem>();
dicSeclectPipeLine = new Dictionary<string, string>();
priorityComponents = new Dictionary<string, HashSet<string>>();
var pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId
select x.FlowingSection).Distinct().ToList();
@@ -155,22 +174,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (var q in unitWork1)
{
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea && x.WarehouseId == WarehouseId select x).Count();
int a = GetUnitWorkTestPackagePipelineCount(q.UnitWorkId);
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn1.CommandName = "单位工程";
tn1.EnableExpandEvent = true;
tn1.EnableClickEvent = true;
tn1.EnableCheckBox = false;
rootNode1.Nodes.Add(tn1);
if (a > 0)
{
// BindNodes(tn1);
TreeNode newNode = new TreeNode();
newNode.Text = "加载管线...";
newNode.NodeID = "加载管线...";
tn1.Nodes.Add(newNode);
BindTestPackageNodes(tn1);
}
}
}
@@ -178,7 +195,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
foreach (var q in unitWork2)
{
int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea && x.WarehouseId == WarehouseId select x).Count();
int a = GetUnitWorkTestPackagePipelineCount(q.UnitWorkId);
// var NowComPipelineCode = PipelineService.GetNoComPipelinesByUnitWordId(q.UnitWorkId);
//int a = NowComPipelineCode.Count();
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
@@ -190,7 +207,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
tn2.Expanded = true;
}
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.CommandName = "单位工程";
tn2.EnableExpandEvent = true;
tn2.EnableClickEvent = true;
tn2.EnableCheckBox = false;
@@ -198,11 +215,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
rootNode2.Nodes.Add(tn2);
if (a > 0)
{
// BindNodes(tn2);
TreeNode newNode = new TreeNode();
newNode.Text = "加载管线...";
newNode.NodeID = "加载管线...";
tn2.Nodes.Add(newNode);
BindTestPackageNodes(tn2);
}
}
}
@@ -215,22 +228,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
// node.Text += "|" + NowComPipelineCode.Count();
//}
var CompleteInOutPlanDetail_RelationList = from x in Funs.DB.Tw_InOutPlanDetail_Relation
join y in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id
where y.State == (int)TwConst.State.已完成 && y.WarehouseCode == drpWarehouse.SelectedValue
select x;
var pipeline = (from x in Funs.DB.HJGL_Pipeline
join y in CompleteInOutPlanDetail_RelationList on x.PipelineId equals y.PipelineId into temp
from y in temp.DefaultIfEmpty()
where y == null && x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) && x.WarehouseId==WarehouseId
orderby x.PipelineCode
select x).ToList();
if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.SelectedValue != Const._Null)
{
pipeline = pipeline.Where(x => x.FlowingSection == drpFlowingSection.SelectedValue).ToList();
}
var pipeline = GetTestPackagePipelineList(node.NodeID);
//pipeline= pipeline.Where(x => NowComPipelineCode.Contains(x.PipelineCode)).ToList();
if (!node.Text.Contains("|"))
{
@@ -268,6 +266,74 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
private int GetUnitWorkTestPackagePipelineCount(string unitWorkId)
{
var testPackageIds = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == unitWorkId
select x.PTP_ID).ToList();
return testPackageIds.Select(x => GetTestPackagePipelineList(x).Count()).Sum();
}
private void BindTestPackageNodes(TreeNode unitWorkNode)
{
var testPackages = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == unitWorkNode.NodeID
orderby x.TestPackageNo
select x).ToList();
foreach (var item in testPackages)
{
int pipelineCount = GetTestPackagePipelineList(item.PTP_ID).Count();
if (pipelineCount == 0)
{
continue;
}
TreeNode newNode = new TreeNode();
newNode.Text = (string.IsNullOrEmpty(item.TestPackageNo) ? "未知" : item.TestPackageNo) + "【" + pipelineCount.ToString() + "】管线";
newNode.NodeID = item.PTP_ID;
newNode.CommandName = 1 + "|" + Funs.GetEndPageNumber(pipelineCount, pageSize);
newNode.EnableClickEvent = true;
newNode.EnableExpandEvent = true;
newNode.EnableCheckBox = false;
unitWorkNode.Nodes.Add(newNode);
TreeNode loadNode = new TreeNode();
loadNode.Text = "加载管线...";
loadNode.NodeID = "加载管线...";
loadNode.EnableCheckBox = false;
newNode.Nodes.Add(loadNode);
}
}
private List<Model.HJGL_Pipeline> GetTestPackagePipelineList(string ptpId)
{
var completeInOutPlanDetailRelationList = from x in Funs.DB.Tw_InOutPlanDetail_Relation
join y in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id
where y.State == (int)TwConst.State.已完成 && y.WarehouseCode == drpWarehouse.SelectedValue
select x;
var pipeline = (from x in Funs.DB.HJGL_Pipeline
join p in Funs.DB.PTP_PipelineList on x.PipelineId equals p.PipelineId
join y in completeInOutPlanDetailRelationList on x.PipelineId equals y.PipelineId into temp
from y in temp.DefaultIfEmpty()
where y == null
&& p.PTP_ID == ptpId
&& x.ProjectId == this.CurrUser.LoginProjectId
&& x.PipeArea == PipeArea
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
&& x.WarehouseId == WarehouseId
orderby x.PipelineCode
select x).ToList();
if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.SelectedValue != Const._Null)
{
pipeline = pipeline.Where(x => x.FlowingSection == drpFlowingSection.SelectedValue).ToList();
}
return pipeline.Distinct().ToList();
}
protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
{
if (e.Node.Nodes[0].NodeID == "加载管线...")
@@ -417,23 +483,66 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}*/
}
protected void Grid2_RowClick(object sender, GridRowClickEventArgs e)
private void BindMaterialDetail(string pipelineId)
{
var tb = tw_PipeMatMatchOutputs.Where(x => x.PipelineId == Grid2.SelectedRowID).ToList();
var tb = tw_PipeMatMatchOutputs.Where(x => x.PipelineId == pipelineId).ToList();
Grid1.DataSource = tb;
Grid1.DataBind();
var selectList = new List<string>();
for (int i = 0; i < Grid1.Rows.Count; i++)
{
var model = Grid1.Rows[i].DataItem as Tw_PipeMatMatchOutput;
if (model?.MatchRate < 1 || model?.MatchRate == null)
if (model == null)
{
Grid1.Rows[i].RowCssClass = "red";
continue;
}
if (IsPriorityComponent(model.PipelineId, model.PrefabricatedComponents))
{
Grid1.Rows[i].RowCssClass = "priority";
selectList.Add(model.Id);
}
else if (model.MatchRate < 1 || model.MatchRate == null)
{
Grid1.Rows[i].RowCssClass = "red";
}
}
Grid1.SelectedRowIDArray = selectList.ToArray();
}
private bool IsPriorityComponent(string pipelineId, string prefabricatedComponents)
{
return !string.IsNullOrEmpty(pipelineId)
&& !string.IsNullOrEmpty(prefabricatedComponents)
&& priorityComponents.ContainsKey(pipelineId)
&& priorityComponents[pipelineId].Contains(prefabricatedComponents);
}
private Dictionary<string, List<string>> GetPriorityComponentList()
{
return priorityComponents
.Where(x => x.Value != null && x.Value.Any())
.ToDictionary(x => x.Key, x => x.Value.ToList());
}
private void RefreshMatchResult()
{
tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(
this.CurrUser.LoginProjectId,
dicSeclectPipeLine.Keys.ToList(),
drpWarehouse.SelectedValue,
GetPriorityComponentList());
BindGrid3();
BindGrid2();
}
protected void Grid2_RowClick(object sender, GridRowClickEventArgs e)
{
BindMaterialDetail(Grid2.SelectedRowID);
}
protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
{
@@ -473,7 +582,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid();
if (!string.IsNullOrEmpty(Grid2.SelectedRowID) && tw_PipeMatMatchOutputs != null && tw_PipeMatMatchOutputs.Any())
{
BindMaterialDetail(Grid2.SelectedRowID);
}
else
{
BindGrid();
}
}
#endregion
@@ -491,7 +607,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
parameter3D.TagNum = "";
parameter3D.ButtonType = "3";
if (this.tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2)
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
var pipeline = (from x in Funs.DB.HJGL_Pipeline
@@ -517,7 +633,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
{
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
this.hdUnitWorkId.Text = pipeline.UnitWorkId;
this.BindGrid();
}
@@ -566,10 +682,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
dicSeclectPipeLine.Add(node.NodeID, node.Text);
}
}
tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(this.CurrUser.LoginProjectId, dicSeclectPipeLine.Keys.ToList(), drpWarehouse.SelectedValue);
BindGrid3();
BindGrid2();
RefreshMatchResult();
}
protected void btnDeletePipelineMatchMat_Click(object sender, EventArgs e)
@@ -579,6 +692,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (string rowId in Grid3.SelectedRowIDArray)
{
dicSeclectPipeLine.Remove(rowId);
priorityComponents.Remove(rowId);
var node = tvControlItem.FindNode(rowId);
if (node != null)
{
@@ -586,25 +700,63 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(this.CurrUser.LoginProjectId, dicSeclectPipeLine.Keys.ToList(), drpWarehouse.SelectedValue);
BindGrid3();
BindGrid2();
RefreshMatchResult();
}
}
protected void btnPriorityComponents_Click(object sender, EventArgs e)
{
string selectedPipelineId = Grid2.SelectedRowID;
if (string.IsNullOrEmpty(selectedPipelineId))
{
ShowNotify("请先在材料匹配列表选择管线！", MessageBoxIcon.Warning);
return;
}
var selectedComponents = new HashSet<string>();
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
if (Grid1.DataKeys[rowIndex].Length < 3)
{
continue;
}
string pipelineId = Grid1.DataKeys[rowIndex][1]?.ToString();
string componentCode = Grid1.DataKeys[rowIndex][2]?.ToString();
if (pipelineId == selectedPipelineId && !string.IsNullOrEmpty(componentCode))
{
selectedComponents.Add(componentCode);
}
}
if (selectedComponents.Any())
{
priorityComponents[selectedPipelineId] = selectedComponents;
}
else
{
priorityComponents.Remove(selectedPipelineId);
}
RefreshMatchResult();
BindMaterialDetail(selectedPipelineId);
}
protected void btnGenTask_Click(object sender, EventArgs e)
{
if (Grid2.SelectedRowIDArray.Count() > 0)
{
SaveTask();
ShowNotify("生成任务单成功！", MessageBoxIcon.Warning);
// Alert.Show("生成任务单成功！", MessageBoxIcon.Warning);
Grid1.DataSource = null;
Grid1.DataBind();
Grid2.DataSource = null;
Grid2.DataBind();
Grid3.DataSource = null;
Grid3.DataBind();
if (SaveTask())
{
ShowNotify("生成任务单成功！", MessageBoxIcon.Warning);
// Alert.Show("生成任务单成功！", MessageBoxIcon.Warning);
Grid1.DataSource = null;
Grid1.DataBind();
Grid2.DataSource = null;
Grid2.DataBind();
Grid3.DataSource = null;
Grid3.DataBind();
}
}
else
{
@@ -612,7 +764,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
private void SaveTask()
private bool SaveTask()
{
var weldingRods = from x in Funs.DB.Base_Consumables where x.ConsumablesType == "2" select x;
var weldingWires = from x in Funs.DB.Base_Consumables where x.ConsumablesType == "1" select x;
@@ -632,6 +784,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
selectRowId = selectRowId.Where(x => x.JointAttribute == "预制口").ToList();
}
var priorityWeldJointIds = GetPriorityWeldJointIds(Grid2.SelectedRowIDArray.ToList());
if (priorityWeldJointIds.Any())
{
if (priorityWeldJointIds.Any(x => !x.Value.Any()))
{
ShowNotify("选中组件未找到关联焊口，无法按组件生成任务单！", MessageBoxIcon.Warning);
return false;
}
selectRowId = selectRowId.Where(x => !priorityWeldJointIds.ContainsKey(x.PipelineId) || priorityWeldJointIds[x.PipelineId].Contains(x.WeldJointId)).ToList();
}
if (!selectRowId.Any())
{
ShowNotify("未找到可生成任务单的焊口！", MessageBoxIcon.Warning);
return false;
}
foreach (var weldjoint in selectRowId)
{
string canWeldingRodName = string.Empty;
@@ -666,7 +833,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (oldWeldTask != null)
{
ShowNotify("所选焊口已存在任务单，无法保存！", MessageBoxIcon.Warning);
return;
return false;
}
Model.HJGL_WeldJoint weldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(NewTask.WeldJointId);
if (weldJoint != null)
@@ -739,7 +906,36 @@ namespace FineUIPro.Web.HJGL.WeldingManage
BLL.WeldTaskService.AddWeldTask(NewTask);
}
return true;
}
private Dictionary<string, HashSet<string>> GetPriorityWeldJointIds(List<string> selectedPipelineIds)
{
var result = new Dictionary<string, HashSet<string>>();
var selectedPriority = priorityComponents
.Where(x => selectedPipelineIds.Contains(x.Key) && x.Value != null && x.Value.Any())
.ToList();
foreach (var item in selectedPriority)
{
string pipelineId = item.Key;
var componentCodes = item.Value.ToList();
var weldJointIds = (from joint in Funs.DB.HJGL_Pipeline_ComponentJoint
join weldJoint in Funs.DB.HJGL_WeldJoint on joint.WeldJointId equals weldJoint.WeldJointId
join component in Funs.DB.HJGL_Pipeline_Component on joint.PipelineComponentId equals component.PipelineComponentId into componentJoin
from componentItem in componentJoin.DefaultIfEmpty()
where joint.WeldJointId != null
&& weldJoint.PipelineId == pipelineId
&& ((componentItem != null && componentCodes.Contains(componentItem.PipelineComponentCode))
|| componentCodes.Contains(joint.PipelineComponentCode))
select joint.WeldJointId).Distinct().ToList();
result[pipelineId] = new HashSet<string>(weldJointIds);
}
return result;
}
private bool IsCoverClass(string wpsClass, string matClass)
{
bool isCover = false;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs
Generated
+9
View File
@@ -257,6 +257,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.Label lbNote;
/// <summary>
/// btnPriorityComponents 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPriorityComponents;
/// <summary>
/// btnGenTask 控件。
/// </summary>
SGGL/FineUIPro.Web/common/Menu_DigData.xml
+54 -9
View File
@@ -1,9 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl="">
<TreeNode id="0E9C6A47-E410-43C4-95D1-1EC1C01E9967" Text="WBS数据仓库" NavigateUrl="DigData/WBSDW.aspx">
</TreeNode>
<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl="">
<TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl="">
<TreeNode id="8B550B58-C681-4F34-83F0-F1E99CE04A47" Text="国内标准" NavigateUrl="">
</TreeNode>
<TreeNode id="97D1E401-EA0F-4C90-B7DC-61D568BAE617" Text="国外标准" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""><TreeNode id="2C7F78D3-DA7B-4193-A37F-CC479E4B9583" Text="法律法规" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""><TreeNode id="406EBAAB-05B2-4249-BAC2-5589F50AE365" Text="企业标准" NavigateUrl=""></TreeNode>
<TreeNode id="59F3FA81-7D08-4611-A3FF-22BFA656A940" Text="企业制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
</TreeNode>
<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
</TreeNode>
<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
</TreeNode>
<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
<TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
<TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
<TreeNode id="24939ABD-E174-4C3D-8B04-494917B7BE40" Text="HSE隐患整改问题分析" NavigateUrl="DigData/RectifyProblemAnalysis.aspx"></TreeNode>
<TreeNode id="4B2E7EE5-AC7C-4143-B5BC-60080C763A24" Text="HSE教育培训统计" NavigateUrl="DigData/TrainRecordAnalysis.aspx"></TreeNode>
@@ -16,12 +58,15 @@
<TreeNode id="A20E2443-A118-4C67-9084-FFEB685CA539" Text="清单子目使用率及价格走势图" NavigateUrl=""></TreeNode>
<TreeNode id="6D1F3A3F-EFD1-420A-87E7-8CFAEF971165" Text="日工效统计" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="5BE7F83B-C02D-4481-815F-153279B44C39" Text="劳务数据库" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="AF5C32FD-F0CB-404E-B56D-C4AE79A8A050" Text="人员功效分析" NavigateUrl=""></TreeNode>
<TreeNode id="0DB6BB5F-B17A-4A38-AABB-278300EA9E39" Text="员工产值分析" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="CFEF47C0-8EFA-46FF-8648-5B1922519DCC" Text="WBS数据分析" NavigateUrl="DigData/WBSAnalysis.aspx"></TreeNode>
<TreeNode id="B146FC96-B199-426B-8504-4BE093C0DCB1" Text="项目数据汇总分析" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
<TreeNode id="DD960B76-1F33-468B-9FEF-76328235C079" Text="项目质量数据汇总" NavigateUrl="DigData/CQMSDataCollect.aspx"></TreeNode>
<TreeNode id="A705738B-D0A2-41D2-A01A-18774B5AED49" Text="项目施工数据汇总" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
</TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/Menu_HJGL.xml
+6 -6
View File
@@ -12,14 +12,15 @@
<TreeNode id="32F5CC8C-E0F4-456C-AB88-77E36269FA50" Text="焊接设计基础数据导入" NavigateUrl="HJGL/WeldingManage/WeldJointList.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1EE36752-6077-47C9-AFF0-5372B862FF61" Text="管线划分" NavigateUrl="HJGL/PreDesign/PipelingDivide.aspx"></TreeNode>
<TreeNode id="1C6F9CA9-FDAC-4CE5-A19C-5536538851E1" Text="试压包划分" NavigateUrl="HJGL/TestPackage/TestPackageEdit.aspx"></TreeNode>
<TreeNode id="EF6B01AF-D038-4A38-BFAF-D89130D60DE6" Text="材料信息导入" NavigateUrl="HJGL/DataImport/MaterialInformation.aspx"></TreeNode>
<TreeNode id="1E36EA73-D536-4215-BFB9-A8771937BD89" Text="工厂预制管理" NavigateUrl=""><TreeNode id="0A3F6AB0-535E-489C-9F64-4FFE61C17085" Text="材料管理" NavigateUrl="HJGL/PreDesign/MaterialManage.aspx"></TreeNode>
<TreeNode id="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.aspx"></TreeNode>
<TreeNode id="8255554C-0A92-4C7B-BF19-779AF0220A8C" Text="预制组件管理" NavigateUrl="HJGL/PreDesign/PrePipeline.aspx"></TreeNode>
<TreeNode id="F18CFC0E-47E0-477A-9AB3-72B88D438299" Text="堆场规划" NavigateUrl="HJGL/PreDesign/YardPlanning.aspx"></TreeNode>
<TreeNode id="EEC0D060-C15E-4D25-B015-C2B91F735DAC" Text="车次管理" NavigateUrl="HJGL/PreDesign/TrainNumberManager.aspx"></TreeNode>
<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="发货管理" NavigateUrl="HJGL/PreDesign/PackagingManage.aspx"></TreeNode>
<TreeNode id="BD9C587E-17C2-49F1-82AE-A05117E41D89" Text="安装清单" NavigateUrl="HJGL/PreDesign/InstallList.aspx"></TreeNode>
<TreeNode id="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.aspx"></TreeNode>
<TreeNode id="EEC0D060-C15E-4D25-B015-C2B91F735DAC" Text="发货管理" NavigateUrl="HJGL/PreDesign/TrainNumberManager.aspx"></TreeNode>
<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="包装管理" NavigateUrl="HJGL/PreDesign/PackagingManage.aspx"></TreeNode>
</TreeNode>
<TreeNode id="9B828E92-733B-4AF9-9DD0-55ECD8B64AB8" Text="材料管理" NavigateUrl=""><TreeNode id="E29C1839-3530-45EC-A752-B26A0027E2CD" Text="入库管理" NavigateUrl=""><TreeNode id="324C72AF-447A-4308-AFB7-ABF788C58240" Text="入库申请" NavigateUrl="CLGL/InPlanMaster.aspx"></TreeNode>
<TreeNode id="4A55351A-2440-4A2D-8509-3FFEE5FC8861" Text="入库单管理" NavigateUrl="CLGL/InputMaster.aspx"></TreeNode>
@@ -28,7 +29,7 @@
<TreeNode id="BCCA4D81-410C-4746-B1E4-F882BC3A25F4" Text="出库单管理" NavigateUrl="CLGL/OutputMaster.aspx"></TreeNode>
</TreeNode>
<TreeNode id="9579C717-769E-4CC0-9E54-EE03D87C15A5" Text="库存管理" NavigateUrl=""><TreeNode id="803F9828-52FA-4EF7-99C7-ADA99DADE9FB" Text="库存管理" NavigateUrl="CLGL/MaterialStock.aspx"></TreeNode>
<TreeNode id="D15E534F-98F3-4B8A-8656-EAF165DE917F" Text="盘点" NavigateUrl="CLGL/MaterialStock.aspx"></TreeNode>
<TreeNode id="D15E534F-98F3-4B8A-8656-EAF165DE917F" Text="盘点" NavigateUrl="CLGL/InputMaster.aspx"></TreeNode>
<TreeNode id="C05EF3BE-AB13-4852-B2AA-1095BE4EEB2F" Text="到货分析" NavigateUrl="CLGL/ArrivalStatistics.aspx"></TreeNode>
</TreeNode>
</TreeNode>
@@ -62,8 +63,7 @@
<TreeNode id="72B3E508-1315-4CC3-939F-E840FA701A0E" Text="硬度检测委托" NavigateUrl="HJGL/HotProcessHard/HardTrust.aspx"></TreeNode>
<TreeNode id="c5ba5ef6-2112-4fe2-9ada-b8762cb629f6" Text="硬度检测报告" NavigateUrl="HJGL/HotProcessHard/HardReport.aspx"></TreeNode>
</TreeNode>
<TreeNode id="A24B7926-EF69-456E-8A24-936D30384680" Text="试压管理" NavigateUrl=""><TreeNode id="1C6F9CA9-FDAC-4CE5-A19C-5536538851E1" Text="试压包划分" NavigateUrl="HJGL/TestPackage/TestPackageEdit.aspx"></TreeNode>
<TreeNode id="55976B16-2C33-406E-B514-2FE42D031071" Text="试压前条件确认" NavigateUrl="HJGL/TestPackage/TestPackageAudit.aspx"></TreeNode>
<TreeNode id="A24B7926-EF69-456E-8A24-936D30384680" Text="试压管理" NavigateUrl=""><TreeNode id="55976B16-2C33-406E-B514-2FE42D031071" Text="试压前条件确认" NavigateUrl="HJGL/TestPackage/TestPackageAudit.aspx"></TreeNode>
<TreeNode id="24941EDC-CED6-4176-8CCD-EB5F08156D08" Text="尾项检查及消项" NavigateUrl="HJGL/TestPackage/ItemEndCheck.aspx"></TreeNode>
<TreeNode id="82951D78-9029-4F69-A032-00C47551B3E6" Text="压力试验" NavigateUrl="HJGL/TestPackage/TestPackageComplete.aspx"></TreeNode>
<TreeNode id="244F69AE-EBD0-4DFA-A959-E13CE8D85968" Text="试压包资料" NavigateUrl="HJGL/TestPackage/TestPackageData.aspx"></TreeNode>
SGGL/FineUIPro.Web/common/Menu_HTGL.xml
+3 -3
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl="">
<TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx">
</TreeNode>
<TreeNode id="E9D387EB-2797-43E3-AACE-93413839CCF7" Text="合同管理" NavigateUrl="">
</TreeNode>
<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl=""><TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx"></TreeNode>
<TreeNode id="C5560FF5-8181-4BA2-8326-D2B49E45660C" Text="合同协议书" NavigateUrl="PHTGL/ContractCompile/ContractAgreementEdit.aspx"></TreeNode>
<TreeNode id="98573D16-3310-4292-96A5-A59B9A5E6B6B" Text="通用条款" NavigateUrl="PHTGL/ContractCompile/GeneralTermsConditions.aspx"></TreeNode>
<TreeNode id="98367C43-9C85-467E-9144-288D80101E41" Text="专用条款" NavigateUrl="PHTGL/ContractCompile/SpecialTermsConditions.aspx"></TreeNode>
SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+5 -1
View File
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划编制" NavigateUrl="JDGL/Check/PlanSet.aspx">
<TreeNode id="BAC3D994-03A8-466C-8975-A31039998BCC" Text="施工进度统计" NavigateUrl="JDGL/Check/ProgressShow.aspx">
</TreeNode>
<TreeNode id="1172B112-2A12-4410-AD66-E5BA6B461475" Text="施工进度赢得值曲线" NavigateUrl="JDGL/Check/ProgressStatistics.aspx"></TreeNode>
<TreeNode id="B479EC55-E12A-4F91-AF3F-864DAAA136FB" Text="进度完成情况录入" NavigateUrl="JDGL/Check/CompleteInput.aspx"></TreeNode>
<TreeNode id="4288426D-E49B-4E5D-A495-7E6A76F269B5" Text="周计划" NavigateUrl=""></TreeNode>
<TreeNode id="F0E296C3-6499-43E5-88CD-E00C5180D3BC" Text="赢得值曲线" NavigateUrl="JDGL/Check/EarnedValueCurve.aspx"></TreeNode>
<TreeNode id="C75F0853-8A2B-4B32-83B7-509278D11957" Text="项目里程碑节点" NavigateUrl=""></TreeNode>
<TreeNode id="3550F422-E520-4962-9816-B691B0EE2865" Text="形象进度照片" NavigateUrl=""></TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
+1 -1
View File
@@ -4,10 +4,10 @@
<TreeNode id="2E57E92E-31BE-46B3-89AF-E08DAE8FC8E7" Text="实施计划编制" NavigateUrl="PHTGL/BiddingManagement/ActionPlanFormation.aspx">
</TreeNode>
<TreeNode id="303B6753-ED3C-438A-A860-F9C5E5489C8F" Text="实施计划审批" NavigateUrl="PHTGL/BiddingManagement/ActionPlanReview.aspx"></TreeNode>
<TreeNode id="687991B6-73AC-42FA-9A72-178AF94D1EB4" Text="招标工程量清单定制" NavigateUrl="PHTGL/BillOfQuantities/BidProjectQuantityList.aspx"></TreeNode>
<TreeNode id="0BB31BB1-469D-41E8-9039-A53A2B1EEB86" Text="招标文件审批" NavigateUrl="PHTGL/BiddingManagement/BidDocumentsReview.aspx"></TreeNode>
<TreeNode id="133C55A1-3744-40F5-9C74-24E85AB1261F" Text="评标小组名单审批" NavigateUrl="PHTGL/BiddingManagement/ApproveUserReview.aspx"></TreeNode>
<TreeNode id="11503AD6-742D-406D-96F1-17BA3B9E7580" Text="确定中标人审批" NavigateUrl="PHTGL/BiddingManagement/SetSubReview.aspx"></TreeNode>
<TreeNode id="687991B6-73AC-42FA-9A72-178AF94D1EB4" Text="招标工程量清单定制" NavigateUrl="PHTGL/BillOfQuantities/BidProjectQuantityList.aspx"></TreeNode>
</TreeNode>
<TreeNode id="C041D799-47A0-4ECA-A6A2-C387857165D6" Text="合同管理" NavigateUrl=""><TreeNode id="C609FEA5-0904-4F59-A920-22B6459F1A94" Text="合同编制" NavigateUrl="PHTGL/ContractCompile/ContractFormation.aspx"></TreeNode>
<TreeNode id="B32E7F62-5AA3-46B2-A438-E286909A47B4" Text="合同评审" NavigateUrl="PHTGL/ContractCompile/ContractReview_Countersign.aspx"></TreeNode>
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
-42
View File
@@ -58,51 +58,9 @@
<TreeNode id="3BBFCD70-D7A3-435C-9571-DD499D5ED7B8" Text="应急信息" NavigateUrl=""><TreeNode id="D12C2412-E12A-4F78-9AEF-1EE8AC84A561" Text="应急预案管理清单" NavigateUrl="ZHGL/Emergency/EmergencyList.aspx"></TreeNode>
<TreeNode id="172F25E0-F5E2-42E3-AD67-AC824D4E0FBB" Text="应急演练开展情况" NavigateUrl="ZHGL/Emergency/DrillRecordList.aspx"></TreeNode>
</TreeNode>
<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl=""><TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl=""></TreeNode>
<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""></TreeNode>
<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""></TreeNode>
<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
</TreeNode>
<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
</TreeNode>
<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
</TreeNode>
<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
<TreeNode id="C4B90ED3-0258-437A-BC0D-4AB43721EE08" Text="看板数据汇总" NavigateUrl="ZHGL/DataSync/DataStatistics.aspx"></TreeNode>
<TreeNode id="A9E94BE9-6F53-4A41-9A65-250F09D9E449" Text="安全巡检统计分析" NavigateUrl="HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx?Types=1"></TreeNode>
<TreeNode id="28848506-234F-4D21-8E79-A0F24F2B2DDA" Text="质量巡检统计分析" NavigateUrl="HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx?Types=2"></TreeNode>
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
<TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
<TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>
SGGL/Model/CLGL/Tw_ArrivalStatisticsOutPut.cs
+3
View File
@@ -9,6 +9,9 @@ namespace Model
public class Tw_ArrivalStatisticsOutPut
{
public string MaterialCode { get; set; }
public string Code { get; set; }
public string HeatNo { get; set; }
public string BatchNo { get; set; }
public string MaterialName { get; set; }
public string MaterialSpec { get; set; }
public string MaterialUnit { get; set; }
SGGL/Model/CLGL/Tw_InOutDetailOutput.cs
+4
View File
@@ -17,6 +17,10 @@ namespace Model
/// </summary>
public string HeatNo { get; set; }
/// <summary>
/// 材料编码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 材料名称
/// </summary>
public string MaterialName { get; set; }
SGGL/Model/CLGL/Tw_InputDataIn.cs
+18 -6
View File
@@ -17,29 +17,41 @@ namespace Model
/// </summary>
[ExcelColumnIndex("B")] public string MaterialCode { get; set; }
/// <summary>
/// 炉批号
/// 炉号
/// </summary>
[ExcelColumnIndex("C")] public string HeatNo { get; set; }
/// <summary>
/// 批号
/// </summary>
[ExcelColumnIndex("D")] public string BatchNo { get; set; }
/// <summary>
/// 类型
/// </summary>
[ExcelColumnIndex("D")] public string MaterialName { get; set; }
[ExcelColumnIndex("E")] public string MaterialName { get; set; }
/// <summary>
/// 规格
/// </summary>
[ExcelColumnIndex("E")] public string MaterialSpec { get; set; }
[ExcelColumnIndex("F")] public string MaterialSpec { get; set; }
/// <summary>
/// 材料描述
/// </summary>
[ExcelColumnIndex("G")] public string MaterialDef { get; set; }
/// <summary>
/// 单位
/// </summary>
[ExcelColumnIndex("F")] public string MaterialUnit { get; set; }
[ExcelColumnIndex("H")] public string MaterialUnit { get; set; }
/// <summary>
/// 数量
/// </summary>
[ExcelColumnIndex("G")] public string PlanNum { get; set; }
[ExcelColumnIndex("I")] public string PlanNum { get; set; }
/// <summary>
/// 类型
/// </summary>
[ExcelColumnIndex("H")] public string TypeString { get; set; }
[ExcelColumnIndex("J")] public string TypeString { get; set; }
/// <summary>
/// 到货时间
/// </summary>
[ExcelColumnIndex("K")] public string DeliveryDate { get; set; }
}
}
SGGL/Model/CLGL/Tw_InputDetailBarCodeOutput.cs
+3
View File
@@ -7,6 +7,9 @@ namespace Model
public string InputMasterId { get; set; }
public string CusBillCode { get; set; }
public string MaterialCode { get; set; }
public string Code { get; set; }
public string HeatNo { get; set; }
public string BatchNo { get; set; }
public string MaterialName { get; set; }
public string MaterialDef { get; set; }
public string BarCode { get; set; }
SGGL/Model/CLGL/Tw_MaterialStockOutput.cs
+4 -1
View File
@@ -2,9 +2,12 @@
{
public class Tw_MaterialStockOutput: Tw_MaterialStock
{
public string Code { get; set; }
public string HeatNo { get; set; }
public string BatchNo { get; set; }
public string MaterialName { get; set; }
public string MaterialDef { get; set; }
public string MaterialSpec { get; set; }
public string MaterialUnit { get; set; }
}
}
}
SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs
+3
View File
@@ -17,6 +17,9 @@ namespace Model
public string UnitWorkName { get; set; }
public string PrefabricatedComponents { get; set; }
public string MaterialCode { get; set; }
public string Code { get; set; }
public string HeatNo { get; set; }
public string BatchNo { get; set; }
public string MaterialName { get; set; }
public string MaterialSpec { get; set; }
public string MaterialUnit { get; set; }
SGGL/Model/HJGL/PreDesign/Material/MaterialStockItem.cs
+13 -1
View File
@@ -9,10 +9,22 @@ namespace Model
public class MaterialStockItem
{
/// <summary>
/// 材料编码
/// 材料主编码
/// </summary>
public string MaterialCode { get; set; }
/// <summary>
/// 材料编码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 炉号
/// </summary>
public string HeatNo { get; set; }
/// <summary>
/// 批号
/// </summary>
public string BatchNo { get; set; }
/// <summary>
/// 材料名称
/// </summary>
public string MaterialName { get; set; }
SGGL/Model/Model.cs
+96
View File
@@ -100586,6 +100586,10 @@ namespace Model
private string _HeatNo;
private string _BatchNo;
private string _Code;
private EntityRef<Base_Project> _Base_Project;
private EntitySet<HJGL_PipeLineMat> _HJGL_PipeLineMat;
@@ -100612,6 +100616,10 @@ namespace Model
partial void OnMaterialUnitChanged();
partial void OnHeatNoChanging(string value);
partial void OnHeatNoChanged();
partial void OnBatchNoChanging(string value);
partial void OnBatchNoChanged();
partial void OnCodeChanging(string value);
partial void OnCodeChanged();
#endregion
public HJGL_MaterialCodeLib()
@@ -100805,6 +100813,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BatchNo", DbType="NVarChar(50)")]
public string BatchNo
{
get
{
return this._BatchNo;
}
set
{
if ((this._BatchNo != value))
{
this.OnBatchNoChanging(value);
this.SendPropertyChanging();
this._BatchNo = value;
this.SendPropertyChanged("BatchNo");
this.OnBatchNoChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Code", DbType="NVarChar(50)")]
public string Code
{
get
{
return this._Code;
}
set
{
if ((this._Code != value))
{
this.OnCodeChanging(value);
this.SendPropertyChanging();
this._Code = value;
this.SendPropertyChanged("Code");
this.OnCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_MaterialCodeLib_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@@ -275610,6 +275658,10 @@ namespace Model
private string _HeatNo;
private string _BatchNo;
private System.Nullable<System.DateTime> _DeliveryDate;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -275630,6 +275682,10 @@ namespace Model
partial void OnSortIndexChanged();
partial void OnHeatNoChanging(string value);
partial void OnHeatNoChanged();
partial void OnBatchNoChanging(string value);
partial void OnBatchNoChanged();
partial void OnDeliveryDateChanging(System.Nullable<System.DateTime> value);
partial void OnDeliveryDateChanged();
#endregion
public Tw_InOutPlanDetail()
@@ -275797,6 +275853,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BatchNo", DbType="NVarChar(50)")]
public string BatchNo
{
get
{
return this._BatchNo;
}
set
{
if ((this._BatchNo != value))
{
this.OnBatchNoChanging(value);
this.SendPropertyChanging();
this._BatchNo = value;
this.SendPropertyChanged("BatchNo");
this.OnBatchNoChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DeliveryDate", DbType="DateTime")]
public System.Nullable<System.DateTime> DeliveryDate
{
get
{
return this._DeliveryDate;
}
set
{
if ((this._DeliveryDate != value))
{
this.OnDeliveryDateChanging(value);
this.SendPropertyChanging();
this._DeliveryDate = value;
this.SendPropertyChanged("DeliveryDate");
this.OnDeliveryDateChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;