2023-02-20 001 焊接修改
This commit is contained in:
parent
7e66339f48
commit
ef6bbc170e
|
|
@ -0,0 +1,136 @@
|
|||
alter table HJGL_Pipeline_Component add ProductionState int
|
||||
Go
|
||||
update HJGL_WeldJoint set WeldingMode=task.WeldingMode
|
||||
from HJGL_WeldJoint as joint ,HJGL_WeldTask as task
|
||||
where task.WeldJointId =joint.WeldJointId and task.WeldingMode !=''
|
||||
Go
|
||||
update Sys_Menu set SortIndex='105' where MenuId='7FE911EF-616A-4F04-AACD-E53E633A9E86'
|
||||
Go
|
||||
/****** Object: Table [dbo].[HJGL_Pipeline_ComponentJoint] Script Date: 2023/2/18 16:21:52 ******/
|
||||
SET ANSI_NULLS ON
|
||||
GO
|
||||
|
||||
SET QUOTED_IDENTIFIER ON
|
||||
GO
|
||||
|
||||
SET ANSI_PADDING ON
|
||||
GO
|
||||
|
||||
CREATE TABLE [dbo].[HJGL_Pipeline_ComponentJoint](
|
||||
[Id] [varchar](50) NOT NULL,
|
||||
[PipelineComponentId] [varchar](50) NULL,
|
||||
[PipelineComponentCode] [varchar](50) NULL,
|
||||
[WeldJointId] [varchar](50) NULL,
|
||||
[WeldJointCode] [varchar](50) NULL,
|
||||
[State] [int] NULL,
|
||||
CONSTRAINT [PK_HJGL_Pipeline_ComponentJoint] PRIMARY KEY CLUSTERED
|
||||
(
|
||||
[Id] ASC
|
||||
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
|
||||
) ON [PRIMARY]
|
||||
|
||||
GO
|
||||
|
||||
SET ANSI_PADDING OFF
|
||||
GO
|
||||
|
||||
|
||||
SET ANSI_NULLS ON
|
||||
GO
|
||||
SET QUOTED_IDENTIFIER ON
|
||||
GO
|
||||
/*
|
||||
create by shuke.li 2020-9-15
|
||||
*/
|
||||
create function [dbo].[SplitString]
|
||||
(
|
||||
@Input nvarchar(max), --input string to be separated
|
||||
@Separator nvarchar(max)=',', --a string that delimit the substrings in the input string
|
||||
@RemoveEmptyEntries bit=1 --the return value does not include array elements that contain an empty string
|
||||
)
|
||||
returns @TABLE table
|
||||
(
|
||||
[Id] int identity(1,1),
|
||||
[Value] nvarchar(max)
|
||||
)
|
||||
as
|
||||
begin
|
||||
declare @Index int, @Entry nvarchar(max)
|
||||
set @Index = charindex(@Separator,@Input)
|
||||
|
||||
while (@Index>0)
|
||||
begin
|
||||
set @Entry=ltrim(rtrim(substring(@Input, 1, @Index-1)))
|
||||
|
||||
if (@RemoveEmptyEntries=0) or (@RemoveEmptyEntries=1 and @Entry<>'')
|
||||
begin
|
||||
insert into @TABLE([Value]) Values(@Entry)
|
||||
end
|
||||
|
||||
set @Input = substring(@Input, @Index+datalength(@Separator)/2, len(@Input))
|
||||
set @Index = charindex(@Separator, @Input)
|
||||
end
|
||||
|
||||
set @Entry=ltrim(rtrim(@Input))
|
||||
if (@RemoveEmptyEntries=0) or (@RemoveEmptyEntries=1 and @Entry<>'')
|
||||
begin
|
||||
insert into @TABLE([Value]) Values(@Entry)
|
||||
end
|
||||
return
|
||||
end
|
||||
GO
|
||||
|
||||
|
||||
|
||||
DECLARE
|
||||
@PipelineComponentId varchar( 50 ),
|
||||
@PipelineComponentCode varchar( 100 ),
|
||||
@PipelineId varchar( 100 ),
|
||||
@QRCode varchar( max ),
|
||||
@QRCodeItem varchar( 100 )
|
||||
DECLARE cursor_name CURSOR FOR -- 定义游标
|
||||
|
||||
select PipelineComponentId ,PipelineComponentCode,PipelineId, QRCode from HJGL_Pipeline_Component where QRCode !=''
|
||||
|
||||
OPEN cursor_name -- 打开游标
|
||||
FETCH NEXT FROM cursor_name INTO @PipelineComponentId,@PipelineComponentCode,@PipelineId ,@QRCode -- 抓取下一行游标数据
|
||||
WHILE @@FETCH_STATUS = 0 --(-1 语句失败， -2 被提取行不存在）
|
||||
BEGIN
|
||||
|
||||
DECLARE QRCodeList CURSOR FOR -- 定义游标
|
||||
select value from [dbo].[SplitString](@QRCode, ';', 0)
|
||||
OPEN QRCodeList -- 打开游标
|
||||
FETCH NEXT FROM QRCodeList INTO @QRCodeItem -- 抓取下一行游标数据
|
||||
WHILE @@FETCH_STATUS = 0 --(-1 语句失败， -2 被提取行不存在）
|
||||
BEGIN
|
||||
DECLARE @jointcount int;
|
||||
DECLARE @WeldJointId varchar( 100 ) ;
|
||||
DECLARE @WeldJointCode varchar( 100 )
|
||||
set @jointcount= (select COUNT (*) from HJGL_WeldJoint where PipelineId =@PipelineId and WeldJointCode = SUBSTRING(@QRCodeItem,2,LEN(@QRCodeItem)-1) )
|
||||
set @WeldJointId= (select WeldJointId from HJGL_WeldJoint where PipelineId =@PipelineId and WeldJointCode =SUBSTRING(@QRCodeItem,2,LEN(@QRCodeItem)-1))
|
||||
set @WeldJointCode= (select WeldJointCode from HJGL_WeldJoint where PipelineId =@PipelineId and WeldJointCode =SUBSTRING(@QRCodeItem,2,LEN(@QRCodeItem)-1))
|
||||
--print @QRCodeItem
|
||||
if @jointcount>0
|
||||
begin
|
||||
DECLARE @ComponentJointcount int;
|
||||
set @ComponentJointcount=(select COUNT (*) from HJGL_Pipeline_ComponentJoint where WeldJointId= @WeldJointId)
|
||||
if @ComponentJointcount>0
|
||||
begin
|
||||
print '更新焊口'+@WeldJointCode
|
||||
update HJGL_Pipeline_ComponentJoint set PipelineComponentId=@PipelineComponentId,PipelineComponentCode =@PipelineComponentCode where Id in (select Id from HJGL_Pipeline_ComponentJoint where WeldJointId= @WeldJointId );
|
||||
end
|
||||
else
|
||||
begin
|
||||
print '插入焊口'+@WeldJointCode
|
||||
insert into HJGL_Pipeline_ComponentJoint values(NEWID(),@PipelineComponentId,@PipelineComponentCode,@WeldJointId,@WeldJointCode,0)
|
||||
end
|
||||
end
|
||||
FETCH NEXT FROM QRCodeList INTO @QRCodeItem
|
||||
END
|
||||
CLOSE QRCodeList -- 关闭游标
|
||||
DEALLOCATE QRCodeList -- 释放游标
|
||||
|
||||
FETCH NEXT FROM cursor_name INTO @PipelineComponentId,@PipelineComponentCode,@PipelineId ,@QRCode
|
||||
END
|
||||
CLOSE cursor_name -- 关闭游标
|
||||
DEALLOCATE cursor_name -- 释放游标
|
||||
|
|
@ -252,7 +252,7 @@ GO
|
|||
--------------------------------------------------------------------------------------------------------------------------------
|
||||
--6.热处理/硬度管理
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
VALUES('7FE911EF-616A-4F04-AACD-E53E633A9E86','热处理/硬度管理','',60,'0','Menu_HJGL',0,0,1)
|
||||
VALUES('7FE911EF-616A-4F04-AACD-E53E633A9E86','热处理/硬度管理','',105,'0','Menu_HJGL',0,0,1)
|
||||
GO
|
||||
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
|
|
|
|||
|
|
@ -372,6 +372,7 @@
|
|||
<Compile Include="HJGL\TestPackage\TestPackageApproveService.cs" />
|
||||
<Compile Include="HJGL\TestPackage\TestPackageAuditService.cs" />
|
||||
<Compile Include="HJGL\TestPackage\TestPackageEditService.cs" />
|
||||
<Compile Include="HJGL\WeldingManage\HJGL_ComponentJointService.cs" />
|
||||
<Compile Include="HJGL\WeldingManage\HJGL_WeldingReportService.cs" />
|
||||
<Compile Include="HJGL\WeldingManage\PipelineComponentService.cs" />
|
||||
<Compile Include="HJGL\WeldingManage\PipelineMatService.cs" />
|
||||
|
|
|
|||
|
|
@ -104,15 +104,19 @@ namespace BLL
|
|||
{
|
||||
string url = Funs.RootPath + filePah.Replace('/', '\\');
|
||||
FileInfo info = new FileInfo(url);
|
||||
long fileSize = info.Length;
|
||||
System.Web.HttpContext.Current.Response.BufferOutput = true;
|
||||
System.Web.HttpContext.Current.Response.Clear();
|
||||
System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
|
||||
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
|
||||
System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
|
||||
System.Web.HttpContext.Current.Response.TransmitFile(url, 0, fileSize);
|
||||
System.Web.HttpContext.Current.Response.Flush();
|
||||
System.Web.HttpContext.Current.Response.Close();
|
||||
if (info.Exists)
|
||||
{
|
||||
long fileSize = info.Length;
|
||||
System.Web.HttpContext.Current.Response.BufferOutput = true;
|
||||
System.Web.HttpContext.Current.Response.Clear();
|
||||
System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
|
||||
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
|
||||
System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
|
||||
System.Web.HttpContext.Current.Response.TransmitFile(url, 0, fileSize);
|
||||
System.Web.HttpContext.Current.Response.Flush();
|
||||
System.Web.HttpContext.Current.Response.Close();
|
||||
}
|
||||
|
||||
}
|
||||
catch (System.Exception ex)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -108,23 +108,57 @@ namespace BLL
|
|||
/// <returns></returns>
|
||||
public static DataTable GetSHOPStockDt( string projectid)
|
||||
{
|
||||
string strSql = @" select
|
||||
mat.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialUnit,
|
||||
sum( mat.Num)+ISNULL( aa.Num,0) as MaterialNum
|
||||
from HJGL_MaterialManage mat
|
||||
left join HJGL_MaterialCodeLib lib on mat.MaterialCode=lib.MaterialCode
|
||||
left join (SELECT lib.MaterialCode,lib.MaterialName,lib.MaterialUnit,
|
||||
lib.MaterialSpec,lib.MaterialMade,-sum( pipe.Number) as num
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode
|
||||
LEFT JOIN HJGL_Pipeline line ON pipe.PipelineId=line.PipelineId
|
||||
WHERE line.PipeArea=@PipeArea and line.State=1
|
||||
group by lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.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
|
||||
string strSql = @" SELECT mat.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialUnit,
|
||||
sum( mat.Num)+ISNULL( aa.Num,
|
||||
0) AS MaterialNum
|
||||
FROM HJGL_MaterialManage mat
|
||||
LEFT JOIN HJGL_MaterialCodeLib lib
|
||||
ON mat.MaterialCode=lib.MaterialCode
|
||||
LEFT JOIN
|
||||
(SELECT stockused.MaterialCode,
|
||||
stockused.MaterialName,
|
||||
stockused.MaterialUnit,
|
||||
stockused.MaterialSpec,
|
||||
stockused.MaterialMade,
|
||||
-sum( stockused.num) AS num
|
||||
FROM
|
||||
(SELECT lib.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialUnit,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialMade,
|
||||
-sum( pipe.Number) AS num
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN HJGL_Pipeline_ComponentJoint comjoint
|
||||
ON comjoint.PipelineComponentCode =pipe.PrefabricatedComponents
|
||||
LEFT JOIN HJGL_MaterialCodeLib lib
|
||||
ON lib.MaterialCode = pipe.MaterialCode
|
||||
WHERE comjoint.State=1
|
||||
GROUP BY lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade
|
||||
UNION
|
||||
SELECT lib.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialUnit,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialMade,
|
||||
-sum( pipe.Number) AS num
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN HJGL_MaterialCodeLib lib
|
||||
ON lib.MaterialCode = pipe.MaterialCode
|
||||
LEFT JOIN HJGL_Pipeline line
|
||||
ON pipe.PipelineId=line.PipelineId
|
||||
LEFT JOIN View_HJGL_WeldJoint weldjoint
|
||||
ON weldjoint.PipelineId=line.PipelineId
|
||||
WHERE weldjoint.JointAttribute='安装口'
|
||||
AND weldjoint .WeldingDailyId !=''
|
||||
GROUP BY lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade ) AS stockused
|
||||
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
|
||||
|
||||
";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
|
|
@ -136,26 +170,61 @@ namespace BLL
|
|||
}
|
||||
public static DataTable GetFIELDStockDt(string projectid)
|
||||
{
|
||||
string strSql = @" select
|
||||
mat.MaterialCode,
|
||||
string strSql = @"
|
||||
SELECT mat.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialUnit,
|
||||
sum( mat.Num)+ISNULL( aa.Num,
|
||||
0) AS MaterialNum
|
||||
FROM Material_Material mat
|
||||
LEFT JOIN HJGL_MaterialCodeLib lib
|
||||
ON mat.MaterialCode=lib.MaterialCode
|
||||
LEFT JOIN Material_Inspection Ins
|
||||
ON mat.InspectionId=Ins.InspectionId
|
||||
LEFT JOIN
|
||||
(SELECT stockused.MaterialCode,
|
||||
stockused.MaterialName,
|
||||
stockused.MaterialUnit,
|
||||
stockused.MaterialSpec,
|
||||
stockused.MaterialMade,
|
||||
-sum( stockused.num) AS num
|
||||
FROM
|
||||
(SELECT lib.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialUnit,
|
||||
sum( mat.Num)+ISNULL( aa.Num,0) as MaterialNum
|
||||
from Material_Material mat
|
||||
left join HJGL_MaterialCodeLib lib on mat.MaterialCode=lib.MaterialCode
|
||||
left join Material_Inspection Ins on mat.InspectionId=Ins.InspectionId
|
||||
left join (SELECT lib.MaterialCode,lib.MaterialName,lib.MaterialUnit,
|
||||
lib.MaterialSpec,lib.MaterialMade,-sum( pipe.Number) as num
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode
|
||||
LEFT JOIN HJGL_Pipeline line ON pipe.PipelineId=line.PipelineId
|
||||
WHERE line.PipeArea=@PipeArea
|
||||
group by lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade) as aa 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
|
||||
|
||||
";
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialMade,
|
||||
-sum( pipe.Number) AS num
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN HJGL_Pipeline_ComponentJoint comjoint
|
||||
ON comjoint.PipelineComponentCode =pipe.PrefabricatedComponents
|
||||
LEFT JOIN HJGL_MaterialCodeLib lib
|
||||
ON lib.MaterialCode = pipe.MaterialCode
|
||||
WHERE comjoint.State=1
|
||||
GROUP BY lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade
|
||||
UNION
|
||||
SELECT lib.MaterialCode,
|
||||
lib.MaterialName,
|
||||
lib.MaterialUnit,
|
||||
lib.MaterialSpec,
|
||||
lib.MaterialMade,
|
||||
-sum( pipe.Number) AS num
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN HJGL_MaterialCodeLib lib
|
||||
ON lib.MaterialCode = pipe.MaterialCode
|
||||
LEFT JOIN HJGL_Pipeline line
|
||||
ON pipe.PipelineId=line.PipelineId
|
||||
LEFT JOIN View_HJGL_WeldJoint weldjoint
|
||||
ON weldjoint.PipelineId=line.PipelineId
|
||||
WHERE weldjoint.JointAttribute='安装口'
|
||||
AND weldjoint .WeldingDailyId !=''
|
||||
GROUP BY lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade ) AS stockused
|
||||
GROUP BY stockused.MaterialCode,stockused.MaterialName,stockused.MaterialUnit,stockused.MaterialSpec,stockused.MaterialMade ) AS aa
|
||||
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 ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
listStr.Add(new SqlParameter("@Projectid", projectid));
|
||||
listStr.Add(new SqlParameter("@PipeArea", BLL.PipelineService.PipeArea_SHOP));
|
||||
|
|
@ -284,12 +353,13 @@ namespace BLL
|
|||
if ((decimal)item.Number > StockNum) //实际大于库存
|
||||
{
|
||||
state = false; //库存不足
|
||||
return state;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
state = false; //库存不足
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -297,14 +367,14 @@ namespace BLL
|
|||
else
|
||||
{
|
||||
state = false; //库存不足
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
state = false; //库存不足
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,193 @@
|
|||
using FineUIPro;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
||||
public static class HJGL_PipelineComponentjointService
|
||||
{
|
||||
public static Model.SGGLDB db = Funs.DB;
|
||||
|
||||
|
||||
#region 获取列表
|
||||
/// <summary>
|
||||
/// 记录数
|
||||
/// </summary>
|
||||
public static int count
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
public static List<Model.HJGL_Pipeline_ComponentJoint> GetHJGL_Pipeline_ComponentJointByModle(Model.HJGL_Pipeline_ComponentJoint table)
|
||||
{
|
||||
var q = from x in db.HJGL_Pipeline_ComponentJoint
|
||||
where
|
||||
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
|
||||
(string.IsNullOrEmpty(table.PipelineComponentId) || x.PipelineComponentId.Contains(table.PipelineComponentId)) &&
|
||||
(string.IsNullOrEmpty(table.PipelineComponentCode) || x.PipelineComponentCode.Contains(table.PipelineComponentCode)) &&
|
||||
(string.IsNullOrEmpty(table.WeldJointId) || x.WeldJointId.Contains(table.WeldJointId)) &&
|
||||
(string.IsNullOrEmpty(table.WeldJointCode) || x.WeldJointCode.Contains(table.WeldJointCode))
|
||||
select x
|
||||
;
|
||||
|
||||
return q.ToList();
|
||||
}
|
||||
|
||||
/// 获取分页列表
|
||||
/// </summary>
|
||||
/// <param name="PageIndex">页码</param>
|
||||
/// <param name="PageSize">每页数量</param>
|
||||
/// <returns></returns>
|
||||
public static IEnumerable getListData(Model.HJGL_Pipeline_ComponentJoint table, Grid Grid1)
|
||||
{
|
||||
var q = GetHJGL_Pipeline_ComponentJointByModle(table);
|
||||
count = q.Count();
|
||||
if (count == 0)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
// q= q.Take(Grid1.PageSize * Grid1.PageIndex).Skip(Grid1.PageSize * (Grid1.PageIndex)).ToList();
|
||||
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
|
||||
return from x in q
|
||||
select new
|
||||
{
|
||||
x.Id,
|
||||
x.PipelineComponentId,
|
||||
x.PipelineComponentCode,
|
||||
x.WeldJointId,
|
||||
x.WeldJointCode,
|
||||
x.State,
|
||||
|
||||
};
|
||||
}
|
||||
#endregion
|
||||
|
||||
public static Model.HJGL_Pipeline_ComponentJoint GetHJGL_Pipeline_ComponentJointById(string Id)
|
||||
{
|
||||
return db.HJGL_Pipeline_ComponentJoint.FirstOrDefault(x => x.Id == Id);
|
||||
}
|
||||
public static Model.HJGL_Pipeline_ComponentJoint GetHJGL_Pipeline_ComponentJointByWeldJointId(string WeldJointId)
|
||||
{
|
||||
return db.HJGL_Pipeline_ComponentJoint.FirstOrDefault(x => x.WeldJointId == WeldJointId);
|
||||
}
|
||||
|
||||
public static void AddHJGL_Pipeline_ComponentJoint(Model.HJGL_Pipeline_ComponentJoint newtable)
|
||||
{
|
||||
|
||||
Model.HJGL_Pipeline_ComponentJoint table = new Model.HJGL_Pipeline_ComponentJoint
|
||||
{
|
||||
Id = newtable.Id,
|
||||
PipelineComponentId = newtable.PipelineComponentId,
|
||||
PipelineComponentCode = newtable.PipelineComponentCode,
|
||||
WeldJointId = newtable.WeldJointId,
|
||||
WeldJointCode = newtable.WeldJointCode,
|
||||
State = newtable.State,
|
||||
};
|
||||
db.HJGL_Pipeline_ComponentJoint.InsertOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
public static void AddBulkHJGL_Pipeline_ComponentJoint(List<Model.HJGL_Pipeline_ComponentJoint> newtables)
|
||||
{
|
||||
|
||||
db.HJGL_Pipeline_ComponentJoint.InsertAllOnSubmit(newtables);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
|
||||
public static void UpdateHJGL_Pipeline_ComponentJoint(Model.HJGL_Pipeline_ComponentJoint newtable)
|
||||
{
|
||||
|
||||
Model.HJGL_Pipeline_ComponentJoint table = db.HJGL_Pipeline_ComponentJoint.FirstOrDefault(x => x.Id == newtable.Id);
|
||||
if (table != null)
|
||||
{
|
||||
table.Id = newtable.Id;
|
||||
table.PipelineComponentId = newtable.PipelineComponentId;
|
||||
table.PipelineComponentCode = newtable.PipelineComponentCode;
|
||||
table.WeldJointId = newtable.WeldJointId;
|
||||
table.WeldJointCode = newtable.WeldJointCode;
|
||||
table.State = newtable.State;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据焊口号更改状态
|
||||
/// </summary>
|
||||
/// <param name="WeldJointId"></param>
|
||||
public static void UpdateStateByWeldJointId(string WeldJointId,DateTime TaskDate)
|
||||
{
|
||||
|
||||
Model.HJGL_Pipeline_ComponentJoint table = db.HJGL_Pipeline_ComponentJoint.FirstOrDefault(x => x.WeldJointId == WeldJointId);
|
||||
if (table != null)
|
||||
{
|
||||
table.State =1;
|
||||
db.SubmitChanges();
|
||||
GetProductionByPipelineComponentId(table.PipelineComponentId, TaskDate);
|
||||
}
|
||||
|
||||
}
|
||||
public static void GetProductionByPipelineComponentId(string PipelineComponentId, DateTime TaskDate)
|
||||
{
|
||||
var q = db.HJGL_Pipeline_ComponentJoint.Where(x => x.PipelineComponentId == PipelineComponentId).ToList();
|
||||
if (q.Count!=0)
|
||||
{
|
||||
var NotProductionNum = (from x in q where x.State == 0 select x).Count(); //未生产数量
|
||||
var ProductionNum = (from x in q where x.State == 1 select x).Count(); //已生产数量
|
||||
if (NotProductionNum == 0) //全部完成
|
||||
{
|
||||
HJGL_PipelineComponentService.UpdateProductionState(PipelineComponentId, 2, TaskDate);
|
||||
|
||||
}
|
||||
else if (ProductionNum == 0)//未动工
|
||||
{
|
||||
HJGL_PipelineComponentService.UpdateProductionState(PipelineComponentId, 0, TaskDate);
|
||||
|
||||
}
|
||||
else //已生产
|
||||
{
|
||||
HJGL_PipelineComponentService.UpdateProductionState(PipelineComponentId, 1, TaskDate);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static void DeleteHJGL_Pipeline_ComponentJointById(string Id)
|
||||
{
|
||||
|
||||
Model.HJGL_Pipeline_ComponentJoint table = db.HJGL_Pipeline_ComponentJoint.FirstOrDefault(x => x.Id == Id);
|
||||
if (table != null)
|
||||
{
|
||||
db.HJGL_Pipeline_ComponentJoint.DeleteOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
public static void DeleteHJGL_Pipeline_ComponentJointByPipelineComponentId(string PipelineComponentId)
|
||||
{
|
||||
|
||||
var table = db.HJGL_Pipeline_ComponentJoint.Where(x => x.PipelineComponentId == PipelineComponentId);
|
||||
if (table != null)
|
||||
{
|
||||
db.HJGL_Pipeline_ComponentJoint.DeleteAllOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
public static void DeleteALLHJGL_Pipeline_ComponentJoint()
|
||||
{
|
||||
if (db.HJGL_Pipeline_ComponentJoint != null)
|
||||
{
|
||||
db.HJGL_Pipeline_ComponentJoint.DeleteAllOnSubmit(db.HJGL_Pipeline_ComponentJoint);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
using System.Collections.Generic;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
|
|
@ -18,6 +19,8 @@ namespace BLL
|
|||
/// 已装箱
|
||||
/// </summary>
|
||||
public static int state_2 = 2;
|
||||
|
||||
|
||||
public static ListItem[] GetState()
|
||||
{
|
||||
ListItem[] list = new ListItem[3];
|
||||
|
|
@ -26,6 +29,14 @@ namespace BLL
|
|||
list[2] = new ListItem("已出库", state_2.ToString());
|
||||
return list;
|
||||
}
|
||||
public static ListItem[] GetProductionState()
|
||||
{
|
||||
ListItem[] list = new ListItem[3];
|
||||
list[0] = new ListItem("未开始", "0");
|
||||
list[1] = new ListItem("已开始", "1");
|
||||
list[2] = new ListItem("已完成", "2");
|
||||
return list;
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据ID获取组件信息
|
||||
/// </summary>
|
||||
|
|
@ -95,6 +106,7 @@ namespace BLL
|
|||
model.PipelineComponentCode = model_mat.PrefabricatedComponents;
|
||||
model.DrawingName = model_mat.PrefabricatedComponents.Substring(0, model_mat.PrefabricatedComponents.LastIndexOf('-')).Replace("\"", "");
|
||||
model.State = state_0;
|
||||
model.ProductionState = 0;
|
||||
UpdatePipelineComponent(model);
|
||||
}
|
||||
else
|
||||
|
|
@ -105,6 +117,7 @@ namespace BLL
|
|||
model.PipelineComponentCode = model_mat.PrefabricatedComponents;
|
||||
model.DrawingName = model_mat.PrefabricatedComponents.Substring(0, model_mat.PrefabricatedComponents.LastIndexOf('-')).Replace("\"", "");
|
||||
model.State = state_0;
|
||||
model.ProductionState = 0;
|
||||
AddPipelineComponent(model);
|
||||
}
|
||||
|
||||
|
|
@ -135,6 +148,7 @@ namespace BLL
|
|||
newPipeline.DrawingName = pipeline.DrawingName;
|
||||
newPipeline.ReceiveMan= pipeline.ReceiveMan;
|
||||
newPipeline.ReceiveDate= pipeline.ReceiveDate;
|
||||
newPipeline.ProductionState= pipeline.ProductionState;
|
||||
db.HJGL_Pipeline_Component.InsertOnSubmit(newPipeline);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
|
@ -164,6 +178,7 @@ namespace BLL
|
|||
newPipeline.DrawingName = pipeline.DrawingName;
|
||||
newPipeline.ReceiveMan = pipeline.ReceiveMan;
|
||||
newPipeline.ReceiveDate = pipeline.ReceiveDate;
|
||||
newPipeline.ProductionState = pipeline.ProductionState;
|
||||
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
|
@ -179,6 +194,40 @@ namespace BLL
|
|||
|
||||
}
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 修改生产状态
|
||||
/// </summary>
|
||||
/// <param name="pipelineComponentId"></param>
|
||||
/// <param name="BoxNumber"></param>
|
||||
public static void UpdateProductionState(string pipelineComponentId, int state, DateTime TaskDate)
|
||||
{
|
||||
var q = GetPipelineComponentById(pipelineComponentId);
|
||||
if (q!=null)
|
||||
{
|
||||
q.ProductionState = state;
|
||||
if (state==2)
|
||||
{
|
||||
q.ActEndDate = TaskDate;
|
||||
}
|
||||
else if(state==1)
|
||||
{
|
||||
if (q.ActStartDate ==null)
|
||||
{
|
||||
q.ActStartDate = TaskDate;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (DateTime.Compare(TaskDate,q.ActStartDate.Value) < 0)
|
||||
{
|
||||
q.ActStartDate = TaskDate;
|
||||
}
|
||||
}
|
||||
}
|
||||
UpdatePipelineComponent(q);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据作业管线Id删除一个作业管线信息
|
||||
|
|
@ -275,5 +324,16 @@ namespace BLL
|
|||
Funs.FineUIPleaseSelect(dropName);
|
||||
}
|
||||
}
|
||||
public static void InitMainItemDownProductionStateList(FineUIPro.DropDownList dropName, bool isShowPlease)
|
||||
{
|
||||
dropName.DataValueField = "Value";
|
||||
dropName.DataTextField = "Text";
|
||||
dropName.DataSource = GetProductionState();
|
||||
dropName.DataBind();
|
||||
if (isShowPlease)
|
||||
{
|
||||
Funs.FineUIPleaseSelect(dropName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,6 +55,10 @@ namespace BLL
|
|||
/// </summary>
|
||||
ActDateEnd_FIELD ,
|
||||
}
|
||||
/// <summary>
|
||||
/// 管线划分
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static ListItem[] GetPipeArea()
|
||||
{
|
||||
ListItem[] list = new ListItem[2];
|
||||
|
|
@ -76,6 +80,10 @@ namespace BLL
|
|||
{
|
||||
return Funs.DB.HJGL_Pipeline.FirstOrDefault(e => e.PipelineId == pipelineId);
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据管线id获取管线状态
|
||||
/// </summary>
|
||||
/// <param name="pipelineId"></param>
|
||||
public static void GetStateByPipelineId(string pipelineId)
|
||||
{
|
||||
var mdoel = GetPipelineByPipelineId(pipelineId);
|
||||
|
|
@ -91,6 +99,13 @@ namespace BLL
|
|||
{
|
||||
ActEndDate = Convert.ToDateTime(GetDateByPipelineId(pipelineId, ActDateType.ActDateEnd_FIELD));
|
||||
}
|
||||
if (PlanStartDate==null|| PlanEndDate==null)
|
||||
{
|
||||
mdoel.State = 0;
|
||||
|
||||
UpdatePipeline(mdoel);
|
||||
return;
|
||||
}
|
||||
if (ActStartDate==null&&DateTime.Compare(DateTime.Now,PlanStartDate.Value)<0)
|
||||
{
|
||||
mdoel.State = 0;
|
||||
|
|
@ -114,6 +129,12 @@ namespace BLL
|
|||
UpdatePipeline(mdoel);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据管线id获取实际开始，实际完成日期
|
||||
/// </summary>
|
||||
/// <param name="pipelineId"></param>
|
||||
/// <param name="actDateType"></param>
|
||||
/// <returns></returns>
|
||||
public static string GetDateByPipelineId(object pipelineId, ActDateType actDateType)
|
||||
{
|
||||
string result ="";
|
||||
|
|
@ -127,7 +148,7 @@ namespace BLL
|
|||
var joints = BLL.WeldJointService.GetWeldJointsByPipelineId(_pipelineId);
|
||||
int joint_Shop_count = joints.Where(x => x.JointAttribute == "预制口").Count();
|
||||
int joint_Field_count = joints.Where(x => x.JointAttribute == "安装口").Count();
|
||||
var TaskJoints = (from x in Funs.DB.View_HJGL_WeldingTask where x.ProjectId == pipemodel.ProjectId && x.PipelineCode == pipemodel.PipelineCode
|
||||
var TaskJoints = (from x in Funs.DB.View_HJGL_WeldingTask where x.ProjectId == pipemodel.ProjectId && x.PipelineCode == pipemodel.PipelineCode && x.WeldingDailyId!=null
|
||||
select x).ToList();
|
||||
var TaskJoints_Shop = TaskJoints.Where(x => x.JointAttribute == "预制口").ToList();
|
||||
var TaskJoints_Field= TaskJoints.Where(x => x.JointAttribute == "安装口").ToList();
|
||||
|
|
@ -165,10 +186,66 @@ namespace BLL
|
|||
return result;
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据焊口更改管线和组件（预制）的实际开始日期和完成日期
|
||||
/// </summary>
|
||||
/// <param name="WeldJointId"></param>
|
||||
public static void UpdataDateByWeldJointId(string WeldJointId)
|
||||
{
|
||||
|
||||
DateTime ActDateStart_FIELD = new DateTime();
|
||||
DateTime ActDateEnd_FIELD = new DateTime();
|
||||
|
||||
string JointAttribute = "";
|
||||
|
||||
var model_joint=BLL.WeldJointService.GetWeldJointByWeldJointId(WeldJointId);
|
||||
if (model_joint!=null)
|
||||
{
|
||||
JointAttribute = model_joint.JointAttribute;
|
||||
var model_pipeline = GetPipelineByPipelineId(model_joint.PipelineId);
|
||||
var joints = BLL.WeldJointService.GetWeldJointsByPipelineId(model_joint.PipelineId);
|
||||
var TaskJoints = (from x in Funs.DB.View_HJGL_WeldingTask
|
||||
where x.ProjectId == model_pipeline.ProjectId && x.PipelineCode == model_pipeline.PipelineCode && x.WeldingDailyId != null
|
||||
select x).ToList();
|
||||
switch (JointAttribute)
|
||||
{
|
||||
|
||||
case "安装口":
|
||||
int joint_Field_count = joints.Where(x => x.JointAttribute == "安装口").Count();
|
||||
var TaskJoints_Field = TaskJoints.Where(x => x.JointAttribute == "安装口").ToList();
|
||||
|
||||
if (TaskJoints_Field.Count > 0)
|
||||
{
|
||||
ActDateStart_FIELD = TaskJoints_Field.OrderBy(x => x.TaskDate).First().TaskDate.Value;
|
||||
}
|
||||
if (joint_Field_count == TaskJoints_Field.Count && joint_Field_count > 0)
|
||||
{
|
||||
ActDateEnd_FIELD = TaskJoints_Field.OrderByDescending(x => x.TaskDate).First().TaskDate.Value;
|
||||
}
|
||||
model_pipeline.ActStartDate = ActDateStart_FIELD;
|
||||
model_pipeline.ActEndDate = ActDateEnd_FIELD;
|
||||
UpdatePipeline(model_pipeline);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据管线code获取管线信息
|
||||
/// </summary>
|
||||
/// <param name="pipelineCode"></param>
|
||||
/// <returns></returns>
|
||||
public static Model.HJGL_Pipeline GetPipelineByPipelineCode(string pipelineCode)
|
||||
{
|
||||
return Funs.DB.HJGL_Pipeline.FirstOrDefault(e => e.PipelineCode == pipelineCode);
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据管线信息筛选管线
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
/// <returns></returns>
|
||||
public static List<HJGL_Pipeline> GetView_HJGL_Pipelines(HJGL_Pipeline model)
|
||||
{
|
||||
var db = Funs.DB;
|
||||
|
|
@ -228,6 +305,38 @@ namespace BLL
|
|||
return Funs.DB.View_HJGL_Pipeline.FirstOrDefault(e => e.PipelineId == pipelineId);
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据主项id获取未完成管线
|
||||
/// </summary>
|
||||
/// <param name="unitworkId"></param>
|
||||
/// <returns></returns>
|
||||
public static List<string> GetNoComPipelinesByUnitWordId(string unitworkId)
|
||||
{
|
||||
var q = (from x in Funs.DB.View_HJGL_WeldJoint
|
||||
where x.UnitWorkId == unitworkId
|
||||
select new {
|
||||
PipelineId=x.PipelineId,
|
||||
WeldingDate=x.WeldingDate,
|
||||
PipelineCode=x.PipelineCode
|
||||
}).Distinct();
|
||||
if (q.Count()==0)
|
||||
{
|
||||
return new List<string>();
|
||||
}
|
||||
var noCompipeline = from x in q
|
||||
group x by x.PipelineId into g
|
||||
select new
|
||||
{
|
||||
PipelineId = g.Key,
|
||||
Count = (from x2 in g where x2.WeldingDate != null && x2.WeldingDate != "" select x2).Count(),
|
||||
};
|
||||
var NowComPipelineCode = (from x in q
|
||||
join y in noCompipeline on x.PipelineId equals y.PipelineId
|
||||
where y.Count == 0
|
||||
select x.PipelineCode
|
||||
).Distinct(). ToList();
|
||||
return NowComPipelineCode;
|
||||
}
|
||||
/// <summary>
|
||||
/// 下载预制口管线导入模板
|
||||
/// </summary>
|
||||
/// <param name="projectid"></param>
|
||||
|
|
@ -377,7 +486,7 @@ namespace BLL
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据管线Code获取管线信息
|
||||
/// 根据管线code查询管线是否存在
|
||||
/// </summary>
|
||||
/// <param name="isoNo"></param>
|
||||
/// <returns></returns>
|
||||
|
|
@ -404,20 +513,12 @@ namespace BLL
|
|||
}
|
||||
}
|
||||
|
||||
public static bool IsExistPipelineCode(string pipelineCode, string unitWorkId)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.HJGL_Pipeline q = null;
|
||||
q = Funs.DB.HJGL_Pipeline.FirstOrDefault(x => x.PipelineCode == pipelineCode && x.UnitWorkId == unitWorkId);
|
||||
if (q != null)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据管线code获取管线信息
|
||||
/// </summary>
|
||||
/// <param name="pipelineCode">管线号</param>
|
||||
/// <param name="unitWorkId">主项id</param>
|
||||
/// <returns></returns>
|
||||
public static HJGL_Pipeline GetPipelineByCode(string pipelineCode, string unitWorkId)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
|
|
@ -425,7 +526,10 @@ namespace BLL
|
|||
q = Funs.DB.HJGL_Pipeline.FirstOrDefault(x => x.PipelineCode == pipelineCode && x.UnitWorkId == unitWorkId);
|
||||
return q;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加管线信息
|
||||
/// </summary>
|
||||
/// <param name="pipeline"></param>
|
||||
public static void AddPipeline(Model.HJGL_Pipeline pipeline)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
|
|
@ -520,7 +624,11 @@ namespace BLL
|
|||
}
|
||||
}
|
||||
|
||||
// 管线划分
|
||||
/// <summary>
|
||||
/// 修改管线划分
|
||||
/// </summary>
|
||||
/// <param name="pipelineId"></param>
|
||||
/// <param name="pipelineArea"></param>
|
||||
public static void UpdatePipelineArea(string pipelineId, string pipelineArea)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ using System.Collections.Generic;
|
|||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
using WIA;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
|
@ -45,35 +46,57 @@ namespace BLL
|
|||
public static List<Model.SpWeldingDailyItem> GetWeldingDailyItem(string weldingDailyId)
|
||||
{
|
||||
List<Model.SpWeldingDailyItem> returnViewMatch = new List<Model.SpWeldingDailyItem>();
|
||||
var weldlineLists = from x in Funs.DB.View_HJGL_WeldJoint
|
||||
var weldlineLists = (from x in Funs.DB.View_HJGL_WeldJoint
|
||||
where x.WeldingDailyId == weldingDailyId
|
||||
select x;
|
||||
if (weldlineLists.Count() > 0)
|
||||
{
|
||||
foreach (var item in weldlineLists)
|
||||
{
|
||||
Model.SpWeldingDailyItem newWeldReportItem = new Model.SpWeldingDailyItem();
|
||||
newWeldReportItem.WeldJointId = item.WeldJointId;
|
||||
newWeldReportItem.WeldJointCode = item.WeldJointCode;
|
||||
newWeldReportItem.PipelineCode = item.PipelineCode;
|
||||
newWeldReportItem.CoverWelderCode = item.CoverWelderCode;
|
||||
newWeldReportItem.CoverWelderId = item.CoverWelderId;
|
||||
newWeldReportItem.BackingWelderCode = item.BackingWelderCode;
|
||||
newWeldReportItem.BackingWelderId = item.BackingWelderId;
|
||||
//newWeldReportItem.WeldTypeId = item.WeldTypeCode;
|
||||
newWeldReportItem.JointArea = item.JointArea;
|
||||
newWeldReportItem.WeldingLocationId = item.WeldingLocationId;
|
||||
newWeldReportItem.WeldingLocationCode = item.WeldingLocationCode;
|
||||
newWeldReportItem.JointAttribute = item.JointAttribute;
|
||||
newWeldReportItem.Size = item.Size;
|
||||
newWeldReportItem.Dia = item.Dia;
|
||||
newWeldReportItem.Thickness = item.Thickness;
|
||||
newWeldReportItem.WeldingMethodCode = item.WeldingMethodCode;
|
||||
newWeldReportItem.WeldingWireCode = item.WeldingWireCode;
|
||||
newWeldReportItem.WeldingRodCode = item.WeldingRodCode;
|
||||
returnViewMatch.Add(newWeldReportItem);
|
||||
}
|
||||
}
|
||||
select new SpWeldingDailyItem
|
||||
{
|
||||
WeldJointId = x.WeldJointId,
|
||||
WeldJointCode = x.WeldJointCode,
|
||||
PipelineCode = x.PipelineCode,
|
||||
CoverWelderCode = x.CoverWelderCode,
|
||||
CoverWelderId = x.CoverWelderId,
|
||||
BackingWelderCode = x.BackingWelderCode,
|
||||
BackingWelderId = x.BackingWelderId,
|
||||
WeldTypeId = x.WeldTypeCode,
|
||||
JointArea = x.JointArea,
|
||||
WeldingLocationId = x.WeldingLocationId,
|
||||
WeldingLocationCode = x.WeldingLocationCode,
|
||||
JointAttribute = x.JointAttribute,
|
||||
Size = x.Size,
|
||||
Dia = x.Dia,
|
||||
Thickness = x.Thickness,
|
||||
WeldingMethodCode = x.WeldingMethodCode,
|
||||
WeldingWireCode = x.WeldingWireCode,
|
||||
WeldingRodCode = x.WeldingRodCode
|
||||
|
||||
}).ToList();
|
||||
returnViewMatch = weldlineLists;
|
||||
//if (weldlineLists.Count() > 0)
|
||||
//{
|
||||
// foreach (var item in weldlineLists)
|
||||
// {
|
||||
// Model.SpWeldingDailyItem newWeldReportItem = new Model.SpWeldingDailyItem();
|
||||
// newWeldReportItem.WeldJointId = item.WeldJointId;
|
||||
// newWeldReportItem.WeldJointCode = item.WeldJointCode;
|
||||
// newWeldReportItem.PipelineCode = item.PipelineCode;
|
||||
// newWeldReportItem.CoverWelderCode = item.CoverWelderCode;
|
||||
// newWeldReportItem.CoverWelderId = item.CoverWelderId;
|
||||
// newWeldReportItem.BackingWelderCode = item.BackingWelderCode;
|
||||
// newWeldReportItem.BackingWelderId = item.BackingWelderId;
|
||||
// //newWeldReportItem.WeldTypeId = item.WeldTypeCode;
|
||||
// newWeldReportItem.JointArea = item.JointArea;
|
||||
// newWeldReportItem.WeldingLocationId = item.WeldingLocationId;
|
||||
// newWeldReportItem.WeldingLocationCode = item.WeldingLocationCode;
|
||||
// newWeldReportItem.JointAttribute = item.JointAttribute;
|
||||
// newWeldReportItem.Size = item.Size;
|
||||
// newWeldReportItem.Dia = item.Dia;
|
||||
// newWeldReportItem.Thickness = item.Thickness;
|
||||
// newWeldReportItem.WeldingMethodCode = item.WeldingMethodCode;
|
||||
// newWeldReportItem.WeldingWireCode = item.WeldingWireCode;
|
||||
// newWeldReportItem.WeldingRodCode = item.WeldingRodCode;
|
||||
// returnViewMatch.Add(newWeldReportItem);
|
||||
// }
|
||||
//}
|
||||
|
||||
return returnViewMatch;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,19 @@
|
|||
EnableCollapse="true" Width="250px" Title="单位名称"
|
||||
ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px"
|
||||
IconFont="ArrowCircleLeft">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
<f:TextBox ID="txtQueryWelderCode" runat="server" Label="焊工号"
|
||||
EmptyText="输入查询条件" Width="190px" LabelWidth="80px"
|
||||
LabelAlign="Right">
|
||||
</f:TextBox>
|
||||
<f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
|
||||
EnablePostBack="true" OnClick="btnQuery_Click1" runat="server">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Items>
|
||||
<f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" runat="server" ShowBorder="false" EnableCollapse="true"
|
||||
EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true"
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ namespace FineUIPro.Web.CQMS.PersonManage
|
|||
rootNode.Text = item.UnitName;
|
||||
rootNode.EnableClickEvent = true;
|
||||
this.tvControlItem.Nodes.Add(rootNode);
|
||||
var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.States == Const.ProjectPersonStates_1 && x.UnitId == item.UnitId select x).ToList();
|
||||
var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.States == Const.ProjectPersonStates_1 && x.UnitId == item.UnitId && x.WelderCode.Contains(txtQueryWelderCode.Text.Trim()) select x).ToList();
|
||||
foreach (var sitem in getWelders)
|
||||
{
|
||||
TreeNode tn = new TreeNode();
|
||||
|
|
@ -211,6 +211,10 @@ namespace FineUIPro.Web.CQMS.PersonManage
|
|||
|
||||
|
||||
|
||||
}
|
||||
protected void btnQuery_Click1(object sender, EventArgs e)
|
||||
{
|
||||
InitTreeMenu();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,13 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.CQMS.PersonManage {
|
||||
|
||||
|
||||
public partial class WelderManage {
|
||||
|
||||
namespace FineUIPro.Web.CQMS.PersonManage
|
||||
{
|
||||
|
||||
|
||||
public partial class WelderManage
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Panel1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel Panel1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// panelLeftRegion 控件。
|
||||
/// </summary>
|
||||
|
|
@ -47,7 +49,34 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel panelLeftRegion;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar3 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar3;
|
||||
|
||||
/// <summary>
|
||||
/// txtQueryWelderCode 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtQueryWelderCode;
|
||||
|
||||
/// <summary>
|
||||
/// btnQuery 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnQuery;
|
||||
|
||||
/// <summary>
|
||||
/// tvControlItem 控件。
|
||||
/// </summary>
|
||||
|
|
@ -56,7 +85,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Tree tvControlItem;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// panelCenterRegion 控件。
|
||||
/// </summary>
|
||||
|
|
@ -65,7 +94,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel panelCenterRegion;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -74,7 +103,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -83,7 +112,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnEdit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -92,7 +121,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnEdit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnDelete 控件。
|
||||
/// </summary>
|
||||
|
|
@ -101,7 +130,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnDelete;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -110,7 +139,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form SimpleForm1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpUnitId 控件。
|
||||
/// </summary>
|
||||
|
|
@ -119,7 +148,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label drpUnitId;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtWelderName 控件。
|
||||
/// </summary>
|
||||
|
|
@ -128,7 +157,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtWelderName;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtWelderCode 控件。
|
||||
/// </summary>
|
||||
|
|
@ -137,7 +166,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtWelderCode;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// rblSex 控件。
|
||||
/// </summary>
|
||||
|
|
@ -146,7 +175,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label rblSex;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtBirthday 控件。
|
||||
/// </summary>
|
||||
|
|
@ -155,7 +184,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtBirthday;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtCertificateCode 控件。
|
||||
/// </summary>
|
||||
|
|
@ -164,7 +193,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtCertificateCode;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtWelderLevel 控件。
|
||||
/// </summary>
|
||||
|
|
@ -173,7 +202,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtWelderLevel;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// cbIsOnDuty 控件。
|
||||
/// </summary>
|
||||
|
|
@ -182,7 +211,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.CheckBox cbIsOnDuty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtCertificateLimitTime 控件。
|
||||
/// </summary>
|
||||
|
|
@ -191,7 +220,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtCertificateLimitTime;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -200,7 +229,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -209,7 +238,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtQualificationItem 控件。
|
||||
/// </summary>
|
||||
|
|
@ -218,7 +247,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtQualificationItem;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -227,7 +256,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnNew 控件。
|
||||
/// </summary>
|
||||
|
|
@ -236,7 +265,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnNew;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarSeparator1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -245,7 +274,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarText1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -254,7 +283,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarText ToolbarText1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ddlPageSize 控件。
|
||||
/// </summary>
|
||||
|
|
@ -263,7 +292,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPageSize;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Window1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -272,7 +301,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Menu1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -281,7 +310,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu Menu1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuAudit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -290,7 +319,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuAudit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuEdit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -299,7 +328,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuEdit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuDelete 控件。
|
||||
/// </summary>
|
||||
|
|
@ -308,7 +337,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuDelete;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnView 控件。
|
||||
/// </summary>
|
||||
|
|
@ -317,7 +346,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnView;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Menu2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -326,7 +355,7 @@ namespace FineUIPro.Web.CQMS.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu Menu2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuTreeAudit 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="02/15/2023 17:28:47" ReportInfo.CreatorVersion="2017.1.16.0">
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="02/19/2023 16:23:21" 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/9ZLpp1NuxWRFnVNb/fK4p7QDHPWIlqq9X"/>
|
||||
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRE5sj+vO8BF+c7w3QirE3Mg"/>
|
||||
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
|
||||
<Column Name="PrefabricatedComponents" DataType="System.String" PropName="CH_TrustCode"/>
|
||||
<Column Name="PlanStartDate" DataType="System.String" PropName="CH_TrustMan"/>
|
||||
|
|
|
|||
|
|
@ -600,6 +600,7 @@
|
|||
<Content Include="HJGL\WeldingManage\WeldJointList.aspx" />
|
||||
<Content Include="HJGL\WeldingManage\WeldJointView.aspx" />
|
||||
<Content Include="HJGL\WeldingManage\WeldMatMatch.aspx" />
|
||||
<Content Include="HJGL\WeldingManage\WeldMatMatchGet.aspx" />
|
||||
<Content Include="HJGL\WeldingManage\WeldReport.aspx" />
|
||||
<Content Include="HJGL\WeldingManage\WeldReportEdit.aspx" />
|
||||
<Content Include="HJGL\WeldingManage\WeldTask.aspx" />
|
||||
|
|
@ -8232,6 +8233,13 @@
|
|||
<Compile Include="HJGL\WeldingManage\WeldMatMatch.aspx.designer.cs">
|
||||
<DependentUpon>WeldMatMatch.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\WeldingManage\WeldMatMatchGet.aspx.cs">
|
||||
<DependentUpon>WeldMatMatchGet.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\WeldingManage\WeldMatMatchGet.aspx.designer.cs">
|
||||
<DependentUpon>WeldMatMatchGet.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\WeldingManage\WeldReport.aspx.cs">
|
||||
<DependentUpon>WeldReport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@
|
|||
<f:Menu ID="Menu1" runat="server">
|
||||
<Items>
|
||||
|
||||
<f:MenuButton ID="btnMenuDownload" EnablePostBack="true" runat="server" Hidden="true" Text="下载" Icon="Printer" EnableAjax="false"
|
||||
<f:MenuButton ID="btnMenuDownload" EnablePostBack="true" runat="server" Hidden="false" Text="下载" Icon="Printer" EnableAjax="false"
|
||||
OnClick="btnMenuDownload_Click">
|
||||
</f:MenuButton>
|
||||
<f:MenuButton ID="btnMenuDelete" EnablePostBack="true" runat="server" Hidden="false" Text="删除" Icon="Delete"
|
||||
|
|
@ -194,7 +194,7 @@
|
|||
</f:Menu>
|
||||
<f:Menu ID="Menu2" runat="server">
|
||||
<Items>
|
||||
<f:MenuButton ID="btnMenuDownload2" EnablePostBack="true" runat="server" Hidden="true" Text="下载" Icon="Printer" EnableAjax="false"
|
||||
<f:MenuButton ID="btnMenuDownload2" EnablePostBack="true" runat="server" Hidden="false" Text="下载" Icon="Printer" EnableAjax="false"
|
||||
OnClick="btnMenuDownload2_Click">
|
||||
</f:MenuButton>
|
||||
<f:MenuButton ID="btnMenuDelete2" EnablePostBack="true" runat="server" Hidden="false" Text="删除" Icon="Delete"
|
||||
|
|
|
|||
|
|
@ -292,13 +292,13 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
|||
}
|
||||
else if (this.tvControlItem.SelectedNode.CommandName == "管线")
|
||||
{
|
||||
model.PipelineId= this.tvControlItem.SelectedNodeID;
|
||||
}
|
||||
model.PipelineId= this.tvControlItem.SelectedNodeID;
|
||||
model.WeldJointCode = this.txtWeldJointCode.Text;
|
||||
var list= BLL.WeldJointService.GetViewWeldJointsBymodel(model);
|
||||
Grid1.RecordCount = list.Count;
|
||||
// var table = this.GetPagedDataTable(Grid1, list);
|
||||
var table = list.Skip(Grid1.PageSize * (Grid1.PageIndex - 1)).Take(Grid1.PageSize).ToList();
|
||||
var table = list.Skip(Grid1.PageSize * (Grid1.PageIndex)).Take(Grid1.PageSize).ToList();
|
||||
Grid1.DataSource = table;
|
||||
Grid1.DataBind();
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,19 @@
|
|||
EnableCollapse="true" Width="250px" Title="单位名称"
|
||||
ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px"
|
||||
IconFont="ArrowCircleLeft">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
<f:TextBox ID="txtQueryWelderCode" runat="server" Label="焊工号"
|
||||
EmptyText="输入查询条件" Width="190px" LabelWidth="80px"
|
||||
LabelAlign="Right">
|
||||
</f:TextBox>
|
||||
<f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
|
||||
EnablePostBack="true" OnClick="btnQuery_Click1" runat="server">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Items>
|
||||
<f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" runat="server" ShowBorder="false" EnableCollapse="true"
|
||||
EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true"
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
|
|||
rootNode.Text = item.UnitName;
|
||||
rootNode.EnableClickEvent = true;
|
||||
this.tvControlItem.Nodes.Add(rootNode);
|
||||
var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.UnitId == item.UnitId select x).ToList();
|
||||
var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.UnitId == item.UnitId && x.WelderCode.Contains(txtQueryWelderCode.Text.Trim()) select x).ToList();
|
||||
foreach (var sitem in getWelders)
|
||||
{
|
||||
TreeNode tn = new TreeNode();
|
||||
|
|
@ -211,6 +211,10 @@ namespace FineUIPro.Web.HJGL.PersonManage
|
|||
|
||||
|
||||
|
||||
}
|
||||
protected void btnQuery_Click1(object sender, EventArgs e)
|
||||
{
|
||||
InitTreeMenu();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -557,7 +561,10 @@ namespace FineUIPro.Web.HJGL.PersonManage
|
|||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WelderItemView.aspx?WelderQualifyId={0}", Grid1.SelectedRowID, "查看 - ")));
|
||||
}
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -7,11 +7,13 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.HJGL.PersonManage {
|
||||
|
||||
|
||||
public partial class WelderManage {
|
||||
|
||||
namespace FineUIPro.Web.HJGL.PersonManage
|
||||
{
|
||||
|
||||
|
||||
public partial class WelderManage
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Panel1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel Panel1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// panelLeftRegion 控件。
|
||||
/// </summary>
|
||||
|
|
@ -47,7 +49,34 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel panelLeftRegion;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar3 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar3;
|
||||
|
||||
/// <summary>
|
||||
/// txtQueryWelderCode 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtQueryWelderCode;
|
||||
|
||||
/// <summary>
|
||||
/// btnQuery 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnQuery;
|
||||
|
||||
/// <summary>
|
||||
/// tvControlItem 控件。
|
||||
/// </summary>
|
||||
|
|
@ -56,7 +85,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Tree tvControlItem;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// panelCenterRegion 控件。
|
||||
/// </summary>
|
||||
|
|
@ -65,7 +94,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel panelCenterRegion;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -74,7 +103,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -83,7 +112,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnEdit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -92,7 +121,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnEdit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnDelete 控件。
|
||||
/// </summary>
|
||||
|
|
@ -101,7 +130,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnDelete;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -110,7 +139,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form SimpleForm1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpUnitId 控件。
|
||||
/// </summary>
|
||||
|
|
@ -119,7 +148,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label drpUnitId;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtWelderName 控件。
|
||||
/// </summary>
|
||||
|
|
@ -128,7 +157,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtWelderName;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtWelderCode 控件。
|
||||
/// </summary>
|
||||
|
|
@ -137,7 +166,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtWelderCode;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// rblSex 控件。
|
||||
/// </summary>
|
||||
|
|
@ -146,7 +175,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label rblSex;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtBirthday 控件。
|
||||
/// </summary>
|
||||
|
|
@ -155,7 +184,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtBirthday;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtCertificateCode 控件。
|
||||
/// </summary>
|
||||
|
|
@ -164,7 +193,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtCertificateCode;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtWelderLevel 控件。
|
||||
/// </summary>
|
||||
|
|
@ -173,7 +202,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtWelderLevel;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// cbIsOnDuty 控件。
|
||||
/// </summary>
|
||||
|
|
@ -182,7 +211,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.CheckBox cbIsOnDuty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtCertificateLimitTime 控件。
|
||||
/// </summary>
|
||||
|
|
@ -191,7 +220,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtCertificateLimitTime;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -200,7 +229,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar2 控件。
|
||||
/// </summary>
|
||||
|
|
@ -209,7 +238,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtQualificationItem 控件。
|
||||
/// </summary>
|
||||
|
|
@ -218,7 +247,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtQualificationItem;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -227,7 +256,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnNew 控件。
|
||||
/// </summary>
|
||||
|
|
@ -236,7 +265,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnNew;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarSeparator1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -245,7 +274,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarText1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -254,7 +283,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarText ToolbarText1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ddlPageSize 控件。
|
||||
/// </summary>
|
||||
|
|
@ -263,7 +292,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPageSize;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Window1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -272,7 +301,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Menu1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -281,7 +310,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu Menu1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuAudit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -290,7 +319,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuAudit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuEdit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -299,7 +328,7 @@ namespace FineUIPro.Web.HJGL.PersonManage {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuEdit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuDelete 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
|
||||
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
|
||||
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region" EnableCollapse="true">
|
||||
<Items>
|
||||
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
|
||||
EnableCollapse="true" Width="300px" Title="WBS目录"
|
||||
|
|
@ -34,21 +34,21 @@
|
|||
</f:Tree>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
<f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
|
||||
ShowHeader="false" Layout="Region" BoxConfigAlign="Stretch">
|
||||
<f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" EnableCollapse="true"
|
||||
ShowHeader="false" Layout="Region" >
|
||||
<Items>
|
||||
<f:Panel ID="panelTopRegion" runat="server" RegionPosition="Center" ShowBorder="true" RegionPercent="60%"
|
||||
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
|
||||
TitleToolTip="三维模型显示" AutoScroll="true">
|
||||
ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
|
||||
TitleToolTip="三维模型显示" >
|
||||
<Items>
|
||||
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
|
||||
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false"
|
||||
BodyPadding="0px">
|
||||
<uc1:_3DLook ID="ctlAuditFlow" runat="server" Width="1000px" Height="1000px" />
|
||||
</f:ContentPanel>
|
||||
|
||||
</Items>
|
||||
</f:Panel>
|
||||
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Bottom" RegionSplit="true" EnableCollapse="true" ShowBorder="true"
|
||||
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Bottom" RegionSplit="true" ShowBorder="true"
|
||||
Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="管线信息"
|
||||
TitleToolTip="管线信息" AutoScroll="true" RegionPercent="40%">
|
||||
<Toolbars>
|
||||
|
|
|
|||
|
|
@ -48,6 +48,10 @@
|
|||
<f:DropDownList ID="drpState" Label="组件状态" runat="server"
|
||||
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="100px">
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="drpProductionState" Label="生产状态" runat="server"
|
||||
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="100px">
|
||||
</f:DropDownList>
|
||||
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
<f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
|
||||
|
|
@ -108,6 +112,12 @@
|
|||
<asp:Label ID="lbstate" runat="server" Text='<%# ConvertState(Eval("State")) %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:TemplateField ColumnID="tfState" Width="200px" HeaderText="生产状态" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="Label1" runat="server" Text='<%# ConvertProductionState(Eval("ProductionState")) %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:RenderField Width="200px" ColumnID="PlanStartDate" DataField="PlanStartDate" SortField="PlanStartDate"
|
||||
FieldType="String" HeaderText="管线计划安装日期"
|
||||
HeaderTextAlign="Center"
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
|||
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
|
||||
this.InitTreeMenu();//加载树
|
||||
HJGL_PipelineComponentService.InitMainItemDownList(drpState,true);
|
||||
HJGL_PipelineComponentService.InitMainItemDownProductionStateList(drpProductionState,true);
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -223,7 +224,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
|||
{
|
||||
string strSql = @" SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,
|
||||
com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,
|
||||
com.QRCode,com.State,pipe.PlanStartDate,com.DrawingName,com.ReceiveDate,
|
||||
com.QRCode,com.State,com.ProductionState,pipe.PlanStartDate,com.DrawingName,com.ReceiveDate,
|
||||
person.PersonName
|
||||
FROM HJGL_Pipeline_Component com
|
||||
LEFT JOIN HJGL_Pipeline pipe ON pipe.PipelineId =com.PipelineId
|
||||
|
|
@ -248,7 +249,12 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
|||
listStr.Add(new SqlParameter("@State", drpState.SelectedValue));
|
||||
|
||||
}
|
||||
if (drpProductionState.SelectedValue != Const._Null)
|
||||
{
|
||||
strSql += " AND com.ProductionState =@ProductionState";
|
||||
listStr.Add(new SqlParameter("@ProductionState", drpProductionState.SelectedValue.ToString()));
|
||||
|
||||
}
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
|
||||
|
|
@ -518,6 +524,22 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
|||
}
|
||||
return StateName;
|
||||
}
|
||||
public string ConvertProductionState(object state)
|
||||
{
|
||||
string StateName = string.Empty;
|
||||
if (!string.IsNullOrEmpty(state.ToString()))
|
||||
{
|
||||
|
||||
if (state != null)
|
||||
{
|
||||
string txt = HJGL_PipelineComponentService.GetProductionState().FirstOrDefault(x => x.Value == state.ToString()).Text;
|
||||
|
||||
return txt;
|
||||
}
|
||||
return "";
|
||||
}
|
||||
return StateName;
|
||||
}
|
||||
protected void btnImportQRCode_Click(object sender, EventArgs e)
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PrePipelineQRCodeIn.aspx?", "导入 - ")));
|
||||
|
|
|
|||
|
|
@ -122,6 +122,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpState;
|
||||
|
||||
/// <summary>
|
||||
/// drpProductionState 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpProductionState;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -230,6 +239,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
|||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label lbstate;
|
||||
|
||||
/// <summary>
|
||||
/// Label1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label Label1;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarSeparator1 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using BLL;
|
||||
using MiniExcelLibs;
|
||||
using Model;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
|
@ -264,7 +265,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
|||
//hJGL_Pipeline_Component.QRCode = JsonConvert.SerializeObject(rootName);
|
||||
|
||||
hJGL_Pipeline_Component.QRCode = item.QRCode;
|
||||
|
||||
Pipeline_ComponentList.Add(hJGL_Pipeline_Component);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -335,6 +338,34 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
|||
foreach (var item in Pipeline_ComponentList)
|
||||
{
|
||||
BLL.HJGL_PipelineComponentService.UpdatePipelineComponent(item);
|
||||
HJGL_PipelineComponentjointService.DeleteHJGL_Pipeline_ComponentJointByPipelineComponentId(item.PipelineComponentId);
|
||||
var QRCodeList = item.QRCode.Split(';').ToList();
|
||||
foreach (var QRCodeitem in QRCodeList)
|
||||
{
|
||||
var joint = BLL.WeldJointService.GetWeldJointsByWeldJointCode(item.PipelineId, QRCodeitem.Substring(1));
|
||||
if (joint != null)
|
||||
{
|
||||
var ComponetJoint = BLL.HJGL_PipelineComponentjointService.GetHJGL_Pipeline_ComponentJointByWeldJointId(joint.WeldJointId);
|
||||
if (ComponetJoint!=null)
|
||||
{
|
||||
ComponetJoint.PipelineComponentCode= item.PipelineComponentCode;
|
||||
ComponetJoint.PipelineComponentId = item.PipelineComponentId;
|
||||
HJGL_PipelineComponentjointService.UpdateHJGL_Pipeline_ComponentJoint(ComponetJoint);
|
||||
}
|
||||
else
|
||||
{
|
||||
Model.HJGL_Pipeline_ComponentJoint hJGL_Pipeline_ComponentJoint = new Model.HJGL_Pipeline_ComponentJoint();
|
||||
hJGL_Pipeline_ComponentJoint.Id = SQLHelper.GetNewID();
|
||||
ComponetJoint.PipelineComponentCode = item.PipelineComponentCode;
|
||||
ComponetJoint.PipelineComponentId = item.PipelineComponentId;
|
||||
ComponetJoint.WeldJointCode = joint.WeldJointCode;
|
||||
ComponetJoint.WeldJointId=joint.WeldJointId;
|
||||
HJGL_PipelineComponentjointService.AddHJGL_Pipeline_ComponentJoint(ComponetJoint);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
int a = PipelineList.Count();
|
||||
|
|
|
|||
|
|
@ -548,6 +548,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
NewTask.TaskDate = Convert.ToDateTime(txtTaskDate.Text);
|
||||
NewTask.Tabler = this.CurrUser.PersonId;
|
||||
NewTask.TableDate = DateTime.Now;
|
||||
|
||||
weldJoint.WeldingMode= drpWeldingMode.SelectedValue;
|
||||
BLL.WeldJointService.UpdateWeldJoint(weldJoint);
|
||||
BLL.WeldTaskService.AddWeldTask(NewTask);
|
||||
}
|
||||
//string pipelineId = this.tvControlItem.SelectedNodeID;
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
<f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
|
||||
ShowHeader="false" Layout="Region" BoxConfigAlign="Stretch">
|
||||
<Items>
|
||||
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" RegionPercent="30%"
|
||||
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" RegionPercent="35%"
|
||||
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="管线信息"
|
||||
TitleToolTip="管线信息" AutoScroll="true">
|
||||
<Toolbars>
|
||||
|
|
@ -73,15 +73,12 @@
|
|||
EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="txtMaterialCode_TextChanged"
|
||||
Width="240px" LabelWidth="80px" LabelAlign="Right">
|
||||
</f:TextBox>
|
||||
<f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="图纸预制率"></f:Label>
|
||||
<f:Label ID="lbShopSize" CssClass="customlabel" runat="server" Label="预制口达因"></f:Label>
|
||||
<f:Label ID="lbFiledSize" CssClass="customlabel" runat="server" Label="安装口达因"></f:Label>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
<%--<f:Button ID="btnSelectColumn" Text="选择显示列" Icon="ShapesManySelect"
|
||||
runat="server" OnClick="btnSelectColumn_Click" Hidden="true">
|
||||
</f:Button>--%>
|
||||
<f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
|
||||
<f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
|
||||
</f:Button>
|
||||
<f:Button ID="btnPrint" Text="打印" Icon="Printer" runat="server"
|
||||
OnClick="btnPrint_Click">
|
||||
|
|
@ -97,9 +94,17 @@
|
|||
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
<f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="图纸预制率"></f:Label>
|
||||
<f:Label ID="lbShopSize" CssClass="customlabel" runat="server" Label="预制口达因"></f:Label>
|
||||
<f:Label ID="lbFiledSize" CssClass="customlabel" runat="server" Label="安装口达因"></f:Label>
|
||||
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息"
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息"
|
||||
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineId"
|
||||
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId"
|
||||
AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort"
|
||||
|
|
@ -108,11 +113,11 @@
|
|||
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
|
||||
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
|
||||
<f:RenderField Width="90px" ColumnID="TotalDin" DataField="TotalDin" FieldType="Double"
|
||||
HeaderText="总达因数" HeaderTextAlign="Center" TextAlign="Right">
|
||||
HeaderText="总达因数" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="120px" ColumnID="JointCount" DataField="JointCount" FieldType="Int"
|
||||
HeaderText="总焊口量" HeaderTextAlign="Center"
|
||||
TextAlign="Right">
|
||||
TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:TemplateField Width="130px" HeaderText="无损检测类型" HeaderTextAlign="Center"
|
||||
TextAlign="Center" SortField="DetectionType">
|
||||
|
|
@ -198,7 +203,7 @@
|
|||
</f:Panel>
|
||||
|
||||
<f:Panel runat="server" ID="panelBottomRegion" RegionPosition="Bottom" RegionSplit="true" RegionSplitWidth="20px" EnableCollapse="true"
|
||||
Title="底部面板" ShowBorder="false" RegionPercent="70%" ShowHeader="false" BodyPadding="1px" Layout="Fit" >
|
||||
Title="底部面板" ShowBorder="false" RegionPercent="65%" ShowHeader="false" BodyPadding="1px" Layout="Fit">
|
||||
<Items>
|
||||
<f:TabStrip ID="TabStrip1" ShowBorder="false" TabPosition="Top"
|
||||
EnableTabCloseMenu="false" ActiveTabIndex="0" runat="server" AutoPostBack="true" OnTabIndexChanged="TabStrip1_TabIndexChanged">
|
||||
|
|
@ -216,7 +221,7 @@
|
|||
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode" DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="180px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
|
||||
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="90px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="材质1" ColumnID="Material1Code" DataField="Material1Code" SortField="Material1Code" FieldType="String" HeaderTextAlign="Center"
|
||||
|
|
|
|||
|
|
@ -140,33 +140,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtMaterialCode;
|
||||
|
||||
/// <summary>
|
||||
/// lbSinglePreRate 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbSinglePreRate;
|
||||
|
||||
/// <summary>
|
||||
/// lbShopSize 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbShopSize;
|
||||
|
||||
/// <summary>
|
||||
/// lbFiledSize 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbFiledSize;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -230,6 +203,42 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnMatImport;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar2;
|
||||
|
||||
/// <summary>
|
||||
/// lbSinglePreRate 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbSinglePreRate;
|
||||
|
||||
/// <summary>
|
||||
/// lbShopSize 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbShopSize;
|
||||
|
||||
/// <summary>
|
||||
/// lbFiledSize 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbFiledSize;
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -42,13 +42,18 @@
|
|||
<f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
|
||||
EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
|
||||
</f:Button>
|
||||
<f:Button ID="btnStatisticsMat" ToolTip="匹配材料" Icon="TabGo" runat="server" OnClick="btnStatisticsMat_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnrefresh" ToolTip="同步NET" Icon="ArrowRefresh"
|
||||
EnablePostBack="true" OnClick="btnrefresh_Click" runat="server">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Items>
|
||||
<f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="装置区域"
|
||||
OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
|
||||
EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true"
|
||||
EnableSingleClickExpand="false" AutoLeafIdentification="true" EnableSingleExpand="true"
|
||||
EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
|
||||
</f:Tree>
|
||||
</Items>
|
||||
|
|
@ -125,7 +130,10 @@
|
|||
</f:Panel>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
|
||||
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true"
|
||||
EnableMaximize="true" Target="Top" EnableResize="false" runat="server" IsModal="true"
|
||||
Width="1200px" Height="750px">
|
||||
</f:Window>
|
||||
</form>
|
||||
<script type="text/javascript">
|
||||
var panelTopRegionCD = '<%= panelTopRegion.ClientID %>';
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
{
|
||||
public partial class WeldMatMatch : PageBase
|
||||
{
|
||||
public int pageSize = PipelineService.pageSize;
|
||||
|
||||
public string PipeArea
|
||||
{
|
||||
get
|
||||
|
|
@ -105,7 +107,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
tn1.NodeID = q.UnitWorkId;
|
||||
tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线";
|
||||
tn1.ToolTip = "施工单位：" + u.UnitName;
|
||||
tn1.CommandName = "单位工程";
|
||||
tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
|
||||
tn1.EnableExpandEvent = true;
|
||||
rootNode1.Nodes.Add(tn1);
|
||||
if (a > 0)
|
||||
|
|
@ -123,6 +125,8 @@ 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 select x).Count();
|
||||
// var NowComPipelineCode = PipelineService.GetNoComPipelinesByUnitWordId(q.UnitWorkId);
|
||||
//int a = NowComPipelineCode.Count();
|
||||
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
|
||||
TreeNode tn2 = new TreeNode();
|
||||
tn2.NodeID = q.UnitWorkId;
|
||||
|
|
@ -132,7 +136,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
tn2.Expanded = true;
|
||||
}
|
||||
tn2.ToolTip = "施工单位：" + u.UnitName;
|
||||
tn2.CommandName = "单位工程";
|
||||
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
|
||||
tn2.EnableExpandEvent = true;
|
||||
tn2.EnableClickEvent= true;
|
||||
rootNode2.Nodes.Add(tn2);
|
||||
|
|
@ -147,50 +151,56 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
}
|
||||
}
|
||||
}
|
||||
private void BindNodes(TreeNode node)
|
||||
{
|
||||
var NowComPipelineCode = PipelineService.GetNoComPipelinesByUnitWordId(node.NodeID);
|
||||
if (!node.Text.Contains("|"))
|
||||
{
|
||||
node.Text += "|" + NowComPipelineCode.Count();
|
||||
|
||||
}
|
||||
var 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();
|
||||
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)
|
||||
{
|
||||
if (!NowComPipelineCode.Contains(item.PipelineCode))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
TreeNode newNode = new TreeNode();
|
||||
newNode.Text = item.PipelineCode ;
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
|
||||
{
|
||||
e.Node.Nodes.Clear();
|
||||
if (e.Node.CommandName == "单位工程")
|
||||
if (e.Node.Nodes[0].NodeID == "加载管线...")
|
||||
{
|
||||
|
||||
var pipeline = (from x in Funs.DB.HJGL_Pipeline
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID && x.PipeArea == PipeArea
|
||||
orderby x.PipelineCode
|
||||
select x).ToList();
|
||||
if (!string .IsNullOrEmpty (txtPipelineCode.Text.Trim()))
|
||||
{
|
||||
pipeline= pipeline.Where(x => x.PipelineCode.Contains(txtPipelineCode.Text.Trim())).ToList();
|
||||
}
|
||||
|
||||
foreach (var item in pipeline)
|
||||
{
|
||||
//var jotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count();
|
||||
//var weldJotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null && x.WeldingDailyId != null select x).Count();
|
||||
|
||||
//if (jotCount > weldJotCount)
|
||||
//{
|
||||
// newNode.Text = "<font color='#EE0000'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
|
||||
//}
|
||||
|
||||
TreeNode newNode = new TreeNode();
|
||||
string suf = " (0%)";
|
||||
bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(item.PipelineId, this.CurrUser.LoginProjectId);
|
||||
if (istrue)
|
||||
{
|
||||
suf = " (100%)";
|
||||
newNode.CssClass = "tn-color-green";
|
||||
}
|
||||
newNode.Text = item.PipelineCode+suf; //+ "【" + jotCount.ToString() + " " + "焊口" + "】";
|
||||
newNode.CommandName = "管线";
|
||||
newNode.NodeID = item.PipelineId;
|
||||
newNode.EnableClickEvent = true;
|
||||
e.Node.Nodes.Add(newNode);
|
||||
}
|
||||
e.Node.Nodes.Clear();
|
||||
BindNodes(e.Node);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -208,6 +218,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
|
||||
{
|
||||
if (e.CommandName == "加载")
|
||||
{
|
||||
string CommandName = e.Node.ParentNode.CommandName;
|
||||
e.Node.ParentNode.CommandName = (int.Parse(CommandName.Split('|')[0]) + 1) + "|" + int.Parse(CommandName.Split('|')[1]);
|
||||
TreeNode treeNode = e.Node.ParentNode;
|
||||
treeNode.Nodes.Remove(e.Node);
|
||||
BindNodes(e.Node.ParentNode);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.BindGrid();
|
||||
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 数据绑定
|
||||
protected void btnrefresh_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
|
||||
{
|
||||
|
|
@ -218,11 +247,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
parameter3D.TagNum = "";
|
||||
parameter3D.ButtonType = "3";
|
||||
|
||||
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
|
||||
if (this.tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2)
|
||||
{
|
||||
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
|
||||
var pipeline = (from x in Funs.DB.HJGL_Pipeline
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID && x.PipeArea == PipeArea
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == tvControlItem.SelectedNodeID && x.PipeArea == PipeArea
|
||||
orderby x.PipelineCode
|
||||
select x).ToList();
|
||||
List<string> pipelineList = new List<string>();
|
||||
|
|
@ -235,8 +264,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
}
|
||||
|
||||
}
|
||||
parameter3D.TagNum= string.Join(",", pipelineList);
|
||||
//parameter3D.Line_No = string.Join(",", pipelineList);
|
||||
parameter3D.TagNum = string.Join(",", pipelineList);
|
||||
parameter3D.Line_No = string.Join(",", pipelineList);
|
||||
}
|
||||
else if (this.tvControlItem.SelectedNode.CommandName == "管线")
|
||||
{
|
||||
|
|
@ -274,17 +303,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
parameter3D.TagNum = pipecode;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
|
||||
ctlAuditFlow.data = parameter3D;
|
||||
ctlAuditFlow.BindData();
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 数据绑定
|
||||
|
||||
private void BindGrid()
|
||||
{
|
||||
string strSql = @"SELECT lib.MaterialCode,lib.MaterialName,lib.MaterialUnit,
|
||||
|
|
@ -325,7 +351,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region 排序
|
||||
/// <summary>
|
||||
/// 排序
|
||||
|
|
@ -383,6 +408,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
ctlAuditFlow.data = parameter3D;
|
||||
ctlAuditFlow.BindData();
|
||||
}
|
||||
|
||||
protected void btnStatisticsMat_Click(object sender, EventArgs e)
|
||||
{
|
||||
Model.WBS_UnitWork unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(this.tvControlItem.SelectedNodeID);
|
||||
if (unitWork != null)
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("WeldMatMatchGet.aspx?UnitWorkId={0}&&PipeArea={1}", this.tvControlItem.SelectedNodeID, PipeArea, "匹配 - ")));
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowNotify("请先选择单位工程！", MessageBoxIcon.Warning);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查询
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -86,6 +86,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnTreeFind;
|
||||
|
||||
/// <summary>
|
||||
/// btnStatisticsMat 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnStatisticsMat;
|
||||
|
||||
/// <summary>
|
||||
/// btnrefresh 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnrefresh;
|
||||
|
||||
/// <summary>
|
||||
/// tvControlItem 控件。
|
||||
/// </summary>
|
||||
|
|
@ -175,5 +193,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label Label1;
|
||||
|
||||
/// <summary>
|
||||
/// Window2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window2;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,61 @@
|
|||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldMatMatchGet.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingManage.WeldMatMatchGet" %>
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<title> </title>
|
||||
</head>
|
||||
<body class="f-bgcolor">
|
||||
<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="Toolbar3" runat="server">
|
||||
<Items>
|
||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出"
|
||||
Icon="TableGo" EnableAjax="false" DisableControlBeforePostBack="true" EnablePostBack="true">
|
||||
</f:Button>
|
||||
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息" Height="350px"
|
||||
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineCode" AllowCellEditing="true"
|
||||
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode" EnableBigData="true"
|
||||
AllowSorting="true" SortField="PipelineCode" SortDirection="ASC"
|
||||
AllowPaging="true" IsDatabasePaging="false" PageSize="300" EnableBigDataRowTip="false" ForceFit="true"
|
||||
EnableTextSelection="True" >
|
||||
<Columns>
|
||||
<f:RenderField Width="130px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
|
||||
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>
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
using BLL;
|
||||
using FastReport.Editor;
|
||||
using MiniExcelLibs;
|
||||
using Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
|
||||
public partial class WeldMatMatchGet : PageBase
|
||||
{
|
||||
public static List <string> pipelinecode=new List<string>();
|
||||
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!IsPostBack)
|
||||
{
|
||||
var UnitWorkId = Request.Params["UnitWorkId"];
|
||||
var PipeArea = Request.Params["PipeArea"];
|
||||
// txtProgressBar.Text = "20";
|
||||
GetStockNum(UnitWorkId, PipeArea);
|
||||
}
|
||||
}
|
||||
public void GetStockNum(string UnitWorkId,string PipeArea)
|
||||
{
|
||||
var pipeline = (from x in Funs.DB.HJGL_Pipeline
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == UnitWorkId && x.PipeArea == PipeArea
|
||||
orderby x.PipelineCode
|
||||
select x).ToList();
|
||||
List<string> pipelineList = new List<string>();
|
||||
foreach (var item in pipeline)
|
||||
{
|
||||
bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(item.PipelineId, this.CurrUser.LoginProjectId);
|
||||
if (istrue)
|
||||
{
|
||||
pipelineList.Add(item.PipelineCode);
|
||||
}
|
||||
|
||||
}
|
||||
pipelinecode = pipelineList;
|
||||
BindGrid();
|
||||
}
|
||||
|
||||
protected void btnOut_Click(object sender, EventArgs e)
|
||||
{
|
||||
string path = Funs.RootPath + @"File\Excel\Temp\weldMatchGet.xlsx";
|
||||
path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
|
||||
var a = (from x in pipelinecode select new { PipelineCode = x }).ToList();
|
||||
var b=(from x in Funs.DB .HJGL_Pipeline where pipelinecode.Contains(x.PipelineCode)
|
||||
select new {管线号=x.PipelineCode ,匹配率="100%",计划安装日期=x.PlanStartDate }).ToList();
|
||||
MiniExcel.SaveAs(path, b);
|
||||
|
||||
string fileName = "材料匹配100%管线.xlsx";
|
||||
FileInfo info = new FileInfo(path);
|
||||
long fileSize = info.Length;
|
||||
System.Web.HttpContext.Current.Response.Clear();
|
||||
System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
|
||||
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
|
||||
System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
|
||||
System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
|
||||
System.Web.HttpContext.Current.Response.Flush();
|
||||
System.Web.HttpContext.Current.Response.Close();
|
||||
File.Delete(path);
|
||||
}
|
||||
void BindGrid()
|
||||
{
|
||||
var a =( from x in pipelinecode select new { PipelineCode = x }).ToList();
|
||||
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
|
||||
this.Grid1.DataSource = a;
|
||||
this.Grid1.DataBind();
|
||||
Grid1.RecordCount = a.Count();
|
||||
}
|
||||
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
BindGrid();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,98 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能导致不正确的行为，如果
|
||||
// 重新生成代码，则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
|
||||
|
||||
public partial class WeldMatMatchGet
|
||||
{
|
||||
|
||||
/// <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>
|
||||
/// Toolbar3 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar3;
|
||||
|
||||
/// <summary>
|
||||
/// btnOut 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnOut;
|
||||
|
||||
/// <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;
|
||||
}
|
||||
}
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="180px" ExpandUnusedSpace="true">
|
||||
</f:RenderField>
|
||||
<f:TemplateField ColumnID="tfPipeArea" Width="180px" HeaderText="管线划分" HeaderTextAlign="Center"
|
||||
<f:TemplateField ColumnID="tfPipeArea" Width="180px" HeaderText="管线划分" HeaderTextAlign="Center" Hidden="true"
|
||||
TextAlign="Left">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lbPipeArea" runat="server" Text='<%# ConvertPipeArea(Eval("PipeArea")) %>'></asp:Label>
|
||||
|
|
@ -146,11 +146,11 @@
|
|||
DataField="BackingWelderCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="110px">
|
||||
</f:RenderField>--%>
|
||||
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute"
|
||||
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" Hidden="true"
|
||||
DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊接类型" ColumnID="WeldTypeCode"
|
||||
<f:RenderField HeaderText="焊接类型" ColumnID="WeldTypeCode" Hidden="true"
|
||||
DataField="WeldTypeCode" SortField="WeldTypeCode" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="70px">
|
||||
</f:RenderField>
|
||||
|
|
@ -158,27 +158,27 @@
|
|||
DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
|
||||
Width="70px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="外径" ColumnID="Dia"
|
||||
<f:RenderField HeaderText="外径" ColumnID="Dia" Hidden="true"
|
||||
DataField="Dia" SortField="Dia" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
|
||||
Width="70px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="DN公称直径" ColumnID="DNDia"
|
||||
<f:RenderField HeaderText="DN公称直径" ColumnID="DNDia" Hidden="true"
|
||||
DataField="DNDia" SortField="DNDia" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
|
||||
Width="70px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="壁厚" ColumnID="Thickness"
|
||||
<f:RenderField HeaderText="壁厚" ColumnID="Thickness" Hidden="true"
|
||||
DataField="Thickness" SortField="Thickness" FieldType="Double" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="70px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊接方法" ColumnID="WeldingMethodCode"
|
||||
<f:RenderField HeaderText="焊接方法" ColumnID="WeldingMethodCode" Hidden="true"
|
||||
DataField="WeldingMethodCode" SortField="WeldingMethodCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊丝" ColumnID="WeldingWireCode"
|
||||
<f:RenderField HeaderText="焊丝" ColumnID="WeldingWireCode" Hidden="true"
|
||||
DataField="WeldingWireCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊条" ColumnID="WeldingRodCode"
|
||||
<f:RenderField HeaderText="焊条" ColumnID="WeldingRodCode" Hidden="true"
|
||||
DataField="WeldingRodCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
|
||||
</f:RenderField>
|
||||
|
|
|
|||
|
|
@ -195,19 +195,20 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
|||
{
|
||||
var aw = this.Grid1.SelectedRowIDArray;
|
||||
DataTable dt = null;
|
||||
var list = from x in Funs.DB.View_HJGL_WeldingTask where x.ProjectId == this.CurrUser.LoginProjectId select x;
|
||||
var list = from x in Funs.DB.View_HJGL_WeldingTask where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId select x;
|
||||
if (weldingDailyItem != null)
|
||||
{
|
||||
var task = new List<Model.View_HJGL_WeldingTask>();
|
||||
var weldJointIds = (from x in list
|
||||
where (x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
|
||||
where ( x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
|
||||
&& x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/) || x.WeldingDailyId == this.WeldingDailyId
|
||||
select x.WeldJointId).Distinct().ToList();
|
||||
|
||||
foreach (var weldJointId in weldJointIds)
|
||||
{
|
||||
task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId));
|
||||
}
|
||||
|
||||
select x).GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
|
||||
task = weldJointIds;
|
||||
//foreach (var weldJointId in weldJointIds)
|
||||
//{
|
||||
// task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId));
|
||||
//}
|
||||
if (drpJointAttribute.SelectedValue != Const._Null)
|
||||
{
|
||||
task = task.Where(x=>x.JointAttribute== drpJointAttribute.SelectedValue).ToList();
|
||||
|
|
@ -224,11 +225,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
|||
var weldJointIds = (from x in list
|
||||
where x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
|
||||
&& x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/
|
||||
select x.WeldJointId).Distinct().ToList();
|
||||
foreach (var weldJointId in weldJointIds)
|
||||
{
|
||||
task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId /*&& x.CoverWelderId != null*/));
|
||||
}
|
||||
select x).GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
|
||||
task = weldJointIds;
|
||||
//foreach (var weldJointId in weldJointIds)
|
||||
//{
|
||||
// task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId /*&& x.CoverWelderId != null*/));
|
||||
//}
|
||||
if (drpJointAttribute.SelectedValue != Const._Null)
|
||||
{
|
||||
task = task.Where(x => x.JointAttribute == drpJointAttribute.SelectedValue).ToList();
|
||||
|
|
@ -1238,6 +1240,13 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
|||
if (!string.IsNullOrEmpty(this.WeldingDailyId))
|
||||
{
|
||||
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
|
||||
foreach (var item in GetWeldingDailyItem)
|
||||
{
|
||||
var daily= BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(WeldingDailyId);
|
||||
BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(item.WeldJointId, (DateTime)daily.WeldingDate);//更改预制口实际时间和状态
|
||||
PipelineService.UpdataDateByWeldJointId(item.WeldJointId);//更改安装口时间和状态
|
||||
|
||||
}
|
||||
this.BindGrid(GetWeldingDailyItem); // 初始化页面
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@
|
|||
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="ID"
|
||||
AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" OnRowClick="Grid1_RowClick" EnableRowClickEvent="true"
|
||||
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
|
||||
EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
|
||||
EnableTextSelection="True" EnableRowDoubleClickEvent="true" >
|
||||
<Columns>
|
||||
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
|
||||
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
|
||||
|
|
@ -111,12 +111,16 @@
|
|||
DataField="FlowingSection" SortField="FlowingSection" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
|
||||
</f:RenderField>
|
||||
<f:WindowField ColumnID="PipelineCode" HeaderTextAlign="Center" TextAlign="Left"
|
||||
<%-- <f:WindowField ColumnID="PipelineCode" HeaderTextAlign="Center" TextAlign="Left"
|
||||
Width="280px" WindowID="Window1" HeaderText="管线号" DataTextField="PipelineCode"
|
||||
DataIFrameUrlFields="PipelineId" DataIFrameUrlFormatString="PipelineFinish.aspx?PipelineId={0}"
|
||||
Title="管线号" DataToolTipField="PipelineCode" SortField="PipelineCode"
|
||||
Locked="true">
|
||||
</f:WindowField>
|
||||
</f:WindowField>--%>
|
||||
<f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
|
||||
DataField="PipelineCode" SortField="PipelineCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="预制组件" ColumnID="PipelineComponentCode"
|
||||
DataField="PipelineComponentCode" SortField="PipelineComponentCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
|
||||
|
|
|
|||
|
|
@ -530,6 +530,9 @@ namespace Model
|
|||
partial void InsertHJGL_Pipeline_Component(HJGL_Pipeline_Component instance);
|
||||
partial void UpdateHJGL_Pipeline_Component(HJGL_Pipeline_Component instance);
|
||||
partial void DeleteHJGL_Pipeline_Component(HJGL_Pipeline_Component instance);
|
||||
partial void InsertHJGL_Pipeline_ComponentJoint(HJGL_Pipeline_ComponentJoint instance);
|
||||
partial void UpdateHJGL_Pipeline_ComponentJoint(HJGL_Pipeline_ComponentJoint instance);
|
||||
partial void DeleteHJGL_Pipeline_ComponentJoint(HJGL_Pipeline_ComponentJoint instance);
|
||||
partial void InsertHJGL_PipeLineMat(HJGL_PipeLineMat instance);
|
||||
partial void UpdateHJGL_PipeLineMat(HJGL_PipeLineMat instance);
|
||||
partial void DeleteHJGL_PipeLineMat(HJGL_PipeLineMat instance);
|
||||
|
|
@ -2852,6 +2855,14 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
public System.Data.Linq.Table<HJGL_Pipeline_ComponentJoint> HJGL_Pipeline_ComponentJoint
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.GetTable<HJGL_Pipeline_ComponentJoint>();
|
||||
}
|
||||
}
|
||||
|
||||
public System.Data.Linq.Table<HJGL_PipeLineMat> HJGL_PipeLineMat
|
||||
{
|
||||
get
|
||||
|
|
@ -77368,6 +77379,8 @@ namespace Model
|
|||
|
||||
private System.Nullable<System.DateTime> _ReceiveDate;
|
||||
|
||||
private System.Nullable<int> _ProductionState;
|
||||
|
||||
private EntityRef<HJGL_Pipeline> _HJGL_Pipeline;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
|
|
@ -77406,6 +77419,8 @@ namespace Model
|
|||
partial void OnReceiveManChanged();
|
||||
partial void OnReceiveDateChanging(System.Nullable<System.DateTime> value);
|
||||
partial void OnReceiveDateChanged();
|
||||
partial void OnProductionStateChanging(System.Nullable<int> value);
|
||||
partial void OnProductionStateChanged();
|
||||
#endregion
|
||||
|
||||
public HJGL_Pipeline_Component()
|
||||
|
|
@ -77738,6 +77753,26 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProductionState", DbType="Int")]
|
||||
public System.Nullable<int> ProductionState
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._ProductionState;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._ProductionState != value))
|
||||
{
|
||||
this.OnProductionStateChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._ProductionState = value;
|
||||
this.SendPropertyChanged("ProductionState");
|
||||
this.OnProductionStateChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Pipeline_Component_HJGL_Pipeline", Storage="_HJGL_Pipeline", ThisKey="PipelineId", OtherKey="PipelineId", IsForeignKey=true)]
|
||||
public HJGL_Pipeline HJGL_Pipeline
|
||||
{
|
||||
|
|
@ -77793,6 +77828,188 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_Pipeline_ComponentJoint")]
|
||||
public partial class HJGL_Pipeline_ComponentJoint : INotifyPropertyChanging, INotifyPropertyChanged
|
||||
{
|
||||
|
||||
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
|
||||
|
||||
private string _Id;
|
||||
|
||||
private string _PipelineComponentId;
|
||||
|
||||
private string _PipelineComponentCode;
|
||||
|
||||
private string _WeldJointId;
|
||||
|
||||
private string _WeldJointCode;
|
||||
|
||||
private System.Nullable<int> _State;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
partial void OnLoaded();
|
||||
partial void OnValidate(System.Data.Linq.ChangeAction action);
|
||||
partial void OnCreated();
|
||||
partial void OnIdChanging(string value);
|
||||
partial void OnIdChanged();
|
||||
partial void OnPipelineComponentIdChanging(string value);
|
||||
partial void OnPipelineComponentIdChanged();
|
||||
partial void OnPipelineComponentCodeChanging(string value);
|
||||
partial void OnPipelineComponentCodeChanged();
|
||||
partial void OnWeldJointIdChanging(string value);
|
||||
partial void OnWeldJointIdChanged();
|
||||
partial void OnWeldJointCodeChanging(string value);
|
||||
partial void OnWeldJointCodeChanged();
|
||||
partial void OnStateChanging(System.Nullable<int> value);
|
||||
partial void OnStateChanged();
|
||||
#endregion
|
||||
|
||||
public HJGL_Pipeline_ComponentJoint()
|
||||
{
|
||||
OnCreated();
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
|
||||
public string Id
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Id;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Id != value))
|
||||
{
|
||||
this.OnIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Id = value;
|
||||
this.SendPropertyChanged("Id");
|
||||
this.OnIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineComponentId", DbType="VarChar(50)")]
|
||||
public string PipelineComponentId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._PipelineComponentId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._PipelineComponentId != value))
|
||||
{
|
||||
this.OnPipelineComponentIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._PipelineComponentId = value;
|
||||
this.SendPropertyChanged("PipelineComponentId");
|
||||
this.OnPipelineComponentIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineComponentCode", DbType="VarChar(50)")]
|
||||
public string PipelineComponentCode
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._PipelineComponentCode;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._PipelineComponentCode != value))
|
||||
{
|
||||
this.OnPipelineComponentCodeChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._PipelineComponentCode = value;
|
||||
this.SendPropertyChanged("PipelineComponentCode");
|
||||
this.OnPipelineComponentCodeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointId", DbType="VarChar(50)")]
|
||||
public string WeldJointId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._WeldJointId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._WeldJointId != value))
|
||||
{
|
||||
this.OnWeldJointIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._WeldJointId = value;
|
||||
this.SendPropertyChanged("WeldJointId");
|
||||
this.OnWeldJointIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="VarChar(50)")]
|
||||
public string WeldJointCode
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._WeldJointCode;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._WeldJointCode != value))
|
||||
{
|
||||
this.OnWeldJointCodeChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._WeldJointCode = value;
|
||||
this.SendPropertyChanged("WeldJointCode");
|
||||
this.OnWeldJointCodeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
|
||||
public System.Nullable<int> State
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._State;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._State != value))
|
||||
{
|
||||
this.OnStateChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._State = value;
|
||||
this.SendPropertyChanged("State");
|
||||
this.OnStateChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public event PropertyChangingEventHandler PropertyChanging;
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
protected virtual void SendPropertyChanging()
|
||||
{
|
||||
if ((this.PropertyChanging != null))
|
||||
{
|
||||
this.PropertyChanging(this, emptyChangingEventArgs);
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void SendPropertyChanged(String propertyName)
|
||||
{
|
||||
if ((this.PropertyChanged != null))
|
||||
{
|
||||
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_PipeLineMat")]
|
||||
public partial class HJGL_PipeLineMat : INotifyPropertyChanging, INotifyPropertyChanged
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue