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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
高飞
2024-07-10 16:06:09 +08:00
parent 0fc3260083 c1fe6302bb
commit 89875b673b
13 changed files with 613 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs
+5 -2
View File
@@ -119,7 +119,9 @@ namespace BLL
Remark = weldJoint.Remark,
IsTwoJoint = weldJoint.IsTwoJoint,
SubmitMan = weldJoint.SubmitMan,
TwoJointType = weldJoint.TwoJointType
TwoJointType = weldJoint.TwoJointType,
CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId,
BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId
};
if (!string.IsNullOrEmpty(weldJoint.WeldJointId))
{
@@ -188,7 +190,8 @@ namespace BLL
newWeldJoint.AttachUrl = weldJoint.AttachUrl;
newWeldJoint.SubmitMan = weldJoint.SubmitMan;
newWeldJoint.TwoJointType = weldJoint.TwoJointType;
newWeldJoint.CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId;
newWeldJoint.BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId;
db.SubmitChanges();
}
}
SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs
+2
View File
@@ -387,7 +387,9 @@ namespace BLL
else WeldJointCode end) as '焊口序号',
WeldJointCode as '焊口号',
BackingWelderCode as '打底焊工',
BackingWelderTeamGroupName as '打底焊工班组',
CoverWelderCode as '盖面焊工',
CoverWelderTeamGroupName as '盖面焊工班组',
Material1Code as '材质1' ,
Material2Code as '材质2' ,
Dia as '外径' ,
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
+10 -2
View File
@@ -184,13 +184,21 @@
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="打底焊工号" ColumnID="BackingWelder"
DataField="BackingWelder" SortField="BackingWelder" FieldType="String" HeaderTextAlign="Center"
<f:RenderField HeaderText="打底焊工号" ColumnID="BackingWelderCode"
DataField="BackingWelderCode" SortField="BackingWelderCode" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="打底焊工班组" ColumnID="BackingWelderTeamGroupName"
DataField="BackingWelderTeamGroupName" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="盖面焊工号" ColumnID="WelderCode" DataField="WelderCode"
FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="盖面焊工班组" ColumnID="CoverWelderTeamGroupName"
DataField="CoverWelderTeamGroupName" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="热处理报告编号" ColumnID="HotProessReportNo" DataField="HotProessReportNo"
FieldType="String" HeaderTextAlign="Center" Width="120px">
</f:RenderField>
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+3 -1
View File
@@ -511,7 +511,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
焊口属性 = x.JointAttribute,
焊接日期 = x.WeldingDate,
打底焊工号 = x.BackingWelderCode,
盖面焊工号 = x.WelderCode,
打底焊工班组=x.BackingWelderTeamGroupName,
盖面焊工号 = x.CoverWelderCode,
盖面焊工班组 = x.CoverWelderTeamGroupName,
热处理报告编号 = x.HotProessReportNo,
热处理检测结果 = x.HotProessResult,
硬度报告编号 = x.HardReportNo,
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
+10 -2
View File
@@ -113,9 +113,17 @@
DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="盖面焊工班组" ColumnID="CoverWelderTeamGroupName"
DataField="CoverWelderTeamGroupName" 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">
DataField="BackingWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="打底焊工班组" ColumnID="BackingWelderTeamGroupName"
DataField="BackingWelderTeamGroupName" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="焊口机动化程度" ColumnID="WeldingMode" DataField="WeldingMode" Hidden="True"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+1 -1
View File
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string strSql = @"SELECT WeldingDailyId,WeldJointId,PipelineCode,WeldJointCode,
BackingWelderCode,CoverWelderCode,Material1Code,Material2Code,
Dia,DNDia,Thickness,WeldTypeCode,WeldingMethodCode,WeldingWireCode,WeldingMode,
WeldingRodCode,Size,JointAttribute
WeldingRodCode,Size,JointAttribute,CoverWelderTeamGroupName,BackingWelderTeamGroupName
FROM dbo.View_HJGL_WeldJoint
WHERE WeldingDailyId=@WeldingDailyId";
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+6
View File
@@ -532,6 +532,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
t.CoverWelderId = coverWelderCode.PersonId;
newWeldJoint.CoverWelderId = coverWelderCode.PersonId;
newWeldJoint.CoverWelderTeamGroupId = coverWelderCode.TeamGroupId;
}
var backingWelderCode = (from x in Funs.DB.SitePerson_Person
@@ -542,6 +543,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
t.BackingWelderId = backingWelderCode.PersonId;
newWeldJoint.BackingWelderId = backingWelderCode.PersonId;
newWeldJoint.BackingWelderTeamGroupId = backingWelderCode.TeamGroupId;
}
WeldTaskService.UpdateWeldTask(t);
@@ -868,6 +870,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
newWeldJoint.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim();
newWeldJoint.CoverWelderId = coverWelderId;
newWeldJoint.BackingWelderId = backingWelderId;
newWeldJoint.CoverWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId,coverWelderId).TeamGroupId;
newWeldJoint.BackingWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, backingWelderId).TeamGroupId;
//if (item.WeldingLocationId != Const._Null)
//{
// newWeldJoint.WeldingLocationId = item.WeldingLocationId;
@@ -1001,6 +1005,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
updateWeldJoint.WeldingDailyCode = null;
updateWeldJoint.CoverWelderId = null;
updateWeldJoint.BackingWelderId = null;
updateWeldJoint.CoverWelderTeamGroupId= null;
updateWeldJoint.BackingWelderTeamGroupId = null;
BLL.WeldJointService.UpdateWeldJoint(updateWeldJoint);
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx
+6 -3
View File
@@ -46,6 +46,8 @@
<f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
</f:Button>
<f:Button ID="Button1" Text="自动录入" Icon="Add" runat="server" OnClick="btnAutoInput2_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@@ -53,7 +55,7 @@
<f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="单位工程"
OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
EnableSingleClickExpand="false" AutoLeafIdentification="true"
EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded" EnableCheckBox="true" OnlyLeafCheck="true">
</f:Tree>
</Items>
</f:Panel>
@@ -194,9 +196,10 @@
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="500" Value="500" />
<f:ListItem Text="1000" Value="1000" />
<f:ListItem Text="2000" Value="2000" />
<f:ListItem Text="所有行" Value="10000" />
</f:DropDownList>
</PageItems>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
+76
View File
@@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.HJGL.WeldingManage
{
@@ -121,6 +122,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn1.EnableExpandEvent = true;
tn1.EnableClickEvent = true;
tn1.EnableCheckBox = false;
rootNode1.Nodes.Add(tn1);
if (a > 0)
{
@@ -182,6 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
tn2.EnableExpandEvent = true;
tn2.EnableClickEvent = true;
tn2.EnableCheckBox = false;
rootNode2.Nodes.Add(tn2);
if (a > 0)
{
@@ -463,6 +466,79 @@ namespace FineUIPro.Web.HJGL.WeldingManage
ShowNotify("该管线焊口已完成自动录入！", MessageBoxIcon.Success);
}
}
protected void btnAutoInput2_Click(object sender, EventArgs e)
{
if (this.drpUnit.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择工艺规程编制单位！", MessageBoxIcon.Warning);
return;
}
TreeNode[] nodes = tvControlItem.GetCheckedNodes();
if (nodes.Length > 0)
{
foreach (TreeNode node in nodes)
{
if (!string.IsNullOrEmpty(node.NodeID))
{
var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == node.NodeID && x.JointAttribute == drpJointAttribute.SelectedValue select x;
if (jotList.Count() > 0)
{
foreach (var jot in jotList)
{
List<Model.View_HJGL_WPQ> wpqList = BLL.WPQListServiceService.GetMatchWPQ(jot, this.CurrUser.LoginProjectId, drpUnit.SelectedValue);
Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint();
if (wpqList != null)
{
Model.WPQ_WPQList wps = new Model.WPQ_WPQList();
var a = wpqList.FirstOrDefault(x => x.WeldingMethodId == "feb1234c-a538-476f-99ac-7b3ab15997c1"); //优先匹配GTAW+SMAW的焊评
if (a == null)
{
wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId);
}
else
{
wps = BLL.WPQListServiceService.GetWPQById(a.WPQId);
}
newJot.WPQId = wps.WPQId;
newJot.WeldJointId = jot.WeldJointId;
newJot.WeldingRod = wps.WeldingRod;
newJot.WeldingWire = wps.WeldingWire;
newJot.WeldingMethodId = wps.WeldingMethodId;
newJot.GrooveTypeId = wps.GrooveType;
newJot.PreTemperature = wps.PreTemperature;
newJot.IsHotProess = wps.IsHotProess;
newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode));
}
else
{
newJot.WPQId = null;
newJot.WeldJointId = jot.WeldJointId;
newJot.WeldingRod = null;
newJot.WeldingWire = null;
newJot.WeldingMethodId = null;
newJot.GrooveTypeId = null;
newJot.PreTemperature = null;
newJot.IsHotProess = null;
newJot.MatchableWPQ = null;
}
BLL.WeldJointService.UpdateConWeldJoint(newJot);
}
}
}
}
// BindGrid();
ShowNotify("该管线焊口已完成自动录入！", MessageBoxIcon.Success);
}
else
{
ShowNotify("请勾选需要自动录入的管线！", MessageBoxIcon.Warning);
}
}
protected void btnEdit_Click(object sender, EventArgs e)
{
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.designer.cs
Generated
+45 -34
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage {
public partial class WeldingConDate {
namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class WeldingConDate
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtPipelineCode 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipelineCode;
/// <summary>
/// ckNOEdit 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckNOEdit;
/// <summary>
/// drpPipeArea 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPipeArea;
/// <summary>
/// hdUnitWorkId 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdUnitWorkId;
/// <summary>
/// btnTreeFind 控件。
/// </summary>
@@ -101,7 +103,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnTreeFind;
/// <summary>
/// Button1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button1;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar3 控件。
/// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// txtWeldJointCode 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldJointCode;
/// <summary>
/// rbInput 控件。
/// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbInput;
/// <summary>
/// drpUnit 控件。
/// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpJointAttribute 控件。
/// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointAttribute;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnAutoInput 控件。
/// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAutoInput;
/// <summary>
/// btnEdit 控件。
/// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnEdit;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -227,7 +238,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -236,7 +247,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
@@ -245,7 +256,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Window3 控件。
/// </summary>
@@ -254,7 +265,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window3;
/// <summary>
/// Menu 控件。
/// </summary>
@@ -263,7 +274,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@@ -272,7 +283,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnView 控件。
/// </summary>
SGGL/Model/Model.cs
+217 -133
View File
@@ -11845,7 +11845,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
public string ApproveIdea
{
get
@@ -97808,6 +97808,10 @@ namespace Model
private System.Nullable<System.DateTime> _AuditDate2;
private string _BackingWelderTeamGroupId;
private string _CoverWelderTeamGroupId;
private EntitySet<HJGL_Batch_BatchTrustItem> _HJGL_Batch_BatchTrustItem;
private EntitySet<HJGL_Batch_PointBatchItem> _HJGL_Batch_PointBatchItem;
@@ -97950,6 +97954,10 @@ namespace Model
partial void OnAuditMan2Changed();
partial void OnAuditDate2Changing(System.Nullable<System.DateTime> value);
partial void OnAuditDate2Changed();
partial void OnBackingWelderTeamGroupIdChanging(string value);
partial void OnBackingWelderTeamGroupIdChanged();
partial void OnCoverWelderTeamGroupIdChanging(string value);
partial void OnCoverWelderTeamGroupIdChanged();
#endregion
public HJGL_WeldJoint()
@@ -98979,6 +98987,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BackingWelderTeamGroupId", DbType="NVarChar(50)")]
public string BackingWelderTeamGroupId
{
get
{
return this._BackingWelderTeamGroupId;
}
set
{
if ((this._BackingWelderTeamGroupId != value))
{
this.OnBackingWelderTeamGroupIdChanging(value);
this.SendPropertyChanging();
this._BackingWelderTeamGroupId = value;
this.SendPropertyChanged("BackingWelderTeamGroupId");
this.OnBackingWelderTeamGroupIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CoverWelderTeamGroupId", DbType="NVarChar(50)")]
public string CoverWelderTeamGroupId
{
get
{
return this._CoverWelderTeamGroupId;
}
set
{
if ((this._CoverWelderTeamGroupId != value))
{
this.OnCoverWelderTeamGroupIdChanging(value);
this.SendPropertyChanging();
this._CoverWelderTeamGroupId = value;
this.SendPropertyChanged("CoverWelderTeamGroupId");
this.OnCoverWelderTeamGroupIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Batch_BatchTrustItem_HJGL_WeldJoint", Storage="_HJGL_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")]
public EntitySet<HJGL_Batch_BatchTrustItem> HJGL_Batch_BatchTrustItem
{
@@ -152113,7 +152161,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
public string AttentPerson
{
get
@@ -183072,7 +183120,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")]
public string ProjectDescription
{
get
@@ -183192,7 +183240,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")]
public string CalculationRule
{
get
@@ -183252,7 +183300,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")]
public string ConstructionSubcontractor
{
get
@@ -183636,7 +183684,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WorkPackageEstimate
{
get
@@ -183941,16 +183989,6 @@ namespace Model
private string _ProjectId;
private string _ContractId;
private string _OrderCode;
private System.Nullable<System.DateTime> _OrderInDate;
private System.Nullable<System.DateTime> _OrderOutDate;
private string _MaterialRequisitionUnit;
private System.Nullable<int> _State;
private string _InvoiceCode;
@@ -183979,6 +184017,16 @@ namespace Model
private string _CreateUser;
private string _ContractId;
private System.Nullable<System.DateTime> _OrderInDate;
private string _OrderCode;
private System.Nullable<System.DateTime> _OrderOutDate;
private string _MaterialRequisitionUnit;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -183987,16 +184035,6 @@ namespace Model
partial void OnInvoiceIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnContractIdChanging(string value);
partial void OnContractIdChanged();
partial void OnOrderCodeChanging(string value);
partial void OnOrderCodeChanged();
partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderInDateChanged();
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderOutDateChanged();
partial void OnMaterialRequisitionUnitChanging(string value);
partial void OnMaterialRequisitionUnitChanged();
partial void OnStateChanging(System.Nullable<int> value);
partial void OnStateChanged();
partial void OnInvoiceCodeChanging(string value);
@@ -184025,6 +184063,16 @@ namespace Model
partial void OnCreateDateChanged();
partial void OnCreateUserChanging(string value);
partial void OnCreateUserChanged();
partial void OnContractIdChanging(string value);
partial void OnContractIdChanged();
partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderInDateChanged();
partial void OnOrderCodeChanging(string value);
partial void OnOrderCodeChanged();
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderOutDateChanged();
partial void OnMaterialRequisitionUnitChanging(string value);
partial void OnMaterialRequisitionUnitChanged();
#endregion
public PHTGL_Invoice()
@@ -184072,106 +184120,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
public string ContractId
{
get
{
return this._ContractId;
}
set
{
if ((this._ContractId != value))
{
this.OnContractIdChanging(value);
this.SendPropertyChanging();
this._ContractId = value;
this.SendPropertyChanged("ContractId");
this.OnContractIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
public string OrderCode
{
get
{
return this._OrderCode;
}
set
{
if ((this._OrderCode != value))
{
this.OnOrderCodeChanging(value);
this.SendPropertyChanging();
this._OrderCode = value;
this.SendPropertyChanged("OrderCode");
this.OnOrderCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderInDate
{
get
{
return this._OrderInDate;
}
set
{
if ((this._OrderInDate != value))
{
this.OnOrderInDateChanging(value);
this.SendPropertyChanging();
this._OrderInDate = value;
this.SendPropertyChanged("OrderInDate");
this.OnOrderInDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderOutDate
{
get
{
return this._OrderOutDate;
}
set
{
if ((this._OrderOutDate != value))
{
this.OnOrderOutDateChanging(value);
this.SendPropertyChanging();
this._OrderOutDate = value;
this.SendPropertyChanged("OrderOutDate");
this.OnOrderOutDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
public string MaterialRequisitionUnit
{
get
{
return this._MaterialRequisitionUnit;
}
set
{
if ((this._MaterialRequisitionUnit != value))
{
this.OnMaterialRequisitionUnitChanging(value);
this.SendPropertyChanging();
this._MaterialRequisitionUnit = value;
this.SendPropertyChanged("MaterialRequisitionUnit");
this.OnMaterialRequisitionUnitChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
public System.Nullable<int> State
{
@@ -184452,6 +184400,106 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
public string ContractId
{
get
{
return this._ContractId;
}
set
{
if ((this._ContractId != value))
{
this.OnContractIdChanging(value);
this.SendPropertyChanging();
this._ContractId = value;
this.SendPropertyChanged("ContractId");
this.OnContractIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderInDate
{
get
{
return this._OrderInDate;
}
set
{
if ((this._OrderInDate != value))
{
this.OnOrderInDateChanging(value);
this.SendPropertyChanging();
this._OrderInDate = value;
this.SendPropertyChanged("OrderInDate");
this.OnOrderInDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
public string OrderCode
{
get
{
return this._OrderCode;
}
set
{
if ((this._OrderCode != value))
{
this.OnOrderCodeChanging(value);
this.SendPropertyChanging();
this._OrderCode = value;
this.SendPropertyChanged("OrderCode");
this.OnOrderCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderOutDate
{
get
{
return this._OrderOutDate;
}
set
{
if ((this._OrderOutDate != value))
{
this.OnOrderOutDateChanging(value);
this.SendPropertyChanging();
this._OrderOutDate = value;
this.SendPropertyChanged("OrderOutDate");
this.OnOrderOutDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
public string MaterialRequisitionUnit
{
get
{
return this._MaterialRequisitionUnit;
}
set
{
if ((this._MaterialRequisitionUnit != value))
{
this.OnMaterialRequisitionUnitChanging(value);
this.SendPropertyChanging();
this._MaterialRequisitionUnit = value;
this.SendPropertyChanged("MaterialRequisitionUnit");
this.OnMaterialRequisitionUnitChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -277057,6 +277105,10 @@ namespace Model
private string _CoverWelderCode;
private string _CoverWelderTeamGroupName;
private string _BackingWelderTeamGroupName;
private string _HotProessReportNo;
private string _HotProessResult;
@@ -278333,6 +278385,38 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CoverWelderTeamGroupName", DbType="NVarChar(50)")]
public string CoverWelderTeamGroupName
{
get
{
return this._CoverWelderTeamGroupName;
}
set
{
if ((this._CoverWelderTeamGroupName != value))
{
this._CoverWelderTeamGroupName = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BackingWelderTeamGroupName", DbType="NVarChar(50)")]
public string BackingWelderTeamGroupName
{
get
{
return this._BackingWelderTeamGroupName;
}
set
{
if ((this._BackingWelderTeamGroupName != value))
{
this._BackingWelderTeamGroupName = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HotProessReportNo", DbType="NVarChar(50)")]
public string HotProessReportNo
{
@@ -296646,7 +296730,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
public string Name
{
get
@@ -297223,7 +297307,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -297414,7 +297498,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -302701,7 +302785,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -304173,7 +304257,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@@ -313724,7 +313808,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")]
public string ContractNo
{
get
@@ -313744,7 +313828,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")]
public string UnitWorks
{
get