diff --git a/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx b/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx
index 6e60033c..1a22b1de 100644
--- a/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DataInEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.JoinMarking.DataInEdit" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DataInEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.JoinMarking.DataInEdit" %>
@@ -14,40 +14,14 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.cs
index 12941ceb..e25e9c96 100644
--- a/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.cs
@@ -42,8 +42,6 @@ namespace FineUIPro.Web.HJGL.JoinMarking
{
if (!IsPostBack)
{
- Base_PipingClassService.InitPipingClassDropDownList(this.drpPipingClass, this.CurrUser.LoginProjectId, true, "请选择");//管线等级
- Base_DetectionRateService.InitDetectionRateDropDownList(drpDetectionRate, true);
BLL.Base_MaterialService.InitMaterialDropDownList(this.drpMaterial1, true, "请选择");//材质1
BLL.Base_MaterialService.InitMaterialDropDownList(this.drpMaterial2, true, "请选择");//材质2
BLL.Base_WeldTypeService.InitWeldTypeDropDownList(this.drpWeldTypeCode, "请选择", true);//焊缝类型
@@ -200,42 +198,12 @@ namespace FineUIPro.Web.HJGL.JoinMarking
}
Model.View_HJGL_Pipeline pipeline = BLL.PipelineService.GetViewPipelineByPipelineId(this.PipelineId);
- if (pipeline != null)
- {
- if (!string.IsNullOrEmpty(pipeline.PipingClassId))
- {
- this.drpPipingClass.SelectedValue = pipeline.PipingClassId;
- }
-
- if (!string.IsNullOrEmpty(pipeline.DetectionRateId))
- {
- this.drpDetectionRate.SelectedValue = pipeline.DetectionRateId;
- }
- if (!string.IsNullOrEmpty(pipeline.DetectionType))
- {
- string[] dtype = pipeline.DetectionType.Split('|');
- string DetectionTypestr = "";
- for (int i = 0; i < dtype.Length; i++)
- {
- var DetectionType = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(dtype[i].ToString());
- if (i == 0)
- {
- DetectionTypestr = DetectionType.DetectionTypeCode;
- }
- else
- {
- DetectionTypestr += "," + DetectionType.DetectionTypeCode;
- }
- }
- this.txtDetectionType.Text = DetectionTypestr;
- }
- this.txtPipelineCode.Text = pipeline.PipelineCode;
- }
+
if (!string.IsNullOrEmpty(isTwoJoint))
{
//string perfix = txtPipelineCode.Text + "/Z-";
- string perfix = txtPipelineCode.Text + "/";
+ string perfix = pipeline.PipelineCode + "/";
this.txtWeldJointCode.Text = perfix;
// txtWeldJointCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode4ByProjectId", "dbo.HJGL_WeldJoint", "WeldJointCode", this.CurrUser.LoginProjectId, perfix);
@@ -260,7 +228,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_WeldJointMenuId, BLL.Const.BtnModify))
{
- if (this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null)
+ if ( this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("材质1、材质2不能为空", MessageBoxIcon.Warning);
return;
@@ -315,7 +283,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
private void SaveData(bool isClosed)
{
// if (string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()) || this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.hdWeldingMethodId.Text) || string.IsNullOrEmpty(this.txtWpqId.Text.Trim()))
- if (string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()) || this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null)
+ if (string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()) || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("页面必填项不能为空", MessageBoxIcon.Warning);
Alert.ShowInTop("请完善必填项！", MessageBoxIcon.Warning);
@@ -323,8 +291,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
}
Model.HJGL_WeldJoint joint = dic[WeldJointId];
string weldJointId = WeldJointId;
- joint.PipelineId = this.PipelineId;
- joint.PipelineCode = txtPipelineCode.Text.Trim();
+ joint.PipelineId = this.PipelineId;
joint.ProjectId = this.CurrUser.LoginProjectId;
//if (!this.txtWeldJointCode.Text.Contains("G"))
diff --git a/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.designer.cs
index 57614428..9e364a3e 100644
--- a/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.designer.cs
@@ -50,15 +50,6 @@ namespace FineUIPro.Web.HJGL.JoinMarking
///
protected global::FineUIPro.Toolbar Toolbar1;
- ///
- /// btnAttachUrl 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Button btnAttachUrl;
-
///
/// btnSave 控件。
///
@@ -68,60 +59,6 @@ namespace FineUIPro.Web.HJGL.JoinMarking
///
protected global::FineUIPro.Button btnSave;
- ///
- /// GroupPanel3 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.GroupPanel GroupPanel3;
-
- ///
- /// Form2 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Form Form2;
-
- ///
- /// txtPipelineCode 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.TextBox txtPipelineCode;
-
- ///
- /// drpPipingClass 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DropDownList drpPipingClass;
-
- ///
- /// drpDetectionRate 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DropDownList drpDetectionRate;
-
- ///
- /// txtDetectionType 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.TextBox txtDetectionType;
-
///
/// GroupPanel1 控件。
///