From 877a87466768c12aa9ad8415f475c24d983f6010 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 1 Dec 2023 17:08:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../HJGL/PreDesign/PackagingManage.aspx | 4 +-
.../HJGL/PreDesign/PackagingManageEdit.aspx | 8 +-
.../PackagingManageEdit.aspx.designer.cs | 9 --
.../HJGL/WeldingManage/JotTwoDesign.aspx | 8 +-
.../HJGL/WeldingManage/JotTwoDesign.aspx.cs | 130 ++++++++++++------
.../JotTwoDesign.aspx.designer.cs | 18 ---
6 files changed, 98 insertions(+), 79 deletions(-)
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
index 3ac2eeed..f47fe4ed 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
@@ -44,9 +44,9 @@
FieldType="String" HeaderText="包装编号" HeaderTextAlign="Center" TextAlign="Center">
-
-
+ --%>
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx
index 428a9204..6d22170a 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx
@@ -66,11 +66,11 @@
-
-
-
+ --%>
+
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.designer.cs
index 18fbd906..1bf82dc8 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.designer.cs
@@ -111,15 +111,6 @@ namespace FineUIPro.Web.HJGL.PreDesign {
///
protected global::FineUIPro.Button btnFind;
- ///
- /// txtPlanStartDate 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.TextBox txtPlanStartDate;
-
///
/// txtStackingPosition 控件。
///
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx
index 63dd24d5..f6f2b331 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx
@@ -78,9 +78,9 @@
-
-
+ --%>
@@ -92,8 +92,8 @@
-
-
+ <%--
+ --%>
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
index 546d0da3..ca121e7d 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
@@ -524,49 +524,49 @@ namespace FineUIPro.Web.HJGL.WeldingManage
///
protected void btnAutoInput_Click(object sender, EventArgs e)
{
- if (this.drpUnit.SelectedValue == BLL.Const._Null)
- {
- ShowNotify("请选择工艺规程编制单位！", MessageBoxIcon.Warning);
- return;
- }
- if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
- {
- var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID && x.WPQId == null && x.IsTwoJoint == true select x;
- if (jotList.Count() > 0)
- {
- foreach (var jot in jotList)
- {
- List wpqList = BLL.WPQListServiceService.GetMatchWPQ(jot, this.CurrUser.LoginProjectId, drpUnit.SelectedValue);
- if (wpqList != null)
- {
- Model.HJGL_WeldJoint newJot = WeldJointService.GetWeldJointByWeldJointId(jot.WeldJointId);
- 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);
- }
+ //if (this.drpUnit.SelectedValue == BLL.Const._Null)
+ //{
+ // ShowNotify("请选择工艺规程编制单位！", MessageBoxIcon.Warning);
+ // return;
+ //}
+ //if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
+ //{
+ // var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID && x.WPQId == null && x.IsTwoJoint == true select x;
+ // if (jotList.Count() > 0)
+ // {
+ // foreach (var jot in jotList)
+ // {
+ // List wpqList = BLL.WPQListServiceService.GetMatchWPQ(jot, this.CurrUser.LoginProjectId, drpUnit.SelectedValue);
+ // if (wpqList != null)
+ // {
+ // Model.HJGL_WeldJoint newJot = WeldJointService.GetWeldJointByWeldJointId(jot.WeldJointId);
+ // 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));
- BLL.WeldJointService.UpdateConWeldJoint(newJot);
- }
- }
- }
- BindGrid();
- ShowNotify("该管线焊口已完成自动录入！", MessageBoxIcon.Success);
- }
+ // 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));
+ // BLL.WeldJointService.UpdateConWeldJoint(newJot);
+ // }
+ // }
+ // }
+ // BindGrid();
+ // ShowNotify("该管线焊口已完成自动录入！", MessageBoxIcon.Success);
+ //}
}
///
/// 焊口信息编辑
@@ -609,6 +609,52 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
BLL.WeldJointService.UpdateJointAudit(jot, CurrUser.PersonId, DateTime.Now);
}
+
+ if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
+ {
+ var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID && x.WPQId == null && x.IsTwoJoint == true select x;
+ if (jotList.Count() > 0)
+ {
+ foreach (var jot in jotList)
+ {
+ string unitId = string.Empty;
+ Model.Person_Persons person = BLL.Person_PersonsService.GetPerson_PersonsById(jot.SubmitMan);
+ if (person != null)
+ {
+ unitId = person.UnitId;
+ }
+ List wpqList = BLL.WPQListServiceService.GetMatchWPQ(jot, this.CurrUser.LoginProjectId, unitId);
+ if (wpqList != null)
+ {
+ Model.HJGL_WeldJoint newJot = WeldJointService.GetWeldJointByWeldJointId(jot.WeldJointId);
+ 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));
+ BLL.WeldJointService.UpdateConWeldJoint(newJot);
+ }
+ }
+ }
+ //BindGrid();
+ //ShowNotify("该管线焊口已完成自动录入！", MessageBoxIcon.Success);
+ }
+
ShowNotify("所选口审核成功！", MessageBoxIcon.Success);
BindGrid();
//string weldJointIdList = string.Join("|", Grid1.SelectedRowIDArray);
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.designer.cs
index 2a839a5f..04a36c6f 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.designer.cs
@@ -174,15 +174,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
///
protected global::FineUIPro.DropDownList DropTwoJointType;
- ///
- /// drpUnit 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DropDownList drpUnit;
-
///
/// ToolbarFill1 控件。
///
@@ -219,15 +210,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
///
protected global::FineUIPro.Button btnBatchAdd;
- ///
- /// btnAutoInput 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Button btnAutoInput;
-
///
/// btnOut2 控件。
///