gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20251219 交工资料

Browse Source
This commit is contained in:
毕文静
2025-12-19 17:10:07 +08:00
parent 6d6dba64c1 6a756be0e7
commit 6d0af577b0
7 changed files with 153 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/HJGL/CheckManage/QualityRating.aspx.cs
+18 -15
View File
@@ -814,8 +814,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
this.QualityRatingId = values.Value<string>("QualityRatingId");
if (trust.CH_NDTMethod == "20d2cbca-8b3d-434b-b1c1-181796986fa5") //RT检测，评定结果不为空才保存拍片记录
{
//if (!string.IsNullOrEmpty(newQualityRating.DefectResult))
//{
if (!string.IsNullOrEmpty(newQualityRating.IsPass))
{
filmNum++;
if (newQualityRating.RMaterial == true)
{
@@ -837,25 +837,28 @@ namespace FineUIPro.Web.HJGL.CheckManage
newQualityRating.QualityRatingId = this.QualityRatingId;
BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating);
}
//}
}
}
else
{
var quatlityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId);
if (quatlityRating == null)
if (!string.IsNullOrEmpty(newQualityRating.IsPass))
{
newQualityRating.QualityRatingId = this.QualityRatingId;
BLL.HJGL_BO_QualityRatingService.AddQualityRating(newQualityRating);
}
else
{
Model.HJGL_BO_QualityRating oldQualityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId);
if (oldQualityRating != null)
var quatlityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId);
if (quatlityRating == null)
{
newQualityRating.RemakeResult = oldQualityRating.RemakeResult;
newQualityRating.QualityRatingId = this.QualityRatingId;
BLL.HJGL_BO_QualityRatingService.AddQualityRating(newQualityRating);
}
else
{
Model.HJGL_BO_QualityRating oldQualityRating = BLL.HJGL_BO_QualityRatingService.GetQualityRatingById(this.QualityRatingId);
if (oldQualityRating != null)
{
newQualityRating.RemakeResult = oldQualityRating.RemakeResult;
}
newQualityRating.QualityRatingId = this.QualityRatingId;
BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating);
}
newQualityRating.QualityRatingId = this.QualityRatingId;
BLL.HJGL_BO_QualityRatingService.UpadteQualityRating(newQualityRating);
}
}
BLL.HJGL_CH_TrustItemService.UpdateTrustItem(trustItem);
HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs
+5 -2
View File
@@ -605,9 +605,12 @@ namespace FineUIPro.Web.HJGL.DataIn
{
result += "第" + (i + 2).ToString() + "行," + "该焊口的焊工资质不符合" + "\n";
}
else //D类口暂时不提示
else
{
if (floorWelderQualifys.Count() == 0 && cellWelderQualifys.Count() == 0) //D类口强制提交时，应至少有焊工证，否则也不可强制提交
{
result += "第" + (i + 2).ToString() + "行," + "该焊口的焊工资质不符合" + "\n";
}
}
}
}
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+7
View File
@@ -465,6 +465,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
isAllD = false;
}
else
{
if (floorWelderQualifys.Count() == 0 && cellWelderQualifys.Count() == 0) //D类口强制提交时，应至少有焊工证，否则也不可强制提交
{
isAllD = false;
}
}
}
}
if (eventArg != string.Empty)
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx.cs
+2 -1
View File
@@ -170,7 +170,8 @@ namespace FineUIPro.Web.WeldMat.Stock
/// <param name="e"></param>
protected void btnMoveStore_Click(object sender, EventArgs e)
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_StockMoveRecordsMenuId, BLL.Const.BtnMoveStore))
//if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_StockMoveRecordsMenuId, BLL.Const.BtnMoveStore))
if (this.CurrUser.UserId == "95eae1e8-ddb9-4b76-99f4-78a3636a398b") //焊材移库功能只能赵瑞霞操作
{
if (CurrUser.Account != Const.Gly)
{
HJGL_DS/WebAPI/Controllers/JointInfoController.cs
+9
View File
@@ -214,6 +214,15 @@ namespace WebAPI.Controllers
responeData.message = "该焊口的焊工资质不符合！";
return responeData;
}
else
{
if (floorWelderQualifys.Count() == 0 && cellWelderQualifys.Count() == 0) //D类口强制提交时，应至少有焊工证，否则也不可强制提交
{
responeData.code = 0;
responeData.message = "该焊口的焊工资质不符合！";
return responeData;
}
}
}
}
BLL.APIJointInfoService.SaveJointInfoForWeldReport(addItem);
HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+7 -7
View File
@@ -79,13 +79,13 @@
<publishTime>09/10/2013 16:29:20</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>11/18/2025 11:30:43</publishTime>
<publishTime>12/19/2025 10:46:46</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>07/28/2025 20:15:00</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>11/18/2025 11:30:43</publishTime>
<publishTime>12/19/2025 10:46:46</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/17/2020 21:32:28</publishTime>
@@ -115,10 +115,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>11/18/2025 11:30:43</publishTime>
<publishTime>12/19/2025 10:46:45</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>11/18/2025 11:30:43</publishTime>
<publishTime>12/19/2025 10:46:45</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/17/2021 20:03:36</publishTime>
@@ -319,10 +319,10 @@
<publishTime>02/01/2018 12:20:56</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>11/18/2025 11:30:44</publishTime>
<publishTime>12/19/2025 10:46:46</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>11/18/2025 11:30:44</publishTime>
<publishTime>12/19/2025 10:46:46</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 13:57:34</publishTime>
@@ -448,7 +448,7 @@
<publishTime>07/03/2024 11:01:07</publishTime>
</File>
<File Include="Web.config">
<publishTime>11/18/2025 11:30:50</publishTime>
<publishTime>12/19/2025 10:47:09</publishTime>
</File>
</ItemGroup>
</Project>