shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

121221

This commit is contained in:
jackchenyang 2024-05-12 22:53:47 +08:00
parent af8a1dd0ad
commit e8a1998e0c
9 changed files with 106 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

2
HJGL/FineUIPro.Web/Web.config
View File

@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/> <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections> </configSections>
<connectionStrings> <connectionStrings>
<add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/> <add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True" <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
providerName="System.Data.SqlClient" />--> providerName="System.Data.SqlClient" />-->
</connectionStrings> </connectionStrings>

10
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx
View File

@ -145,17 +145,11 @@
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,QualityNo %>" ColumnID="QualityNo" DataField="QualityNo" <f:RenderField HeaderText="<%$ Resources:Lan,QualityNo %>" ColumnID="QualityNo" DataField="QualityNo"
FieldType="String" TextAlign="Left" Width="150px"> FieldType="String" TextAlign="Left" Width="150px">
<Editor>
<f:TextBox ID="tbxEditorQualityNo" Required="true" runat="server">
</f:TextBox>
</Editor>
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,Acceptance %>" ColumnID="Acceptance" <f:RenderField HeaderText="<%$ Resources:Lan,Acceptance %>" ColumnID="Acceptance"
DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px"> DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px">
<Editor>
<f:TextBox ID="txtEditorAcceptance" Required="true" runat="server">
</f:TextBox>
</Editor>
</f:RenderField> </f:RenderField>
</Columns> </Columns>
<Listeners> <Listeners>

5
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs
View File

@ -309,7 +309,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
} }
else else
{ {
ShowNotify(Resources.Lan.PleaseSelectModifyHotProessTrust, MessageBoxIcon.Warning); ShowNotify("请选择要处理的PMI委托", MessageBoxIcon.Warning);
} }
} }
else else
@ -335,7 +335,8 @@ namespace FineUIPro.Web.WeldingProcess.PMI
//删除主表数据 //删除主表数据
Funs.DB.PMI_Delegation.DeleteOnSubmit(trustManage); Funs.DB.PMI_Delegation.DeleteOnSubmit(trustManage);
//删除 明细表 //删除 明细表
var details = Funs.DB.PMI_DelegationDetails.Where(t => t.PMIId == trustManage.Id).ToList();
Funs.DB.PMI_DelegationDetails.DeleteAllOnSubmit(details);
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
Alert.ShowInTop(Resources.Lan.DeletedSuccessfully, MessageBoxIcon.Success); Alert.ShowInTop(Resources.Lan.DeletedSuccessfully, MessageBoxIcon.Success);
this.InitTreeMenu(); this.InitTreeMenu();

18
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs generated
View File

@ -257,24 +257,6 @@ namespace FineUIPro.Web.WeldingProcess.PMI
/// </remarks> /// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2; protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// tbxEditorQualityNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tbxEditorQualityNo;
/// <summary>
/// txtEditorAcceptance 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtEditorAcceptance;
/// <summary> /// <summary>
/// ToolbarSeparator1 控件。 /// ToolbarSeparator1 控件。
/// </summary> /// </summary>

93
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
View File

@ -162,19 +162,23 @@ namespace FineUIPro.Web.WeldingProcess.PMI
{ {
weldJointIds = hdItemsString.Text.Substring(0, hdItemsString.Text.LastIndexOf('|')); weldJointIds = hdItemsString.Text.Substring(0, hdItemsString.Text.LastIndexOf('|'));
List<Model.View_PMI_DelegationDetails> lists = BLL.PMIDelegation_Service.GetPMI_DelegationAddItem(weldJointIds); var lists = GetGridDataTable(weldJointIds);
this.BindGrid(lists); this.BindGrid(lists);
//获取单位 if (string.IsNullOrEmpty(this.txtDelegationNo.Text))
string unitCode = Funs.DB.Base_Unit.FirstOrDefault(t => t.UnitId == drpUnitId.SelectedValue)?.UnitCode; {
//获取区域code //获取单位
var workdAreaIdList = lists.Select(t => t.WorkAreaId).ToList(); string unitCode = Funs.DB.Base_Unit.FirstOrDefault(t => t.UnitId == drpUnitId.SelectedValue)?.UnitCode;
//获取区域code
var workdAreaIdList = lists.Select(t => t.WorkAreaId).ToList();
var workAreaCode = Funs.DB.Project_WorkArea.AsQueryable().Where(t => workdAreaIdList.Contains(t.WorkAreaId)).Distinct().FirstOrDefault()?.WorkAreaCode; var workAreaCode = Funs.DB.Project_WorkArea.AsQueryable().Where(t => workdAreaIdList.Contains(t.WorkAreaId)).Distinct().FirstOrDefault()?.WorkAreaCode;
string perfix = string.Empty;
perfix = $"PMI-{unitCode}-{workAreaCode}-PI-";
this.txtDelegationNo.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode", "dbo.PMI_Delegation", "DelegationNo", this.CurrUser.LoginProjectId, perfix);
}
string perfix = string.Empty;
perfix = $"PMI-{unitCode}-{workAreaCode}-PI-";
this.txtDelegationNo.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode", "dbo.PMI_Delegation", "DelegationNo", this.CurrUser.LoginProjectId, perfix);
} }
} }
#endregion #endregion
@ -276,7 +280,59 @@ namespace FineUIPro.Web.WeldingProcess.PMI
} }
#endregion #endregion
#region 获取Grid里面的数据返回集合
private List<View_PMI_DelegationDetails> GetGridDataTable(string weldJointIds)
{
string[] arr = weldJointIds.Split('|');
JArray mergedData = Grid1.GetMergedData();
var result = Funs.DB.View_Pipeline_WeldJoint.Select(t => new View_PMI_DelegationDetails {
WeldJointId= t.WeldJointId,
PipelineCode= t.PipelineCode,
ProjectId= t.ProjectId,
Acceptance="",
QualityNo="",
WeldJointCode=t.WeldJointCode,
Specification=t.Specification,
MaterialCode=t.MaterialCode,
WorkAreaId=t.WorkAreaId,
Status=0,
PMIId=this.PMIDelegationId
}).Where(t => arr.Contains(t.WeldJointId)).ToList();
result.ForEach(item =>
{
item.Id = SQLHelper.GetNewID(typeof(PMI_DelegationDetails));
});
if (mergedData.Count == 0)
{
return result;
}
else
{
foreach (JObject mergedRow in mergedData)
{
JObject values = mergedRow.Value<JObject>("values");
Model.View_PMI_DelegationDetails newTrustItem = new Model.View_PMI_DelegationDetails();
newTrustItem.Id = values.Value<string>("Id").ToString();
newTrustItem.PipelineCode = values.Value<string>("PipelineCode").ToString();
newTrustItem.WeldJointId = values.Value<string>("WeldJointId").ToString();
newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString();
newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString();
newTrustItem.WeldJointCode = values.Value<string>("WeldJointCode").ToString();
newTrustItem.Specification =HttpUtility.HtmlDecode(values.Value<string>("Specification").ToString());
newTrustItem.MaterialCode = values.Value<string>("MaterialCode").ToString();
newTrustItem.Status = 0;
newTrustItem.PMIId = this.PMIDelegationId;
result.Add(newTrustItem);
}
}
return result;
}
#endregion
#region 收集Grid页面信息,提交明细 #region 收集Grid页面信息,提交明细
/// <summary> /// <summary>
/// 收集Grid页面信息,提交明细 /// 收集Grid页面信息,提交明细
/// </summary> /// </summary>
@ -315,28 +371,19 @@ namespace FineUIPro.Web.WeldingProcess.PMI
{ {
this.hdItemsString.Text = this.hdItemsString.Text.Substring(0, this.hdItemsString.Text.LastIndexOf('|')); this.hdItemsString.Text = this.hdItemsString.Text.Substring(0, this.hdItemsString.Text.LastIndexOf('|'));
} }
var trust = Funs.DB.PMI_Delegation.FirstOrDefault(t=>t.Id==this.PMIDelegationId);
if (Grid1.SelectedRowIndexArray.Length > 0) if (Grid1.SelectedRowIndexArray.Length > 0)
{ {
List<Model.View_PMI_DelegationDetails> GetHotProessTrustItem = new List<Model.View_PMI_DelegationDetails>(); var listData = GetGridDataTable("");
if (!string.IsNullOrEmpty(this.hdItemsString.Text))
{
GetHotProessTrustItem = BLL.PMIDelegation_Service.GetPMI_DelegationAddItem(this.hdItemsString.Text);
}
else if (string.IsNullOrEmpty(this.hdItemsString.Text) && this.PMIDelegationId != null)
{
GetHotProessTrustItem = BLL.PMIDelegation_Service.GetPMI_DelegationItem(this.CurrUser.LoginProjectId, this.PMIDelegationId);
}
foreach (int rowIndex in Grid1.SelectedRowIndexArray) foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{ {
string rowID = Grid1.DataKeys[rowIndex][0].ToString(); string rowID = Grid1.DataKeys[rowIndex][0].ToString();
var item = GetHotProessTrustItem.FirstOrDefault(x => x.WeldJointId == rowID); var item = listData.FirstOrDefault(x => x.WeldJointId == rowID);
if (item != null) if (item != null)
{ {
GetHotProessTrustItem.Remove(item); listData.Remove(item);
} }
} }
BindGrid(GetHotProessTrustItem); BindGrid(listData);
ShowNotify(Resources.Lan.DeletedSuccessfully, MessageBoxIcon.Success); ShowNotify(Resources.Lan.DeletedSuccessfully, MessageBoxIcon.Success);
} }
} }

18
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
View File

@ -131,7 +131,7 @@
Width="50px" HeaderTextAlign="Center" TextAlign="Center" /> Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="<%$ Resources:Lan,PipelineCode %>" ColumnID="PipelineCode" <f:RenderField HeaderText="<%$ Resources:Lan,PipelineCode %>" ColumnID="PipelineCode"
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center" DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="220px" Locked="true"> TextAlign="Left" Width="200px" Locked="true">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,WeldingJointNumber %>" ColumnID="WeldJointCode" <f:RenderField HeaderText="<%$ Resources:Lan,WeldingJointNumber %>" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center" DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
@ -139,11 +139,11 @@
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,Specifications %>" ColumnID="Specification" <f:RenderField HeaderText="<%$ Resources:Lan,Specifications %>" ColumnID="Specification"
DataField="Specification" SortField="Specification" FieldType="String" HeaderTextAlign="Center" DataField="Specification" SortField="Specification" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="170px"> TextAlign="Left" Width="160px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,MaterialSpecificationCode %>" ColumnID="MaterialCode" <f:RenderField HeaderText="<%$ Resources:Lan,MaterialSpecificationCode %>" ColumnID="MaterialCode"
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center" DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="120px"> TextAlign="Center" Width="160px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,QualityNo %>" ColumnID="QualityNo" DataField="QualityNo" <f:RenderField HeaderText="<%$ Resources:Lan,QualityNo %>" ColumnID="QualityNo" DataField="QualityNo"
FieldType="String" TextAlign="Left" Width="150px"> FieldType="String" TextAlign="Left" Width="150px">
@ -152,20 +152,20 @@
DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px"> DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px">
</f:RenderField> </f:RenderField>
<%-- 检测日期 --%> <%-- 检测日期 --%>
<f:RenderField HeaderText="<%$ Resources:Lan,FilmDate %>" ColumnID="TrustDate" <f:RenderField HeaderText="<%$ Resources:Lan,FilmDate %>" ColumnID="DelegationDate"
DataField="TrustDate" SortField="TrustDate" FieldType="Date" Renderer="Date" DataField="DelegationDate" SortField="DelegationDate" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="120px"> HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor> <Editor>
<f:DatePicker ID="tbxTrustDate" Required="true" runat="server"> <f:DatePicker ID="tbxTrustDate" DateFormatString="yyyy-MM-dd" Required="true" runat="server">
</f:DatePicker> </f:DatePicker>
</Editor> </Editor>
</f:RenderField> </f:RenderField>
<%-- 报告日期 --%> <%-- 报告日期 --%>
<f:RenderField HeaderText="<%$ Resources:Lan,ReportDate %>" ColumnID="CreatedTime" <f:RenderField HeaderText="<%$ Resources:Lan,ReportDate %>" ColumnID="CreatedTime"
DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date" DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="120px"> HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor> <Editor>
<f:DatePicker ID="tbxCreatedTime" Required="true" runat="server"> <f:DatePicker ID="tbxCreatedTime" DateFormatString="yyyy-MM-dd" Required="true" runat="server">
</f:DatePicker> </f:DatePicker>
</Editor> </Editor>
</f:RenderField> </f:RenderField>
@ -180,7 +180,7 @@
</f:RenderField> </f:RenderField>
<%-- 是否合格 --%> <%-- 是否合格 --%>
<f:RenderField HeaderText="<%$ Resources:Lan,IsPass %>" ColumnID="StatusText" <f:RenderField HeaderText="<%$ Resources:Lan,IsPass %>" ColumnID="StatusText"
DataField="StatusText" SortField="status" FieldType="String" HeaderTextAlign="Center" DataField="StatusText" SortField="StatusText" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px"> TextAlign="Left" Width="100px">
<Editor> <Editor>
<f:DropDownList ID="drpstatus" runat="server" ShowRedStar="true" Required="true" > <f:DropDownList ID="drpstatus" runat="server" ShowRedStar="true" Required="true" >

8
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
View File

@ -217,7 +217,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
if (pageInfo.Count > 0) if (pageInfo.Count > 0)
{ {
this.txtDelegationNo.Text = pageInfo[0].DelegationNo; this.txtDelegationNo.Text = pageInfo[0].DelegationNo;
this.txtDelegationDate.Text = pageInfo[0].DelegationDate.ToString(); this.txtDelegationDate.Text = pageInfo[0].DelegationDate.Value.ToString("yyyy-MM-dd");
this.txtInstallationName.Text = pageInfo[0].InstallationName; this.txtInstallationName.Text = pageInfo[0].InstallationName;
this.txtUnitName.Text = pageInfo[0].UnitName; this.txtUnitName.Text = pageInfo[0].UnitName;
this.txtDetectionMethod.Text = pageInfo[0].DetectionMethod; this.txtDetectionMethod.Text = pageInfo[0].DetectionMethod;
@ -349,8 +349,8 @@ namespace FineUIPro.Web.WeldingProcess.PMI
if (onePMIDelegationDetails == null) if (onePMIDelegationDetails == null)
continue; continue;
//检测日期(缺失) //检测日期(缺失)
string trustDate = values.Value<string>("TrustDate"); string DelegationDate = values.Value<string>("DelegationDate");
if (string.IsNullOrWhiteSpace(trustDate)) if (string.IsNullOrWhiteSpace(DelegationDate))
; ;
else else
; ;
@ -374,7 +374,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
this.BindGrid(); this.BindGrid();
} }
ShowNotify("数据保存成功！（表格数据已重新绑定）"); ShowNotify(Resources.Lan.SaveSuccessfully, MessageBoxIcon.Success);
} }
} }
} }

47
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs
View File

@ -23,12 +23,12 @@ namespace FineUIPro.Web.WeldingProcess.PMI
/// <param name="e"></param> /// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e) protected void Page_Load(object sender, EventArgs e)
{ {
this.UnitId = Request.Params["unitId"] ?? "";
this.ProjectId = this.CurrUser.LoginProjectId;
this.PMIId = Request.Params["PMIId"] ?? "";
this.weldJointIds = Request.Params["weldJointIds"] ?? "";
if (!IsPostBack) if (!IsPostBack)
{ {
this.UnitId = Request.Params["unitId"] ??"";
this.ProjectId = this.CurrUser.LoginProjectId;
this.PMIId = Request.Params["PMIId"]??"";
this.weldJointIds = Request.Params["weldJointIds"] ?? "";
this.InitTreeMenu();//加载树 this.InitTreeMenu();//加载树
this.BindGrid(); this.BindGrid();
} }
@ -127,32 +127,12 @@ namespace FineUIPro.Web.WeldingProcess.PMI
select b.JointId select b.JointId
).Distinct().ToList(); ).Distinct().ToList();
// string sql = @"SELECT WeldJointId,ProjectId,PipelineId,WeldJointCode,WPQCode,DetectionType, string[] arr = this.weldJointIds.Split('|');
// convert(int,dbo.Fun_GetParseInt(WeldJointCode)) AS ConvertJointNo,
//dbo.Fun_GetParseString(WeldJointCode) AS PreJotNo,
// PipingClassCode,PipeSegment,JointAttribute,PageNum,
// ComponentsCode1,ComponentsCode2,Is_hjName,IsHotProessStr,Material1Code,Material2Code,
// WeldTypeCode,Specification,HeartNo1,HeartNo2,Size,Dia,Thickness,GrooveTypeCode,
// WeldingMethodCode,WeldSilkId,WeldMatCode,WeldingDate,WeldingDailyCode,DoneDin,
// BackingWelderCode,CoverWelderCode,SystemNumber,TestPackageNo,Remark,
// MaterialCode,WeldingDate,
// (CASE WHEN IsCancel=1 THEN '是' ELSE '否' END) AS IsCancel,isPMI
// FROM View_Pipeline_WeldJoint WHERE isPMI=1 ";
// List<SqlParameter> paramsList = new List<SqlParameter>();
// if (!string.IsNullOrEmpty(this.txtJointNo.Text))
// {
// sql += @" and WeldJointCode=@WeldJointCode";
// paramsList.Add(new SqlParameter("@WeldJointCode", txtJointNo.Text.Trim()));
// }
// if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
// {
// sql += @" and PipelineId=@PipelineId ";
// paramsList.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID));
// }
// var dt = SQLHelper.GetDataTableRunText(sql, paramsList.ToArray());
var query = Funs.DB.View_Pipeline_WeldJoint.Where(t => t.IsPMI == true); var query = Funs.DB.View_Pipeline_WeldJoint.Where(t => t.IsPMI == true);
if (arr.Length > 0)
{
listData.Add(arr[0]);
}
if (listData.Count > 0) if (listData.Count > 0)
{ {
query = query.Where(t => !listData.Contains(t.WeldJointId)); query = query.Where(t => !listData.Contains(t.WeldJointId));
@ -165,7 +145,14 @@ namespace FineUIPro.Web.WeldingProcess.PMI
{ {
query = query.Where(t => t.PipelineId == this.tvControlItem.SelectedNodeID); query = query.Where(t => t.PipelineId == this.tvControlItem.SelectedNodeID);
} }
Grid1.DataSource = query.ToList(); var data= query.ToList() ;
if (!string.IsNullOrEmpty(weldJointIds))
{
string[] jots = weldJointIds.Split('|');
data = data.Where(t => !jots.Contains(t.WeldJointId)).ToList();
}
data = data.OrderBy(t => t.WeldJointCode).ToList();
Grid1.DataSource = data;
Grid1.DataBind(); Grid1.DataBind();
} }
#endregion #endregion