From e5c44d6dc24c730cbf22a50df52747fd4efa3f30 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Thu, 7 Nov 2024 16:22:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2024-11-06.sql | 26 ++++ SGGL/BLL/CLGL/TwInOutplanmasterService.cs | 15 ++ SGGL/BLL/CLGL/TwInputmasterService.cs | 31 +++- SGGL/BLL/CLGL/TwOutputmasterService.cs | 29 +++- SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx | 28 ++-- SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs | 7 + .../CLGL/InPlanMasterEdit.aspx.cs | 5 + SGGL/FineUIPro.Web/CLGL/InputMaster.aspx | 28 ++-- SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs | 6 + SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx | 36 ++--- SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs | 6 + .../CLGL/OutPlanMasterOut.aspx.cs | 5 + SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx | 34 ++--- SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs | 6 + .../File/Fastreport/材料入库单.frx | 22 ++- .../File/Fastreport/材料入库计划单.frx | 22 ++- .../File/Fastreport/材料出库单.frx | 28 ++-- .../File/Fastreport/材料出库计划单.frx | 22 ++- .../HJGL/PreDesign/PrePipeline.aspx | 6 + .../HJGL/PreDesign/PrePipeline.aspx.cs | 26 +++- .../PreDesign/PrePipeline.aspx.designer.cs | 9 ++ .../HJGL/WeldingManage/WeldTask.aspx.cs | 1 + SGGL/Model/CLGL/Tw_InOutMasterOutput.cs | 1 + SGGL/Model/CLGL/Tw_PrintModel.cs | 2 + SGGL/Model/Model.cs | 144 ++++++++++++++++++ 25 files changed, 434 insertions(+), 111 deletions(-) diff --git a/DataBase/版本日志/SGGLDB_V2024-11-06.sql b/DataBase/版本日志/SGGLDB_V2024-11-06.sql index fa8c6e98..ba46502c 100644 --- a/DataBase/版本日志/SGGLDB_V2024-11-06.sql +++ b/DataBase/版本日志/SGGLDB_V2024-11-06.sql @@ -1,3 +1,29 @@ alter table dbo.HJGL_Pipeline_Component add Remark nvarchar(200) go + +alter table dbo.Tw_OutputMaster + add WarehouseMan nvarchar(50) +go + +alter table dbo.Tw_OutputMaster + add WarehouseDate datetime +go +alter table dbo.Tw_InOutPlanMaster + add WarehouseMan nvarchar(50) +go + +alter table dbo.Tw_InOutPlanMaster + add WarehouseDate datetime +go +alter table dbo.Tw_InputMaster + add WarehouseMan nvarchar(50) +go + +alter table dbo.Tw_InputMaster + add WarehouseDate datetime +go + + + + diff --git a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs index 34db1b20..c0dff8e3 100644 --- a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs +++ b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs @@ -39,6 +39,8 @@ namespace BLL from auditperson in auditpersons.DefaultIfEmpty() join auditperson2 in Funs.DB.Person_Persons on x.AuditMan2 equals auditperson2.PersonId into auditpersons2 from auditperson2 in auditpersons2.DefaultIfEmpty() + join warehouseperson in Funs.DB.Person_Persons on x.WarehouseMan equals warehouseperson.PersonId into warehousepersons + from warehouseperson in warehousepersons.DefaultIfEmpty() join unit in Funs.DB.Base_Unit on x.ReqUnitId equals unit.UnitId into units from unit in units.DefaultIfEmpty() where @@ -80,6 +82,9 @@ namespace BLL Remark = x.Remark, AuditManName2 = auditperson2.PersonName, AuditDate2 = x.AuditDate2, + WarehouseMan = x.WarehouseMan, + WarehouseDate = x.WarehouseDate, + WarehouseManName= warehouseperson.PersonName } ; @@ -134,6 +139,9 @@ namespace BLL Remark = x.Remark, AuditManName2 = x.AuditManName2, AuditDate2 = x.AuditDate2, + WarehouseMan = x.WarehouseMan, + WarehouseDate = x.WarehouseDate, + WarehouseManName= x.WarehouseManName }).ToList(); } @@ -178,6 +186,9 @@ namespace BLL Remark = x.Remark, AuditManName2 = x.AuditManName2, AuditDate2 = x.AuditDate2, + WarehouseMan = x.WarehouseMan, + WarehouseDate = x.WarehouseDate, + WarehouseManName= x.WarehouseManName }; } @@ -325,6 +336,8 @@ namespace BLL Remark = newtable.Remark, AuditMan2=newtable.AuditMan2, AuditDate2=newtable.AuditDate2, + WarehouseMan = newtable.WarehouseMan, + WarehouseDate = newtable.WarehouseDate, }; Funs.DB.Tw_InOutPlanMaster.InsertOnSubmit(table); Funs.DB.SubmitChanges(); @@ -354,6 +367,8 @@ namespace BLL table.Remark = newtable.Remark; table.AuditMan2 = newtable.AuditMan2; table.AuditDate2 = newtable.AuditDate2; + table.WarehouseMan = newtable.WarehouseMan; + table.WarehouseDate = newtable.WarehouseDate; Funs.DB.SubmitChanges(); } diff --git a/SGGL/BLL/CLGL/TwInputmasterService.cs b/SGGL/BLL/CLGL/TwInputmasterService.cs index a4df4628..81df4031 100644 --- a/SGGL/BLL/CLGL/TwInputmasterService.cs +++ b/SGGL/BLL/CLGL/TwInputmasterService.cs @@ -28,6 +28,8 @@ namespace BLL from person in persons.DefaultIfEmpty() join auditperson in Funs.DB.Person_Persons on x.AuditMan equals auditperson.PersonId into auditpersons from auditperson in auditpersons.DefaultIfEmpty() + join warehouseperson in Funs.DB.Person_Persons on x.WarehouseMan equals warehouseperson.PersonId into warehousepersons + from warehouseperson in warehousepersons.DefaultIfEmpty() join unit in Funs.DB.Base_Unit on x.ReqUnitId equals unit.UnitId into units from unit in units.DefaultIfEmpty() where @@ -60,7 +62,10 @@ namespace BLL AuditMan = x.AuditMan, AuditManName = auditperson.PersonName, AuditDate = x.AuditDate, - Remark = x.Remark + Remark = x.Remark, + WarehouseMan = x.WarehouseMan, + WarehouseManName = warehouseperson.PersonName, + WarehouseDate = x.WarehouseDate }; return q; @@ -105,7 +110,10 @@ namespace BLL AuditMan = x.AuditMan, AuditManName = x.AuditManName, AuditDate = x.AuditDate, - Remark=x.Remark + Remark=x.Remark, + WarehouseMan = x.WarehouseMan, + WarehouseDate = x.WarehouseDate, + WarehouseManName= x.WarehouseManName }; } @@ -142,7 +150,10 @@ namespace BLL AuditMan = x.AuditMan, AuditManName = x.AuditManName, AuditDate = x.AuditDate, - Remark = x.Remark + Remark = x.Remark, + WarehouseMan = x.WarehouseMan, + WarehouseDate = x.WarehouseDate, + WarehouseManName= x.WarehouseManName }).ToList(); } #endregion @@ -172,7 +183,9 @@ namespace BLL ReqUnitId = newtable.ReqUnitId, AuditMan= newtable.AuditMan, AuditDate = newtable.AuditDate, - Remark = newtable.Remark + Remark = newtable.Remark, + WarehouseMan= newtable.WarehouseMan, + WarehouseDate = newtable.WarehouseDate }; Funs.DB.Tw_InputMaster.InsertOnSubmit(table); Funs.DB.SubmitChanges(); @@ -199,6 +212,8 @@ namespace BLL table.AuditMan = newtable.AuditMan; table.AuditDate = newtable.AuditDate; table.Remark = newtable.Remark; + table.WarehouseMan = newtable.WarehouseMan; + table.WarehouseDate = newtable.WarehouseDate; Funs.DB.SubmitChanges(); } @@ -250,11 +265,13 @@ namespace BLL Category = plan.Category, State = (int)TwConst.State.已完成, CreateMan = plan.CreateMan, - CreateDate = DateTime.Now, + CreateDate = plan.CreateDate, ReqUnitId = plan.ReqUnitId, - AuditMan = plan.CreateMan, + AuditMan = plan.AuditMan, AuditDate = plan.AuditDate, - Remark= remark + Remark= remark, + WarehouseMan = plan.WarehouseMan, + WarehouseDate = plan.WarehouseDate }; if ((TwConst.TypeInt)plan.TypeInt!= TwConst.TypeInt.采购入库) { diff --git a/SGGL/BLL/CLGL/TwOutputmasterService.cs b/SGGL/BLL/CLGL/TwOutputmasterService.cs index 7195ff87..ba035b9b 100644 --- a/SGGL/BLL/CLGL/TwOutputmasterService.cs +++ b/SGGL/BLL/CLGL/TwOutputmasterService.cs @@ -34,6 +34,8 @@ namespace BLL from person in persons.DefaultIfEmpty() join auditperson in Funs.DB.Person_Persons on x.AuditMan equals auditperson.PersonId into auditpersons from auditperson in auditpersons.DefaultIfEmpty() + join warehouseperson in Funs.DB.Person_Persons on x.WarehouseMan equals warehouseperson.PersonId into warehousepersons + from warehouseperson in warehousepersons.DefaultIfEmpty() join unit in Funs.DB.Base_Unit on x.ReqUnitId equals unit.UnitId into units from unit in units.DefaultIfEmpty() where @@ -68,6 +70,9 @@ namespace BLL AuditMan = x.AuditMan, AuditManName = auditperson.PersonName, AuditDate = x.AuditDate, + WarehouseMan = x.WarehouseMan, + WarehouseDate = x.WarehouseDate, + WarehouseManName = warehouseperson.PersonName }; return q; @@ -112,7 +117,10 @@ namespace BLL WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode : "" : "", AuditMan = x.AuditMan, AuditManName = x.AuditManName, - AuditDate = x.AuditDate + AuditDate = x.AuditDate, + WarehouseMan = x.WarehouseMan, + WarehouseManName = x.WarehouseManName, + WarehouseDate = x.WarehouseDate }; } @@ -150,7 +158,10 @@ namespace BLL WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode : "" : "", AuditMan = x.AuditMan, AuditManName = x.AuditManName, - AuditDate = x.AuditDate + AuditDate = x.AuditDate, + WarehouseMan = x.WarehouseMan, + WarehouseManName = x.WarehouseManName, + WarehouseDate = x.WarehouseDate }).ToList(); } @@ -180,7 +191,9 @@ namespace BLL CreateDate = newtable.CreateDate, ReqUnitId = newtable.ReqUnitId, AuditMan = newtable.AuditMan, - AuditDate = newtable.AuditDate + AuditDate = newtable.AuditDate, + WarehouseMan = newtable.WarehouseMan, + WarehouseDate = newtable.WarehouseDate, }; Funs.DB.Tw_OutputMaster.InsertOnSubmit(table); Funs.DB.SubmitChanges(); @@ -206,6 +219,8 @@ namespace BLL table.ReqUnitId = newtable.ReqUnitId; table.AuditMan = newtable.AuditMan; table.AuditDate = newtable.AuditDate; + table.WarehouseMan = newtable.WarehouseMan; + table.WarehouseDate = newtable.WarehouseDate; Funs.DB.SubmitChanges(); } @@ -257,10 +272,12 @@ namespace BLL TypeInt = plan.TypeInt, State = (int)TwConst.State.已完成, CreateMan = plan.CreateMan, - CreateDate = DateTime.Now, + CreateDate = plan.CreateDate, ReqUnitId = plan.ReqUnitId, - AuditMan = plan.CreateMan, - AuditDate = plan.AuditDate + AuditMan = plan.AuditMan, + AuditDate = plan.AuditDate, + WarehouseMan = plan.WarehouseMan, + WarehouseDate = plan.WarehouseDate }; Add(master); //生成出库单明细 diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx index 69d798db..40b7dcee 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx @@ -78,34 +78,34 @@ - - - - - - - - - - @@ -139,7 +139,7 @@ - - + FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center" ExpandUnusedSpace="True"> - diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs index 7b8e51ba..92ea05c1 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs @@ -434,8 +434,15 @@ namespace FineUIPro.Web.CLGL ProjectName = ProjectService.GetProjectNameByProjectId(result.ProjectId), CategoryString = result.CategoryString, BillName = TwConst.PlanPrintMap.Where(x => x.Value == result.TypeInt).Select(x => x.Key).FirstOrDefault(), + AuditManName = !string.IsNullOrEmpty(result.AuditMan) ? BLL.Person_PersonsService.getSignatureUrl(result.AuditMan) : "", + AuditDate = string.Format("{0:yyyy-MM-dd}", result.AuditDate), + AuditManName2 = !string.IsNullOrEmpty(result.AuditMan2) ? BLL.Person_PersonsService.getSignatureUrl(result.AuditMan2) : "", + AuditDate2 = string.Format("{0:yyyy-MM-dd}", result.AuditDate2), + WarehouseManName = !string.IsNullOrEmpty(result.WarehouseMan) ? BLL.Person_PersonsService.getSignatureUrl(result.WarehouseMan) : "", + WarehouseManAuditDate = string.Format("{0:yyyy-MM-dd}", result.WarehouseDate), }; tw_PrintMasters.Add(printMaster); + // orderApproveIn.ProjectManager = !string.IsNullOrEmpty(approveManModels.InputApproveMan.ProjectManager) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.InputApproveMan.ProjectManager) : ""; DataTable Table1 = LINQToDataTable(tw_PrintMasters); if (Table1 != null) { diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs index bf22a4c6..13d9bd8c 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs @@ -88,6 +88,11 @@ namespace FineUIPro.Web.CLGL protected void btnSave_Click(object sender, EventArgs e) { + var model = TwInOutplanmasterService.GetById(Id); + if (model == null) return; + model.WarehouseMan = this.CurrUser.PersonId; + model.WarehouseDate = DateTime.Now; + TwInOutplanmasterService.Update(model); TwInputmasterService.GenInMasterByPlanId(Id, SaveDetail(Id),txtRemark.Text); ShowNotify("保存成功！", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); diff --git a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx index 364b789d..d4383db6 100644 --- a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx @@ -66,31 +66,31 @@ - - - - - - - - - @@ -124,7 +124,7 @@ - - + FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center" ExpandUnusedSpace="True"> - - diff --git a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs index e79c50fa..ae32704b 100644 --- a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs @@ -326,6 +326,12 @@ namespace FineUIPro.Web.CLGL ProjectName = ProjectService.GetProjectNameByProjectId(result.ProjectId), CategoryString = result.CategoryString, BillName = TwConst.PrintMap.Where(x => x.Value == result.TypeInt).Select(x => x.Key).FirstOrDefault(), + AuditManName = !string.IsNullOrEmpty(result.AuditMan) ? BLL.Person_PersonsService.getSignatureUrl(result.AuditMan) : "", + AuditDate = string.Format("{0:yyyy-MM-dd}", result.AuditDate), + AuditManName2 = !string.IsNullOrEmpty(result.AuditMan2) ? BLL.Person_PersonsService.getSignatureUrl(result.AuditMan2) : "", + AuditDate2 = string.Format("{0:yyyy-MM-dd}", result.AuditDate2), + WarehouseManName = !string.IsNullOrEmpty(result.WarehouseMan) ? BLL.Person_PersonsService.getSignatureUrl(result.WarehouseMan) : "", + WarehouseManAuditDate = string.Format("{0:yyyy-MM-dd}", result.WarehouseDate), }; tw_PrintMasters.Add(printMaster); DataTable Table1 = LINQToDataTable(tw_PrintMasters); diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx index d4f9a48f..e655fdb0 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx @@ -102,46 +102,46 @@ - - - - - - - - - - - - - @@ -162,7 +162,7 @@ - - + FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center" ExpandUnusedSpace="True"> - - diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs index e0f89528..d16e0228 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs @@ -274,6 +274,12 @@ namespace FineUIPro.Web.CLGL ProjectName = ProjectService.GetProjectNameByProjectId(result.ProjectId), CategoryString = result.CategoryString, BillName = TwConst.PlanPrintMap.Where(x => x.Value == result.TypeInt).Select(x => x.Key).FirstOrDefault(), + AuditManName = !string.IsNullOrEmpty(result.AuditMan) ? BLL.Person_PersonsService.getSignatureUrl(result.AuditMan) : "", + AuditDate = string.Format("{0:yyyy-MM-dd}", result.AuditDate), + AuditManName2 = !string.IsNullOrEmpty(result.AuditMan2) ? BLL.Person_PersonsService.getSignatureUrl(result.AuditMan2) : "", + AuditDate2 = string.Format("{0:yyyy-MM-dd}", result.AuditDate2), + WarehouseManName = !string.IsNullOrEmpty(result.WarehouseMan) ? BLL.Person_PersonsService.getSignatureUrl(result.WarehouseMan) : "", + WarehouseManAuditDate = string.Format("{0:yyyy-MM-dd}", result.WarehouseDate), }; tw_PrintMasters.Add(printMaster); DataTable Table1 = LINQToDataTable(tw_PrintMasters); diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs index 9adf70c9..04c7f128 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs @@ -93,6 +93,11 @@ namespace FineUIPro.Web.CLGL protected void btnSave_Click(object sender, EventArgs e) { + var model = TwInOutplanmasterService.GetById(Id); + if (model == null) return; + model.WarehouseMan = this.CurrUser.PersonId; + model.WarehouseDate = DateTime.Now; + TwInOutplanmasterService.Update(model); TwOutputmasterService.GenOutMasterByPlanId(Id, SaveDetail(Id)); ShowNotify("保存成功！", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); diff --git a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx index d3c4ff84..c2fdb37c 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx @@ -100,41 +100,41 @@ - - - - - - - - - - - @@ -155,7 +155,7 @@ - + FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center" ExpandUnusedSpace="True"> - - - - diff --git a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs index d6e3cd12..a88399b1 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs @@ -565,6 +565,12 @@ namespace FineUIPro.Web.CLGL ProjectName = ProjectService.GetProjectNameByProjectId(result.ProjectId), CategoryString = result.CategoryString, BillName = TwConst.PrintMap.Where(x => x.Value == result.TypeInt).Select(x => x.Key).FirstOrDefault(), + AuditManName = !string.IsNullOrEmpty(result.AuditMan) ? BLL.Person_PersonsService.getSignatureUrl(result.AuditMan) : "", + AuditDate = string.Format("{0:yyyy-MM-dd}", result.AuditDate), + AuditManName2 = !string.IsNullOrEmpty(result.AuditMan2) ? BLL.Person_PersonsService.getSignatureUrl(result.AuditMan2) : "", + AuditDate2 = string.Format("{0:yyyy-MM-dd}", result.AuditDate2), + WarehouseManName = !string.IsNullOrEmpty(result.WarehouseMan) ? BLL.Person_PersonsService.getSignatureUrl(result.WarehouseMan) : "", + WarehouseManAuditDate = string.Format("{0:yyyy-MM-dd}", result.WarehouseDate), }; tw_PrintMasters.Add(printMaster); DataTable Table1 = LINQToDataTable(tw_PrintMasters); diff --git a/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx b/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx index e0b7e869..9e1654af 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; @@ -84,7 +84,7 @@ namespace FastReport } - + @@ -97,6 +97,8 @@ namespace FastReport + + @@ -159,7 +161,7 @@ namespace FastReport - + @@ -196,7 +198,7 @@ namespace FastReport - + @@ -204,15 +206,19 @@ namespace FastReport - + + + - + + + - + - + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/材料入库计划单.frx b/SGGL/FineUIPro.Web/File/Fastreport/材料入库计划单.frx index 983aa532..200e4b0b 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; @@ -84,7 +84,7 @@ namespace FastReport } - + @@ -97,6 +97,8 @@ namespace FastReport + + @@ -159,7 +161,7 @@ namespace FastReport - + @@ -193,7 +195,7 @@ namespace FastReport - + @@ -201,15 +203,19 @@ namespace FastReport - + + + - + + + - + - + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/材料出库单.frx b/SGGL/FineUIPro.Web/File/Fastreport/材料出库单.frx index deaff193..035e6146 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; @@ -84,7 +84,7 @@ namespace FastReport } - + @@ -97,6 +97,8 @@ namespace FastReport + + @@ -159,7 +161,7 @@ namespace FastReport - + @@ -196,7 +198,7 @@ namespace FastReport - + @@ -206,19 +208,25 @@ namespace FastReport - + + + - + + + - + + + - + - + - + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/材料出库计划单.frx b/SGGL/FineUIPro.Web/File/Fastreport/材料出库计划单.frx index 9768ed7f..ef835ecc 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; @@ -84,7 +84,7 @@ namespace FastReport } - + @@ -97,6 +97,8 @@ namespace FastReport + + @@ -159,7 +161,7 @@ namespace FastReport - + @@ -193,7 +195,7 @@ namespace FastReport - + @@ -201,15 +203,19 @@ namespace FastReport - + + + - + + + - + - + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx index 80327dc5..e3aa99d9 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx @@ -82,6 +82,8 @@ + + @@ -158,6 +160,10 @@ + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs index 433c496a..02e810cc 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs @@ -242,7 +242,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// private void BindGrid() { - string strSql = @" SELECT distinct com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber, + string strSql = @" SELECT distinct com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,com.Remark, com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,com.IsPrint, com.QRCode,com.State,com.ProductionState,pipe.PlanStartDate,pipe.FlowingSection,com.DrawingName,com.ReceiveDate, person.PersonName @@ -642,6 +642,30 @@ namespace FineUIPro.Web.HJGL.PreDesign } } + protected void btnRectification_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIDArray.Length > 0) + { + + foreach (var item in Grid1.SelectedRowIDArray) + { + var model = HJGL_PipelineComponentService.GetPipelineComponentById(item); + if (model.State == HJGL_PipelineComponentService.StatePenRec) + { + model.State = HJGL_PipelineComponentService.StateRec; + HJGL_PipelineComponentService.UpdatePipelineComponent(model); + + } + } + ShowNotify("操作成功", MessageBoxIcon.Success); + BindGrid(); + } + else + { + ShowNotify("请选择需要整改的数据", MessageBoxIcon.Warning); + + } + } protected void btnOut_Click(object sender, EventArgs e) { diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs index 7c5e2a59..a464984d 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs @@ -212,6 +212,15 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected global::FineUIPro.ToolbarFill ToolbarFill2; + /// + /// btnRectification 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnRectification; + /// /// btnAccept 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs index f11a2a25..ecd2a9fd 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs @@ -1392,6 +1392,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage string rootPath = Server.MapPath("~/"); initTemplatePath = "File\\Fastreport\\管道焊接任务单.frx"; + if (File.Exists(rootPath + initTemplatePath)) { PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Controls/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); diff --git a/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs b/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs index c98f669c..e80a9910 100644 --- a/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs +++ b/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs @@ -13,6 +13,7 @@ namespace Model public string StateString { get; set; } public string TypeString { get; set; } public string CreateManName { get; set; } + public string WarehouseManName { get; set; } public string AuditManName { get; set; } public string AuditManName2 { get; set; } public string ReqUnitName { get; set; } diff --git a/SGGL/Model/CLGL/Tw_PrintModel.cs b/SGGL/Model/CLGL/Tw_PrintModel.cs index 1ef042f7..ac9c6515 100644 --- a/SGGL/Model/CLGL/Tw_PrintModel.cs +++ b/SGGL/Model/CLGL/Tw_PrintModel.cs @@ -11,8 +11,10 @@ namespace Model public string BillName { get; set; } public string ReqUnitName { get; set; } public string AuditManName { get; set; } + public string AuditManName2 { get; set; } public string CreateManName { get; set; } public string AuditDate { get; set; } + public string AuditDate2 { get; set; } public string CreateDate { get; set; } public string CusBillCode { get; set; } public string ProjectName { get; set; } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 56b76f68..563f6c49 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -259490,6 +259490,10 @@ namespace Model private System.Nullable _AuditDate2; + private string _WarehouseMan; + + private System.Nullable _WarehouseDate; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -259532,6 +259536,10 @@ namespace Model partial void OnAuditMan2Changed(); partial void OnAuditDate2Changing(System.Nullable value); partial void OnAuditDate2Changed(); + partial void OnWarehouseManChanging(string value); + partial void OnWarehouseManChanged(); + partial void OnWarehouseDateChanging(System.Nullable value); + partial void OnWarehouseDateChanged(); #endregion public Tw_InOutPlanMaster() @@ -259919,6 +259927,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseMan", DbType="NVarChar(50)")] + public string WarehouseMan + { + get + { + return this._WarehouseMan; + } + set + { + if ((this._WarehouseMan != value)) + { + this.OnWarehouseManChanging(value); + this.SendPropertyChanging(); + this._WarehouseMan = value; + this.SendPropertyChanged("WarehouseMan"); + this.OnWarehouseManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseDate", DbType="DateTime")] + public System.Nullable WarehouseDate + { + get + { + return this._WarehouseDate; + } + set + { + if ((this._WarehouseDate != value)) + { + this.OnWarehouseDateChanging(value); + this.SendPropertyChanging(); + this._WarehouseDate = value; + this.SendPropertyChanged("WarehouseDate"); + this.OnWarehouseDateChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -260158,6 +260206,10 @@ namespace Model private string _Remark; + private string _WarehouseMan; + + private System.Nullable _WarehouseDate; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -260192,6 +260244,10 @@ namespace Model partial void OnAuditDateChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); + partial void OnWarehouseManChanging(string value); + partial void OnWarehouseManChanged(); + partial void OnWarehouseDateChanging(System.Nullable value); + partial void OnWarehouseDateChanged(); #endregion public Tw_InputMaster() @@ -260499,6 +260555,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseMan", DbType="NVarChar(50)")] + public string WarehouseMan + { + get + { + return this._WarehouseMan; + } + set + { + if ((this._WarehouseMan != value)) + { + this.OnWarehouseManChanging(value); + this.SendPropertyChanging(); + this._WarehouseMan = value; + this.SendPropertyChanged("WarehouseMan"); + this.OnWarehouseManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseDate", DbType="DateTime")] + public System.Nullable WarehouseDate + { + get + { + return this._WarehouseDate; + } + set + { + if ((this._WarehouseDate != value)) + { + this.OnWarehouseDateChanging(value); + this.SendPropertyChanging(); + this._WarehouseDate = value; + this.SendPropertyChanged("WarehouseDate"); + this.OnWarehouseDateChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -260894,6 +260990,10 @@ namespace Model private System.Nullable _AuditDate; + private string _WarehouseMan; + + private System.Nullable _WarehouseDate; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -260926,6 +261026,10 @@ namespace Model partial void OnAuditManChanged(); partial void OnAuditDateChanging(System.Nullable value); partial void OnAuditDateChanged(); + partial void OnWarehouseManChanging(string value); + partial void OnWarehouseManChanged(); + partial void OnWarehouseDateChanging(System.Nullable value); + partial void OnWarehouseDateChanged(); #endregion public Tw_OutputMaster() @@ -261213,6 +261317,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseMan", DbType="NVarChar(50)")] + public string WarehouseMan + { + get + { + return this._WarehouseMan; + } + set + { + if ((this._WarehouseMan != value)) + { + this.OnWarehouseManChanging(value); + this.SendPropertyChanging(); + this._WarehouseMan = value; + this.SendPropertyChanged("WarehouseMan"); + this.OnWarehouseManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseDate", DbType="DateTime")] + public System.Nullable WarehouseDate + { + get + { + return this._WarehouseDate; + } + set + { + if ((this._WarehouseDate != value)) + { + this.OnWarehouseDateChanging(value); + this.SendPropertyChanging(); + this._WarehouseDate = value; + this.SendPropertyChanged("WarehouseDate"); + this.OnWarehouseDateChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged;