lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
SGGL_SHJ/SGGL/BLL/API/HJGL/APIPreWeldingDailyService.cs

747 lines
38 KiB
C#
Raw Normal View History

代码无效引用清理，试压包资料界面看板修改
2025-10-10 14:33:21 +08:00
using System;
20220905代码初始化
2022-09-05 16:36:31 +08:00
using System.Collections.Generic;
using System.Data;
using System.Linq;
namespace BLL
{
/// <summary>
/// 焊接日报
/// </summary>
public static class APIPreWeldingDailyService
{
#region 根据获取详细信息
/// <summary>
/// 根据获取详细信息
/// </summary>
/// <param name="preWeldingDailyId"></param>
/// <returns></returns>
public static Model.HJGL_WeldingDaily getWeldingDailyInfo(string weldingDailyId, string unitWorkId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.HJGL_WeldingDaily weldingDaily = new Model.HJGL_WeldingDaily();
string unitWorkName = string.Empty, unitName = string.Empty, projectId = string.Empty;
var unitWork = db.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == unitWorkId);
if (unitWork != null)
{
projectId = unitWork.ProjectId;
unitWorkName = unitWork.UnitWorkName;
var unit = db.Base_Unit.FirstOrDefault(x => x.UnitId == unitWork.UnitId);
if (unit != null)
{
unitName = unit.UnitId + "," + unit.UnitName;
}
}
if (string.IsNullOrEmpty(weldingDailyId))
{
string perfix = string.Format("{0:yyyyMMdd}", System.DateTime.Now) + "-";
weldingDaily.WeldingDailyCode = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "dbo.HJGL_WeldingDaily", "WeldingDailyCode", projectId, perfix);
weldingDaily.UnitId = unitName;
weldingDaily.UnitWorkId = unitWorkName;
}
else
{
weldingDaily = db.HJGL_WeldingDaily.FirstOrDefault(x => x.WeldingDailyId == weldingDailyId);
weldingDaily.UnitId = unitName;
weldingDaily.UnitWorkId = unitWorkName;
}
Model.HJGL_WeldingDaily res = new Model.HJGL_WeldingDaily();
res.WeldingDailyId = weldingDaily.WeldingDailyId;
res.WeldingDailyCode = weldingDaily.WeldingDailyCode;
res.ProjectId = weldingDaily.ProjectId;
res.UnitWorkId = weldingDaily.UnitWorkId;
res.UnitId = weldingDaily.UnitId;
res.WeldingDate = weldingDaily.WeldingDate;
res.Tabler = weldingDaily.Tabler;
res.TableDate = weldingDaily.TableDate;
res.Remark = weldingDaily.Remark;
return res;
}
}
#endregion
#region 根据日期、单位工程Id获取日报记录
/// <summary>
/// 根据日期、单位工程Id获取日报记录
/// </summary>
/// <param name="unitWorkId">单位工程Id</param>
/// <param name="projectId">项目Id</param>
/// <returns></returns>
public static List<Model.BaseInfoItem> GetWeldingDailyList(string date, string unitWorkId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var dataList = from x in Funs.DB.HJGL_WeldingDaily
where x.UnitWorkId == unitWorkId
&& x.WeldingDate < Convert.ToDateTime(date + "-01").AddMonths(1)
&& x.WeldingDate >= Convert.ToDateTime(date + "-01")
orderby x.WeldingDailyCode descending
select x;
var getDataLists = (from x in dataList
orderby x.WeldingDailyCode
select new Model.BaseInfoItem
{
BaseInfoId = x.WeldingDailyId,
BaseInfoCode = x.WeldingDailyCode,
}).ToList();
return getDataLists;
}
}
#endregion
#region 获取焊接任务单信息
public static List<Model.View_HJGL_WeldingTask> GetWeldingTasks(string weldingDailyId, string unitWorkId, string date, string projectId)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
var list = from x in db.View_HJGL_WeldingTask where x.ProjectId == projectId select x;
List<string> ids = new List<string>();
//IQueryable<Model.View_HJGL_WeldingTask> q = db.View_HJGL_WeldingTask;
var task = new List<Model.View_HJGL_WeldingTask>();
if (!string.IsNullOrEmpty(weldingDailyId))
{
var weldJointIds = (from x in list
where (x.UnitWorkId == unitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(date)
&& x.WeldingDailyId == null && x.CoverWelderId != null && x.BackingWelderId != null) || x.WeldingDailyId == weldingDailyId
select x.WeldJointId).Distinct().ToList();
foreach (var weldJointId in weldJointIds)
{
task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId));
}
ids = (from x in Funs.DB.View_HJGL_WeldingTask
where x.WeldingDailyId == weldingDailyId
select x.WeldTaskId).ToList();
}
else
{
var weldJointIds = (from x in list
where x.UnitWorkId == unitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(date)
&& x.WeldingDailyId == null && x.CoverWelderId != null && x.BackingWelderId != null
select x.WeldJointId).Distinct().ToList();
foreach (var weldJointId in weldJointIds)
{
task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId && x.CoverWelderId != null));
}
}
//var qres = from x in q
// where x.ApproveDate != null
// orderby x.ADate ascending
// select new
// {
// x.ApproveId,
// x.ApproveDate,
// x.Opinion,
// x.ApproveMan,
// x.ApproveType,
// x.ItemEndCheckListId,
// x.ApproveManName,
// x.StateStr,
// };
//var list = qres.ToList();
List<Model.View_HJGL_WeldingTask> res = new List<Model.View_HJGL_WeldingTask>();
task = task.OrderBy(x => x.PipelineCode).OrderBy(x => x.WeldJointCode).ToList();
foreach (var item in task)
{
Model.View_HJGL_WeldingTask x = new Model.View_HJGL_WeldingTask();
x.WeldTaskId = item.WeldTaskId;
x.WeldJointId = item.WeldJointId;
x.CoverWelderId = item.CoverWelderId;
x.BackingWelderId = item.BackingWelderId;
x.CoverWelderCode = item.CoverWelderCode;
x.BackingWelderCode = item.BackingWelderCode;
x.JointAttribute = item.JointAttribute;
x.WeldingMode = item.WeldingMode;
x.ProjectId = item.ProjectId;
x.UnitWorkId = item.UnitWorkId;
x.UnitId = item.UnitId;
x.TaskDate = item.TaskDate;
x.Tabler = item.Tabler;
x.TableDate = item.TableDate;
x.WeldJointCode = item.WeldJointCode;
x.Dia = item.Dia;
x.Thickness = item.Thickness;
x.Size = item.Size;
x.WeldingLocationId = item.WeldingLocationId;
if (ids.Contains(item.WeldTaskId))
{
x.CanWelderId = "1";
}
else
{
x.CanWelderId = "0";
}
x.IsWelding = item.IsWelding;
x.PipelineCode = item.PipelineCode;
x.WeldTypeCode = item.WeldTypeCode;
x.WeldingMethodCode = item.WeldingMethodCode;
x.WeldingLocationCode = item.WeldingLocationCode;
x.CanWelderCode = item.CanWelderCode;
x.WeldingRodCode = item.WeldingRodCode;
x.CanWeldingRodName = item.CanWeldingRodName;
x.CanWeldingWireName = item.CanWeldingWireName;
x.WeldingWireCode = item.WeldingWireCode;
x.WeldingDailyId = item.WeldingDailyId;
res.Add(x);
}
return res;
}
}
#endregion
#region 获取焊接日报列表信息
/// <summary>
/// 获取施工方案列表信息
/// </summary>
/// <param name="projectId"></param>
/// <returns></returns>
public static List<Model.HJGL_PreWeldingDailyItem> getPreWeldingDailyList(string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getList = from x in db.HJGL_PreWeldingDaily
where x.ProjectId == projectId
orderby x.WeldingDate descending
select new Model.HJGL_PreWeldingDailyItem
{
PreWeldingDailyId = x.PreWeldingDailyId,
ProjectId = x.ProjectId,
UnitWorkId = x.UnitWorkId,
UnitWorkName = db.WBS_UnitWork.First(y => y.UnitWorkId == x.UnitWorkId).UnitWorkName,
UnitId = x.UnitId,
UnitName = db.Base_Unit.First(u => u.UnitId == x.UnitId).UnitName,
};
return getList.ToList();
}
}
#endregion
#region 保存焊接日报
/// <summary>
/// 保存焊接日报
/// </summary>
/// <param name="newItem">焊接日报</param>
/// <returns></returns>
public static void SaveWeldingDaily(Model.HJGL_WeldingDaily newItem)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.HJGL_WeldingDaily newP = new Model.HJGL_WeldingDaily
{
WeldingDailyId = newItem.WeldingDailyId,
WeldingDailyCode = newItem.WeldingDailyCode,
ProjectId = newItem.ProjectId,
UnitWorkId = newItem.UnitWorkId,
UnitId = newItem.UnitId,
代码无效引用清理，试压包资料界面看板修改
2025-10-10 14:33:21 +08:00
WeldingDate = newItem.WeldingDate,
20220905代码初始化
2022-09-05 16:36:31 +08:00
Tabler = newItem.Tabler,
TableDate = newItem.TableDate,
Remark = newItem.Remark,
};
var updateItem = db.HJGL_WeldingDaily.FirstOrDefault(x => x.WeldingDailyId == newItem.WeldingDailyId);
if (updateItem == null)
{
db.HJGL_WeldingDaily.InsertOnSubmit(newP);
db.SubmitChanges();
}
else
{
db.SubmitChanges();
}
}
}
#endregion
代码无效引用清理，试压包资料界面看板修改
2025-10-10 14:33:21 +08:00
public static string SaveWeldingDailyByWeldJointId(string WeldJointId, string Personid, string time)
1
2024-09-27 18:17:21 +08:00
{
string res = "";
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
代码无效引用清理，试压包资料界面看板修改
2025-10-10 14:33:21 +08:00
{
try
1
2024-09-27 18:17:21 +08:00
{
代码无效引用清理，试压包资料界面看板修改
2025-10-10 14:33:21 +08:00
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);//更改安装口时间和状态
焊接扫码填报日报关联修改状态
2024-12-12 14:51:30 +08:00
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", joint.ProjectId);
代码无效引用清理，试压包资料界面看板修改
2025-10-10 14:33:21 +08:00
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);
1
2026-03-11 11:45:23 +08:00
}
catch (Exception ex)
{
APICommonService.SaveSysAPILog("erro", ex.ToString(), "-1");
}
}
return res;
}
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);
扫码填报日报修改
2024-12-02 17:51:43 +08:00
}
catch (Exception ex)
{
代码无效引用清理，试压包资料界面看板修改
2025-10-10 14:33:21 +08:00
APICommonService.SaveSysAPILog("erro", ex.ToString(), "-1");
扫码填报日报修改
2024-12-02 17:51:43 +08:00
}
1
2024-09-27 18:17:21 +08:00
}
return res;
}
feat: SaveWeldingDailyByWeldJointId 支持打底和盖面焊工分别指定 新增 welderType 参数（0 全部/1 打底/2 盖面）， welderType 为 1 或 2 时仅填充对应焊工字段， WeldingDate 保存和自动组批仅在打底与盖面都填充后执行。
2026-04-10 14:06:33 +08:00
/// <summary>
/// 保存焊接日报（支持打底和盖面焊工分别指定）
/// </summary>
/// <param name="WeldJointId">焊口ID</param>
/// <param name="Personid">焊工人员ID</param>
/// <param name="time">日期</param>
/// <param name="weldingLocation">焊接位置ID</param>
/// <param name="welderType">焊工类型 0 全部 1 打底 2 盖面</param>
/// <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;
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, 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;
}
20220905代码初始化
2022-09-05 16:36:31 +08:00
#region 保存焊接日报明细
/// <summary>
/// 保存焊接日报明细
/// </summary>
/// <param name="newItem">焊接日报</param>
/// <returns></returns>
public static void SaveWeldingDailyDetail(string weldingDailyId, string selectIds, string notSelectIds, string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
string[] ids = selectIds.Split(',');
string[] notIds = notSelectIds.Split(',');
var weldJointView = (from x in db.View_HJGL_WeldJoint where x.WeldingDailyId == weldingDailyId orderby x.PipelineCode, x.WeldJointCode select x).ToList();
var daily = db.HJGL_WeldingDaily.FirstOrDefault(x => x.WeldingDailyId == weldingDailyId);
// 获取组批条件
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", projectId);
if (batchC != null)
{
string batchCondition = batchC.SetValue;
// 新建日报
if (weldJointView.Count() == 0)
{
foreach (string id in ids)
{
var t = BLL.WeldTaskService.GetWeldTaskById(id);
if (t != null)
{
InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, daily.WeldingDate, batchCondition, true, weldingDailyId, projectId);
}
}
}
else
{
foreach (string id in ids)
{
var t = BLL.WeldTaskService.GetWeldTaskById(id);
if (t != null)
{
InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, daily.WeldingDate, batchCondition, true, weldingDailyId, projectId);
}
}
foreach (string notId in notIds)
{
var t = BLL.WeldTaskService.GetWeldTaskById(notId);
if (t != null)
{
DeleteWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, daily.WeldingDate, batchCondition, true);
}
}
}
// 日报已存在的情况 暂时
//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);
// }
// }
//}
}
//更新焊口属性
foreach (var id in ids)
{
var t = BLL.WeldTaskService.GetWeldTaskById(id);
if (t != null)
{
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId);
if (newWeldJoint != null)
{
BLL.WeldJointService.UpdateWeldJointAddG(newWeldJoint.WeldJointId, newWeldJoint.JointAttribute, Const.BtnAdd);
}
}
}
}
}
#endregion
#region 保存Solution_ConstructSolution
/// <summary>
/// 保存Solution_ConstructSolution
/// </summary>
/// <param name="newItem">施工方案</param>
/// <returns></returns>
public static void SavePreWeldingDaily(Model.HJGL_PreWeldingDailyItem newItem)
{
Model.SGGLDB db = Funs.DB;
Model.HJGL_PreWeldingDaily newP = new Model.HJGL_PreWeldingDaily
{
PreWeldingDailyId = newItem.PreWeldingDailyId,
ProjectId = newItem.ProjectId,
UnitWorkId = newItem.UnitWorkId,
UnitId = newItem.UnitId,
};
var updateItem = db.HJGL_PreWeldingDaily.FirstOrDefault(x => x.PreWeldingDailyId == newItem.PreWeldingDailyId);
if (updateItem == null)
{
newP.PreWeldingDailyId = SQLHelper.GetNewID();
db.HJGL_PreWeldingDaily.InsertOnSubmit(newP);
db.SubmitChanges();
}
else
{
/// 更新
/// //
}
//if (newItem.BaseInfoItem != null && newItem.BaseInfoItem.Count() > 0)
//{
// foreach (var item in newItem.BaseInfoItem)
// {
// // var a =item.BaseInfoId,
// }
//}
}
#endregion
#region 日报明细插入（更新焊口信息），组批等
/// <summary>
/// 日报明细插入（更新焊口信息），组批等
/// </summary>
/// <param name="item"></param>
/// <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)
{
代码无效引用清理，试压包资料界面看板修改
2025-10-10 14:33:21 +08:00
string errlog = string.Empty;
20220905代码初始化
2022-09-05 16:36:31 +08:00
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
代码无效引用清理，试压包资料界面看板修改
2025-10-10 14:33:21 +08:00
var pipeline = BLL.PipelineService.GetPipelineByPipelineId(newWeldJoint.PipelineId);
20220905代码初始化
2022-09-05 16:36:31 +08:00
var weldingDaily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(weldingDailyId);
焊接修改
2024-12-10 15:18:31 +08:00
if (newWeldJoint != null /*&& string.IsNullOrEmpty(newWeldJoint.WeldingDailyId)*/)
20220905代码初始化
2022-09-05 16:36:31 +08:00
{
if (!string.IsNullOrEmpty(coverWelderId) && !string.IsNullOrEmpty(backingWelderId))
{
if (isSave)
{
newWeldJoint.WeldingDailyId = weldingDailyId;
newWeldJoint.WeldingDailyCode = weldingDaily.WeldingDailyCode;
newWeldJoint.CoverWelderId = coverWelderId;
newWeldJoint.BackingWelderId = backingWelderId;
焊接修改
2024-12-10 15:18:31 +08:00
newWeldJoint.CoverWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(pipeline.ProjectId, coverWelderId).TeamGroupId;
newWeldJoint.BackingWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(pipeline.ProjectId, backingWelderId).TeamGroupId;
20220905代码初始化
2022-09-05 16:36:31 +08:00
//if (item.WeldingLocationId != Const._Null)
//{
// newWeldJoint.WeldingLocationId = item.WeldingLocationId;
//}
newWeldJoint.JointAttribute = jointAttribute;
BLL.WeldJointService.UpdateWeldJoint(newWeldJoint);
// 更新焊口号 修改固定焊口号后 +G
BLL.WeldJointService.UpdateWeldJointAddG(newWeldJoint.WeldJointId, newWeldJoint.JointAttribute, Const.BtnAdd);
// 进批
//BLL.Batch_PointBatchItemService.InsertPointBatch(this.ProjectId, this.drpUnit.SelectedValue, this.drpUnitWork.SelectedValue, item.CoverWelderId, item.WeldJointId, weldingDate);
焊接修改
2024-12-10 15:18:31 +08:00
if (isSave)
20220905代码初始化
2022-09-05 16:36:31 +08:00
{
焊接修改
2024-12-10 15:18:31 +08:00
errlog = PointBatchService.AddBatchByWeldJointId(weldJointId, weldingDate, batchCondition);//自动组批
20220905代码初始化
2022-09-05 16:36:31 +08:00
}
}
}
else
{
errlog = "焊口" + "【" + newWeldJoint.WeldJointCode + "】" + "未选择焊工";
}
}
return errlog;
}
#endregion
#region 日报明细删除（更新焊口信息），组批等
/// <summary>
/// 日报明细删除（更新焊口信息），组批等
/// </summary>
/// <param name="item"></param>
/// <param name="weldingDailyId"></param>
/// <returns></returns>
private static string DeleteWeldingDailyItem(string weldJointId, string coverWelderId, string backingWelderId, string jointAttribute, DateTime? weldingDate, string batchCondition, bool isSave)
{
string errlog = string.Empty;
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
var pipeline = BLL.PipelineService.GetPipelineByPipelineId(newWeldJoint.PipelineId);
var unit = BLL.UnitService.GetUnitByUnitId(pipeline.UnitId);
var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(newWeldJoint.DetectionTypeId);
var ndtr = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(pipeline.DetectionRateId);
if (newWeldJoint != null && !string.IsNullOrEmpty(newWeldJoint.WeldingDailyId))
{
var isTrust = from x in Funs.DB.HJGL_Batch_BatchTrustItem
where x.WeldJointId == weldJointId
select x; ;
if (isTrust.Count() == 0)
{
var updateWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
if (updateWeldJoint != null)
{
updateWeldJoint.WeldingDailyId = null;
updateWeldJoint.WeldingDailyCode = null;
updateWeldJoint.CoverWelderId = null;
updateWeldJoint.BackingWelderId = null;
BLL.WeldJointService.UpdateWeldJoint(updateWeldJoint);
var pointBatchItems = from x in Funs.DB.HJGL_Batch_PointBatchItem where x.WeldJointId == weldJointId select x;
string pointBatchId = pointBatchItems.FirstOrDefault().PointBatchId;
// 删除焊口所在批明细信息
BLL.PointBatchDetailService.DeleteBatchDetail(weldJointId);
// 删除批信息
var batch = from x in Funs.DB.HJGL_Batch_PointBatchItem where x.PointBatchId == pointBatchId select x;
if (pointBatchId != null && batch.Count() == 0)
{
BLL.PointBatchService.DeleteBatch(pointBatchId);
}
//BLL.Batch_NDEItemService.DeleteAllNDEInfoToWeldJoint(item.WeldJointId);
}
//BLL.Sys_LogService.AddLog(BLL.Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldReportMenuId, Const.BtnDelete, weldingDailyId);
}
else
{
errlog += "焊口【" + newWeldJoint.WeldJointCode + "】已进委托单了，不能删除。";
}
}
return errlog;
}
#endregion
}
}