lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-09-04

Browse Source
This commit is contained in:
李鹏飞
2023-09-04 18:07:10 +08:00
parent e1e1d5394a
commit 595f6226f2
3 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/SGGL_SeDin/v17/.wsuo
BIN
View File
Binary file not shown.
SGGL/BLL/HJGL/PointTrust/PointBatchService.cs
+2 -2
View File
@@ -291,7 +291,7 @@ namespace BLL
BLL.Funs.DB.HJGL_Batch_PointBatchItem.InsertOnSubmit(batchDetail); BLL.Funs.DB.HJGL_Batch_PointBatchItem.InsertOnSubmit(batchDetail);
BLL.Funs.DB.SubmitChanges(); BLL.Funs.DB.SubmitChanges();
// 焊工首道口RT必点 /*// 焊工首道口RT必点
var joints = from x in Funs.DB.HJGL_Batch_PointBatchItem var joints = from x in Funs.DB.HJGL_Batch_PointBatchItem
join y in Funs.DB.HJGL_Batch_PointBatch on x.PointBatchId equals y.PointBatchId join y in Funs.DB.HJGL_Batch_PointBatch on x.PointBatchId equals y.PointBatchId
join z in Funs.DB.Base_DetectionType on y.DetectionTypeId equals z.DetectionTypeId join z in Funs.DB.Base_DetectionType on y.DetectionTypeId equals z.DetectionTypeId
@@ -303,7 +303,7 @@ namespace BLL
{ {
BLL.PointBatchDetailService.UpdatePointBatchDetail(pointBatchItemId, "1", System.DateTime.Now); BLL.PointBatchDetailService.UpdatePointBatchDetail(pointBatchItemId, "1", System.DateTime.Now);
BLL.PointBatchDetailService.UpdateWelderFirst(pointBatchItemId, true); BLL.PointBatchDetailService.UpdateWelderFirst(pointBatchItemId, true);
} }*/
} }
catch catch
{ {
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs
+9 -8
View File
@@ -446,8 +446,6 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
} }
protected void btnPrint_Click(object sender, EventArgs e) protected void btnPrint_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_RepairTrustMenuId, Const.BtnPrint))
{ {
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{ {
@@ -472,12 +470,15 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId=0", BLL.Const.CheckTrustReport, trustBatchId, varValue))); //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId=0", BLL.Const.CheckTrustReport, trustBatchId, varValue)));
} }
} }
} //if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_RepairTrustMenuId, Const.BtnPrint))
else //{
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); //}
return; //else
} //{
// ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
// return;
//}
} }
#region 判断是否可删除 #region 判断是否可删除