Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SHJ
This commit is contained in:
@@ -36,3 +36,4 @@ SGGL/.svn
|
||||
/SGGL/CLAUDE.md
|
||||
/SGGL/.claude
|
||||
/SGGL/AGENTS.md
|
||||
/SGGL/outputs/manual-20260529-prefab-welding/presentations/prefab-welding-doc
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
IF OBJECT_ID(N'dbo.HJGL_WeldingDailyTempDetail', N'U') IS NULL
|
||||
BEGIN
|
||||
CREATE TABLE dbo.HJGL_WeldingDailyTempDetail
|
||||
(
|
||||
TempDetailId NVARCHAR(50) NOT NULL,
|
||||
ProjectId NVARCHAR(50) NULL,
|
||||
UnitId NVARCHAR(50) NULL,
|
||||
UnitWorkId NVARCHAR(50) NULL,
|
||||
WeldJointId NVARCHAR(50) NOT NULL,
|
||||
WeldingDate DATETIME NOT NULL,
|
||||
CoverWelderId NVARCHAR(50) NULL,
|
||||
BackingWelderId NVARCHAR(50) NULL,
|
||||
JointAttribute NVARCHAR(50) NULL,
|
||||
WeldingLocationId NVARCHAR(50) NULL,
|
||||
WeldingMode NVARCHAR(50) NULL,
|
||||
AttachUrl NVARCHAR(500) NULL,
|
||||
SubmitPersonId NVARCHAR(50) NULL,
|
||||
SubmitDate DATETIME NOT NULL CONSTRAINT DF_HJGL_WeldingDailyTempDetail_SubmitDate DEFAULT(GETDATE()),
|
||||
AuditState INT NOT NULL CONSTRAINT DF_HJGL_WeldingDailyTempDetail_AuditState DEFAULT(0),
|
||||
AuditMan NVARCHAR(50) NULL,
|
||||
AuditDate DATETIME NULL,
|
||||
AuditRemark NVARCHAR(500) NULL,
|
||||
CONSTRAINT PK_HJGL_WeldingDailyTempDetail PRIMARY KEY CLUSTERED (TempDetailId),
|
||||
CONSTRAINT CK_HJGL_WeldingDailyTempDetail_AuditState CHECK (AuditState IN (0, 1))
|
||||
);
|
||||
|
||||
CREATE UNIQUE NONCLUSTERED INDEX UX_HJGL_WeldingDailyTempDetail_Pending
|
||||
ON dbo.HJGL_WeldingDailyTempDetail (WeldJointId, WeldingDate)
|
||||
WHERE AuditState = 0;
|
||||
|
||||
CREATE NONCLUSTERED INDEX IX_HJGL_WeldingDailyTempDetail_Query
|
||||
ON dbo.HJGL_WeldingDailyTempDetail (ProjectId, AuditState, WeldingDate, UnitWorkId);
|
||||
|
||||
CREATE NONCLUSTERED INDEX IX_HJGL_WeldingDailyTempDetail_WeldJointId
|
||||
ON dbo.HJGL_WeldingDailyTempDetail (WeldJointId);
|
||||
END
|
||||
GO
|
||||
@@ -255,125 +255,12 @@ namespace BLL
|
||||
|
||||
public static string SaveWeldingDailyByWeldJointId(string WeldJointId, string Personid, string time)
|
||||
{
|
||||
string res = "";
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
try
|
||||
{
|
||||
var peson = db.Person_Persons.FirstOrDefault(x => x.PersonId == Personid);
|
||||
if (peson == null)
|
||||
{
|
||||
res = "人员不存在";
|
||||
return res;
|
||||
}
|
||||
var joint = db.View_HJGL_WeldJoint.FirstOrDefault(x => x.WeldJointId == WeldJointId);
|
||||
if (joint == null)
|
||||
{
|
||||
res = "焊口不存在";
|
||||
return res;
|
||||
}
|
||||
var weldingDaily = db.HJGL_WeldingDaily.FirstOrDefault(x => x.WeldingDate.Value.Date == Convert.ToDateTime(time).Date && x.UnitWorkId == joint.UnitWorkId);
|
||||
var weldTask = db.HJGL_WeldTask.FirstOrDefault(x => x.WeldJointId == joint.WeldJointId);
|
||||
if (weldingDaily == null)
|
||||
{
|
||||
string perfix = string.Format("{0:yyyyMMdd}", System.DateTime.Now) + "-" + peson.PersonName + "-";
|
||||
weldingDaily = new Model.HJGL_WeldingDaily();
|
||||
weldingDaily.WeldingDailyId = Guid.NewGuid().ToString();
|
||||
weldingDaily.WeldingDailyCode = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "dbo.HJGL_WeldingDaily", "WeldingDailyCode", joint.ProjectId, perfix);
|
||||
weldingDaily.WeldingDate = Convert.ToDateTime(time).Date;
|
||||
weldingDaily.ProjectId = joint.ProjectId;
|
||||
weldingDaily.UnitWorkId = joint.UnitWorkId;
|
||||
weldingDaily.UnitId = weldTask?.UnitId;
|
||||
weldingDaily.Tabler = Personid;
|
||||
weldingDaily.TableDate = Convert.ToDateTime(time).Date;
|
||||
db.HJGL_WeldingDaily.InsertOnSubmit(weldingDaily);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(WeldJointId, (DateTime)weldingDaily.WeldingDate);//更改预制口实际时间和状态
|
||||
PipelineService.UpdataDateByWeldJointId(WeldJointId);//更改安装口时间和状态
|
||||
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", joint.ProjectId);
|
||||
if (batchC != null)
|
||||
{
|
||||
string batchCondition = batchC.SetValue;
|
||||
InsertWeldingDailyItem(WeldJointId, Personid, Personid, joint.JointAttribute, weldingDaily.WeldingDate, batchCondition, true, weldingDaily.WeldingDailyId, joint.ProjectId);
|
||||
}
|
||||
BLL.WeldJointService.UpdateWeldJointAddG(WeldJointId, joint.JointAttribute, Const.BtnAdd);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
APICommonService.SaveSysAPILog("erro", ex.ToString(), "-1");
|
||||
}
|
||||
|
||||
}
|
||||
return res;
|
||||
return BLL.WeldingDailyService.SaveWeldingDailyTempDetailByMobile(WeldJointId, Personid, time, null, 0);
|
||||
}
|
||||
|
||||
public static string SaveWeldingDailyByWeldJointId(string WeldJointId, string Personid, string time, string weldingLocation)
|
||||
{
|
||||
string res = "";
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
try
|
||||
{
|
||||
var peson = db.Person_Persons.FirstOrDefault(x => x.PersonId == Personid);
|
||||
if (peson == null)
|
||||
{
|
||||
res = "人员不存在";
|
||||
return res;
|
||||
}
|
||||
var joint = db.View_HJGL_WeldJoint.FirstOrDefault(x => x.WeldJointId == WeldJointId);
|
||||
if (joint == null)
|
||||
{
|
||||
res = "焊口不存在";
|
||||
return res;
|
||||
}
|
||||
var weldingLocationModel = db.Base_WeldingLocation.FirstOrDefault(x => x.WeldingLocationId == weldingLocation);
|
||||
if (weldingLocationModel == null)
|
||||
{
|
||||
res = "焊口位置不存在";
|
||||
return res;
|
||||
}
|
||||
var weldingDaily = db.HJGL_WeldingDaily.FirstOrDefault(x => x.WeldingDate.Value.Date == Convert.ToDateTime(time).Date && x.UnitWorkId == joint.UnitWorkId);
|
||||
var weldTask = db.HJGL_WeldTask.FirstOrDefault(x => x.WeldJointId == joint.WeldJointId);
|
||||
var weldJoint = db.HJGL_WeldJoint.FirstOrDefault(x => x.WeldJointId == joint.WeldJointId);
|
||||
if (weldingDaily == null)
|
||||
{
|
||||
string perfix = string.Format("{0:yyyyMMdd}", System.DateTime.Now) + "-" + peson.PersonName + "-";
|
||||
weldingDaily = new Model.HJGL_WeldingDaily();
|
||||
weldingDaily.WeldingDailyId = Guid.NewGuid().ToString();
|
||||
weldingDaily.WeldingDailyCode = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "dbo.HJGL_WeldingDaily", "WeldingDailyCode", joint.ProjectId, perfix);
|
||||
weldingDaily.WeldingDate = Convert.ToDateTime(time).Date;
|
||||
weldingDaily.ProjectId = joint.ProjectId;
|
||||
weldingDaily.UnitWorkId = joint.UnitWorkId;
|
||||
weldingDaily.UnitId = weldTask?.UnitId;
|
||||
weldingDaily.Tabler = Personid;
|
||||
weldingDaily.TableDate = Convert.ToDateTime(time).Date;
|
||||
db.HJGL_WeldingDaily.InsertOnSubmit(weldingDaily);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
//更新焊口位置
|
||||
if (weldingDaily != null)
|
||||
{
|
||||
weldJoint.WeldingLocationId= weldingLocation;
|
||||
WeldJointService.UpdateWeldJoint(weldJoint);
|
||||
}
|
||||
BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(WeldJointId, (DateTime)weldingDaily.WeldingDate);//更改预制口实际时间和状态
|
||||
PipelineService.UpdataDateByWeldJointId(WeldJointId);//更改安装口时间和状态
|
||||
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", joint.ProjectId);
|
||||
if (batchC != null)
|
||||
{
|
||||
string batchCondition = batchC.SetValue;
|
||||
InsertWeldingDailyItem(WeldJointId, Personid, Personid, joint.JointAttribute, weldingDaily.WeldingDate, batchCondition, true, weldingDaily.WeldingDailyId, joint.ProjectId);
|
||||
}
|
||||
BLL.WeldJointService.UpdateWeldJointAddG(WeldJointId, joint.JointAttribute, Const.BtnAdd);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
APICommonService.SaveSysAPILog("erro", ex.ToString(), "-1");
|
||||
}
|
||||
|
||||
}
|
||||
return res;
|
||||
return BLL.WeldingDailyService.SaveWeldingDailyTempDetailByMobile(WeldJointId, Personid, time, weldingLocation, 0);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -387,101 +274,7 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static string SaveWeldingDailyByWeldJointId(string WeldJointId, string Personid, string time, string weldingLocation, int welderType)
|
||||
{
|
||||
string res = "";
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
try
|
||||
{
|
||||
var peson = db.Person_Persons.FirstOrDefault(x => x.PersonId == Personid);
|
||||
if (peson == null)
|
||||
{
|
||||
res = "人员不存在";
|
||||
return res;
|
||||
}
|
||||
var joint = db.View_HJGL_WeldJoint.FirstOrDefault(x => x.WeldJointId == WeldJointId);
|
||||
if (joint == null)
|
||||
{
|
||||
res = "焊口不存在";
|
||||
return res;
|
||||
}
|
||||
var weldingLocationModel = db.Base_WeldingLocation.FirstOrDefault(x => x.WeldingLocationId == weldingLocation);
|
||||
if (weldingLocationModel == null)
|
||||
{
|
||||
res = "焊口位置不存在";
|
||||
return res;
|
||||
}
|
||||
var weldTask = db.HJGL_WeldTask.FirstOrDefault(x => x.WeldJointId == joint.WeldJointId);
|
||||
var weldJoint = db.HJGL_WeldJoint.FirstOrDefault(x => x.WeldJointId == joint.WeldJointId);
|
||||
|
||||
// 根据焊工类型确定盖面/打底焊工ID，以及是否两者都已填充
|
||||
string coverWelderId;
|
||||
string backingWelderId;
|
||||
bool bothWeldersFilled;
|
||||
|
||||
if (welderType == 0)
|
||||
{
|
||||
// 全部：打底和盖面都是同一人
|
||||
coverWelderId = Personid;
|
||||
backingWelderId = Personid;
|
||||
bothWeldersFilled = true;
|
||||
}
|
||||
else if (welderType == 1)
|
||||
{
|
||||
// 打底：只更新backingWelderId，coverWelderId取焊口已有值
|
||||
weldJoint.BackingWelderId = Personid;
|
||||
coverWelderId = weldJoint.CoverWelderId;
|
||||
backingWelderId = Personid;
|
||||
bothWeldersFilled = !string.IsNullOrEmpty(coverWelderId) && !string.IsNullOrEmpty(backingWelderId);
|
||||
}
|
||||
else // welderType == 2
|
||||
{
|
||||
// 盖面：只更新coverWelderId，backingWelderId取焊口已有值
|
||||
weldJoint.CoverWelderId = Personid;
|
||||
coverWelderId = Personid;
|
||||
backingWelderId = weldJoint.BackingWelderId;
|
||||
bothWeldersFilled = !string.IsNullOrEmpty(coverWelderId) && !string.IsNullOrEmpty(backingWelderId);
|
||||
}
|
||||
|
||||
// 更新焊口位置
|
||||
weldJoint.WeldingLocationId = weldingLocation;
|
||||
WeldJointService.UpdateWeldJoint(weldJoint);
|
||||
|
||||
// 只有打底和盖面都填充了时才保存WeldingDate和进批
|
||||
if (bothWeldersFilled)
|
||||
{
|
||||
var weldingDaily = db.HJGL_WeldingDaily.FirstOrDefault(x => x.WeldingDate.Value.Date == Convert.ToDateTime(time).Date && x.UnitWorkId == joint.UnitWorkId);
|
||||
if (weldingDaily == null)
|
||||
{
|
||||
string perfix = string.Format("{0:yyyyMMdd}", System.DateTime.Now) + "-" + peson.PersonName + "-";
|
||||
weldingDaily = new Model.HJGL_WeldingDaily();
|
||||
weldingDaily.WeldingDailyId = Guid.NewGuid().ToString();
|
||||
weldingDaily.WeldingDailyCode = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "dbo.HJGL_WeldingDaily", "WeldingDailyCode", joint.ProjectId, perfix);
|
||||
weldingDaily.WeldingDate = Convert.ToDateTime(time).Date;
|
||||
weldingDaily.ProjectId = joint.ProjectId;
|
||||
weldingDaily.UnitWorkId = joint.UnitWorkId;
|
||||
weldingDaily.UnitId = weldTask?.UnitId;
|
||||
weldingDaily.Tabler = Personid;
|
||||
weldingDaily.TableDate = Convert.ToDateTime(time).Date;
|
||||
BLL.WeldingDailyService.AddWeldingDaily(weldingDaily);
|
||||
}
|
||||
BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(WeldJointId, (DateTime)weldingDaily.WeldingDate);//更改预制口实际时间和状态
|
||||
PipelineService.UpdataDateByWeldJointId(WeldJointId);//更改安装口时间和状态
|
||||
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", joint.ProjectId);
|
||||
if (batchC != null)
|
||||
{
|
||||
string batchCondition = batchC.SetValue;
|
||||
InsertWeldingDailyItem(WeldJointId, coverWelderId, backingWelderId, joint.JointAttribute, weldingDaily.WeldingDate, batchCondition, true, weldingDaily.WeldingDailyId, joint.ProjectId);
|
||||
}
|
||||
BLL.WeldJointService.UpdateWeldJointAddG(WeldJointId, joint.JointAttribute, Const.BtnAdd);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
APICommonService.SaveSysAPILog("erro", ex.ToString(), "-1");
|
||||
}
|
||||
|
||||
}
|
||||
return res;
|
||||
return BLL.WeldingDailyService.SaveWeldingDailyTempDetailByMobile(WeldJointId, Personid, time, weldingLocation, welderType);
|
||||
}
|
||||
|
||||
#region 保存焊接日报明细
|
||||
@@ -635,6 +428,25 @@ namespace BLL
|
||||
/// <param name="weldingDailyId"></param>
|
||||
/// <returns></returns>
|
||||
private static string InsertWeldingDailyItem(string weldJointId, string coverWelderId, string backingWelderId, string jointAttribute, DateTime? weldingDate, string batchCondition, bool isSave, string weldingDailyId, string projectId)
|
||||
{
|
||||
return InsertWeldingDailyItem(weldJointId, coverWelderId, backingWelderId, jointAttribute, weldingDate, batchCondition, isSave, weldingDailyId, projectId, null);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 日报明细插入（更新焊口信息），组批等
|
||||
/// </summary>
|
||||
/// <param name="weldJointId">焊口ID</param>
|
||||
/// <param name="coverWelderId">盖面焊工ID</param>
|
||||
/// <param name="backingWelderId">打底焊工ID</param>
|
||||
/// <param name="jointAttribute">焊口属性</param>
|
||||
/// <param name="weldingDate">焊接日期</param>
|
||||
/// <param name="batchCondition">组批条件</param>
|
||||
/// <param name="isSave">是否保存</param>
|
||||
/// <param name="weldingDailyId">日报ID</param>
|
||||
/// <param name="projectId">项目ID</param>
|
||||
/// <param name="weldingLocationId">焊接位置ID</param>
|
||||
/// <returns>错误信息</returns>
|
||||
private static string InsertWeldingDailyItem(string weldJointId, string coverWelderId, string backingWelderId, string jointAttribute, DateTime? weldingDate, string batchCondition, bool isSave, string weldingDailyId, string projectId, string weldingLocationId)
|
||||
{
|
||||
string errlog = string.Empty;
|
||||
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
|
||||
@@ -652,10 +464,10 @@ namespace BLL
|
||||
newWeldJoint.BackingWelderId = backingWelderId;
|
||||
newWeldJoint.CoverWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(pipeline.ProjectId, coverWelderId).TeamGroupId;
|
||||
newWeldJoint.BackingWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(pipeline.ProjectId, backingWelderId).TeamGroupId;
|
||||
//if (item.WeldingLocationId != Const._Null)
|
||||
//{
|
||||
// newWeldJoint.WeldingLocationId = item.WeldingLocationId;
|
||||
//}
|
||||
if (!string.IsNullOrEmpty(weldingLocationId))
|
||||
{
|
||||
newWeldJoint.WeldingLocationId = weldingLocationId;
|
||||
}
|
||||
newWeldJoint.JointAttribute = jointAttribute;
|
||||
BLL.WeldJointService.UpdateWeldJoint(newWeldJoint);
|
||||
|
||||
|
||||
@@ -293,6 +293,408 @@ namespace BLL
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
#region 焊接日报待审核
|
||||
/// <summary>
|
||||
/// 移动端按焊口保存焊接日报待审核明细
|
||||
/// </summary>
|
||||
/// <param name="weldJointId">焊口ID</param>
|
||||
/// <param name="personId">提交焊工ID</param>
|
||||
/// <param name="time">焊接日期</param>
|
||||
/// <param name="weldingLocationId">焊接位置ID</param>
|
||||
/// <param name="welderType">焊工类型 0 全部 1 打底 2 盖面</param>
|
||||
/// <returns>错误信息</returns>
|
||||
public static string SaveWeldingDailyTempDetailByMobile(string weldJointId, string personId, string time, string weldingLocationId, int welderType)
|
||||
{
|
||||
string res = string.Empty;
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
try
|
||||
{
|
||||
DateTime weldingDate;
|
||||
if (!DateTime.TryParse(time, out weldingDate))
|
||||
{
|
||||
return "焊接日期不正确";
|
||||
}
|
||||
weldingDate = weldingDate.Date;
|
||||
|
||||
var person = db.Person_Persons.FirstOrDefault(x => x.PersonId == personId);
|
||||
if (person == null)
|
||||
{
|
||||
return "人员不存在";
|
||||
}
|
||||
|
||||
var joint = db.View_HJGL_WeldJoint.FirstOrDefault(x => x.WeldJointId == weldJointId);
|
||||
string err = CheckWeldingDailyTempJoint(db, joint, weldingLocationId);
|
||||
if (!string.IsNullOrEmpty(err))
|
||||
{
|
||||
return err;
|
||||
}
|
||||
|
||||
var weldTask = db.HJGL_WeldTask.FirstOrDefault(x => x.WeldJointId == joint.WeldJointId);
|
||||
var weldJoint = db.HJGL_WeldJoint.FirstOrDefault(x => x.WeldJointId == joint.WeldJointId);
|
||||
var pending = GetPendingTempDetail(db, weldJointId, weldingDate);
|
||||
|
||||
string coverWelderId = pending != null ? pending.CoverWelderId : weldJoint.CoverWelderId;
|
||||
string backingWelderId = pending != null ? pending.BackingWelderId : weldJoint.BackingWelderId;
|
||||
if (welderType == 0)
|
||||
{
|
||||
coverWelderId = personId;
|
||||
backingWelderId = personId;
|
||||
}
|
||||
else if (welderType == 1)
|
||||
{
|
||||
backingWelderId = personId;
|
||||
}
|
||||
else if (welderType == 2)
|
||||
{
|
||||
coverWelderId = personId;
|
||||
}
|
||||
else
|
||||
{
|
||||
return "焊工类型不正确";
|
||||
}
|
||||
|
||||
SaveWeldingDailyTempDetail(db, joint, weldTask, weldingDate, personId, coverWelderId, backingWelderId,
|
||||
joint.JointAttribute, weldingLocationId, joint.ProjectId, null, null, joint.WeldingMode);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
APICommonService.SaveSysAPILog("erro", ex.ToString(), "-1");
|
||||
res = ex.Message;
|
||||
}
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Web端保存焊接日报待审核明细
|
||||
/// </summary>
|
||||
/// <param name="weldJointId">焊口ID</param>
|
||||
/// <param name="submitPersonId">提交人ID</param>
|
||||
/// <param name="weldingDate">焊接日期</param>
|
||||
/// <param name="coverWelderId">盖面焊工ID</param>
|
||||
/// <param name="backingWelderId">打底焊工ID</param>
|
||||
/// <param name="jointAttribute">焊口属性</param>
|
||||
/// <param name="weldingLocationId">焊接位置ID</param>
|
||||
/// <param name="projectId">项目ID</param>
|
||||
/// <param name="unitId">单位ID</param>
|
||||
/// <param name="unitWorkId">单位工程ID</param>
|
||||
/// <param name="weldingMode">焊接模式</param>
|
||||
/// <returns>错误信息</returns>
|
||||
public static string SaveWeldingDailyTempDetailByWeb(string weldJointId, string submitPersonId, DateTime weldingDate, string coverWelderId,
|
||||
string backingWelderId, string jointAttribute, string weldingLocationId, string projectId, string unitId, string unitWorkId, string weldingMode)
|
||||
{
|
||||
string res = string.Empty;
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
try
|
||||
{
|
||||
weldingDate = weldingDate.Date;
|
||||
weldingLocationId = NormalizeNullValue(weldingLocationId);
|
||||
unitId = NormalizeNullValue(unitId);
|
||||
unitWorkId = NormalizeNullValue(unitWorkId);
|
||||
|
||||
if (string.IsNullOrEmpty(weldJointId))
|
||||
{
|
||||
return "焊口不能为空";
|
||||
}
|
||||
if (string.IsNullOrEmpty(coverWelderId) || string.IsNullOrEmpty(backingWelderId))
|
||||
{
|
||||
return "未选择完整焊工";
|
||||
}
|
||||
|
||||
var joint = db.View_HJGL_WeldJoint.FirstOrDefault(x => x.WeldJointId == weldJointId);
|
||||
string err = CheckWeldingDailyTempJoint(db, joint, weldingLocationId);
|
||||
if (!string.IsNullOrEmpty(err))
|
||||
{
|
||||
return err;
|
||||
}
|
||||
|
||||
var coverWelder = db.SitePerson_Person.FirstOrDefault(x => x.ProjectId == projectId && x.PersonId == coverWelderId);
|
||||
if (coverWelder == null)
|
||||
{
|
||||
return "盖面焊工不存在";
|
||||
}
|
||||
var backingWelder = db.SitePerson_Person.FirstOrDefault(x => x.ProjectId == projectId && x.PersonId == backingWelderId);
|
||||
if (backingWelder == null)
|
||||
{
|
||||
return "打底焊工不存在";
|
||||
}
|
||||
|
||||
var weldTask = db.HJGL_WeldTask.FirstOrDefault(x => x.WeldJointId == weldJointId);
|
||||
SaveWeldingDailyTempDetail(db, joint, weldTask, weldingDate, submitPersonId, coverWelderId, backingWelderId,
|
||||
jointAttribute, weldingLocationId, projectId, unitId, unitWorkId, weldingMode);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
APICommonService.SaveSysAPILog("erro", ex.ToString(), "-1");
|
||||
res = ex.Message;
|
||||
}
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 审核通过焊接日报待审核明细
|
||||
/// </summary>
|
||||
/// <param name="tempDetailIds">待审核明细ID集合</param>
|
||||
/// <param name="auditMan">审核人</param>
|
||||
/// <returns>错误信息</returns>
|
||||
public static string AuditWeldingDailyTempDetails(string[] tempDetailIds, string auditMan)
|
||||
{
|
||||
string errlog = string.Empty;
|
||||
if (tempDetailIds == null || tempDetailIds.Length == 0)
|
||||
{
|
||||
return "请选择要审核的记录";
|
||||
}
|
||||
|
||||
foreach (string tempDetailId in tempDetailIds.Where(x => !string.IsNullOrEmpty(x)).Distinct())
|
||||
{
|
||||
var tempDetail = Funs.DB.HJGL_WeldingDailyTempDetail.FirstOrDefault(x => x.TempDetailId == tempDetailId);
|
||||
if (tempDetail == null)
|
||||
{
|
||||
errlog += "待审核记录不存在；";
|
||||
continue;
|
||||
}
|
||||
if (tempDetail.AuditState != 0)
|
||||
{
|
||||
errlog += "焊口待审核记录已审核；";
|
||||
continue;
|
||||
}
|
||||
if (string.IsNullOrEmpty(tempDetail.CoverWelderId) || string.IsNullOrEmpty(tempDetail.BackingWelderId))
|
||||
{
|
||||
errlog += "焊口待审核记录未选择完整焊工；";
|
||||
continue;
|
||||
}
|
||||
|
||||
var weldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(tempDetail.WeldJointId);
|
||||
if (weldJoint == null)
|
||||
{
|
||||
errlog += "焊口不存在；";
|
||||
continue;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(weldJoint.WeldingDailyId))
|
||||
{
|
||||
errlog += "焊口【" + weldJoint.WeldJointCode + "】已生成焊接日报；";
|
||||
continue;
|
||||
}
|
||||
|
||||
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", tempDetail.ProjectId);
|
||||
if (batchC == null)
|
||||
{
|
||||
errlog += "请设置项目的组批条件；";
|
||||
continue;
|
||||
}
|
||||
|
||||
var weldingDaily = GetOrCreateWeldingDailyByTempDetail(tempDetail);
|
||||
string itemErr = InsertWeldingDailyItem(tempDetail.WeldJointId, tempDetail.CoverWelderId, tempDetail.BackingWelderId,
|
||||
tempDetail.JointAttribute, weldingDaily.WeldingDate, batchC.SetValue, true, weldingDaily.WeldingDailyId,
|
||||
tempDetail.ProjectId, tempDetail.WeldingLocationId);
|
||||
if (!string.IsNullOrEmpty(itemErr))
|
||||
{
|
||||
errlog += itemErr;
|
||||
continue;
|
||||
}
|
||||
|
||||
BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(tempDetail.WeldJointId, (DateTime)weldingDaily.WeldingDate);//更改预制口实际时间和状态
|
||||
PipelineService.UpdataDateByWeldJointId(tempDetail.WeldJointId);//更改安装口时间和状态
|
||||
tempDetail.AuditState = 1;
|
||||
tempDetail.AuditMan = auditMan;
|
||||
tempDetail.AuditDate = DateTime.Now;
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
|
||||
return errlog;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 删除未审核的焊接日报待审核明细
|
||||
/// </summary>
|
||||
/// <param name="tempDetailIds">待审核明细ID集合</param>
|
||||
/// <returns>错误信息</returns>
|
||||
public static string DeleteWeldingDailyTempDetails(string[] tempDetailIds)
|
||||
{
|
||||
if (tempDetailIds == null || tempDetailIds.Length == 0)
|
||||
{
|
||||
return "请选择要删除的记录";
|
||||
}
|
||||
|
||||
string errlog = string.Empty;
|
||||
foreach (string tempDetailId in tempDetailIds.Where(x => !string.IsNullOrEmpty(x)).Distinct())
|
||||
{
|
||||
var tempDetail = Funs.DB.HJGL_WeldingDailyTempDetail.FirstOrDefault(x => x.TempDetailId == tempDetailId);
|
||||
if (tempDetail == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (tempDetail.AuditState != 0)
|
||||
{
|
||||
errlog += "已审核记录不能删除；";
|
||||
continue;
|
||||
}
|
||||
Funs.DB.HJGL_WeldingDailyTempDetail.DeleteOnSubmit(tempDetail);
|
||||
}
|
||||
Funs.DB.SubmitChanges();
|
||||
return errlog;
|
||||
}
|
||||
|
||||
private static string CheckWeldingDailyTempJoint(Model.SGGLDB db, Model.View_HJGL_WeldJoint joint, string weldingLocationId)
|
||||
{
|
||||
if (joint == null)
|
||||
{
|
||||
return "焊口不存在";
|
||||
}
|
||||
if (!string.IsNullOrEmpty(joint.WeldingDailyId))
|
||||
{
|
||||
return "焊口【" + joint.WeldJointCode + "】已生成焊接日报，不能提交待审核";
|
||||
}
|
||||
if (!string.IsNullOrEmpty(weldingLocationId))
|
||||
{
|
||||
var weldingLocationModel = db.Base_WeldingLocation.FirstOrDefault(x => x.WeldingLocationId == weldingLocationId);
|
||||
if (weldingLocationModel == null)
|
||||
{
|
||||
return "焊口位置不存在";
|
||||
}
|
||||
}
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
private static Model.HJGL_WeldingDailyTempDetail GetPendingTempDetail(Model.SGGLDB db, string weldJointId, DateTime weldingDate)
|
||||
{
|
||||
return db.HJGL_WeldingDailyTempDetail.FirstOrDefault(x => x.WeldJointId == weldJointId
|
||||
&& x.WeldingDate >= weldingDate.Date
|
||||
&& x.WeldingDate < weldingDate.Date.AddDays(1)
|
||||
&& x.AuditState == 0);
|
||||
}
|
||||
|
||||
private static void SaveWeldingDailyTempDetail(Model.SGGLDB db, Model.View_HJGL_WeldJoint joint, Model.HJGL_WeldTask weldTask,
|
||||
DateTime weldingDate, string submitPersonId, string coverWelderId, string backingWelderId, string jointAttribute,
|
||||
string weldingLocationId, string projectId, string unitId, string unitWorkId, string weldingMode)
|
||||
{
|
||||
var pending = GetPendingTempDetail(db, joint.WeldJointId, weldingDate);
|
||||
if (pending == null)
|
||||
{
|
||||
pending = new Model.HJGL_WeldingDailyTempDetail
|
||||
{
|
||||
TempDetailId = Guid.NewGuid().ToString(),
|
||||
WeldJointId = joint.WeldJointId,
|
||||
WeldingDate = weldingDate.Date,
|
||||
AuditState = 0,
|
||||
SubmitDate = DateTime.Now
|
||||
};
|
||||
db.HJGL_WeldingDailyTempDetail.InsertOnSubmit(pending);
|
||||
}
|
||||
|
||||
pending.ProjectId = !string.IsNullOrEmpty(projectId) ? projectId : joint.ProjectId;
|
||||
pending.UnitId = !string.IsNullOrEmpty(unitId) ? unitId : (weldTask != null && !string.IsNullOrEmpty(weldTask.UnitId) ? weldTask.UnitId : joint.UnitId);
|
||||
pending.UnitWorkId = !string.IsNullOrEmpty(unitWorkId) ? unitWorkId : joint.UnitWorkId;
|
||||
pending.CoverWelderId = coverWelderId;
|
||||
pending.BackingWelderId = backingWelderId;
|
||||
pending.JointAttribute = !string.IsNullOrEmpty(jointAttribute) ? jointAttribute : joint.JointAttribute;
|
||||
pending.WeldingLocationId = !string.IsNullOrEmpty(weldingLocationId) ? weldingLocationId : joint.WeldingLocationId;
|
||||
pending.WeldingMode = !string.IsNullOrEmpty(weldingMode) ? weldingMode : joint.WeldingMode;
|
||||
pending.SubmitPersonId = submitPersonId;
|
||||
pending.SubmitDate = DateTime.Now;
|
||||
}
|
||||
|
||||
private static Model.HJGL_WeldingDaily GetOrCreateWeldingDailyByTempDetail(Model.HJGL_WeldingDailyTempDetail tempDetail)
|
||||
{
|
||||
var weldingDaily = Funs.DB.HJGL_WeldingDaily.FirstOrDefault(x => x.UnitWorkId == tempDetail.UnitWorkId
|
||||
&& x.WeldingDate >= tempDetail.WeldingDate.Date
|
||||
&& x.WeldingDate < tempDetail.WeldingDate.Date.AddDays(1));
|
||||
if (weldingDaily != null)
|
||||
{
|
||||
return weldingDaily;
|
||||
}
|
||||
|
||||
var submitPerson = Funs.DB.Person_Persons.FirstOrDefault(x => x.PersonId == tempDetail.SubmitPersonId);
|
||||
string personName = submitPerson != null ? submitPerson.PersonName : string.Empty;
|
||||
string perfix = string.Format("{0:yyyyMMdd}", tempDetail.WeldingDate) + "-" + personName + "-";
|
||||
weldingDaily = new Model.HJGL_WeldingDaily
|
||||
{
|
||||
WeldingDailyId = Guid.NewGuid().ToString(),
|
||||
WeldingDailyCode = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "dbo.HJGL_WeldingDaily", "WeldingDailyCode", tempDetail.ProjectId, perfix),
|
||||
WeldingDate = tempDetail.WeldingDate.Date,
|
||||
ProjectId = tempDetail.ProjectId,
|
||||
UnitWorkId = tempDetail.UnitWorkId,
|
||||
UnitId = tempDetail.UnitId,
|
||||
Tabler = tempDetail.SubmitPersonId,
|
||||
TableDate = tempDetail.WeldingDate.Date,
|
||||
Remark = "焊接日报待审核通过"
|
||||
};
|
||||
BLL.WeldingDailyService.AddWeldingDaily(weldingDaily);
|
||||
return weldingDaily;
|
||||
}
|
||||
|
||||
private static string NormalizeNullValue(string value)
|
||||
{
|
||||
return value == Const._Null ? null : value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 日报明细插入（更新焊口信息），组批等
|
||||
/// </summary>
|
||||
/// <param name="weldJointId">焊口ID</param>
|
||||
/// <param name="coverWelderId">盖面焊工ID</param>
|
||||
/// <param name="backingWelderId">打底焊工ID</param>
|
||||
/// <param name="jointAttribute">焊口属性</param>
|
||||
/// <param name="weldingDate">焊接日期</param>
|
||||
/// <param name="batchCondition">组批条件</param>
|
||||
/// <param name="isSave">是否保存</param>
|
||||
/// <param name="weldingDailyId">日报ID</param>
|
||||
/// <param name="projectId">项目ID</param>
|
||||
/// <param name="weldingLocationId">焊接位置ID</param>
|
||||
/// <returns>错误信息</returns>
|
||||
private static string InsertWeldingDailyItem(string weldJointId, string coverWelderId, string backingWelderId, string jointAttribute, DateTime? weldingDate, string batchCondition, bool isSave, string weldingDailyId, string projectId, string weldingLocationId)
|
||||
{
|
||||
string errlog = string.Empty;
|
||||
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
|
||||
if (newWeldJoint == null)
|
||||
{
|
||||
return "焊口不存在；";
|
||||
}
|
||||
|
||||
var pipeline = BLL.PipelineService.GetPipelineByPipelineId(newWeldJoint.PipelineId);
|
||||
var weldingDaily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(weldingDailyId);
|
||||
if (pipeline == null || weldingDaily == null)
|
||||
{
|
||||
return "焊口关联管线或日报不存在；";
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(coverWelderId) && !string.IsNullOrEmpty(backingWelderId))
|
||||
{
|
||||
if (isSave)
|
||||
{
|
||||
newWeldJoint.WeldingDailyId = weldingDailyId;
|
||||
newWeldJoint.WeldingDailyCode = weldingDaily.WeldingDailyCode;
|
||||
newWeldJoint.CoverWelderId = coverWelderId;
|
||||
newWeldJoint.BackingWelderId = backingWelderId;
|
||||
newWeldJoint.CoverWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(pipeline.ProjectId, coverWelderId).TeamGroupId;
|
||||
newWeldJoint.BackingWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(pipeline.ProjectId, backingWelderId).TeamGroupId;
|
||||
if (!string.IsNullOrEmpty(weldingLocationId))
|
||||
{
|
||||
newWeldJoint.WeldingLocationId = weldingLocationId;
|
||||
}
|
||||
newWeldJoint.JointAttribute = jointAttribute;
|
||||
BLL.WeldJointService.UpdateWeldJoint(newWeldJoint);
|
||||
|
||||
// 更新焊口号 修改固定焊口号后 +G
|
||||
BLL.WeldJointService.UpdateWeldJointAddG(newWeldJoint.WeldJointId, newWeldJoint.JointAttribute, Const.BtnAdd);
|
||||
errlog = PointBatchService.AddBatchByWeldJointId(weldJointId, weldingDate, batchCondition);//自动组批
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
errlog = "焊口" + "【" + newWeldJoint.WeldJointCode + "】" + "未选择焊工";
|
||||
}
|
||||
|
||||
return errlog;
|
||||
}
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// 日报明细删除
|
||||
/// </summary>
|
||||
|
||||
@@ -138,8 +138,8 @@
|
||||
<Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Spire.Pdf, Version=12.2.6.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Spire.PDF.12.2.6\lib\net40\Spire.Pdf.dll</HintPath>
|
||||
<Reference Include="Spire.Pdf, Version=12.5.8.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Spire.PDF.12.5.8\lib\net40\Spire.Pdf.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Buffers.4.6.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
|
||||
|
||||
@@ -52,10 +52,10 @@
|
||||
</Items>
|
||||
</f:Panel>--%>
|
||||
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" RegionSplit="true" EnableCollapse="true" ShowBorder="true"
|
||||
Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="焊接日报"
|
||||
Layout="VBox" BoxConfigAlign="Stretch" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="焊接日报"
|
||||
TitleToolTip="焊接日报" AutoScroll="true">
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接日报明细" EnableCollapse="true"
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="焊接日报" EnableCollapse="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="WeldJointId" AllowCellEditing="true" OnRowClick="Grid1_RowClick" EnableRowClickEvent="true"
|
||||
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="WeldJointId"
|
||||
AllowSorting="true" SortField="PipelineCode,WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort"
|
||||
@@ -195,6 +195,91 @@
|
||||
</f:DropDownList>
|
||||
</PageItems>
|
||||
</f:Grid>
|
||||
<f:Grid ID="GridPending" ShowBorder="true" ShowHeader="true" Title="待审核"
|
||||
runat="server" BoxFlex="1" DataKeyNames="TempDetailId" AllowCellEditing="false"
|
||||
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="TempDetailId"
|
||||
AllowSorting="true" SortField="PipelineCode,WeldJointCode" SortDirection="ASC" OnSort="GridPending_Sort"
|
||||
AllowPaging="true" IsDatabasePaging="true" PageSize="30" OnPageIndexChange="GridPending_PageIndexChange"
|
||||
EnableTextSelection="true" EnableCheckBoxSelect="true" KeepCurrentSelection="true">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="ToolbarPending" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
<f:DatePicker ID="txtPendingWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right"
|
||||
LabelWidth="90px" Width="220px" AutoPostBack="true" OnTextChanged="PendingFilter_TextChanged">
|
||||
</f:DatePicker>
|
||||
<f:TextBox ID="txtPendingPipelineCode" runat="server" Label="管线号" EmptyText="输入查询条件"
|
||||
LabelAlign="Right" AutoPostBack="true" OnTextChanged="PendingFilter_TextChanged">
|
||||
</f:TextBox>
|
||||
<f:TextBox ID="txtPendingWelderCode" runat="server" Label="焊工号" EmptyText="输入查询条件"
|
||||
LabelAlign="Right" AutoPostBack="true" OnTextChanged="PendingFilter_TextChanged">
|
||||
</f:TextBox>
|
||||
<f:ToolbarFill ID="ToolbarFillPending" runat="server">
|
||||
</f:ToolbarFill>
|
||||
<f:Button ID="btnPendingAudit" Text="审核通过" ToolTip="审核通过" Icon="ApplicationEdit" runat="server"
|
||||
ConfirmText="确认审核通过选中记录？" ConfirmTarget="Top" OnClick="btnPendingAudit_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnPendingDelete" Text="删除" ToolTip="删除未审核记录" Icon="Delete" runat="server"
|
||||
ConfirmText="确认删除选中待审核记录？" ConfirmTarget="Top" OnClick="btnPendingDelete_Click">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Columns>
|
||||
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center"/>
|
||||
<f:RenderField HeaderText="管线号" ColumnID="PipelineCode" DataField="PipelineCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Left" Width="180px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode" DataField="WeldJointCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Center" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊接日期" ColumnID="WeldingDate" DataField="WeldingDate" FieldType="Date"
|
||||
Renderer="Date" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode" DataField="CoverWelderCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Center" Width="90px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode" DataField="BackingWelderCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Center" Width="90px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" DataField="JointAttribute" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Center" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊接位置" ColumnID="WeldingLocationCode" DataField="WeldingLocationCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Center" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="达因" ColumnID="Size" DataField="Size" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Center" Width="80px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="外径" ColumnID="Dia" DataField="Dia" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Center" Width="80px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="壁厚" ColumnID="Thickness" DataField="Thickness" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Center" Width="80px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊接方法" ColumnID="WeldingMethodCode" DataField="WeldingMethodCode" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Center" Width="160px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="提交人" ColumnID="SubmitPersonName" DataField="SubmitPersonName" FieldType="String"
|
||||
HeaderTextAlign="Center" TextAlign="Center" Width="90px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="提交时间" ColumnID="SubmitDate" DataField="SubmitDate" FieldType="Date"
|
||||
Renderer="Date" HeaderTextAlign="Center" TextAlign="Center" Width="140px">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
<PageItems>
|
||||
<f:ToolbarSeparator ID="ToolbarSeparatorPending" runat="server">
|
||||
</f:ToolbarSeparator>
|
||||
<f:ToolbarText ID="ToolbarTextPending" runat="server" Text="每页记录数：">
|
||||
</f:ToolbarText>
|
||||
<f:DropDownList runat="server" ID="ddlPendingPageSize" Width="80px" AutoPostBack="true"
|
||||
OnSelectedIndexChanged="ddlPendingPageSize_SelectedIndexChanged">
|
||||
<f:ListItem Text="10" Value="10"/>
|
||||
<f:ListItem Text="30" Value="30"/>
|
||||
<f:ListItem Text="50" Value="50"/>
|
||||
<f:ListItem Text="100" Value="100"/>
|
||||
</f:DropDownList>
|
||||
</PageItems>
|
||||
</f:Grid>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
|
||||
@@ -245,4 +330,4 @@
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
||||
@@ -19,7 +19,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
|
||||
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
|
||||
this.ddlPendingPageSize.SelectedValue = this.GridPending.PageSize.ToString();
|
||||
this.txtPendingWeldingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
|
||||
this.InitTreeMenu();//加载树
|
||||
this.BindPendingGrid();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -146,12 +149,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
|
||||
{
|
||||
this.BindGrid();
|
||||
this.BindPendingGrid();
|
||||
var daily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(tvControlItem.SelectedNodeID);
|
||||
txtUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(daily.UnitId);
|
||||
if (daily != null)
|
||||
{
|
||||
txtUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(daily.UnitId);
|
||||
|
||||
txtTabler.Text = BLL.Person_PersonsService.GetPersonsNameById(daily.Tabler);
|
||||
txtTableDate.Text = string.Format("{0:yyyy-MM-dd}", daily.TableDate);
|
||||
txtWeldingDate.Text = string.Format("{0:yyyy-MM-dd}", daily.WeldingDate);
|
||||
txtTabler.Text = BLL.Person_PersonsService.GetPersonsNameById(daily.Tabler);
|
||||
txtTableDate.Text = string.Format("{0:yyyy-MM-dd}", daily.TableDate);
|
||||
txtWeldingDate.Text = string.Format("{0:yyyy-MM-dd}", daily.WeldingDate);
|
||||
}
|
||||
//Model.Parameter3D parameter3D = new Model.Parameter3D();
|
||||
//Model.ColorModel colorModel = new Model.ColorModel();
|
||||
//colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
||||
@@ -188,6 +195,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
if (this.tvControlItem.SelectedNode != null)
|
||||
{
|
||||
var daily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(tvControlItem.SelectedNodeID);
|
||||
if (daily == null)
|
||||
{
|
||||
Grid1.DataSource = null;
|
||||
Grid1.DataBind();
|
||||
return;
|
||||
}
|
||||
string strSql = @"SELECT WeldingDailyId,WeldJointId,PipelineCode,WeldJointCode,
|
||||
BackingWelderCode,CoverWelderCode,Material1Code,Material2Code,
|
||||
Dia,DNDia,Thickness,WeldTypeCode,WeldingMethodCode,WeldingWireCode,WeldingMode,
|
||||
@@ -229,6 +243,79 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 待审核数据绑定
|
||||
/// <summary>
|
||||
/// 绑定待审核焊接日报明细
|
||||
/// </summary>
|
||||
private void BindPendingGrid()
|
||||
{
|
||||
string strSql = @"SELECT temp.TempDetailId,
|
||||
temp.WeldJointId,
|
||||
temp.WeldingDate,
|
||||
jot.PipelineCode,
|
||||
jot.WeldJointCode,
|
||||
coverWelder.WelderCode AS CoverWelderCode,
|
||||
backingWelder.WelderCode AS BackingWelderCode,
|
||||
temp.JointAttribute,
|
||||
location.WeldingLocationCode,
|
||||
jot.Size,
|
||||
jot.Dia,
|
||||
jot.Thickness,
|
||||
jot.WeldingMethodCode,
|
||||
submitPerson.PersonName AS SubmitPersonName,
|
||||
temp.SubmitDate
|
||||
FROM dbo.HJGL_WeldingDailyTempDetail AS temp
|
||||
LEFT JOIN dbo.View_HJGL_WeldJoint AS jot ON jot.WeldJointId = temp.WeldJointId
|
||||
LEFT JOIN dbo.SitePerson_Person AS coverWelder ON coverWelder.PersonId = temp.CoverWelderId
|
||||
LEFT JOIN dbo.SitePerson_Person AS backingWelder ON backingWelder.PersonId = temp.BackingWelderId
|
||||
LEFT JOIN dbo.Base_WeldingLocation AS location ON location.WeldingLocationId = temp.WeldingLocationId
|
||||
LEFT JOIN dbo.Person_Persons AS submitPerson ON submitPerson.PersonId = temp.SubmitPersonId
|
||||
WHERE temp.ProjectId = @ProjectId AND temp.AuditState = 0";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
|
||||
|
||||
var unitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
|
||||
if (unitWork == null)
|
||||
{
|
||||
var daily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(tvControlItem.SelectedNodeID);
|
||||
if (daily != null)
|
||||
{
|
||||
unitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(daily.UnitWorkId);
|
||||
}
|
||||
}
|
||||
if (unitWork != null)
|
||||
{
|
||||
strSql += " AND temp.UnitWorkId = @UnitWorkId";
|
||||
listStr.Add(new SqlParameter("@UnitWorkId", unitWork.UnitWorkId));
|
||||
}
|
||||
if (!string.IsNullOrEmpty(txtPendingWeldingDate.Text.Trim()))
|
||||
{
|
||||
strSql += " AND temp.WeldingDate >= @WeldingDate AND temp.WeldingDate < @WeldingDateEnd";
|
||||
DateTime weldingDate = Convert.ToDateTime(txtPendingWeldingDate.Text.Trim()).Date;
|
||||
listStr.Add(new SqlParameter("@WeldingDate", weldingDate));
|
||||
listStr.Add(new SqlParameter("@WeldingDateEnd", weldingDate.AddDays(1)));
|
||||
}
|
||||
if (!string.IsNullOrEmpty(txtPendingPipelineCode.Text.Trim()))
|
||||
{
|
||||
strSql += " AND jot.PipelineCode LIKE @PendingPipelineCode";
|
||||
listStr.Add(new SqlParameter("@PendingPipelineCode", "%" + txtPendingPipelineCode.Text.Trim() + "%"));
|
||||
}
|
||||
if (!string.IsNullOrEmpty(txtPendingWelderCode.Text.Trim()))
|
||||
{
|
||||
strSql += " AND (coverWelder.WelderCode LIKE @PendingWelderCode OR backingWelder.WelderCode LIKE @PendingWelderCode)";
|
||||
listStr.Add(new SqlParameter("@PendingWelderCode", "%" + txtPendingWelderCode.Text.Trim() + "%"));
|
||||
}
|
||||
strSql += " ORDER BY jot.PipelineCode, jot.WeldJointCode";
|
||||
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, listStr.ToArray());
|
||||
GridPending.RecordCount = tb.Rows.Count;
|
||||
tb = GetFilteredTable(GridPending.FilteredData, tb);
|
||||
var table = this.GetPagedDataTable(GridPending, tb);
|
||||
GridPending.DataSource = table;
|
||||
GridPending.DataBind();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 分页排序
|
||||
#region 页索引改变事件
|
||||
/// <summary>
|
||||
@@ -252,6 +339,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
BindGrid();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 待审核排序
|
||||
/// </summary>
|
||||
protected void GridPending_Sort(object sender, GridSortEventArgs e)
|
||||
{
|
||||
BindPendingGrid();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 分页选择下拉改变事件
|
||||
@@ -265,6 +360,23 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
|
||||
BindGrid();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 待审核页索引改变事件
|
||||
/// </summary>
|
||||
protected void GridPending_PageIndexChange(object sender, GridPageEventArgs e)
|
||||
{
|
||||
BindPendingGrid();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 待审核分页选择下拉改变事件
|
||||
/// </summary>
|
||||
protected void ddlPendingPageSize_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
GridPending.PageSize = Convert.ToInt32(ddlPendingPageSize.SelectedValue);
|
||||
BindPendingGrid();
|
||||
}
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
@@ -509,6 +621,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
this.InitTreeMenu();
|
||||
this.BindGrid();
|
||||
this.BindPendingGrid();
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -522,6 +635,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
BindGrid();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 待审核筛选
|
||||
/// </summary>
|
||||
protected void PendingFilter_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
BindPendingGrid();
|
||||
}
|
||||
#endregion
|
||||
|
||||
protected void btnOut_Click(object sender, EventArgs e)
|
||||
@@ -584,5 +705,52 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 待审核记录审核通过
|
||||
/// </summary>
|
||||
protected void btnPendingAudit_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (GridPending.SelectedRowIDArray.Length == 0)
|
||||
{
|
||||
ShowNotify("请选择要审核的记录", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
string errlog = BLL.WeldingDailyService.AuditWeldingDailyTempDetails(GridPending.SelectedRowIDArray, this.CurrUser.PersonId);
|
||||
this.InitTreeMenu();
|
||||
this.BindPendingGrid();
|
||||
if (string.IsNullOrEmpty(errlog))
|
||||
{
|
||||
ShowNotify("审核通过！", MessageBoxIcon.Success);
|
||||
}
|
||||
else
|
||||
{
|
||||
Alert.ShowInTop("部分记录处理失败：" + errlog, MessageBoxIcon.Warning);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 删除未审核记录
|
||||
/// </summary>
|
||||
protected void btnPendingDelete_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (GridPending.SelectedRowIDArray.Length == 0)
|
||||
{
|
||||
ShowNotify("请选择要删除的记录", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
string errlog = BLL.WeldingDailyService.DeleteWeldingDailyTempDetails(GridPending.SelectedRowIDArray);
|
||||
this.BindPendingGrid();
|
||||
if (string.IsNullOrEmpty(errlog))
|
||||
{
|
||||
ShowNotify("删除成功！", MessageBoxIcon.Success);
|
||||
}
|
||||
else
|
||||
{
|
||||
Alert.ShowInTop(errlog, MessageBoxIcon.Warning);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+100
-1
@@ -92,7 +92,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel panelCenterRegion;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
@@ -245,6 +245,105 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPageSize;
|
||||
|
||||
/// <summary>
|
||||
/// GridPending 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid GridPending;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarPending 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar ToolbarPending;
|
||||
|
||||
/// <summary>
|
||||
/// txtPendingWeldingDate 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtPendingWeldingDate;
|
||||
|
||||
/// <summary>
|
||||
/// txtPendingPipelineCode 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtPendingPipelineCode;
|
||||
|
||||
/// <summary>
|
||||
/// txtPendingWelderCode 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtPendingWelderCode;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFillPending 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFillPending;
|
||||
|
||||
/// <summary>
|
||||
/// btnPendingAudit 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnPendingAudit;
|
||||
|
||||
/// <summary>
|
||||
/// btnPendingDelete 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnPendingDelete;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarSeparatorPending 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarSeparator ToolbarSeparatorPending;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarTextPending 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarText ToolbarTextPending;
|
||||
|
||||
/// <summary>
|
||||
/// ddlPendingPageSize 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPendingPageSize;
|
||||
|
||||
/// <summary>
|
||||
/// Window1 控件。
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldingLocationId.aspx.cs"
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldReportEdit.aspx.cs"
|
||||
Inherits="FineUIPro.Web.WeldingProcess.WeldingManage.WeldReportEdit" %>
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
@@ -466,23 +466,17 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
||||
ShowNotify("请选择单位名称！", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
if (BLL.WeldingDailyService.IsExistWeldingDailyCode(this.txtWeldingDailyCode.Text,
|
||||
!string.IsNullOrEmpty(this.WeldingDailyId) ? this.WeldingDailyId : "", CurrUser.LoginProjectId))
|
||||
{
|
||||
ShowNotify("日报编号已存在，请重新录入", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(this.txtWeldingDate.Text) ||
|
||||
string.IsNullOrEmpty(this.txtWeldingDailyCode.Text.Trim()))
|
||||
{
|
||||
ShowNotify("日报告号、焊接日期不能为空", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
// 创建新的焊接日报
|
||||
var newWeldingDaily = CreateNewWeldingDaily();
|
||||
// 获取焊接信息
|
||||
var weldJointView = GetWeldJointView();
|
||||
if (this.Grid1.SelectedRowIDArray == null || this.Grid1.SelectedRowIDArray.Length == 0)
|
||||
{
|
||||
ShowNotify("请选择要提交待审核的焊口！", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
string errlog = string.Empty;
|
||||
string eventArg = string.Empty;
|
||||
@@ -491,20 +485,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
||||
|
||||
if (eventArg == string.Empty) //焊工焊接的所有焊口资质都符合要求）
|
||||
{
|
||||
if (!string.IsNullOrEmpty(this.WeldingDailyId))
|
||||
{
|
||||
newWeldingDaily.WeldingDailyId = this.WeldingDailyId;
|
||||
BLL.WeldingDailyService.UpdateWeldingDaily(newWeldingDaily);
|
||||
//BLL.Sys_LogService.AddLog(BLL.Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldReportMenuId, Const.BtnModify, this.WeldingDailyId);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.WeldingDailyId = SQLHelper.GetNewID(typeof(Model.HJGL_WeldingDaily));
|
||||
newWeldingDaily.WeldingDailyId = this.WeldingDailyId;
|
||||
BLL.WeldingDailyService.AddWeldingDaily(newWeldingDaily);
|
||||
//BLL.Sys_LogService.AddLog(BLL.Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldReportMenuId, Const.BtnAdd, this.WeldingDailyId);
|
||||
}
|
||||
|
||||
DateTime weldingDate = Funs.GetNewDateTime(this.txtWeldingDate.Text) ?? DateTime.Now;
|
||||
int saveCount = 0;
|
||||
foreach (JObject mergedRow in Grid1.GetMergedData())
|
||||
{
|
||||
JObject values = mergedRow.Value<JObject>("values");
|
||||
@@ -514,119 +496,57 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
||||
if (this.Grid1.SelectedRowIDArray.Contains(rowId))
|
||||
{
|
||||
var t = BLL.WeldTaskService.GetWeldTaskById(rowId);
|
||||
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId);
|
||||
|
||||
|
||||
if (newWeldJoint != null)
|
||||
if (t == null)
|
||||
{
|
||||
newWeldJoint.JointAttribute = values.Value<string>("JointAttribute");
|
||||
newWeldJoint.WeldingLocationId = values.Value<string>("WeldingLocationId");
|
||||
var coverWelderCode = (from x in Funs.DB.SitePerson_Person
|
||||
where x.ProjectId == CurrUser.LoginProjectId &&
|
||||
x.WelderCode == values.Value<string>("CoverWelderCode")
|
||||
select x).FirstOrDefault();
|
||||
if (coverWelderCode != null)
|
||||
{
|
||||
t.CoverWelderId = coverWelderCode.PersonId;
|
||||
newWeldJoint.CoverWelderId = coverWelderCode.PersonId;
|
||||
newWeldJoint.CoverWelderTeamGroupId = coverWelderCode.TeamGroupId;
|
||||
}
|
||||
|
||||
var backingWelderCode = (from x in Funs.DB.SitePerson_Person
|
||||
where x.ProjectId == CurrUser.LoginProjectId &&
|
||||
x.WelderCode == values.Value<string>("BackingWelderCode")
|
||||
select x).FirstOrDefault();
|
||||
if (backingWelderCode != null)
|
||||
{
|
||||
t.BackingWelderId = backingWelderCode.PersonId;
|
||||
newWeldJoint.BackingWelderId = backingWelderCode.PersonId;
|
||||
newWeldJoint.BackingWelderTeamGroupId = backingWelderCode.TeamGroupId;
|
||||
}
|
||||
|
||||
WeldTaskService.UpdateWeldTask(t);
|
||||
WeldJointService.UpdateWeldJoint(newWeldJoint);
|
||||
//if (!string.IsNullOrEmpty(values.Value<string>("JointAttribute").ToString()))
|
||||
//{
|
||||
// newWeldJoint.JointAttribute = values.Value<string>("JointAttribute").ToString();
|
||||
//}
|
||||
//BLL.WeldJointService.UpdateWeldJoint(newWeldJoint);
|
||||
BLL.WeldJointService.UpdateWeldJointAddG(newWeldJoint.WeldJointId,
|
||||
newWeldJoint.JointAttribute, Const.BtnAdd);
|
||||
errlog += "焊接任务不存在；";
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 获取组批条件
|
||||
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", CurrUser.LoginProjectId);
|
||||
if (batchC != null)
|
||||
{
|
||||
string batchCondition = batchC.SetValue;
|
||||
// 新建日报
|
||||
if (weldJointView.Count() == 0)
|
||||
{
|
||||
foreach (string row in Grid1.SelectedRowIDArray)
|
||||
var weldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId);
|
||||
if (weldJoint == null)
|
||||
{
|
||||
var t = BLL.WeldTaskService.GetWeldTaskById(row);
|
||||
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId);
|
||||
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId,
|
||||
newWeldJoint.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
|
||||
errlog += "焊口不存在；";
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i = 0; i < Grid1.Rows.Count; i++)
|
||||
|
||||
string weldJointCode = values.Value<string>("WeldJointCode");
|
||||
var coverWelderCode = (from x in Funs.DB.SitePerson_Person
|
||||
where x.ProjectId == CurrUser.LoginProjectId &&
|
||||
x.WelderCode == values.Value<string>("CoverWelderCode")
|
||||
select x).FirstOrDefault();
|
||||
if (coverWelderCode == null)
|
||||
{
|
||||
if (Grid1.SelectedRowIDArray.Contains(Grid1.Rows[i].RowID))
|
||||
{
|
||||
var t = BLL.WeldTaskService.GetWeldTaskById(Grid1.Rows[i].RowID);
|
||||
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId);
|
||||
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId,
|
||||
newWeldJoint.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
var t = BLL.WeldTaskService.GetWeldTaskById(Grid1.Rows[i].RowID);
|
||||
errlog += BLL.WeldingDailyService
|
||||
.DeleteWeldingDailyItemByweldJointId(t.WeldJointId);
|
||||
}
|
||||
errlog += "焊口【" + weldJointCode + "】盖面焊工不存在；";
|
||||
continue;
|
||||
}
|
||||
var backingWelderCode = (from x in Funs.DB.SitePerson_Person
|
||||
where x.ProjectId == CurrUser.LoginProjectId &&
|
||||
x.WelderCode == values.Value<string>("BackingWelderCode")
|
||||
select x).FirstOrDefault();
|
||||
if (backingWelderCode == null)
|
||||
{
|
||||
errlog += "焊口【" + weldJointCode + "】打底焊工不存在；";
|
||||
continue;
|
||||
}
|
||||
|
||||
string itemErr = BLL.WeldingDailyService.SaveWeldingDailyTempDetailByWeb(
|
||||
t.WeldJointId,
|
||||
CurrUser.PersonId,
|
||||
weldingDate,
|
||||
coverWelderCode.PersonId,
|
||||
backingWelderCode.PersonId,
|
||||
values.Value<string>("JointAttribute"),
|
||||
values.Value<string>("WeldingLocationId"),
|
||||
CurrUser.LoginProjectId,
|
||||
this.drpUnit.SelectedValue,
|
||||
this.drpUnitWork.SelectedValue != BLL.Const._Null ? this.drpUnitWork.SelectedValue : this.UnitWorkId,
|
||||
weldJoint.WeldingMode);
|
||||
if (!string.IsNullOrEmpty(itemErr))
|
||||
{
|
||||
errlog += "焊口【" + weldJointCode + "】" + itemErr + "；";
|
||||
continue;
|
||||
}
|
||||
saveCount++;
|
||||
}
|
||||
// 日报已存在的情况 暂时
|
||||
//else
|
||||
//{
|
||||
// var weldJoints = from x in weldJointView select x.WeldJointId;
|
||||
// foreach (var item in GetWeldingDailyItem)
|
||||
// {
|
||||
// // 如日报明细存在则只更新焊口信息，如进批条件改变，则只有删除后再重新增加
|
||||
// if (weldJoints.Contains(item.WeldJointId))
|
||||
// {
|
||||
// var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(item.WeldJointId);
|
||||
// newWeldJoint.WeldingDailyId = this.WeldingDailyId;
|
||||
// newWeldJoint.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim();
|
||||
// newWeldJoint.CoverWelderId = item.CoverWelderId;
|
||||
// newWeldJoint.BackingWelderId = item.BackingWelderId;
|
||||
|
||||
// if (!string.IsNullOrEmpty(item.JointAttribute))
|
||||
// {
|
||||
// newWeldJoint.JointAttribute = item.JointAttribute;
|
||||
|
||||
// }
|
||||
// BLL.WeldJointService.UpdateWeldJoint(newWeldJoint);
|
||||
|
||||
// //更新焊口号 修改固定焊口号后 +G
|
||||
// BLL.WeldJointService.UpdateWeldJointAddG(newWeldJoint.WeldJointId, newWeldJoint.JointAttribute, Const.BtnAdd);
|
||||
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// errlog += InsertWeldingDailyItem(item, newWeldingDaily.WeldingDate, batchCondition, true);
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
}
|
||||
else
|
||||
{
|
||||
errlog += "请设置项目的组批条件";
|
||||
}
|
||||
|
||||
#region 焊工每天超过60达因的提示（暂不用）
|
||||
@@ -676,14 +596,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
||||
|
||||
#endregion
|
||||
|
||||
System.Threading.Tasks.Task.Run(() =>
|
||||
{
|
||||
ChanggeState();
|
||||
});
|
||||
|
||||
if (string.IsNullOrEmpty(errlog))
|
||||
{
|
||||
ShowNotify("保存成功！", MessageBoxIcon.Success);
|
||||
ShowNotify("已提交待审核！", MessageBoxIcon.Success);
|
||||
drpJointAttribute_SelectedIndexChanged(null, null);
|
||||
BindGrid(null);
|
||||
//PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
|
||||
@@ -691,7 +606,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
||||
else
|
||||
{
|
||||
// string okj = ActiveWindow.GetWriteBackValueReference(newWeldReportMain.WeldingDailyId) + ActiveWindow.GetHidePostBackReference();
|
||||
Alert.ShowInTop("保存成功！" + "焊接明细中" + errlog, "提交结果", MessageBoxIcon.Warning);
|
||||
Alert.ShowInTop("已提交待审核" + saveCount + "条；焊接明细中" + errlog, "提交结果", MessageBoxIcon.Warning);
|
||||
drpJointAttribute_SelectedIndexChanged(null, null);
|
||||
BindGrid(null);
|
||||
// ShowAlert("焊接明细中" + errlog, MessageBoxIcon.Warning);
|
||||
@@ -1228,4 +1143,4 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
|
||||
#endregion
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,51 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Tree>
|
||||
<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl="">
|
||||
<TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl="">
|
||||
<TreeNode id="8B550B58-C681-4F34-83F0-F1E99CE04A47" Text="国内标准" NavigateUrl="">
|
||||
</TreeNode>
|
||||
<TreeNode id="97D1E401-EA0F-4C90-B7DC-61D568BAE617" Text="国外标准" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""><TreeNode id="2C7F78D3-DA7B-4193-A37F-CC479E4B9583" Text="法律法规" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""><TreeNode id="406EBAAB-05B2-4249-BAC2-5589F50AE365" Text="企业标准" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="59F3FA81-7D08-4611-A3FF-22BFA656A940" Text="企业制度" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
|
||||
<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
|
||||
<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
|
||||
<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
|
||||
<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
|
||||
<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
|
||||
<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
|
||||
<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
|
||||
<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
|
||||
<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
|
||||
<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
|
||||
<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
|
||||
<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
|
||||
<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
|
||||
<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
|
||||
<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
|
||||
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
|
||||
<TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
|
||||
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl="">
|
||||
<TreeNode id="0E9C6A47-E410-43C4-95D1-1EC1C01E9967" Text="WBS数据仓库" NavigateUrl="DigData/WBSDW.aspx">
|
||||
</TreeNode>
|
||||
<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
|
||||
<TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
|
||||
<TreeNode id="24939ABD-E174-4C3D-8B04-494917B7BE40" Text="HSE隐患整改问题分析" NavigateUrl="DigData/RectifyProblemAnalysis.aspx"></TreeNode>
|
||||
<TreeNode id="4B2E7EE5-AC7C-4143-B5BC-60080C763A24" Text="HSE教育培训统计" NavigateUrl="DigData/TrainRecordAnalysis.aspx"></TreeNode>
|
||||
@@ -58,15 +16,12 @@
|
||||
<TreeNode id="A20E2443-A118-4C67-9084-FFEB685CA539" Text="清单子目使用率及价格走势图" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="6D1F3A3F-EFD1-420A-87E7-8CFAEF971165" Text="日工效统计" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="5BE7F83B-C02D-4481-815F-153279B44C39" Text="劳务数据库" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="AF5C32FD-F0CB-404E-B56D-C4AE79A8A050" Text="人员功效分析" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="0DB6BB5F-B17A-4A38-AABB-278300EA9E39" Text="员工产值分析" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="CFEF47C0-8EFA-46FF-8648-5B1922519DCC" Text="WBS数据分析" NavigateUrl="DigData/WBSAnalysis.aspx"></TreeNode>
|
||||
<TreeNode id="B146FC96-B199-426B-8504-4BE093C0DCB1" Text="项目数据汇总分析" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
|
||||
<TreeNode id="DD960B76-1F33-468B-9FEF-76328235C079" Text="项目质量数据汇总" NavigateUrl="DigData/CQMSDataCollect.aspx"></TreeNode>
|
||||
<TreeNode id="A705738B-D0A2-41D2-A01A-18774B5AED49" Text="项目施工数据汇总" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
</TreeNode>
|
||||
</Tree>
|
||||
@@ -10,17 +10,19 @@
|
||||
<TreeNode id="8IDKGJE2-09B1-4607-DCS2-DCC3O48F080F" Text="数据导入" NavigateUrl=""><TreeNode id="B13BFFA5-3112-4209-8562-5329B78B405C" Text="三维模型导入" NavigateUrl="HJGL/DataImport/TDMImport.aspx"></TreeNode>
|
||||
<TreeNode id="5CBE9258-6FE9-47A8-BFDD-3BDD90F7DECC" Text="图纸导入" NavigateUrl="HJGL/DataImport/DrawingImport.aspx"></TreeNode>
|
||||
<TreeNode id="32F5CC8C-E0F4-456C-AB88-77E36269FA50" Text="焊接设计基础数据导入" NavigateUrl="HJGL/WeldingManage/WeldJointList.aspx"></TreeNode>
|
||||
<TreeNode id="EFD1E914-E79C-4F5E-A2F7-CFF4F7821284" Text="管线导入" NavigateUrl="HJGL/DataImport/PipeLineInAuto.aspx"></TreeNode>
|
||||
<TreeNode id="34BAD63E-EF7C-4D7E-8641-C706BBFCD85F" Text="轴测图识别" NavigateUrl="HJGL/DataImport/DrawingRecognition.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="1EE36752-6077-47C9-AFF0-5372B862FF61" Text="管线划分" NavigateUrl="HJGL/PreDesign/PipelingDivide.aspx"></TreeNode>
|
||||
<TreeNode id="1C6F9CA9-FDAC-4CE5-A19C-5536538851E1" Text="试压包划分" NavigateUrl="HJGL/TestPackage/TestPackageEdit.aspx"></TreeNode>
|
||||
<TreeNode id="EF6B01AF-D038-4A38-BFAF-D89130D60DE6" Text="材料信息导入" NavigateUrl="HJGL/DataImport/MaterialInformation.aspx"></TreeNode>
|
||||
<TreeNode id="1E36EA73-D536-4215-BFB9-A8771937BD89" Text="工厂预制管理" NavigateUrl=""><TreeNode id="0A3F6AB0-535E-489C-9F64-4FFE61C17085" Text="材料管理" NavigateUrl="HJGL/PreDesign/MaterialManage.aspx"></TreeNode>
|
||||
<TreeNode id="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.aspx"></TreeNode>
|
||||
<TreeNode id="8255554C-0A92-4C7B-BF19-779AF0220A8C" Text="预制组件管理" NavigateUrl="HJGL/PreDesign/PrePipeline.aspx"></TreeNode>
|
||||
<TreeNode id="F18CFC0E-47E0-477A-9AB3-72B88D438299" Text="堆场规划" NavigateUrl="HJGL/PreDesign/YardPlanning.aspx"></TreeNode>
|
||||
<TreeNode id="EEC0D060-C15E-4D25-B015-C2B91F735DAC" Text="车次管理" NavigateUrl="HJGL/PreDesign/TrainNumberManager.aspx"></TreeNode>
|
||||
<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="发货管理" NavigateUrl="HJGL/PreDesign/PackagingManage.aspx"></TreeNode>
|
||||
<TreeNode id="BD9C587E-17C2-49F1-82AE-A05117E41D89" Text="安装清单" NavigateUrl="HJGL/PreDesign/InstallList.aspx"></TreeNode>
|
||||
<TreeNode id="EEC0D060-C15E-4D25-B015-C2B91F735DAC" Text="发货管理" NavigateUrl="HJGL/PreDesign/TrainNumberManager.aspx"></TreeNode>
|
||||
<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="包装管理" NavigateUrl="HJGL/PreDesign/PackagingManage.aspx"></TreeNode>
|
||||
<TreeNode id="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="9B828E92-733B-4AF9-9DD0-55ECD8B64AB8" Text="材料管理" NavigateUrl=""><TreeNode id="E29C1839-3530-45EC-A752-B26A0027E2CD" Text="入库管理" NavigateUrl=""><TreeNode id="324C72AF-447A-4308-AFB7-ABF788C58240" Text="入库申请" NavigateUrl="CLGL/InPlanMaster.aspx"></TreeNode>
|
||||
<TreeNode id="4A55351A-2440-4A2D-8509-3FFEE5FC8861" Text="入库单管理" NavigateUrl="CLGL/InputMaster.aspx"></TreeNode>
|
||||
@@ -29,7 +31,7 @@
|
||||
<TreeNode id="BCCA4D81-410C-4746-B1E4-F882BC3A25F4" Text="出库单管理" NavigateUrl="CLGL/OutputMaster.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="9579C717-769E-4CC0-9E54-EE03D87C15A5" Text="库存管理" NavigateUrl=""><TreeNode id="803F9828-52FA-4EF7-99C7-ADA99DADE9FB" Text="库存管理" NavigateUrl="CLGL/MaterialStock.aspx"></TreeNode>
|
||||
<TreeNode id="D15E534F-98F3-4B8A-8656-EAF165DE917F" Text="盘点" NavigateUrl="CLGL/InputMaster.aspx"></TreeNode>
|
||||
<TreeNode id="D15E534F-98F3-4B8A-8656-EAF165DE917F" Text="盘点" NavigateUrl="CLGL/MaterialStock.aspx"></TreeNode>
|
||||
<TreeNode id="C05EF3BE-AB13-4852-B2AA-1095BE4EEB2F" Text="到货分析" NavigateUrl="CLGL/ArrivalStatistics.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
</TreeNode>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Tree>
|
||||
<TreeNode id="E9D387EB-2797-43E3-AACE-93413839CCF7" Text="合同管理" NavigateUrl="">
|
||||
</TreeNode>
|
||||
<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl=""><TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx"></TreeNode>
|
||||
<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl="">
|
||||
<TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx">
|
||||
</TreeNode>
|
||||
<TreeNode id="C5560FF5-8181-4BA2-8326-D2B49E45660C" Text="合同协议书" NavigateUrl="PHTGL/ContractCompile/ContractAgreementEdit.aspx"></TreeNode>
|
||||
<TreeNode id="98573D16-3310-4292-96A5-A59B9A5E6B6B" Text="通用条款" NavigateUrl="PHTGL/ContractCompile/GeneralTermsConditions.aspx"></TreeNode>
|
||||
<TreeNode id="98367C43-9C85-467E-9144-288D80101E41" Text="专用条款" NavigateUrl="PHTGL/ContractCompile/SpecialTermsConditions.aspx"></TreeNode>
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Tree>
|
||||
<TreeNode id="BAC3D994-03A8-466C-8975-A31039998BCC" Text="施工进度统计" NavigateUrl="JDGL/Check/ProgressShow.aspx">
|
||||
<TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划编制" NavigateUrl="JDGL/Check/PlanSet.aspx">
|
||||
</TreeNode>
|
||||
<TreeNode id="1172B112-2A12-4410-AD66-E5BA6B461475" Text="施工进度赢得值曲线" NavigateUrl="JDGL/Check/ProgressStatistics.aspx"></TreeNode>
|
||||
<TreeNode id="B479EC55-E12A-4F91-AF3F-864DAAA136FB" Text="进度完成情况录入" NavigateUrl="JDGL/Check/CompleteInput.aspx"></TreeNode>
|
||||
<TreeNode id="4288426D-E49B-4E5D-A495-7E6A76F269B5" Text="周计划" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="F0E296C3-6499-43E5-88CD-E00C5180D3BC" Text="赢得值曲线" NavigateUrl="JDGL/Check/EarnedValueCurve.aspx"></TreeNode>
|
||||
<TreeNode id="C75F0853-8A2B-4B32-83B7-509278D11957" Text="项目里程碑节点" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="3550F422-E520-4962-9816-B691B0EE2865" Text="形象进度照片" NavigateUrl=""></TreeNode>
|
||||
</Tree>
|
||||
@@ -4,10 +4,10 @@
|
||||
<TreeNode id="2E57E92E-31BE-46B3-89AF-E08DAE8FC8E7" Text="实施计划编制" NavigateUrl="PHTGL/BiddingManagement/ActionPlanFormation.aspx">
|
||||
</TreeNode>
|
||||
<TreeNode id="303B6753-ED3C-438A-A860-F9C5E5489C8F" Text="实施计划审批" NavigateUrl="PHTGL/BiddingManagement/ActionPlanReview.aspx"></TreeNode>
|
||||
<TreeNode id="687991B6-73AC-42FA-9A72-178AF94D1EB4" Text="招标工程量清单定制" NavigateUrl="PHTGL/BillOfQuantities/BidProjectQuantityList.aspx"></TreeNode>
|
||||
<TreeNode id="0BB31BB1-469D-41E8-9039-A53A2B1EEB86" Text="招标文件审批" NavigateUrl="PHTGL/BiddingManagement/BidDocumentsReview.aspx"></TreeNode>
|
||||
<TreeNode id="133C55A1-3744-40F5-9C74-24E85AB1261F" Text="评标小组名单审批" NavigateUrl="PHTGL/BiddingManagement/ApproveUserReview.aspx"></TreeNode>
|
||||
<TreeNode id="11503AD6-742D-406D-96F1-17BA3B9E7580" Text="确定中标人审批" NavigateUrl="PHTGL/BiddingManagement/SetSubReview.aspx"></TreeNode>
|
||||
<TreeNode id="687991B6-73AC-42FA-9A72-178AF94D1EB4" Text="招标工程量清单定制" NavigateUrl="PHTGL/BillOfQuantities/BidProjectQuantityList.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="C041D799-47A0-4ECA-A6A2-C387857165D6" Text="合同管理" NavigateUrl=""><TreeNode id="C609FEA5-0904-4F59-A920-22B6459F1A94" Text="合同编制" NavigateUrl="PHTGL/ContractCompile/ContractFormation.aspx"></TreeNode>
|
||||
<TreeNode id="B32E7F62-5AA3-46B2-A438-E286909A47B4" Text="合同评审" NavigateUrl="PHTGL/ContractCompile/ContractReview_Countersign.aspx"></TreeNode>
|
||||
|
||||
@@ -58,9 +58,51 @@
|
||||
<TreeNode id="3BBFCD70-D7A3-435C-9571-DD499D5ED7B8" Text="应急信息" NavigateUrl=""><TreeNode id="D12C2412-E12A-4F78-9AEF-1EE8AC84A561" Text="应急预案管理清单" NavigateUrl="ZHGL/Emergency/EmergencyList.aspx"></TreeNode>
|
||||
<TreeNode id="172F25E0-F5E2-42E3-AD67-AC824D4E0FBB" Text="应急演练开展情况" NavigateUrl="ZHGL/Emergency/DrillRecordList.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl=""><TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
|
||||
<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
|
||||
<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
|
||||
<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
|
||||
<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
|
||||
<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
|
||||
<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
|
||||
<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
|
||||
<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
|
||||
<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
|
||||
<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
|
||||
<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
|
||||
<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
|
||||
<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
|
||||
<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
|
||||
<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
|
||||
<TreeNode id="C4B90ED3-0258-437A-BC0D-4AB43721EE08" Text="看板数据汇总" NavigateUrl="ZHGL/DataSync/DataStatistics.aspx"></TreeNode>
|
||||
<TreeNode id="A9E94BE9-6F53-4A41-9A65-250F09D9E449" Text="安全巡检统计分析" NavigateUrl="HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx?Types=1"></TreeNode>
|
||||
<TreeNode id="28848506-234F-4D21-8E79-A0F24F2B2DDA" Text="质量巡检统计分析" NavigateUrl="HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx?Types=2"></TreeNode>
|
||||
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
|
||||
<TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
|
||||
<TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>
|
||||
|
||||
@@ -731,6 +731,9 @@ namespace Model
|
||||
partial void InsertHJGL_WeldingDaily(HJGL_WeldingDaily instance);
|
||||
partial void UpdateHJGL_WeldingDaily(HJGL_WeldingDaily instance);
|
||||
partial void DeleteHJGL_WeldingDaily(HJGL_WeldingDaily instance);
|
||||
partial void InsertHJGL_WeldingDailyTempDetail(HJGL_WeldingDailyTempDetail instance);
|
||||
partial void UpdateHJGL_WeldingDailyTempDetail(HJGL_WeldingDailyTempDetail instance);
|
||||
partial void DeleteHJGL_WeldingDailyTempDetail(HJGL_WeldingDailyTempDetail instance);
|
||||
partial void InsertHJGL_WeldJoint(HJGL_WeldJoint instance);
|
||||
partial void UpdateHJGL_WeldJoint(HJGL_WeldJoint instance);
|
||||
partial void DeleteHJGL_WeldJoint(HJGL_WeldJoint instance);
|
||||
@@ -3840,6 +3843,14 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
public System.Data.Linq.Table<HJGL_WeldingDailyTempDetail> HJGL_WeldingDailyTempDetail
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.GetTable<HJGL_WeldingDailyTempDetail>();
|
||||
}
|
||||
}
|
||||
|
||||
public System.Data.Linq.Table<HJGL_WeldJoint> HJGL_WeldJoint
|
||||
{
|
||||
get
|
||||
@@ -108820,6 +108831,476 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_WeldingDailyTempDetail")]
|
||||
public partial class HJGL_WeldingDailyTempDetail : INotifyPropertyChanging, INotifyPropertyChanged
|
||||
{
|
||||
|
||||
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
|
||||
|
||||
private string _TempDetailId;
|
||||
|
||||
private string _ProjectId;
|
||||
|
||||
private string _UnitId;
|
||||
|
||||
private string _UnitWorkId;
|
||||
|
||||
private string _WeldJointId;
|
||||
|
||||
private System.DateTime _WeldingDate;
|
||||
|
||||
private string _CoverWelderId;
|
||||
|
||||
private string _BackingWelderId;
|
||||
|
||||
private string _JointAttribute;
|
||||
|
||||
private string _WeldingLocationId;
|
||||
|
||||
private string _WeldingMode;
|
||||
|
||||
private string _AttachUrl;
|
||||
|
||||
private string _SubmitPersonId;
|
||||
|
||||
private System.DateTime _SubmitDate;
|
||||
|
||||
private int _AuditState;
|
||||
|
||||
private string _AuditMan;
|
||||
|
||||
private System.Nullable<System.DateTime> _AuditDate;
|
||||
|
||||
private string _AuditRemark;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
partial void OnLoaded();
|
||||
partial void OnValidate(System.Data.Linq.ChangeAction action);
|
||||
partial void OnCreated();
|
||||
partial void OnTempDetailIdChanging(string value);
|
||||
partial void OnTempDetailIdChanged();
|
||||
partial void OnProjectIdChanging(string value);
|
||||
partial void OnProjectIdChanged();
|
||||
partial void OnUnitIdChanging(string value);
|
||||
partial void OnUnitIdChanged();
|
||||
partial void OnUnitWorkIdChanging(string value);
|
||||
partial void OnUnitWorkIdChanged();
|
||||
partial void OnWeldJointIdChanging(string value);
|
||||
partial void OnWeldJointIdChanged();
|
||||
partial void OnWeldingDateChanging(System.DateTime value);
|
||||
partial void OnWeldingDateChanged();
|
||||
partial void OnCoverWelderIdChanging(string value);
|
||||
partial void OnCoverWelderIdChanged();
|
||||
partial void OnBackingWelderIdChanging(string value);
|
||||
partial void OnBackingWelderIdChanged();
|
||||
partial void OnJointAttributeChanging(string value);
|
||||
partial void OnJointAttributeChanged();
|
||||
partial void OnWeldingLocationIdChanging(string value);
|
||||
partial void OnWeldingLocationIdChanged();
|
||||
partial void OnWeldingModeChanging(string value);
|
||||
partial void OnWeldingModeChanged();
|
||||
partial void OnAttachUrlChanging(string value);
|
||||
partial void OnAttachUrlChanged();
|
||||
partial void OnSubmitPersonIdChanging(string value);
|
||||
partial void OnSubmitPersonIdChanged();
|
||||
partial void OnSubmitDateChanging(System.DateTime value);
|
||||
partial void OnSubmitDateChanged();
|
||||
partial void OnAuditStateChanging(int value);
|
||||
partial void OnAuditStateChanged();
|
||||
partial void OnAuditManChanging(string value);
|
||||
partial void OnAuditManChanged();
|
||||
partial void OnAuditDateChanging(System.Nullable<System.DateTime> value);
|
||||
partial void OnAuditDateChanged();
|
||||
partial void OnAuditRemarkChanging(string value);
|
||||
partial void OnAuditRemarkChanged();
|
||||
#endregion
|
||||
|
||||
public HJGL_WeldingDailyTempDetail()
|
||||
{
|
||||
OnCreated();
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TempDetailId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
|
||||
public string TempDetailId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._TempDetailId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._TempDetailId != value))
|
||||
{
|
||||
this.OnTempDetailIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._TempDetailId = value;
|
||||
this.SendPropertyChanged("TempDetailId");
|
||||
this.OnTempDetailIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
|
||||
public string ProjectId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._ProjectId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._ProjectId != value))
|
||||
{
|
||||
this.OnProjectIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._ProjectId = value;
|
||||
this.SendPropertyChanged("ProjectId");
|
||||
this.OnProjectIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
|
||||
public string UnitId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._UnitId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._UnitId != value))
|
||||
{
|
||||
this.OnUnitIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._UnitId = value;
|
||||
this.SendPropertyChanged("UnitId");
|
||||
this.OnUnitIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(50)")]
|
||||
public string UnitWorkId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._UnitWorkId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._UnitWorkId != value))
|
||||
{
|
||||
this.OnUnitWorkIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._UnitWorkId = value;
|
||||
this.SendPropertyChanged("UnitWorkId");
|
||||
this.OnUnitWorkIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
|
||||
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="_WeldingDate", DbType="DateTime NOT NULL")]
|
||||
public System.DateTime WeldingDate
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._WeldingDate;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._WeldingDate != value))
|
||||
{
|
||||
this.OnWeldingDateChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._WeldingDate = value;
|
||||
this.SendPropertyChanged("WeldingDate");
|
||||
this.OnWeldingDateChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CoverWelderId", DbType="NVarChar(50)")]
|
||||
public string CoverWelderId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._CoverWelderId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._CoverWelderId != value))
|
||||
{
|
||||
this.OnCoverWelderIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._CoverWelderId = value;
|
||||
this.SendPropertyChanged("CoverWelderId");
|
||||
this.OnCoverWelderIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BackingWelderId", DbType="NVarChar(50)")]
|
||||
public string BackingWelderId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._BackingWelderId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._BackingWelderId != value))
|
||||
{
|
||||
this.OnBackingWelderIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._BackingWelderId = value;
|
||||
this.SendPropertyChanged("BackingWelderId");
|
||||
this.OnBackingWelderIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JointAttribute", DbType="NVarChar(50)")]
|
||||
public string JointAttribute
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._JointAttribute;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._JointAttribute != value))
|
||||
{
|
||||
this.OnJointAttributeChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._JointAttribute = value;
|
||||
this.SendPropertyChanged("JointAttribute");
|
||||
this.OnJointAttributeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingLocationId", DbType="NVarChar(50)")]
|
||||
public string WeldingLocationId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._WeldingLocationId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._WeldingLocationId != value))
|
||||
{
|
||||
this.OnWeldingLocationIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._WeldingLocationId = value;
|
||||
this.SendPropertyChanged("WeldingLocationId");
|
||||
this.OnWeldingLocationIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingMode", DbType="NVarChar(50)")]
|
||||
public string WeldingMode
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._WeldingMode;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._WeldingMode != value))
|
||||
{
|
||||
this.OnWeldingModeChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._WeldingMode = value;
|
||||
this.SendPropertyChanged("WeldingMode");
|
||||
this.OnWeldingModeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachUrl", DbType="NVarChar(500)")]
|
||||
public string AttachUrl
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._AttachUrl;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._AttachUrl != value))
|
||||
{
|
||||
this.OnAttachUrlChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._AttachUrl = value;
|
||||
this.SendPropertyChanged("AttachUrl");
|
||||
this.OnAttachUrlChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubmitPersonId", DbType="NVarChar(50)")]
|
||||
public string SubmitPersonId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._SubmitPersonId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._SubmitPersonId != value))
|
||||
{
|
||||
this.OnSubmitPersonIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._SubmitPersonId = value;
|
||||
this.SendPropertyChanged("SubmitPersonId");
|
||||
this.OnSubmitPersonIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubmitDate", DbType="DateTime NOT NULL")]
|
||||
public System.DateTime SubmitDate
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._SubmitDate;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._SubmitDate != value))
|
||||
{
|
||||
this.OnSubmitDateChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._SubmitDate = value;
|
||||
this.SendPropertyChanged("SubmitDate");
|
||||
this.OnSubmitDateChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditState", DbType="Int NOT NULL")]
|
||||
public int AuditState
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._AuditState;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._AuditState != value))
|
||||
{
|
||||
this.OnAuditStateChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._AuditState = value;
|
||||
this.SendPropertyChanged("AuditState");
|
||||
this.OnAuditStateChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan", DbType="NVarChar(50)")]
|
||||
public string AuditMan
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._AuditMan;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._AuditMan != value))
|
||||
{
|
||||
this.OnAuditManChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._AuditMan = value;
|
||||
this.SendPropertyChanged("AuditMan");
|
||||
this.OnAuditManChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditDate", DbType="DateTime")]
|
||||
public System.Nullable<System.DateTime> AuditDate
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._AuditDate;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._AuditDate != value))
|
||||
{
|
||||
this.OnAuditDateChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._AuditDate = value;
|
||||
this.SendPropertyChanged("AuditDate");
|
||||
this.OnAuditDateChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditRemark", DbType="NVarChar(500)")]
|
||||
public string AuditRemark
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._AuditRemark;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._AuditRemark != value))
|
||||
{
|
||||
this.OnAuditRemarkChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._AuditRemark = value;
|
||||
this.SendPropertyChanged("AuditRemark");
|
||||
this.OnAuditRemarkChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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_WeldJoint")]
|
||||
public partial class HJGL_WeldJoint : INotifyPropertyChanging, INotifyPropertyChanged
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user