diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 8326a29a..eac87757 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ diff --git a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql index 4c762b12..20cc9602 100644 --- a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql +++ b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql @@ -365,7 +365,7 @@ GO GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('27AA3C4C-D424-4CBA-ABBE-EDA953A196A4','޼ⵥ¼','HJGL/NDT/NDTBatch.aspx?Type=R',30,'E7533566-73A9-4507-8FCB-1FE713819A24','Menu_HJGL',0,1,1) + VALUES('27AA3C4C-D424-4CBA-ABBE-EDA953A196A4','޼ⵥ¼','HJGL/NDT/NDTBatch.arspx?Type=R',30,'E7533566-73A9-4507-8FCB-1FE713819A24','Menu_HJGL',0,1,1) GO /*ⵥ¼*/ INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('A4284CC7-4F99-4188-8CAB-A2CF578A0F2A','27AA3C4C-D424-4CBA-ABBE-EDA953A196A4','',1) diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx index 5d47cd9a..c05040e6 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -99,7 +99,7 @@ namespace FastReport } - + @@ -153,15 +153,15 @@ namespace FastReport - + - - + + - + @@ -174,28 +174,28 @@ namespace FastReport - + - + - + - + - + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 558a3655..ec18c3f4 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -526,7 +526,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { var t = BLL.WeldTaskService.GetWeldTaskById(row); - errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, false); + errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true); } } else @@ -536,7 +536,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage if (Grid1.SelectedRowIDArray.Contains(Grid1.Rows[i].RowID)) { var t = BLL.WeldTaskService.GetWeldTaskById(Grid1.Rows[i].RowID); - errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, false); + errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true); } else { @@ -1062,7 +1062,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage var pointBatchItems = from x in Funs.DB.HJGL_Batch_PointBatchItem where x.WeldJointId == weldJointId select x; string pointBatchId = pointBatchItems.FirstOrDefault().PointBatchId; - /*// 删除焊口所在批明细信息 + // 删除焊口所在批明细信息 BLL.PointBatchDetailService.DeleteBatchDetail(weldJointId); // 删除批信息 @@ -1070,7 +1070,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage if (pointBatchId != null && batch.Count() == 0) { BLL.PointBatchService.DeleteBatch(pointBatchId); - }*/ + } } } else diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs index 025e2f42..49415846 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs @@ -427,7 +427,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (batchC != null) { string batchCondition = batchC.SetValue; - BLL.PointBatchService.AddBatchByWeldJointId(item.WeldJointId,null, batchCondition); + //BLL.PointBatchService.AddBatchByWeldJointId(item.WeldJointId,null, batchCondition); } @@ -919,7 +919,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (task != null) { BLL.WeldTaskService.DeleteWeldingTask(task.WeldTaskId); - PointBatchService.DeleteBatchByWeldJointId(task.WeldJointId); + //PointBatchService.DeleteBatchByWeldJointId(task.WeldJointId); } } ShowNotify("删除成功！", MessageBoxIcon.Success);