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

00

Browse Source
This commit is contained in:
jackchenyang
2024-05-27 15:57:14 +08:00
parent a9d779470f a3876cde11
commit bd97eda8b0
21 changed files with 810 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/.vs/HJGL/config/applicationhost.config
+2 -2
View File
@@ -162,7 +162,7 @@
</site>
<site name="WebApi" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" />
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:3862:localhost" />
@@ -250,7 +250,7 @@
</site>
<site name="FineUIPro.Web(10)" id="13">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" />
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:13960:localhost" />
HJGL/BLL/WeldingProcess/TrustManage/Batch_PointBatchItemService.cs
+14 -7
View File
@@ -286,17 +286,24 @@ namespace BLL
newPointBatchItem.WeldJointId = weldJointId;
newPointBatchItem.WeldingDate = weldingDate;
newPointBatchItem.IsCheckRepair = false;
if (rate.DetectionRateValue != 0)
if (ndttype.SysType == "射线检测")
{
if (rate.DetectionRateValue == 5 || rate.DetectionRateValue == 10)
if (rate.DetectionRateValue != 0)
{
newPointBatchItem.AcceptLevel = "Ⅲ";
}
else
{
newPointBatchItem.AcceptLevel = "Ⅱ";
if (rate.DetectionRateValue == 5 || rate.DetectionRateValue == 10)
{
newPointBatchItem.AcceptLevel = "Ⅲ";
}
else
{
newPointBatchItem.AcceptLevel = "Ⅱ";
}
}
}
else
{
newPointBatchItem.AcceptLevel = "Ⅰ";
}
newPointBatchItem.IsCompletedPoint = false;
BLL.Batch_PointBatchItemService.AddPointBatchItem(newPointBatchItem); // 插入明细表
HJGL/FineUIPro.Web/PublicInfo/WPQ/WPQEdit.aspx.cs
+1
View File
@@ -21,6 +21,7 @@ namespace FineUIPro.Web.PublicInfo.WPQ
ckbWelders.DataTextField = "WelderCode";
ckbWelders.DataSource = from x in Funs.DB.Welder_Welder
join y in Funs.DB.Welder_ProjectWelder on x.WelderId equals y.WelderId
orderby x.WelderCode
where y.ProjectId == CurrUser.LoginProjectId
select x;
ckbWelders.DataBind();
HJGL/FineUIPro.Web/Web.config
+1 -1
View File
@@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections>
<connectionStrings>
<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
<add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
providerName="System.Data.SqlClient" />-->
</connectionStrings>
HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx
+1 -1
View File
@@ -38,7 +38,7 @@
<f:ListItem Value="FeⅠ" Text="FeⅠ"/>
<f:ListItem Value="FeⅡ" Text="FeⅡ"/>
<f:ListItem Value="FeⅢ" Text="FeⅢ"/>
<f:ListItem Value="FeIV" Text="FeIV"/>
<f:ListItem Value="FeⅣ" Text="FeⅣ"/>
<f:ListItem Value="其它" Text="其它"/>
</f:DropDownList>
</Items>
HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs
+1
View File
@@ -126,6 +126,7 @@ namespace FineUIPro.Web.WelderManage
{
updateQue.ThicknessMax = 0;
}
updateQue.IsHand=true;
Funs.DB.SubmitChanges();
BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnModify, this.WelderQualifiedProjectId);
HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs
+5 -2
View File
@@ -95,10 +95,12 @@ namespace FineUIPro.Web.WelderManage
{
welders = welders.Where(e => e.WelderName.Contains(this.txtWelderNameS.Text.Trim())).ToList();
}
welders= welders.OrderBy(x=>x.WelderCode).ToList();
foreach (var item in welders)
{
TreeNode newNode = new TreeNode();
newNode.Text = item.WelderName;
newNode.Text = item.WelderName + "(" + item.WelderCode + ")";
newNode.NodeID = item.WelderId;
newNode.ToolTip = item.WelderCode;
newNode.EnableClickEvent = true;
@@ -373,7 +375,8 @@ namespace FineUIPro.Web.WelderManage
{
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
var que = from x in Funs.DB.Welder_WelderQualify where x.WelderId == this.tvControlItem.SelectedNodeID select x;
// 手动的不自动分析 IsHand==null
var que = from x in Funs.DB.Welder_WelderQualify where x.WelderId == this.tvControlItem.SelectedNodeID && x.IsHand==null select x;
if (que.Count() > 0)
{
foreach (var q in que)
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx
+2
View File
@@ -123,6 +123,8 @@
<f:Button ID="btnSelectExpandPoint" Text="重新选择扩口" ToolTip="重新选择扩口" Icon="ArrowRefresh"
runat="server" OnClick="btnSelectExpandPoint_Click" Hidden="true">
</f:Button>
<f:Button ID="btnPTIn" Text="PT导入" runat="server" OnClick="btnPTIn_Click" >
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
+67
View File
@@ -1,9 +1,14 @@
using BLL;
using FineUIPro.Web.common.BaseInfo;
using FineUIPro.Web.common.ProjectSet;
using NPOI.SS.Formula.Functions;
using Org.BouncyCastle.Asn1.Tsp;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Management;
using System.Reflection;
using System.Web.UI.WebControls;
@@ -1534,6 +1539,66 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
}
#endregion
protected void btnPTIn_Click(object sender, EventArgs e)
{
string strSql = @"SELECT pipe.PipelineId,pipe.PipelineCode,pipe.DetectionRateId,rate.DetectionRateCode
FROM dbo.Pipeline_Pipeline pipe
LEFT JOIN dbo.Base_DetectionRate rate ON rate.DetectionRateId = pipe.DetectionRateId
WHERE (SELECT COUNT(*) FROM dbo.Pipeline_WeldJoint jot
WHERE jot.PipelineId=pipe.PipelineId
AND jot.WeldingDailyId IS NOT NULL
AND jot.DetectionType LIKE '%53704a2c-ce45-41d9-a6e7-be24f0780d87%' )>0";
DataTable tb = SQLHelper.GetDataTableRunText(strSql, null);
if (tb != null)
{
foreach (DataRow dr in tb.Rows)
{
string pipelineId =dr["PipelineId"].ToString();
string pipelineCode = dr["PipelineCode"].ToString();
string detectionRateId = dr["DetectionRateId"].ToString();
string detectionRateCode = dr["DetectionRateCode"].ToString();
Model.Batch_PointBatch newPointBatch = new Model.Batch_PointBatch();
string pointBatchId = SQLHelper.GetNewID(typeof(Model.Batch_PointBatch));
string pointBatchCode = Batch_PointBatchService.GetNewPointBatchCode("0bbe1ae1-e643-4f86-9695-4381ed792ec9", pipelineCode, "PT", detectionRateCode);
newPointBatch.PointBatchId = pointBatchId;
newPointBatch.PointBatchCode = pointBatchCode;
newPointBatch.ProjectId = "0bbe1ae1-e643-4f86-9695-4381ed792ec9";
newPointBatch.UnitId = "8c730dfc-07a5-424e-8f58-75098493e0c5";
newPointBatch.PipelineId = pipelineId;
newPointBatch.InstallationId = "2990422b-4589-42a1-b2b5-b0c2e39324d0";
newPointBatch.DetectionTypeId = "53704a2c-ce45-41d9-a6e7-be24f0780d87";
newPointBatch.DetectionRateId = detectionRateId;
newPointBatch.StartDate = System.DateTime.Now;
newPointBatch.IsTrust = true;
Batch_PointBatchService.AddPointBatch(newPointBatch); // 生成主表
// 增加明细
var jotList = (from x in Funs.DB.Pipeline_WeldJoint
join y in Funs.DB.Pipeline_WeldingDaily on x.WeldingDailyId equals y.WeldingDailyId
where x.PipelineId == pipelineId && x.WeldingDailyId != null
&& x.DetectionType.Contains("53704a2c-ce45-41d9-a6e7-be24f0780d87")
select new { x.WeldJointId, y.WeldingDate }).ToList();
foreach (var jot in jotList)
{
Model.Batch_PointBatchItem newPointBatchItem = new Model.Batch_PointBatchItem();
string pointBatchItemId = SQLHelper.GetNewID(typeof(Model.Batch_PointBatchItem));
newPointBatchItem.PointBatchItemId = pointBatchItemId;
newPointBatchItem.PointBatchId = pointBatchId;
newPointBatchItem.WeldJointId = jot.WeldJointId;
newPointBatchItem.WeldingDate = jot.WeldingDate;
newPointBatchItem.IsCheckRepair = false;
newPointBatchItem.AcceptLevel = "Ⅰ";
newPointBatchItem.IsCompletedPoint = true;
BLL.Batch_PointBatchItemService.AddPointBatchItem(newPointBatchItem); // 插入明细表
}
}
}
}
private string GetNewTrust(string code)
{
int r_num = 0;
@@ -1558,5 +1623,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
return newTrustCode;
}
}
}
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.designer.cs
Generated
+54 -43
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.TrustManage {
public partial class PointManage {
namespace FineUIPro.Web.WeldingProcess.TrustManage
{
public partial class PointManage
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpTrust 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpTrust;
/// <summary>
/// Toolbar3 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// drpNde 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpNde;
/// <summary>
/// Toolbar6 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar6;
/// <summary>
/// txtPipeCode 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipeCode;
/// <summary>
/// Toolbar5 控件。
/// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar5;
/// <summary>
/// txtJotDate 控件。
/// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtJotDate;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpIsTrust 控件。
/// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsTrust;
/// <summary>
/// drpIsCompletedPoint 控件。
/// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsCompletedPoint;
/// <summary>
/// drpWelder 控件。
/// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWelder;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnGenerate 控件。
/// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnGenerate;
/// <summary>
/// btnHandGenerate 控件。
/// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnHandGenerate;
/// <summary>
/// btnbtnOpenResetPoint 控件。
/// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnbtnOpenResetPoint;
/// <summary>
/// btnClear 控件。
/// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClear;
/// <summary>
/// btnSelectExpandPoint 控件。
/// </summary>
@@ -227,7 +229,16 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSelectExpandPoint;
/// <summary>
/// btnPTIn 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPTIn;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -236,7 +247,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtStartDate 控件。
/// </summary>
@@ -245,7 +256,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtStartDate;
/// <summary>
/// txtEndDate 控件。
/// </summary>
@@ -254,7 +265,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtEndDate;
/// <summary>
/// txtState 控件。
/// </summary>
@@ -263,7 +274,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtState;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -272,7 +283,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -281,7 +292,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -290,7 +301,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -299,7 +310,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -308,7 +319,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
@@ -317,7 +328,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -326,7 +337,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnCancelPoint 控件。
/// </summary>
@@ -335,7 +346,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnCancelPoint;
/// <summary>
/// btnCancel 控件。
/// </summary>
@@ -344,7 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnCancel;
/// <summary>
/// btnModefyFristWeld 控件。
/// </summary>
@@ -353,7 +364,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnModefyFristWeld;
/// <summary>
/// btnCut 控件。
/// </summary>
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/PipelineManage.aspx.cs
+10 -3
View File
@@ -188,9 +188,16 @@ namespace FineUIPro.Web.WeldingManage
FROM View_Pipeline_Pipeline WHERE ProjectId= @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
strSql += " AND WorkAreaId =@WorkAreaId";
listStr.Add(new SqlParameter("@WorkAreaId", this.tvControlItem.SelectedNodeID));
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
var area = BLL.Project_WorkAreaService.GetProject_WorkAreaByWorkAreaId(this.tvControlItem.SelectedNodeID);
if (area != null)
{
strSql += " AND WorkAreaId =@WorkAreaId";
listStr.Add(new SqlParameter("@WorkAreaId", this.tvControlItem.SelectedNodeID));
}
}
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
{
strSql += " AND PipelineCode LIKE @PipelineCode";
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs
+12 -5
View File
@@ -982,8 +982,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
sch = dn.First().XXS;
}
}
d.Thickness = sch;
if (sch != null)
{
d.Thickness = sch;
}
else
{
errorInfos += (i + 2) + "行,美标壁厚[" + ansi + "]未设置值；";
}
if (dia != null && sch != null)
{
@@ -1254,7 +1261,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
bool canSave = false;
var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(jotId);
var joty = BLL.Base_WeldTypeService.GetWeldTypeByWeldTypeId(jot.WeldTypeId);
var joty = BLL.Base_WeldTypeService.GetWeldTypeByWeldTypeId(d.WeldTypeId);
string weldTypeGroup = joty.Flag;
string weldTypeCode = joty.WeldTypeCode;
string floorWelder = floorWelderId;
@@ -1263,7 +1270,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
//decimal? sch = jot.Thickness;
string weldingMethodCode = string.Empty;
var wm = BLL.Base_WeldingMethodService.GetWeldingMethodByWeldingMethodId(jot.WeldingMethodId);
var wm = BLL.Base_WeldingMethodService.GetWeldingMethodByWeldingMethodId(d.WeldingMethodId);
if (wm != null)
{
weldingMethodCode = wm.WeldingMethodCode;
@@ -1271,7 +1278,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
string[] wmeCodes = weldingMethodCode.Split('+');
string location = string.Empty;
var loc = BLL.Base_WeldingLocationServie.GetWeldingLocationById(jot.WeldingLocationId);
var loc = BLL.Base_WeldingLocationServie.GetWeldingLocationById(d.WeldingLocationId);
if (loc != null)
{
location = loc.WeldingLocationCode;
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.cs
+3
View File
@@ -429,6 +429,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
bool canSave = false;
var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(item.WeldJointId);
var joty = BLL.Base_WeldTypeService.GetWeldTypeByWeldTypeId(jot.WeldTypeId);
string weldTypeGroup = joty.Flag;
string weldTypeCode = joty.WeldTypeCode;
string floorWelder = item.BackingWelderId;
@@ -1330,7 +1331,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
item.WPQId = wps.WPQId;
if (!string.IsNullOrEmpty(wps.WeldingMethodId))
{
var met = BLL.Base_WeldingMethodService.GetWeldingMethodByWeldingMethodId(wps.WeldingMethodId);
item.WeldingMethodId = wps.WeldingMethodId;
item.WeldingMethodCode= met.WeldingMethodCode;
}
if (!string.IsNullOrEmpty(wps.WeldMatId))
{
HJGL/Model/Model.cs
+24
View File
@@ -46674,6 +46674,8 @@ namespace Model
private string _Remark;
private System.Nullable<bool> _IsHand;
private EntityRef<Welder_Welder> _Welder_Welder;
#region 可扩展性方法定义
@@ -46712,6 +46714,8 @@ namespace Model
partial void OnIsPassChanged();
partial void OnRemarkChanging(string value);
partial void OnRemarkChanged();
partial void OnIsHandChanging(System.Nullable<bool> value);
partial void OnIsHandChanged();
#endregion
public Welder_WelderQualify()
@@ -47044,6 +47048,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsHand", DbType="Bit")]
public System.Nullable<bool> IsHand
{
get
{
return this._IsHand;
}
set
{
if ((this._IsHand != value))
{
this.OnIsHandChanging(value);
this.SendPropertyChanging();
this._IsHand = value;
this.SendPropertyChanged("IsHand");
this.OnIsHandChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Welder_WelderQualify_Welder_Welder", Storage="_Welder_Welder", ThisKey="WelderId", OtherKey="WelderId", IsForeignKey=true)]
public Welder_Welder Welder_Welder
{
HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.