diff --git a/DataBase/版本日志/SGGLDB_V2026-08-11-gf.sql b/DataBase/版本日志/SGGLDB_V2026-08-11-gf.sql
new file mode 100644
index 00000000..d8352e78
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2026-08-11-gf.sql
@@ -0,0 +1,3 @@
+alter table HJGL_Batch_PointBatchItem add NDT nvarchar(300) null
+alter table HJGL_Batch_BatchTrust alter column TrustBatchCode nvarchar(100) null
+GO
\ No newline at end of file
diff --git a/SGGL/BLL/API/HJGL/APINDETrustService.cs b/SGGL/BLL/API/HJGL/APINDETrustService.cs
index bb616813..ffd257c4 100644
--- a/SGGL/BLL/API/HJGL/APINDETrustService.cs
+++ b/SGGL/BLL/API/HJGL/APINDETrustService.cs
@@ -434,7 +434,7 @@ namespace BLL
Model.HJGL_Batch_BatchTrust newBatchTrust = new Model.HJGL_Batch_BatchTrust
{
TrustBatchId = trustBatchId,
- TrustBatchCode = BLL.Batch_BatchTrustService.BuildTrustBatchCode(batch.PointBatchCode, DateTime.Now),
+ TrustBatchCode = BLL.Batch_BatchTrustService.BuildTrustBatchCode(batch.PointBatchCode, DateTime.Now,string.Empty,string.Empty),
TrustDate = DateTime.Now,
ProjectId = batch.ProjectId,
PointBatchId = pointBatchId,
diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_DetectionTypeService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_DetectionTypeService.cs
index d0901aad..b91cd0e6 100644
--- a/SGGL/BLL/HJGL/BaseInfo/Base_DetectionTypeService.cs
+++ b/SGGL/BLL/HJGL/BaseInfo/Base_DetectionTypeService.cs
@@ -100,6 +100,20 @@
return list;
}
+ ///
+ /// 按类型获取探伤类型项
+ ///
+ ///
+ ///
+ public static List GetDetectionTypeListByDetectionTypeType2(string[] strs)
+ {
+ var list = (from x in Funs.DB.Base_DetectionType
+ where strs.Contains(x.DetectionTypeCode) && !x.DetectionTypeCode.Contains("/")
+ orderby x.DetectionTypeCode
+ select x).ToList();
+ return list;
+ }
+
#region 探伤类型下拉项
///
/// 探伤类型下拉项
diff --git a/SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustService.cs b/SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustService.cs
index 877c9ebd..ce7b5c87 100644
--- a/SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustService.cs
+++ b/SGGL/BLL/HJGL/PointTrust/Batch_BatchTrustService.cs
@@ -10,9 +10,9 @@ namespace BLL
///
/// 根据点口批编号生成委托单号，在流水号前追加日期段。
///
- public static string BuildTrustBatchCode(string pointBatchCode, System.DateTime trustDate)
+ public static string BuildTrustBatchCode(string pointBatchCode, System.DateTime trustDate, string typeStr1, string typeStr2)
{
- string trustBatchCode = (pointBatchCode ?? string.Empty).Replace("-DK-", "-WT-");
+ string trustBatchCode = (pointBatchCode ?? string.Empty).Replace("-DK-", "-WT-").Replace(typeStr1, typeStr2);
return InsertDateBeforeSerial(trustBatchCode, trustDate);
}
diff --git a/SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs b/SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs
index d878af84..e7ada938 100644
--- a/SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs
+++ b/SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs
@@ -64,6 +64,7 @@ namespace BLL
newBatchDetail.IsBuildTrust = batchDetail.IsBuildTrust;
newBatchDetail.IsWelderFirst = batchDetail.IsWelderFirst;
newBatchDetail.IsPipelineFirst = batchDetail.IsPipelineFirst;
+ newBatchDetail.NDT = batchDetail.NDT;
newBatchDetail.Remark = batchDetail.Remark;
Funs.DB.SubmitChanges();
diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx
index 3aceb227..4826330b 100644
--- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx
@@ -32,8 +32,8 @@
-
+ LabelAlign="Right" Width="300px" LabelWidth="90px" AutoPostBack="true" OnSelectedIndexChanged="Tree_TextChanged">
+
@@ -82,13 +82,13 @@
--%>
-
+ TitleToolTip="点口管理" AutoScroll="true">
-
+
@@ -108,8 +108,8 @@
-
+
@@ -120,7 +120,7 @@
-
+
@@ -166,7 +166,7 @@
@@ -195,6 +195,14 @@
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
index 6347b3c2..8590ae18 100644
--- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
@@ -1026,63 +1026,144 @@ namespace FineUIPro.Web.HJGL.PointTrust
}
#endregion
- #region 生成
- ///
- /// 生成
- ///
- ///
- ///
- protected void btnGenerate_Click(object sender, EventArgs e)
- {
- //if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_PointBatchMenuId, Const.BtnGenerate))
- //{
-
- // var getViewGenerateTrustLists = (from x in Funs.DB.View_GenerateTrust where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
- // if (getViewGenerateTrustLists.Count() > 0)
- // {
- // var getUnit = BLL.Base_UnitService.GetUnit(this.CurrUser.UnitId);
- // if (getUnit == null || getUnit.UnitTypeId == "1" || getUnit.UnitTypeId == "2" || getUnit.UnitTypeId == "3")
- // {
- // GenerateTrust(getViewGenerateTrustLists);
- // }
- // else
- // {
- // var getUnitViewGenerateTrustLists = getViewGenerateTrustLists.Where(x => x.UnitId == this.CurrUser.UnitId);
- // if (getUnitViewGenerateTrustLists.Count() > 0)
- // {
- // // 当前单位未委托批
- // GenerateTrust(getUnitViewGenerateTrustLists.ToList());
- // }
- // else
- // {
- // Alert.ShowInTop("所属单位点口已全部生成委托单！", MessageBoxIcon.Warning);
- // }
- // }
- // BLL.Sys_LogService.AddLog(BLL.Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_PointBatchMenuId, Const.BtnGenerate, null);
- // this.InitTreeMenu();//加载树
- // this.BindGrid();
- // }
- // else
- // {
- // Alert.ShowInTop("已全部生成委托单！", MessageBoxIcon.Warning);
- // }
- //}
- //else
- //{
- // ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
- // return;
- //}
- }
-
+ #region 生成委托单
///
/// 生成委托单
///
- ///
- //private void GenerateTrust(List GenerateTrustLists)
- //{
+ ///
+ ///
+ protected void btnGeneratingOrder_Click(object sender, EventArgs e)
+ {
+ if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_PointBatchMenuId, Const.BtnPointAudit))
+ {
+ string batchId = this.tvControlItem.SelectedNodeID;
+ if (!string.IsNullOrEmpty(batchId))
+ {
+ var batch = BLL.PointBatchService.GetPointBatchById(batchId);
+ var detail = BLL.PointBatchDetailService.GetBatchDetailByBatchId(batchId);
+ foreach (var d in detail)
+ {
+ for (int i = 0; i < this.Grid1.Rows.Count; i++)
+ {
+ System.Web.UI.WebControls.CheckBoxList cblNDT = (System.Web.UI.WebControls.CheckBoxList)(this.Grid1.Rows[i].FindControl("cblNDT"));
+ System.Web.UI.WebControls.HiddenField hdBatchDetailId = (System.Web.UI.WebControls.HiddenField)(this.Grid1.Rows[i].FindControl("hdBatchDetailId"));
+ if (d.PointBatchItemId == hdBatchDetailId.Value)
+ {
+ string ndtId = string.Empty;
+ foreach (System.Web.UI.WebControls.ListItem item in cblNDT.Items)
+ {
+ if (item.Selected)
+ {
+ ndtId += item.Value + ",";
+ }
+ }
+ if (!string.IsNullOrEmpty(ndtId))
+ {
+ ndtId = ndtId.Substring(0, ndtId.LastIndexOf(","));
+ d.NDT = ndtId;
+ BLL.PointBatchDetailService.UpdatePointBatchDetail(d);
+ }
+ }
+ }
+ }
+ if (batch.EndDate.HasValue && detail.Where(d => d.NDT != null).Count() > 0)
+ {
+ var detectionTypes = from x in Funs.DB.Base_DetectionType select x;
+ var type1 = detectionTypes.FirstOrDefault(x => x.DetectionTypeId == batch.DetectionTypeId);
+ string typeStr1 = string.Empty;
+ if (type1 != null)
+ {
+ typeStr1 = type1.DetectionTypeCode;
+ }
+ var trust = from x in Funs.DB.HJGL_Batch_BatchTrust where x.PointBatchId == batchId select x;
+ if (trust.Count() == 0)
+ {
+ detail = detail.Where(d => d.NDT != null).ToList();
+ foreach (var d in detail)
+ {
+ string[] ndts = d.NDT.Split(','); // 可能有多种探伤类型
+ foreach (string n in ndts)
+ {
+ var trustNdt = from x in Funs.DB.HJGL_Batch_BatchTrust where x.PointBatchId == batchId && x.DetectionTypeId == n select x;
+ if (trustNdt.Count() == 0)
+ {
+ Model.HJGL_Batch_BatchTrust newBatchTrust = new Model.HJGL_Batch_BatchTrust();
+ var project = BLL.ProjectService.GetProjectByProjectId(batch.ProjectId);
+ var unit = BLL.UnitService.GetUnitByUnitId(batch.UnitId);
+ var area = BLL.UnitWorkService.getUnitWorkByUnitWorkId(batch.UnitWorkId);
+ var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(batch.DetectionTypeId);
+ var rate = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(batch.DetectionRateId);
- //}
- #endregion
+ string perfix = string.Empty;
+ var type2 = detectionTypes.FirstOrDefault(x => x.DetectionTypeId == n);
+ string typeStr2 = string.Empty;
+ if (type2 != null)
+ {
+ typeStr2 = type2.DetectionTypeCode;
+ }
+ newBatchTrust.TrustBatchCode = BLL.Batch_BatchTrustService.BuildTrustBatchCode(batch.PointBatchCode, DateTime.Now, typeStr1, typeStr2);
+ string trustBatchId = SQLHelper.GetNewID(typeof(Model.HJGL_Batch_BatchTrust));
+ newBatchTrust.TrustBatchId = trustBatchId;
+
+ newBatchTrust.TrustDate = DateTime.Now;
+ newBatchTrust.ProjectId = batch.ProjectId;
+ newBatchTrust.PointBatchId = batch.PointBatchId;
+ newBatchTrust.UnitId = batch.UnitId;
+ newBatchTrust.UnitWorkId = batch.UnitWorkId;
+ newBatchTrust.DetectionTypeId = n;
+ newBatchTrust.DetectionRateId = batch.DetectionRateId;
+ var NDEUnit = Funs.DB.Project_ProjectUnit.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_5);
+ if (NDEUnit != null)
+ {
+ newBatchTrust.NDEUnit = NDEUnit.UnitId;
+ }
+ newBatchTrust.PointBatchId = this.PointBatchId;
+ BLL.Batch_BatchTrustService.AddBatchTrust(newBatchTrust); // 新增委托单
+
+ // 增加明细
+
+ Model.HJGL_Batch_BatchTrustItem item = new Model.HJGL_Batch_BatchTrustItem();
+ item.TrustBatchItemId = SQLHelper.GetNewID(typeof(Model.HJGL_Batch_BatchTrustItem));
+ item.TrustBatchId = trustBatchId;
+ item.PointBatchItemId = d.PointBatchItemId;
+ item.WeldJointId = d.WeldJointId;
+ item.CreateDate = DateTime.Now;
+ BLL.Batch_BatchTrustItemService.AddBatchTrustItem(item);
+ }
+ else
+ {
+
+ Model.HJGL_Batch_BatchTrustItem item = new Model.HJGL_Batch_BatchTrustItem();
+ item.TrustBatchItemId = SQLHelper.GetNewID(typeof(Model.HJGL_Batch_BatchTrustItem));
+ item.TrustBatchId = trustNdt.First().TrustBatchId;
+ item.PointBatchItemId = d.PointBatchItemId;
+ item.WeldJointId = d.WeldJointId;
+ item.CreateDate = DateTime.Now;
+ BLL.Batch_BatchTrustItemService.AddBatchTrustItem(item);
+ }
+ }
+ }
+ BLL.LogService.AddSys_Log(this.CurrUser, this.PointBatchId, this.PointBatchId, BLL.Const.HJGL_PointBatchMenuId, "生成委托单");
+ ShowNotify("成功生成委托单！", MessageBoxIcon.Success);
+ }
+ else
+ {
+ ShowNotify("已生成委托单！", MessageBoxIcon.Warning);
+ }
+ }
+ else
+ {
+ ShowNotify("批未关闭或批里没有点口！", MessageBoxIcon.Warning);
+ }
+ }
+ }
+ else
+ {
+ Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+ return;
+ }
+ }
+ #endregion
#region 切除焊口
@@ -1195,5 +1276,45 @@ namespace FineUIPro.Web.HJGL.PointTrust
string detectionType = this.tvControlItem.SelectedNode.ParentNode.ParentNode.NodeID.Split('|')[0];
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PointWeldJointView.aspx?unitWorkId={0}&rateId={1}&detectionType={2}", unitWorkId, rateId, detectionType, "新增 - ")));
}
+
+ #region Grid绑定事件
+ ///
+ /// Grid1绑定事件
+ ///
+ ///
+ ///
+ protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
+ {
+ var batch = Funs.DB.View_HJGL_Batch_PointBatch.FirstOrDefault(x => x.PointBatchId == this.tvControlItem.SelectedNodeID);
+ if (batch != null)
+ {
+ string[] strs = batch.DetectionTypeCode.Split('/');
+ System.Web.UI.WebControls.CheckBoxList cblNDT = (System.Web.UI.WebControls.CheckBoxList)(this.Grid1.Rows[e.RowIndex].FindControl("cblNDT"));
+ cblNDT.DataTextField = "DetectionTypeCode";
+ cblNDT.DataValueField = "DetectionTypeId";
+ cblNDT.DataSource = BLL.Base_DetectionTypeService.GetDetectionTypeListByDetectionTypeType2(strs);
+ cblNDT.DataBind();
+
+ var batchDetail = BLL.PointBatchDetailService.GetBatchDetailById(hdBatchDetailId.Value);
+ if (batchDetail != null)
+ {
+ if (!string.IsNullOrEmpty(batchDetail.NDT))
+ {
+ List ndtIds = batchDetail.NDT.Split(',').ToList();
+ foreach (var ndtId in ndtIds)
+ {
+ for (int i = 0; i < cblNDT.Items.Count; i++)
+ {
+ if (cblNDT.Items[i].Value == ndtId)
+ {
+ cblNDT.Items[i].Selected = true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ #endregion
}
}
diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.designer.cs
index 91cc2edf..d8824721 100644
--- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.designer.cs
@@ -220,13 +220,13 @@ namespace FineUIPro.Web.HJGL.PointTrust {
protected global::FineUIPro.Button btnPointAudit;
///
- /// btnGenerate 控件。
+ /// btnGeneratingOrder 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.Button btnGenerate;
+ protected global::FineUIPro.Button btnGeneratingOrder;
///
/// btnSelectExpandPoint 控件。
@@ -417,6 +417,24 @@ namespace FineUIPro.Web.HJGL.PointTrust {
///
protected global::FineUIPro.Grid Grid1;
+ ///
+ /// cblNDT 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.CheckBoxList cblNDT;
+
+ ///
+ /// hdBatchDetailId 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hdBatchDetailId;
+
///
/// ToolbarSeparator1 控件。
///
diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointTrust.aspx.cs
index 298003a0..3743308d 100644
--- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointTrust.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointTrust.aspx.cs
@@ -55,7 +55,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(batch.UnitWorkId);
var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(batch.DetectionTypeId);
var rate = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(batch.DetectionRateId);
- this.txtTrustBatchCode.Text = BLL.Batch_BatchTrustService.BuildTrustBatchCode(batch.PointBatchCode, DateTime.Now);
+ this.txtTrustBatchCode.Text = BLL.Batch_BatchTrustService.BuildTrustBatchCode(batch.PointBatchCode, DateTime.Now, string.Empty, string.Empty);
if (unit != null)
{
this.txtUnit.Text = unit.UnitName;
diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx
index 6c781a35..0cad926a 100644
--- a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx
@@ -197,7 +197,7 @@
IsModal="true" Width="1010px" Height="660px">
diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
index b2d06da2..67944535 100644
--- a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
@@ -226,8 +226,10 @@ namespace FineUIPro.Web.HJGL.PointTrust
pointManages = pointManages.Where(x => x.UnitId == this.drpUnit.SelectedValue);
}
pointManages = pointManages.OrderBy(x => x.StartDate);
-
- foreach (var item in pointManages)
+ var trustView = from x in Funs.DB.View_Batch_BatchTrust
+ join y in pointManages on x.PointBatchId equals y.PointBatchId
+ select x;
+ foreach (var item in trustView)
{
var pipeline = PointBatchService.GetPointBatchById(item.PointBatchId);
string startdate = string.Format("{0:yyyy-MM-dd}", pipeline.StartDate);
@@ -235,21 +237,21 @@ namespace FineUIPro.Web.HJGL.PointTrust
TreeNode newNode = new TreeNode
{
- NodeID = item.PointBatchId,
- ToolTip = "批",
+ NodeID = item.TrustBatchId,
+ Text = item.TrustBatchCode + "【" + startdate + "】" + "【" + item.UnitName + "】",
+ ToolTip = "委托单",
EnableClickEvent = true,
};
- string code = "DK-" + item.PointBatchCode.Substring(item.PointBatchCode.Length - 4);
// 未委托批次红色显示
- if (BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(item.PointBatchId) == null)
- {
- newNode.Text = "" + code + "【" + startdate + "】" + "【" + item.UnitName + "】" + "";
- newNode.ToolTip = "未委托";
- }
- else
- {
- newNode.Text = code + "【" + startdate + "】" + "【" + item.UnitName + "】";
- }
+ //if (BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(item.PointBatchId) == null)
+ //{
+ // newNode.Text = "" + code + "【" + startdate + "】" + "【" + item.UnitName + "】" + "";
+ // newNode.ToolTip = "未委托";
+ //}
+ //else
+ //{
+ // newNode.Text = code + "【" + startdate + "】" + "【" + item.UnitName + "】";
+ //}
e.Node.Nodes.Add(newNode);
}
@@ -276,8 +278,8 @@ namespace FineUIPro.Web.HJGL.PointTrust
this.txtTrustDate.Text = string.Empty;
this.txtDetectionTypeCode.Text = string.Empty;
this.lbNDEUnit.Text = string.Empty;
- Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(this.tvControlItem.SelectedNodeID);
- Model.HJGL_Batch_PointBatch batch = BLL.PointBatchService.GetPointBatchById(this.tvControlItem.SelectedNodeID);
+ Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewById(this.tvControlItem.SelectedNodeID);
+ Model.HJGL_Batch_PointBatch batch = BLL.PointBatchService.GetPointBatchById(trust.PointBatchId);
if (trust != null)
{
if (batch.IsClosed == true)
@@ -330,7 +332,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_TrustBatchMenuId, Const.BtnGenerate))
{
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PointAudit.aspx", "委托 - ")));
- Model.HJGL_Batch_PointBatch pointBatch = BLL.PointBatchService.GetPointBatchById(this.tvControlItem.SelectedNodeID);
+ Model.HJGL_Batch_PointBatch pointBatch = BLL.PointBatchService.GetPointBatchById(this.tvControlItem.SelectedNodeID.Split(',')[0]);
if (pointBatch != null)
{
if (pointBatch.IsClosed == true)
@@ -338,13 +340,13 @@ namespace FineUIPro.Web.HJGL.PointTrust
ShowNotify("该检验批无需委托！", MessageBoxIcon.Warning);
return;
}
- Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(this.tvControlItem.SelectedNodeID);
+ Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(this.tvControlItem.SelectedNodeID.Split(',')[0]);
if (trust != null)
{
ShowNotify("该检验批已生成委托！", MessageBoxIcon.Warning);
return;
}
- PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PointTrust.aspx?PointBatchId=" + this.tvControlItem.SelectedNodeID, "委托 - ")));
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PointTrust.aspx?PointBatchId=" + this.tvControlItem.SelectedNodeID.Split(',')[0], "委托 - ")));
}
else
{
@@ -365,17 +367,17 @@ namespace FineUIPro.Web.HJGL.PointTrust
///
private void BindGrid()
{
- if (this.tvControlItem.SelectedNode != null)
+ if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
- Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(this.tvControlItem.SelectedNodeID);
- if (trust == null) //为生成委托
+ Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewById(this.tvControlItem.SelectedNodeID);
+ if (trust == null) //未生成委托
{
string strSql = @"SELECT * FROM dbo.View_GenerateTrustItem d WHERE PointBatchId=@PointBatchId ";
List listStr = new List
{
};
- listStr.Add(new SqlParameter("@PointBatchId", this.tvControlItem.SelectedNodeID));
+ listStr.Add(new SqlParameter("@PointBatchId", trust.PointBatchId));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -489,7 +491,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
{
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
- string trustBatchId = this.tvControlItem.SelectedNodeID;
+ string trustBatchId = this.tvControlItem.SelectedNodeID.Split(',')[1];
BLL.Batch_BatchTrustService.UpdateBatchTrustAudit(trustBatchId, true);
PageInfo();
ShowNotify("该委托单已审核！", MessageBoxIcon.Success);
@@ -514,7 +516,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
Model.SGGLDB db = Funs.DB;
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
- string trustBatchId = this.tvControlItem.SelectedNodeID;
+ string trustBatchId = this.tvControlItem.SelectedNodeID.Split(',')[1];
string trustBatchCode = this.tvControlItem.SelectedNode.Text;
var trust = BLL.Batch_BatchTrustService.GetBatchTrustById(trustBatchId);
@@ -566,7 +568,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
string varValue = string.Empty;
- string pointBatchId = this.tvControlItem.SelectedNodeID;
+ string pointBatchId = this.tvControlItem.SelectedNodeID.Split(',')[0];
Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(pointBatchId);
if (trust != null)
@@ -626,8 +628,6 @@ namespace FineUIPro.Web.HJGL.PointTrust
return;
}
string reportId = this.tvControlItem.SelectedNode.NodeID;
- // Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(this.tvControlItem.SelectedNodeID);
- // Model.HJGL_Batch_PointBatch batch = BLL.PointBatchService.GetPointBatchById(this.tvControlItem.SelectedNodeID);
var trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(reportId);
var CH_WeldMethod = (from batch in Funs.DB.View_Batch_BatchTrustItem
join joint in Funs.DB.View_HJGL_WeldJoint on batch.WeldJointId equals joint.WeldJointId
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 5fdc5605..e0904da5 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -728,6 +728,9 @@ namespace Model
partial void InsertHJGL_PreWeldCuttingCheck(HJGL_PreWeldCuttingCheck instance);
partial void UpdateHJGL_PreWeldCuttingCheck(HJGL_PreWeldCuttingCheck instance);
partial void DeleteHJGL_PreWeldCuttingCheck(HJGL_PreWeldCuttingCheck instance);
+ partial void InsertHJGL_PreWeldCuttingCheckMaterial(HJGL_PreWeldCuttingCheckMaterial instance);
+ partial void UpdateHJGL_PreWeldCuttingCheckMaterial(HJGL_PreWeldCuttingCheckMaterial instance);
+ partial void DeleteHJGL_PreWeldCuttingCheckMaterial(HJGL_PreWeldCuttingCheckMaterial instance);
partial void InsertHJGL_PreWeldFitupCheck(HJGL_PreWeldFitupCheck instance);
partial void UpdateHJGL_PreWeldFitupCheck(HJGL_PreWeldFitupCheck instance);
partial void DeleteHJGL_PreWeldFitupCheck(HJGL_PreWeldFitupCheck instance);
@@ -743,6 +746,9 @@ namespace Model
partial void InsertHJGL_TrainNumberManage(HJGL_TrainNumberManage instance);
partial void UpdateHJGL_TrainNumberManage(HJGL_TrainNumberManage instance);
partial void DeleteHJGL_TrainNumberManage(HJGL_TrainNumberManage instance);
+ partial void InsertHJGL_WeldAppearanceCheck(HJGL_WeldAppearanceCheck instance);
+ partial void UpdateHJGL_WeldAppearanceCheck(HJGL_WeldAppearanceCheck instance);
+ partial void DeleteHJGL_WeldAppearanceCheck(HJGL_WeldAppearanceCheck instance);
partial void InsertHJGL_WeldingDaily(HJGL_WeldingDaily instance);
partial void UpdateHJGL_WeldingDaily(HJGL_WeldingDaily instance);
partial void DeleteHJGL_WeldingDaily(HJGL_WeldingDaily instance);
@@ -3851,6 +3857,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table HJGL_PreWeldCuttingCheckMaterial
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table HJGL_PreWeldFitupCheck
{
get
@@ -3899,6 +3913,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table HJGL_WeldAppearanceCheck
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table HJGL_WeldingDaily
{
get
@@ -94774,8 +94796,6 @@ namespace Model
private EntityRef _Base_PipingClass;
- private EntityRef _HJGL_Pipeline;
-
private EntityRef _Person_Persons;
private EntityRef _WBS_UnitWork;
@@ -94823,7 +94843,6 @@ namespace Model
this._Base_Unit = default(EntityRef);
this._Base_Project = default(EntityRef);
this._Base_PipingClass = default(EntityRef);
- this._HJGL_Pipeline = default(EntityRef);
this._Person_Persons = default(EntityRef);
this._WBS_UnitWork = default(EntityRef);
this._HJGL_Batch_PointBatchItem = new EntitySet(new Action(this.attach_HJGL_Batch_PointBatchItem), new Action(this.detach_HJGL_Batch_PointBatchItem));
@@ -95025,10 +95044,6 @@ namespace Model
{
if ((this._PipelineId != value))
{
- if (this._HJGL_Pipeline.HasLoadedOrAssignedValue)
- {
- throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
- }
this.OnPipelineIdChanging(value);
this.SendPropertyChanging();
this._PipelineId = value;
@@ -95312,40 +95327,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Batch_PointBatch_HJGL_Pipeline", Storage="_HJGL_Pipeline", ThisKey="PipelineId", OtherKey="PipelineId", IsForeignKey=true)]
- public HJGL_Pipeline HJGL_Pipeline
- {
- get
- {
- return this._HJGL_Pipeline.Entity;
- }
- set
- {
- HJGL_Pipeline previousValue = this._HJGL_Pipeline.Entity;
- if (((previousValue != value)
- || (this._HJGL_Pipeline.HasLoadedOrAssignedValue == false)))
- {
- this.SendPropertyChanging();
- if ((previousValue != null))
- {
- this._HJGL_Pipeline.Entity = null;
- previousValue.HJGL_Batch_PointBatch.Remove(this);
- }
- this._HJGL_Pipeline.Entity = value;
- if ((value != null))
- {
- value.HJGL_Batch_PointBatch.Add(this);
- this._PipelineId = value.PipelineId;
- }
- else
- {
- this._PipelineId = default(string);
- }
- this.SendPropertyChanged("HJGL_Pipeline");
- }
- }
- }
-
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Batch_PointBatch_Person_Persons", Storage="_Person_Persons", ThisKey="WelderId", OtherKey="PersonId", IsForeignKey=true)]
public Person_Persons Person_Persons
{
@@ -95502,6 +95483,8 @@ namespace Model
private string _PCoverWelderId;
+ private string _NDT;
+
private EntitySet _HJGL_Batch_BatchTrustItem;
private EntityRef _HJGL_Batch_PointBatch;
@@ -95550,6 +95533,8 @@ namespace Model
partial void OnPBackingWelderIdChanged();
partial void OnPCoverWelderIdChanging(string value);
partial void OnPCoverWelderIdChanged();
+ partial void OnNDTChanging(string value);
+ partial void OnNDTChanged();
#endregion
public HJGL_Batch_PointBatchItem()
@@ -95933,6 +95918,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NDT", DbType="NVarChar(300)")]
+ public string NDT
+ {
+ get
+ {
+ return this._NDT;
+ }
+ set
+ {
+ if ((this._NDT != value))
+ {
+ this.OnNDTChanging(value);
+ this.SendPropertyChanging();
+ this._NDT = value;
+ this.SendPropertyChanged("NDT");
+ this.OnNDTChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Batch_BatchTrustItem_HJGL_Batch_PointBatchItem", Storage="_HJGL_Batch_BatchTrustItem", ThisKey="PointBatchItemId", OtherKey="PointBatchItemId", DeleteRule="NO ACTION")]
public EntitySet HJGL_Batch_BatchTrustItem
{
@@ -101668,6 +101673,8 @@ namespace Model
private string _Code;
+ private string _DesignInstitute;
+
private EntityRef _Base_Project;
private EntitySet _HJGL_PipeLineMat;
@@ -101698,6 +101705,8 @@ namespace Model
partial void OnBatchNoChanged();
partial void OnCodeChanging(string value);
partial void OnCodeChanged();
+ partial void OnDesignInstituteChanging(string value);
+ partial void OnDesignInstituteChanged();
#endregion
public HJGL_MaterialCodeLib()
@@ -101931,6 +101940,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignInstitute", DbType="NVarChar(200)")]
+ public string DesignInstitute
+ {
+ get
+ {
+ return this._DesignInstitute;
+ }
+ set
+ {
+ if ((this._DesignInstitute != value))
+ {
+ this.OnDesignInstituteChanging(value);
+ this.SendPropertyChanging();
+ this._DesignInstitute = value;
+ this.SendPropertyChanged("DesignInstitute");
+ this.OnDesignInstituteChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_MaterialCodeLib_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@@ -104732,8 +104761,6 @@ namespace Model
private EntityRef _Base_TestMedium;
- private EntitySet _HJGL_Batch_PointBatch;
-
private EntitySet _HJGL_LV_Pipeline;
private EntitySet _HJGL_PC_Pipeline;
@@ -104843,7 +104870,6 @@ namespace Model
public HJGL_Pipeline()
{
this._Base_TestMedium = default(EntityRef);
- this._HJGL_Batch_PointBatch = new EntitySet(new Action(this.attach_HJGL_Batch_PointBatch), new Action(this.detach_HJGL_Batch_PointBatch));
this._HJGL_LV_Pipeline = new EntitySet(new Action(this.attach_HJGL_LV_Pipeline), new Action(this.detach_HJGL_LV_Pipeline));
this._HJGL_PC_Pipeline = new EntitySet(new Action(this.attach_HJGL_PC_Pipeline), new Action(this.detach_HJGL_PC_Pipeline));
this._Base_DetectionRate = default(EntityRef);
@@ -105647,19 +105673,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Batch_PointBatch_HJGL_Pipeline", Storage="_HJGL_Batch_PointBatch", ThisKey="PipelineId", OtherKey="PipelineId", DeleteRule="NO ACTION")]
- public EntitySet HJGL_Batch_PointBatch
- {
- get
- {
- return this._HJGL_Batch_PointBatch;
- }
- set
- {
- this._HJGL_Batch_PointBatch.Assign(value);
- }
- }
-
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_LV_Pipeline_HJGL_Pipeline", Storage="_HJGL_LV_Pipeline", ThisKey="PipelineId", OtherKey="PipelineId", DeleteRule="NO ACTION")]
public EntitySet HJGL_LV_Pipeline
{
@@ -106009,18 +106022,6 @@ namespace Model
}
}
- private void attach_HJGL_Batch_PointBatch(HJGL_Batch_PointBatch entity)
- {
- this.SendPropertyChanging();
- entity.HJGL_Pipeline = this;
- }
-
- private void detach_HJGL_Batch_PointBatch(HJGL_Batch_PointBatch entity)
- {
- this.SendPropertyChanging();
- entity.HJGL_Pipeline = null;
- }
-
private void attach_HJGL_LV_Pipeline(HJGL_LV_Pipeline entity)
{
this.SendPropertyChanging();
@@ -106845,6 +106846,8 @@ namespace Model
private string _MaterialCode2;
+ private string _PipeArea;
+
private EntityRef _HJGL_MaterialCodeLib;
private EntityRef _HJGL_Pipeline;
@@ -106869,6 +106872,8 @@ namespace Model
partial void OnWeldJointIdChanged();
partial void OnMaterialCode2Changing(string value);
partial void OnMaterialCode2Changed();
+ partial void OnPipeAreaChanging(string value);
+ partial void OnPipeAreaChanged();
#endregion
public HJGL_PipeLineMat()
@@ -107046,6 +107051,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeArea", DbType="NChar(1)")]
+ public string PipeArea
+ {
+ get
+ {
+ return this._PipeArea;
+ }
+ set
+ {
+ if ((this._PipeArea != value))
+ {
+ this.OnPipeAreaChanging(value);
+ this.SendPropertyChanging();
+ this._PipeArea = value;
+ this.SendPropertyChanged("PipeArea");
+ this.OnPipeAreaChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_PipeLineMat_HJGL_MaterialCodeLib", Storage="_HJGL_MaterialCodeLib", ThisKey="MaterialCode", OtherKey="MaterialCode", IsForeignKey=true)]
public HJGL_MaterialCodeLib HJGL_MaterialCodeLib
{
@@ -107175,6 +107200,16 @@ namespace Model
private string _RectifyRequirement;
+ private int _ReviewState;
+
+ private string _SpecialReviewerId;
+
+ private string _ReviewerId;
+
+ private System.Nullable _ReviewTime;
+
+ private EntitySet _HJGL_PreWeldCuttingCheckMaterial;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -107213,10 +107248,19 @@ namespace Model
partial void OnUnqualifiedReasonChanged();
partial void OnRectifyRequirementChanging(string value);
partial void OnRectifyRequirementChanged();
+ partial void OnReviewStateChanging(int value);
+ partial void OnReviewStateChanged();
+ partial void OnSpecialReviewerIdChanging(string value);
+ partial void OnSpecialReviewerIdChanged();
+ partial void OnReviewerIdChanging(string value);
+ partial void OnReviewerIdChanged();
+ partial void OnReviewTimeChanging(System.Nullable value);
+ partial void OnReviewTimeChanged();
#endregion
public HJGL_PreWeldCuttingCheck()
{
+ this._HJGL_PreWeldCuttingCheckMaterial = new EntitySet(new Action(this.attach_HJGL_PreWeldCuttingCheckMaterial), new Action(this.detach_HJGL_PreWeldCuttingCheckMaterial));
OnCreated();
}
@@ -107560,6 +107604,358 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewState", DbType="Int NOT NULL")]
+ public int ReviewState
+ {
+ get
+ {
+ return this._ReviewState;
+ }
+ set
+ {
+ if ((this._ReviewState != value))
+ {
+ this.OnReviewStateChanging(value);
+ this.SendPropertyChanging();
+ this._ReviewState = value;
+ this.SendPropertyChanged("ReviewState");
+ this.OnReviewStateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecialReviewerId", DbType="NVarChar(50)")]
+ public string SpecialReviewerId
+ {
+ get
+ {
+ return this._SpecialReviewerId;
+ }
+ set
+ {
+ if ((this._SpecialReviewerId != value))
+ {
+ this.OnSpecialReviewerIdChanging(value);
+ this.SendPropertyChanging();
+ this._SpecialReviewerId = value;
+ this.SendPropertyChanged("SpecialReviewerId");
+ this.OnSpecialReviewerIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewerId", DbType="NVarChar(50)")]
+ public string ReviewerId
+ {
+ get
+ {
+ return this._ReviewerId;
+ }
+ set
+ {
+ if ((this._ReviewerId != value))
+ {
+ this.OnReviewerIdChanging(value);
+ this.SendPropertyChanging();
+ this._ReviewerId = value;
+ this.SendPropertyChanged("ReviewerId");
+ this.OnReviewerIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewTime", DbType="DateTime")]
+ public System.Nullable ReviewTime
+ {
+ get
+ {
+ return this._ReviewTime;
+ }
+ set
+ {
+ if ((this._ReviewTime != value))
+ {
+ this.OnReviewTimeChanging(value);
+ this.SendPropertyChanging();
+ this._ReviewTime = value;
+ this.SendPropertyChanged("ReviewTime");
+ this.OnReviewTimeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_PreWeldCuttingCheckMaterial_Check", Storage="_HJGL_PreWeldCuttingCheckMaterial", ThisKey="CuttingCheckId", OtherKey="CuttingCheckId", DeleteRule="NO ACTION")]
+ public EntitySet HJGL_PreWeldCuttingCheckMaterial
+ {
+ get
+ {
+ return this._HJGL_PreWeldCuttingCheckMaterial;
+ }
+ set
+ {
+ this._HJGL_PreWeldCuttingCheckMaterial.Assign(value);
+ }
+ }
+
+ 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));
+ }
+ }
+
+ private void attach_HJGL_PreWeldCuttingCheckMaterial(HJGL_PreWeldCuttingCheckMaterial entity)
+ {
+ this.SendPropertyChanging();
+ entity.HJGL_PreWeldCuttingCheck = this;
+ }
+
+ private void detach_HJGL_PreWeldCuttingCheckMaterial(HJGL_PreWeldCuttingCheckMaterial entity)
+ {
+ this.SendPropertyChanging();
+ entity.HJGL_PreWeldCuttingCheck = null;
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_PreWeldCuttingCheckMaterial")]
+ public partial class HJGL_PreWeldCuttingCheckMaterial : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _CuttingCheckMaterialId;
+
+ private string _CuttingCheckId;
+
+ private string _PipeLineMatId;
+
+ private int _MaterialSide;
+
+ private string _OriginalMainCode;
+
+ private string _ReportedMainCode;
+
+ private bool _IsBatchChanged;
+
+ private EntityRef _HJGL_PreWeldCuttingCheck;
+
+ #region 可扩展性方法定义
+ partial void OnLoaded();
+ partial void OnValidate(System.Data.Linq.ChangeAction action);
+ partial void OnCreated();
+ partial void OnCuttingCheckMaterialIdChanging(string value);
+ partial void OnCuttingCheckMaterialIdChanged();
+ partial void OnCuttingCheckIdChanging(string value);
+ partial void OnCuttingCheckIdChanged();
+ partial void OnPipeLineMatIdChanging(string value);
+ partial void OnPipeLineMatIdChanged();
+ partial void OnMaterialSideChanging(int value);
+ partial void OnMaterialSideChanged();
+ partial void OnOriginalMainCodeChanging(string value);
+ partial void OnOriginalMainCodeChanged();
+ partial void OnReportedMainCodeChanging(string value);
+ partial void OnReportedMainCodeChanged();
+ partial void OnIsBatchChangedChanging(bool value);
+ partial void OnIsBatchChangedChanged();
+ #endregion
+
+ public HJGL_PreWeldCuttingCheckMaterial()
+ {
+ this._HJGL_PreWeldCuttingCheck = default(EntityRef);
+ OnCreated();
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CuttingCheckMaterialId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+ public string CuttingCheckMaterialId
+ {
+ get
+ {
+ return this._CuttingCheckMaterialId;
+ }
+ set
+ {
+ if ((this._CuttingCheckMaterialId != value))
+ {
+ this.OnCuttingCheckMaterialIdChanging(value);
+ this.SendPropertyChanging();
+ this._CuttingCheckMaterialId = value;
+ this.SendPropertyChanged("CuttingCheckMaterialId");
+ this.OnCuttingCheckMaterialIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CuttingCheckId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ public string CuttingCheckId
+ {
+ get
+ {
+ return this._CuttingCheckId;
+ }
+ set
+ {
+ if ((this._CuttingCheckId != value))
+ {
+ if (this._HJGL_PreWeldCuttingCheck.HasLoadedOrAssignedValue)
+ {
+ throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+ }
+ this.OnCuttingCheckIdChanging(value);
+ this.SendPropertyChanging();
+ this._CuttingCheckId = value;
+ this.SendPropertyChanged("CuttingCheckId");
+ this.OnCuttingCheckIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeLineMatId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ public string PipeLineMatId
+ {
+ get
+ {
+ return this._PipeLineMatId;
+ }
+ set
+ {
+ if ((this._PipeLineMatId != value))
+ {
+ this.OnPipeLineMatIdChanging(value);
+ this.SendPropertyChanging();
+ this._PipeLineMatId = value;
+ this.SendPropertyChanged("PipeLineMatId");
+ this.OnPipeLineMatIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialSide", DbType="Int NOT NULL")]
+ public int MaterialSide
+ {
+ get
+ {
+ return this._MaterialSide;
+ }
+ set
+ {
+ if ((this._MaterialSide != value))
+ {
+ this.OnMaterialSideChanging(value);
+ this.SendPropertyChanging();
+ this._MaterialSide = value;
+ this.SendPropertyChanged("MaterialSide");
+ this.OnMaterialSideChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OriginalMainCode", DbType="NVarChar(100)")]
+ public string OriginalMainCode
+ {
+ get
+ {
+ return this._OriginalMainCode;
+ }
+ set
+ {
+ if ((this._OriginalMainCode != value))
+ {
+ this.OnOriginalMainCodeChanging(value);
+ this.SendPropertyChanging();
+ this._OriginalMainCode = value;
+ this.SendPropertyChanged("OriginalMainCode");
+ this.OnOriginalMainCodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportedMainCode", DbType="NVarChar(100)")]
+ public string ReportedMainCode
+ {
+ get
+ {
+ return this._ReportedMainCode;
+ }
+ set
+ {
+ if ((this._ReportedMainCode != value))
+ {
+ this.OnReportedMainCodeChanging(value);
+ this.SendPropertyChanging();
+ this._ReportedMainCode = value;
+ this.SendPropertyChanged("ReportedMainCode");
+ this.OnReportedMainCodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBatchChanged", DbType="Bit NOT NULL")]
+ public bool IsBatchChanged
+ {
+ get
+ {
+ return this._IsBatchChanged;
+ }
+ set
+ {
+ if ((this._IsBatchChanged != value))
+ {
+ this.OnIsBatchChangedChanging(value);
+ this.SendPropertyChanging();
+ this._IsBatchChanged = value;
+ this.SendPropertyChanged("IsBatchChanged");
+ this.OnIsBatchChangedChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_PreWeldCuttingCheckMaterial_Check", Storage="_HJGL_PreWeldCuttingCheck", ThisKey="CuttingCheckId", OtherKey="CuttingCheckId", IsForeignKey=true)]
+ public HJGL_PreWeldCuttingCheck HJGL_PreWeldCuttingCheck
+ {
+ get
+ {
+ return this._HJGL_PreWeldCuttingCheck.Entity;
+ }
+ set
+ {
+ HJGL_PreWeldCuttingCheck previousValue = this._HJGL_PreWeldCuttingCheck.Entity;
+ if (((previousValue != value)
+ || (this._HJGL_PreWeldCuttingCheck.HasLoadedOrAssignedValue == false)))
+ {
+ this.SendPropertyChanging();
+ if ((previousValue != null))
+ {
+ this._HJGL_PreWeldCuttingCheck.Entity = null;
+ previousValue.HJGL_PreWeldCuttingCheckMaterial.Remove(this);
+ }
+ this._HJGL_PreWeldCuttingCheck.Entity = value;
+ if ((value != null))
+ {
+ value.HJGL_PreWeldCuttingCheckMaterial.Add(this);
+ this._CuttingCheckId = value.CuttingCheckId;
+ }
+ else
+ {
+ this._CuttingCheckId = default(string);
+ }
+ this.SendPropertyChanged("HJGL_PreWeldCuttingCheck");
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -107741,7 +108137,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrooveTypeId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrooveTypeId", DbType="NVarChar(50)")]
public string GrooveTypeId
{
get
@@ -110484,6 +110880,349 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_WeldAppearanceCheck")]
+ public partial class HJGL_WeldAppearanceCheck : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _AppearanceCheckId;
+
+ private string _ProjectId;
+
+ private string _WeldJointId;
+
+ private bool _IsQualified;
+
+ private string _CheckPerson;
+
+ private System.DateTime _CheckTime;
+
+ private string _Remark;
+
+ private string _CreateUser;
+
+ private System.DateTime _CreateTime;
+
+ private string _ModifyUser;
+
+ private System.Nullable _ModifyTime;
+
+ private EntityRef _HJGL_WeldJoint;
+
+ #region 可扩展性方法定义
+ partial void OnLoaded();
+ partial void OnValidate(System.Data.Linq.ChangeAction action);
+ partial void OnCreated();
+ partial void OnAppearanceCheckIdChanging(string value);
+ partial void OnAppearanceCheckIdChanged();
+ partial void OnProjectIdChanging(string value);
+ partial void OnProjectIdChanged();
+ partial void OnWeldJointIdChanging(string value);
+ partial void OnWeldJointIdChanged();
+ partial void OnIsQualifiedChanging(bool value);
+ partial void OnIsQualifiedChanged();
+ partial void OnCheckPersonChanging(string value);
+ partial void OnCheckPersonChanged();
+ partial void OnCheckTimeChanging(System.DateTime value);
+ partial void OnCheckTimeChanged();
+ partial void OnRemarkChanging(string value);
+ partial void OnRemarkChanged();
+ partial void OnCreateUserChanging(string value);
+ partial void OnCreateUserChanged();
+ partial void OnCreateTimeChanging(System.DateTime value);
+ partial void OnCreateTimeChanged();
+ partial void OnModifyUserChanging(string value);
+ partial void OnModifyUserChanged();
+ partial void OnModifyTimeChanging(System.Nullable value);
+ partial void OnModifyTimeChanged();
+ #endregion
+
+ public HJGL_WeldAppearanceCheck()
+ {
+ this._HJGL_WeldJoint = default(EntityRef);
+ OnCreated();
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AppearanceCheckId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+ public string AppearanceCheckId
+ {
+ get
+ {
+ return this._AppearanceCheckId;
+ }
+ set
+ {
+ if ((this._AppearanceCheckId != value))
+ {
+ this.OnAppearanceCheckIdChanging(value);
+ this.SendPropertyChanging();
+ this._AppearanceCheckId = value;
+ this.SendPropertyChanged("AppearanceCheckId");
+ this.OnAppearanceCheckIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ 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="_WeldJointId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ public string WeldJointId
+ {
+ get
+ {
+ return this._WeldJointId;
+ }
+ set
+ {
+ if ((this._WeldJointId != value))
+ {
+ if (this._HJGL_WeldJoint.HasLoadedOrAssignedValue)
+ {
+ throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+ }
+ this.OnWeldJointIdChanging(value);
+ this.SendPropertyChanging();
+ this._WeldJointId = value;
+ this.SendPropertyChanged("WeldJointId");
+ this.OnWeldJointIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsQualified", DbType="Bit NOT NULL")]
+ public bool IsQualified
+ {
+ get
+ {
+ return this._IsQualified;
+ }
+ set
+ {
+ if ((this._IsQualified != value))
+ {
+ this.OnIsQualifiedChanging(value);
+ this.SendPropertyChanging();
+ this._IsQualified = value;
+ this.SendPropertyChanged("IsQualified");
+ this.OnIsQualifiedChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckPerson", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ public string CheckPerson
+ {
+ get
+ {
+ return this._CheckPerson;
+ }
+ set
+ {
+ if ((this._CheckPerson != value))
+ {
+ this.OnCheckPersonChanging(value);
+ this.SendPropertyChanging();
+ this._CheckPerson = value;
+ this.SendPropertyChanged("CheckPerson");
+ this.OnCheckPersonChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckTime", DbType="DateTime NOT NULL")]
+ public System.DateTime CheckTime
+ {
+ get
+ {
+ return this._CheckTime;
+ }
+ set
+ {
+ if ((this._CheckTime != value))
+ {
+ this.OnCheckTimeChanging(value);
+ this.SendPropertyChanging();
+ this._CheckTime = value;
+ this.SendPropertyChanged("CheckTime");
+ this.OnCheckTimeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
+ public string Remark
+ {
+ get
+ {
+ return this._Remark;
+ }
+ set
+ {
+ if ((this._Remark != value))
+ {
+ this.OnRemarkChanging(value);
+ this.SendPropertyChanging();
+ this._Remark = value;
+ this.SendPropertyChanged("Remark");
+ this.OnRemarkChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateUser", DbType="NVarChar(50)")]
+ public string CreateUser
+ {
+ get
+ {
+ return this._CreateUser;
+ }
+ set
+ {
+ if ((this._CreateUser != value))
+ {
+ this.OnCreateUserChanging(value);
+ this.SendPropertyChanging();
+ this._CreateUser = value;
+ this.SendPropertyChanged("CreateUser");
+ this.OnCreateUserChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateTime", DbType="DateTime NOT NULL")]
+ public System.DateTime CreateTime
+ {
+ get
+ {
+ return this._CreateTime;
+ }
+ set
+ {
+ if ((this._CreateTime != value))
+ {
+ this.OnCreateTimeChanging(value);
+ this.SendPropertyChanging();
+ this._CreateTime = value;
+ this.SendPropertyChanged("CreateTime");
+ this.OnCreateTimeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ModifyUser", DbType="NVarChar(50)")]
+ public string ModifyUser
+ {
+ get
+ {
+ return this._ModifyUser;
+ }
+ set
+ {
+ if ((this._ModifyUser != value))
+ {
+ this.OnModifyUserChanging(value);
+ this.SendPropertyChanging();
+ this._ModifyUser = value;
+ this.SendPropertyChanged("ModifyUser");
+ this.OnModifyUserChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ModifyTime", DbType="DateTime")]
+ public System.Nullable ModifyTime
+ {
+ get
+ {
+ return this._ModifyTime;
+ }
+ set
+ {
+ if ((this._ModifyTime != value))
+ {
+ this.OnModifyTimeChanging(value);
+ this.SendPropertyChanging();
+ this._ModifyTime = value;
+ this.SendPropertyChanged("ModifyTime");
+ this.OnModifyTimeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_WeldAppearanceCheck_WeldJoint", Storage="_HJGL_WeldJoint", ThisKey="WeldJointId", OtherKey="WeldJointId", IsForeignKey=true)]
+ public HJGL_WeldJoint HJGL_WeldJoint
+ {
+ get
+ {
+ return this._HJGL_WeldJoint.Entity;
+ }
+ set
+ {
+ HJGL_WeldJoint previousValue = this._HJGL_WeldJoint.Entity;
+ if (((previousValue != value)
+ || (this._HJGL_WeldJoint.HasLoadedOrAssignedValue == false)))
+ {
+ this.SendPropertyChanging();
+ if ((previousValue != null))
+ {
+ this._HJGL_WeldJoint.Entity = null;
+ previousValue.HJGL_WeldAppearanceCheck.Remove(this);
+ }
+ this._HJGL_WeldJoint.Entity = value;
+ if ((value != null))
+ {
+ value.HJGL_WeldAppearanceCheck.Add(this);
+ this._WeldJointId = value.WeldJointId;
+ }
+ else
+ {
+ this._WeldJointId = default(string);
+ }
+ this.SendPropertyChanged("HJGL_WeldJoint");
+ }
+ }
+ }
+
+ 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_WeldingDaily")]
public partial class HJGL_WeldingDaily : INotifyPropertyChanging, INotifyPropertyChanged
{
@@ -111530,6 +112269,8 @@ namespace Model
private EntitySet _HJGL_Hard_TrustItem;
+ private EntitySet _HJGL_WeldAppearanceCheck;
+
private EntityRef _Base_Consumables;
private EntityRef _WeldingWireBase_Consumables;
@@ -111692,6 +112433,7 @@ namespace Model
{
this._HJGL_Hard_Report = new EntitySet(new Action(this.attach_HJGL_Hard_Report), new Action(this.detach_HJGL_Hard_Report));
this._HJGL_Hard_TrustItem = new EntitySet(new Action(this.attach_HJGL_Hard_TrustItem), new Action(this.detach_HJGL_Hard_TrustItem));
+ this._HJGL_WeldAppearanceCheck = new EntitySet(new Action(this.attach_HJGL_WeldAppearanceCheck), new Action(this.detach_HJGL_WeldAppearanceCheck));
this._Base_Consumables = default(EntityRef);
this._WeldingWireBase_Consumables = default(EntityRef);
this._Base_DetectionType = default(EntityRef);
@@ -112997,6 +113739,19 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_WeldAppearanceCheck_WeldJoint", Storage="_HJGL_WeldAppearanceCheck", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")]
+ public EntitySet HJGL_WeldAppearanceCheck
+ {
+ get
+ {
+ return this._HJGL_WeldAppearanceCheck;
+ }
+ set
+ {
+ this._HJGL_WeldAppearanceCheck.Assign(value);
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_WeldJoint_Base_Consumables", Storage="_Base_Consumables", ThisKey="WeldingRod", OtherKey="ConsumablesId", IsForeignKey=true)]
public Base_Consumables Base_Consumables
{
@@ -113564,6 +114319,18 @@ namespace Model
entity.HJGL_WeldJoint = null;
}
+ private void attach_HJGL_WeldAppearanceCheck(HJGL_WeldAppearanceCheck entity)
+ {
+ this.SendPropertyChanging();
+ entity.HJGL_WeldJoint = this;
+ }
+
+ private void detach_HJGL_WeldAppearanceCheck(HJGL_WeldAppearanceCheck entity)
+ {
+ this.SendPropertyChanging();
+ entity.HJGL_WeldJoint = null;
+ }
+
private void attach_HJGL_HotProess_Report(HJGL_HotProess_Report entity)
{
this.SendPropertyChanging();
@@ -304210,6 +304977,10 @@ namespace Model
private string _CheckResult;
+ private System.Nullable _WeldAppearanceIsQualified;
+
+ private string _WeldAppearanceResult;
+
private string _PipelineId;
private string _JointArea;
@@ -305620,6 +306391,38 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldAppearanceIsQualified", DbType="Bit")]
+ public System.Nullable WeldAppearanceIsQualified
+ {
+ get
+ {
+ return this._WeldAppearanceIsQualified;
+ }
+ set
+ {
+ if ((this._WeldAppearanceIsQualified != value))
+ {
+ this._WeldAppearanceIsQualified = value;
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldAppearanceResult", DbType="NVarChar(3) NOT NULL", CanBeNull=false)]
+ public string WeldAppearanceResult
+ {
+ get
+ {
+ return this._WeldAppearanceResult;
+ }
+ set
+ {
+ if ((this._WeldAppearanceResult != value))
+ {
+ this._WeldAppearanceResult = value;
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineId", DbType="NVarChar(50)")]
public string PipelineId
{