材料管理修改

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
+
+
+
+

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();
             }
 

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.采购入库)
             {

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,
+                AuditMan = plan.AuditMan,
-                AuditDate = plan.AuditDate
+                AuditDate = plan.AuditDate,
+                WarehouseMan = plan.WarehouseMan,
+                WarehouseDate = plan.WarehouseDate
             }; 
             Add(master);
             //生成出库单明细 

SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx

@@ -78,34 +78,34 @@
                                                 <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                                             </ItemTemplate>
                                         </f:TemplateField>
-                                        <f:RenderField Width="150px" ColumnID="CusBillCode" DataField="CusBillCode" SortField="CusBillCode"
+                                        <f:RenderField Width="310px" ColumnID="CusBillCode" DataField="CusBillCode" SortField="CusBillCode"
                                             FieldType="String" HeaderText="编号" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="WarehouseCode" DataField="WarehouseCode" SortField="WarehouseCode"
+                                        <f:RenderField Width="80px" ColumnID="WarehouseCode" DataField="WarehouseCode" SortField="WarehouseCode"
                                             FieldType="String" HeaderText="仓库" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="TypeString" DataField="TypeString" SortField="TypeString"
+                                        <f:RenderField Width="80px" ColumnID="TypeString" DataField="TypeString" SortField="TypeString"
                                             FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CategoryString" DataField="CategoryString" SortField="CategoryString"
+                                        <f:RenderField Width="80px" ColumnID="CategoryString" DataField="CategoryString" SortField="CategoryString"
                                             FieldType="String" HeaderText="类别" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="StateString" DataField="StateString" SortField="StateString"
+                                        <f:RenderField Width="80px" ColumnID="StateString" DataField="StateString" SortField="StateString"
                                             FieldType="String" HeaderText="状态" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CreateManName" DataField="CreateManName" SortField="CreateManName"
+                                        <f:RenderField Width="80px" ColumnID="CreateManName" DataField="CreateManName" SortField="CreateManName"
                                             FieldType="String" HeaderText="发起人" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField> 
-                                        <f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate" Renderer="Date"
+                                        <f:RenderField Width="100px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate" Renderer="Date"
                                             RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="发起时间" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="AuditManName" DataField="AuditManName" SortField="AuditManName"
+                                        <f:RenderField Width="80px" ColumnID="AuditManName" DataField="AuditManName" SortField="AuditManName"
                                             FieldType="String" HeaderText="审核人" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate" Renderer="Date"
+                                        <f:RenderField Width="100px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate" Renderer="Date"
                                             RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="审核时间" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
+                                        <f:RenderField Width="300px" ColumnID="Remark" DataField="Remark" SortField="Remark"
                                             FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
                                          <f:LinkButtonField Width="150px" ColumnID="btnInPlanMasterPrint" TextAlign="Center" CommandName="btnInPlanMasterPrint" Text="申请单打印"   />
@@ -139,7 +139,7 @@
                         <f:Panel ID="Panel3" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" AutoScroll="true"
                             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
                             <Items>
-                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="true" Title="入库申请明细表" EnableCollapse="true"     ForceFit="true"
+                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="true" Title="入库申请明细表" EnableCollapse="true"      
                                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" 
                                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode"
                                     SortDirection="DESC"  EnableColumnLines="true"  
@@ -154,13 +154,13 @@
                                         <f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
                                             FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
+                                        <f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
                                             FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
                                         <f:RenderField   Width="300px" ColumnID="MaterialDef" DataField="MaterialDef" SortField="MaterialDef"  
-                                            FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center">
+                                            FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center" ExpandUnusedSpace="True">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
+                                        <f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
                                             FieldType="String" HeaderText="数量" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField> 
                                     </Columns> 

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)
             {

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());

SGGL/FineUIPro.Web/CLGL/InputMaster.aspx

@@ -66,31 +66,31 @@
                                                 <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                                             </ItemTemplate>
                                         </f:TemplateField>
-                                        <f:RenderField Width="150px" ColumnID="CusBillCode" DataField="CusBillCode" SortField="CusBillCode"
+                                        <f:RenderField Width="310px" ColumnID="CusBillCode" DataField="CusBillCode" SortField="CusBillCode"
                                             FieldType="String" HeaderText="编号" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="WarehouseCode" DataField="WarehouseCode" SortField="WarehouseCode"
+                                        <f:RenderField Width="80px" ColumnID="WarehouseCode" DataField="WarehouseCode" SortField="WarehouseCode"
                                             FieldType="String" HeaderText="仓库" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="TypeString" DataField="TypeString" SortField="TypeString"
+                                        <f:RenderField Width="80px" ColumnID="TypeString" DataField="TypeString" SortField="TypeString"
                                             FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="StateString" DataField="StateString" SortField="StateString"
+                                        <f:RenderField Width="80px" ColumnID="StateString" DataField="StateString" SortField="StateString"
                                             FieldType="String" HeaderText="状态" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CreateManName" DataField="CreateManName" SortField="CreateManName"
+                                        <f:RenderField Width="80px" ColumnID="CreateManName" DataField="CreateManName" SortField="CreateManName"
                                             FieldType="String" HeaderText="发起人" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate" Renderer="Date"
+                                        <f:RenderField Width="100px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate" Renderer="Date"
                                             RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="发起时间" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="AuditManName" DataField="AuditManName" SortField="AuditManName"
+                                        <f:RenderField Width="80px" ColumnID="AuditManName" DataField="AuditManName" SortField="AuditManName"
                                             FieldType="String" HeaderText="审核人" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate" Renderer="Date"
+                                        <f:RenderField Width="100px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate" Renderer="Date"
                                             RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="审核时间" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
+                                        <f:RenderField Width="300px" ColumnID="Remark" DataField="Remark" SortField="Remark"
                                             FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
                                         <f:LinkButtonField Width="150px" ColumnID="btnInPlanMasterPrint" TextAlign="Center" CommandName="btnInPlanMasterPrint" Text="入库单打印" />
@@ -124,7 +124,7 @@
                         <f:Panel ID="Panel3" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" AutoScroll="true"
                             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
                             <Items>
-                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="true" Title="入库申请明细表" EnableCollapse="true" ForceFit="true"
+                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="true" Title="入库申请明细表" EnableCollapse="true"  
                                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
                                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
                                     SortDirection="DESC" EnableColumnLines="true"  
@@ -139,16 +139,16 @@
                                         <f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
                                             FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
+                                        <f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
                                             FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
                                         <f:RenderField   Width="300px" ColumnID="MaterialDef" DataField="MaterialDef" SortField="MaterialDef"
-                                            FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center">
+                                            FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center" ExpandUnusedSpace="True">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
+                                        <f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
                                             FieldType="String" HeaderText="计划数量" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="ActNum" DataField="ActNum" SortField="ActNum"
+                                        <f:RenderField Width="100px" ColumnID="ActNum" DataField="ActNum" SortField="ActNum"
                                             FieldType="String" HeaderText="实际数量" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
                                     </Columns>

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);

SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx

@@ -102,46 +102,46 @@
                                                 <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                                             </ItemTemplate>
                                         </f:TemplateField>
-                                        <f:RenderField Width="150px" ColumnID="WeldTaskCode" DataField="WeldTaskCode" SortField="WeldTaskCode"
+                                        <f:RenderField Width="200px" ColumnID="WeldTaskCode" DataField="WeldTaskCode" SortField="WeldTaskCode"
                                             FieldType="String" HeaderText="任务单编号" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CusBillCode" DataField="CusBillCode" SortField="CusBillCode"
+                                        <f:RenderField Width="310px" ColumnID="CusBillCode" DataField="CusBillCode" SortField="CusBillCode"
                                             FieldType="String" HeaderText="编号" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="WarehouseCode" DataField="WarehouseCode" SortField="WarehouseCode"
+                                        <f:RenderField Width="80px" ColumnID="WarehouseCode" DataField="WarehouseCode" SortField="WarehouseCode"
                                             FieldType="String" HeaderText="仓库" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="TypeString" DataField="TypeString" SortField="TypeString"
+                                        <f:RenderField Width="80px" ColumnID="TypeString" DataField="TypeString" SortField="TypeString"
                                             FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CategoryString" DataField="CategoryString" SortField="CategoryString"
+                                        <f:RenderField Width="80px" ColumnID="CategoryString" DataField="CategoryString" SortField="CategoryString"
                                             FieldType="String" HeaderText="类别" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="StateString" DataField="StateString" SortField="StateString"
+                                        <f:RenderField Width="80px" ColumnID="StateString" DataField="StateString" SortField="StateString"
                                             FieldType="String" HeaderText="状态" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="ReqUnitName" DataField="ReqUnitName" SortField="ReqUnitName"
+                                        <f:RenderField Width="230px" ColumnID="ReqUnitName" DataField="ReqUnitName" SortField="ReqUnitName"
                                             FieldType="String" HeaderText="领料单位" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
                                         <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
                                             FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CreateManName" DataField="CreateManName" SortField="CreateManName"
+                                        <f:RenderField Width="90px" ColumnID="CreateManName" DataField="CreateManName" SortField="CreateManName"
                                             FieldType="String" HeaderText="发起人" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate" Renderer="Date"
+                                        <f:RenderField Width="100px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate" Renderer="Date"
                                             RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="发起时间" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="AuditManName" DataField="AuditManName" SortField="AuditManName"
+                                        <f:RenderField Width="80px" ColumnID="AuditManName" DataField="AuditManName" SortField="AuditManName"
                                             FieldType="String" HeaderText="审核人(专工)" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate" Renderer="Date"
+                                        <f:RenderField Width="100px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate" Renderer="Date"
                                             RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="审核时间(专工" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="AuditManName2" DataField="AuditManName2" SortField="AuditManName2"
+                                        <f:RenderField Width="80px" ColumnID="AuditManName2" DataField="AuditManName2" SortField="AuditManName2"
                                             FieldType="String" HeaderText="审核人(材控)" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="AuditDate2" DataField="AuditDate2" SortField="AuditDate2" Renderer="Date"
+                                        <f:RenderField Width="100px" ColumnID="AuditDate2" DataField="AuditDate2" SortField="AuditDate2" Renderer="Date"
                                             RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="审核时间(材控)" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
                                         <f:LinkButtonField Width="150px" ColumnID="btnInPlanMasterPrint" TextAlign="Center" CommandName="btnInPlanMasterPrint" Text="申请单打印" />
@@ -162,7 +162,7 @@
                                     <Tabs>
                                         <f:Tab ID="TabDetail" Title="出库明细" BodyPadding="1px" Layout="VBox" runat="server" AutoScroll="true">
                                             <Items>
-                                                <f:Grid ID="Grid2" ShowBorder="False" ShowHeader="False" Title="出库明细" EnableCollapse="true" ForceFit="true"
+                                                <f:Grid ID="Grid2" ShowBorder="False" ShowHeader="False" Title="出库明细" EnableCollapse="true"  
                                                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
                                                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode"
                                                     SortDirection="DESC" EnableColumnLines="true"
@@ -172,16 +172,16 @@
                                                         <f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
                                                             FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
                                                         </f:RenderField>
-                                                        <f:RenderField Width="100px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
+                                                        <f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
                                                             FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
                                                         </f:RenderField>
                                                         <f:RenderField Width="300px" ColumnID="MaterialDef" DataField="MaterialDef" SortField="MaterialDef"
-                                                            FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center">
+                                                            FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center" ExpandUnusedSpace="True">
                                                         </f:RenderField>
-                                                        <f:RenderField Width="150px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
+                                                        <f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
                                                             FieldType="String" HeaderText="计划数量" TextAlign="Left" HeaderTextAlign="Center">
                                                         </f:RenderField>
-                                                        <f:RenderField Width="150px" ColumnID="StockNum" DataField="StockNum" SortField="StockNum"
+                                                        <f:RenderField Width="100px" ColumnID="StockNum" DataField="StockNum" SortField="StockNum"
                                                             FieldType="String" HeaderText="实时库存" TextAlign="Left" HeaderTextAlign="Center">
                                                         </f:RenderField>
                                                     </Columns>

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);

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());

SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx

@@ -100,41 +100,41 @@
                                                 <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                                             </ItemTemplate>
                                         </f:TemplateField>
-                                        <f:RenderField Width="150px" ColumnID="WeldTaskCode" DataField="WeldTaskCode" SortField="WeldTaskCode"
+                                        <f:RenderField Width="200px" ColumnID="WeldTaskCode" DataField="WeldTaskCode" SortField="WeldTaskCode"
                                             FieldType="String" HeaderText="任务单编号" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CusBillCode" DataField="CusBillCode" SortField="CusBillCode"
+                                        <f:RenderField Width="310px" ColumnID="CusBillCode" DataField="CusBillCode" SortField="CusBillCode"
                                             FieldType="String" HeaderText="编号" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="WarehouseCode" DataField="WarehouseCode" SortField="WarehouseCode"
+                                        <f:RenderField Width="80px" ColumnID="WarehouseCode" DataField="WarehouseCode" SortField="WarehouseCode"
                                             FieldType="String" HeaderText="仓库" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="TypeString" DataField="TypeString" SortField="TypeString"
+                                        <f:RenderField Width="80px" ColumnID="TypeString" DataField="TypeString" SortField="TypeString"
                                             FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CategoryString" DataField="CategoryString" SortField="CategoryString"
+                                        <f:RenderField Width="80px" ColumnID="CategoryString" DataField="CategoryString" SortField="CategoryString"
                                             FieldType="String" HeaderText="类别" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
 
-                                        <f:RenderField Width="150px" ColumnID="StateString" DataField="StateString" SortField="StateString"
+                                        <f:RenderField Width="80px" ColumnID="StateString" DataField="StateString" SortField="StateString"
                                             FieldType="String" HeaderText="状态" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="ReqUnitName" DataField="ReqUnitName" SortField="ReqUnitName"
+                                        <f:RenderField Width="230px" ColumnID="ReqUnitName" DataField="ReqUnitName" SortField="ReqUnitName"
                                             FieldType="String" HeaderText="领料单位" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
                                         <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
                                             FieldType="String" HeaderText="备注" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CreateManName" DataField="CreateManName" SortField="CreateManName"
+                                        <f:RenderField Width="80px" ColumnID="CreateManName" DataField="CreateManName" SortField="CreateManName"
                                             FieldType="String" HeaderText="发起人" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate" Renderer="Date"
+                                        <f:RenderField Width="100px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate" Renderer="Date"
                                             RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="发起时间" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="AuditManName" DataField="AuditManName" SortField="AuditManName"
+                                        <f:RenderField Width="80px" ColumnID="AuditManName" DataField="AuditManName" SortField="AuditManName"
                                             FieldType="String" HeaderText="审核人" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate" Renderer="Date"
+                                        <f:RenderField Width="100px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate" Renderer="Date"
                                             RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="审核时间" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField>
                                         <f:LinkButtonField Width="150px" ColumnID="btnInPlanMasterPrint" TextAlign="Center" CommandName="btnInPlanMasterPrint" Text="出库单打印" />
@@ -155,7 +155,7 @@
                                     <Tabs>
                                         <f:Tab ID="TabDetail" Title="出库明细" BodyPadding="1px" Layout="VBox" runat="server" AutoScroll="true">
                                             <Items>
-                                                <f:Grid ID="Grid2" ShowBorder="False" ShowHeader="False" Title="入库申请明细表" EnableCollapse="true" ForceFit="true"
+                                                <f:Grid ID="Grid2" ShowBorder="False" ShowHeader="False" Title="入库申请明细表" EnableCollapse="true"  
                                                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
                                                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode"
                                                     SortDirection="DESC" EnableColumnLines="true"  
@@ -171,18 +171,18 @@
                                                             FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
                                                         </f:RenderField>
                                                         <f:RenderField   Width="300px" ColumnID="MaterialDef" DataField="MaterialDef" SortField="MaterialDef"
-                                                            FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center">
+                                                            FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center" ExpandUnusedSpace="True">
                                                         </f:RenderField>
-                                                        <f:RenderField Width="150px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
+                                                        <f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
                                                             FieldType="String" HeaderText="计划数量" TextAlign="Left" HeaderTextAlign="Center">
                                                         </f:RenderField>
-                                                        <f:RenderField Width="150px" ColumnID="ActNum" DataField="ActNum" SortField="ActNum"
+                                                        <f:RenderField Width="100px" ColumnID="ActNum" DataField="ActNum" SortField="ActNum"
                                                             FieldType="String" HeaderText="实际数量" TextAlign="Left" HeaderTextAlign="Center">
                                                         </f:RenderField>
-                                                        <f:RenderField Width="150px" ColumnID="DiffNum" DataField="DiffNum" SortField="DiffNum"
+                                                        <f:RenderField Width="100px" ColumnID="DiffNum" DataField="DiffNum" SortField="DiffNum"
                                                             FieldType="String" HeaderText="差异" TextAlign="Left" HeaderTextAlign="Center">
                                                         </f:RenderField>
-                                                        <f:RenderField Width="150px" ColumnID="StockNum" DataField="StockNum" SortField="StockNum"
+                                                        <f:RenderField Width="100px" ColumnID="StockNum" DataField="StockNum" SortField="StockNum"
                                                             FieldType="String" HeaderText="实时库存" TextAlign="Left" HeaderTextAlign="Center">
                                                         </f:RenderField>
                                                     </Columns>

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);

SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/06/2024 10:23:55" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/07/2024 16:15:13" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRF67i6IehnB4bwXHeNNj9k1"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREljhlknPe0ucx4RV8UxTdJ"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
       <Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
@@ -97,6 +97,8 @@ namespace FastReport
       <Column Name="CategoryString" DataType="System.String" PropName="Column"/>
       <Column Name="WarehouseManName" DataType="System.String" PropName="Column"/>
       <Column Name="WarehouseManAuditDate" DataType="System.String" PropName="Column"/>
+      <Column Name="AuditManName2" DataType="System.String"/>
+      <Column Name="AuditDate2" DataType="System.String"/>
     </TableDataSource>
     <TableDataSource Name="Data" ReferenceName="Data" DataType="System.Int32" Enabled="true" TableName="Data">
       <Column Name="PipelineCode" DataType="System.String" PropName="CH_TrustID"/>
@@ -159,7 +161,7 @@ namespace FastReport
         </TableRow>
       </TableObject>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="177.22" Width="1047.06" Height="71.82">
+    <DataBand Name="Data1" Top="177.26" Width="1047.06" Height="71.82">
       <TableObject Name="Tabel_Data" Left="9.45" Width="1030.05" Height="71.82" Border.Lines="Top" ManualBuildEvent="Tabel_Data_ManualBuild">
         <TableColumn Name="Column21" Width="41.58"/>
         <TableColumn Name="Column22" Width="117.23"/>
@@ -196,7 +198,7 @@ namespace FastReport
           <TableCell Name="Cell334" Border.Lines="All" Text="[Data.UnitWorkName]"/>
         </TableRow>
       </TableObject>
-      <DataFooterBand Name="DataFooter1" Top="253.04" Width="1047.06" Height="175.72">
+      <DataFooterBand Name="DataFooter1" Top="253.12" Width="1047.06" Height="175.72">
         <TableObject Name="Table6" Left="9.45" Width="1031.98" Height="175.72" Border.Lines="Top" ManualBuildEvent="Table6_ManualBuild">
           <TableColumn Name="Column65" Width="161.28"/>
           <TableColumn Name="Column66" Width="331.43"/>
@@ -204,15 +206,19 @@ namespace FastReport
           <TableColumn Name="Column85" Width="349.65"/>
           <TableRow Name="Row33" Height="74.62">
             <TableCell Name="Cell271" Text="材控审核：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell272" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
+            <TableCell Name="Cell272" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt">
+              <PictureObject Name="Picture1" Left="9.45" Top="9.45" Width="255.15" Height="56.7" DataColumn="Table1.AuditManName"/>
+            </TableCell>
             <TableCell Name="Cell273" Text="库管：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell331" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell331" HorzAlign="Center" VertAlign="Center">
+              <PictureObject Name="Picture6" Left="18.9" Top="9.45" Width="255.15" Height="56.7" DataColumn="Table1.WarehouseManName"/>
+            </TableCell>
           </TableRow>
           <TableRow Name="Row34" Height="101.1">
             <TableCell Name="Cell281" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell282" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
+            <TableCell Name="Cell282" Text="[Table1.AuditDate]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
             <TableCell Name="Cell283" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell332" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell332" Text="[Table1.WarehouseManAuditDate]" HorzAlign="Center" VertAlign="Center"/>
           </TableRow>
         </TableObject>
       </DataFooterBand>

SGGL/FineUIPro.Web/File/Fastreport/材料入库计划单.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="09/27/2024 11:39:03" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/07/2024 16:12:57" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRHZmbHErLNJSzoobFuldBZi"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREle+zCYpLB66N/WZ+YJ430"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
       <Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
@@ -97,6 +97,8 @@ namespace FastReport
       <Column Name="CategoryString" DataType="System.String" PropName="Column"/>
       <Column Name="WarehouseManName" DataType="System.String" PropName="Column"/>
       <Column Name="WarehouseManAuditDate" DataType="System.String" PropName="Column"/>
+      <Column Name="AuditManName2" DataType="System.String"/>
+      <Column Name="AuditDate2" DataType="System.String"/>
     </TableDataSource>
     <TableDataSource Name="Data" ReferenceName="Data" DataType="System.Int32" Enabled="true" TableName="Data">
       <Column Name="PipelineCode" DataType="System.String" PropName="CH_TrustID"/>
@@ -159,7 +161,7 @@ namespace FastReport
         </TableRow>
       </TableObject>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="177.22" Width="1047.06" Height="71.82">
+    <DataBand Name="Data1" Top="177.26" Width="1047.06" Height="71.82">
       <TableObject Name="Tabel_Data" Left="9.45" Width="1030.05" Height="71.82" Border.Lines="Top" ManualBuildEvent="Tabel_Data_ManualBuild">
         <TableColumn Name="Column21" Width="41.58"/>
         <TableColumn Name="Column22" Width="117.23"/>
@@ -193,7 +195,7 @@ namespace FastReport
           <TableCell Name="Cell250" Border.Lines="All" Text="[Data.UnitWorkName]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
         </TableRow>
       </TableObject>
-      <DataFooterBand Name="DataFooter1" Top="253.04" Width="1047.06" Height="175.72">
+      <DataFooterBand Name="DataFooter1" Top="253.12" Width="1047.06" Height="175.72">
         <TableObject Name="Table6" Left="9.45" Width="1031.98" Height="175.72" Border.Lines="Top" ManualBuildEvent="Table6_ManualBuild">
           <TableColumn Name="Column65" Width="227.43"/>
           <TableColumn Name="Column66" Width="255.83"/>
@@ -201,15 +203,19 @@ namespace FastReport
           <TableColumn Name="Column85" Width="302.4"/>
           <TableRow Name="Row33" Height="74.62">
             <TableCell Name="Cell271" Text="材控审核：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell272" VertAlign="Center" Font="宋体, 10pt"/>
+            <TableCell Name="Cell272" VertAlign="Center" Font="宋体, 10pt">
+              <PictureObject Name="Picture1" Left="18.9" Top="9.45" Width="207.9" Height="56.7" DataColumn="Table1.AuditManName"/>
+            </TableCell>
             <TableCell Name="Cell273" Text="库管：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell331"/>
+            <TableCell Name="Cell331">
+              <PictureObject Name="Picture6" Left="18.9" Top="9.45" Width="226.8" Height="56.7" DataColumn="Table1.WarehouseManName"/>
+            </TableCell>
           </TableRow>
           <TableRow Name="Row34" Height="101.1">
             <TableCell Name="Cell281" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell282" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
+            <TableCell Name="Cell282" Text="[Table1.AuditDate]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
             <TableCell Name="Cell283" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell332"/>
+            <TableCell Name="Cell332" Text="[Table1.WarehouseManAuditDate]" HorzAlign="Center" VertAlign="Center"/>
           </TableRow>
         </TableObject>
       </DataFooterBand>

SGGL/FineUIPro.Web/File/Fastreport/材料出库单.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/04/2024 15:04:52" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/07/2024 16:20:11" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFXobmD2K2wt1l97DiO58GJ"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREgTkNx6oeza2Yn8AolBnrO"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
       <Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
@@ -97,6 +97,8 @@ namespace FastReport
       <Column Name="CategoryString" DataType="System.String" PropName="Column"/>
       <Column Name="WarehouseManName" DataType="System.String" PropName="Column"/>
       <Column Name="WarehouseManAuditDate" DataType="System.String" PropName="Column"/>
+      <Column Name="AuditManName2" DataType="System.String"/>
+      <Column Name="AuditDate2" DataType="System.String"/>
     </TableDataSource>
     <TableDataSource Name="Data" ReferenceName="Data" DataType="System.Int32" Enabled="true" TableName="Data">
       <Column Name="PipelineCode" DataType="System.String" PropName="CH_TrustID"/>
@@ -159,7 +161,7 @@ namespace FastReport
         </TableRow>
       </TableObject>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="177.22" Width="1047.06" Height="71.82">
+    <DataBand Name="Data1" Top="177.26" Width="1047.06" Height="71.82">
       <TableObject Name="Tabel_Data" Left="9.45" Width="1030.05" Height="71.82" Border.Lines="Top" ManualBuildEvent="Tabel_Data_ManualBuild">
         <TableColumn Name="Column21" Width="41.58"/>
         <TableColumn Name="Column22" Width="117.23"/>
@@ -196,7 +198,7 @@ namespace FastReport
           <TableCell Name="Cell334" Border.Lines="All" Text="[Data.UnitWorkName]"/>
         </TableRow>
       </TableObject>
-      <DataFooterBand Name="DataFooter1" Top="253.04" Width="1047.06" Height="175.72">
+      <DataFooterBand Name="DataFooter1" Top="253.12" Width="1047.06" Height="175.72">
         <TableObject Name="Table6" Left="9.45" Width="1031.98" Height="175.72" Border.Lines="Top" ManualBuildEvent="Table6_ManualBuild">
           <TableColumn Name="Column65" Width="142.38"/>
           <TableColumn Name="Column66" Width="180.23"/>
@@ -206,19 +208,25 @@ namespace FastReport
           <TableColumn Name="Column88" Width="207.9"/>
           <TableRow Name="Row33" Height="74.62">
             <TableCell Name="Cell271" Text="材控审核：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell272" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
+            <TableCell Name="Cell272" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt">
+              <PictureObject Name="Picture1" Left="9.45" Top="9.45" Width="151.2" Height="56.7" DataColumn="Table1.AuditManName"/>
+            </TableCell>
             <TableCell Name="Cell273" Text="库管：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell331" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell331" HorzAlign="Center" VertAlign="Center">
+              <PictureObject Name="Picture6" Left="9.45" Top="9.45" Width="151.2" Height="56.7" DataColumn="Table1.WarehouseManName"/>
+            </TableCell>
             <TableCell Name="Cell335" Text="领料申请人：" HorzAlign="Center" VertAlign="Center"/>
-            <TableCell Name="Cell336" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell336" HorzAlign="Center" VertAlign="Center">
+              <PictureObject Name="Picture7" Left="9.45" Top="9.45" Width="179.55" Height="56.7" DataColumn="Table1.CreateManName"/>
+            </TableCell>
           </TableRow>
           <TableRow Name="Row34" Height="101.1">
             <TableCell Name="Cell281" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell282" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
+            <TableCell Name="Cell282" Text="[Table1.AuditDate]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
             <TableCell Name="Cell283" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell332" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell332" Text="[Table1.WarehouseManAuditDate]" HorzAlign="Center" VertAlign="Center"/>
             <TableCell Name="Cell337" Text="日期：" HorzAlign="Center" VertAlign="Center"/>
-            <TableCell Name="Cell338" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell338" Text="[Table1.CreateDate]" HorzAlign="Center" VertAlign="Center"/>
           </TableRow>
         </TableObject>
       </DataFooterBand>

SGGL/FineUIPro.Web/File/Fastreport/材料出库计划单.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/06/2024 10:24:12" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/07/2024 16:19:52" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFseuh+sOz5dBo5fumo4Mv+"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFtorR7vaUuDP9abqvufqrp"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
       <Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
@@ -97,6 +97,8 @@ namespace FastReport
       <Column Name="CategoryString" DataType="System.String" PropName="Column"/>
       <Column Name="WarehouseManName" DataType="System.String" PropName="Column"/>
       <Column Name="WarehouseManAuditDate" DataType="System.String" PropName="Column"/>
+      <Column Name="AuditManName2" DataType="System.String"/>
+      <Column Name="AuditDate2" DataType="System.String"/>
     </TableDataSource>
     <TableDataSource Name="Data" ReferenceName="Data" DataType="System.Int32" Enabled="true" TableName="Data">
       <Column Name="PipelineCode" DataType="System.String" PropName="CH_TrustID"/>
@@ -159,7 +161,7 @@ namespace FastReport
         </TableRow>
       </TableObject>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="177.22" Width="1047.06" Height="71.82">
+    <DataBand Name="Data1" Top="177.26" Width="1047.06" Height="71.82">
       <TableObject Name="Tabel_Data" Left="9.45" Width="1030.05" Height="71.82" Border.Lines="Top" ManualBuildEvent="Tabel_Data_ManualBuild">
         <TableColumn Name="Column21" Width="41.58"/>
         <TableColumn Name="Column22" Width="117.23"/>
@@ -193,7 +195,7 @@ namespace FastReport
           <TableCell Name="Cell250" Border.Lines="All" Text="[Data.UnitWorkName]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
         </TableRow>
       </TableObject>
-      <DataFooterBand Name="DataFooter1" Top="253.04" Width="1047.06" Height="175.72">
+      <DataFooterBand Name="DataFooter1" Top="253.12" Width="1047.06" Height="175.72">
         <TableObject Name="Table6" Left="9.45" Width="1031.98" Height="175.72" Border.Lines="Top" ManualBuildEvent="Table6_ManualBuild">
           <TableColumn Name="Column65" Width="227.43"/>
           <TableColumn Name="Column66" Width="255.83"/>
@@ -201,15 +203,19 @@ namespace FastReport
           <TableColumn Name="Column85" Width="302.4"/>
           <TableRow Name="Row33" Height="74.62">
             <TableCell Name="Cell271" Text="材控审核：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell272" VertAlign="Center" Font="宋体, 10pt"/>
+            <TableCell Name="Cell272" VertAlign="Center" Font="宋体, 10pt">
+              <PictureObject Name="Picture1" Left="9.45" Top="9.45" Width="236.25" Height="56.7" DataColumn="Table1.AuditManName"/>
+            </TableCell>
             <TableCell Name="Cell273" Text="领料申请人" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell331"/>
+            <TableCell Name="Cell331">
+              <PictureObject Name="Picture6" Left="9.45" Top="9.45" Width="264.6" Height="56.7" DataColumn="Table1.CreateManName"/>
+            </TableCell>
           </TableRow>
           <TableRow Name="Row34" Height="101.1">
             <TableCell Name="Cell281" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell282" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
+            <TableCell Name="Cell282" Text="[Table1.AuditDate]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
             <TableCell Name="Cell283" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
-            <TableCell Name="Cell332"/>
+            <TableCell Name="Cell332" Text="[Table1.CreateDate]" HorzAlign="Center" VertAlign="Center"/>
           </TableRow>
         </TableObject>
       </DataFooterBand>

SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx

@@ -82,6 +82,8 @@
                             <Items>
                                 <f:ToolbarFill ID="ToolbarFill2" runat="server">
                                 </f:ToolbarFill>
+                                <f:Button ID="btnRectification" Text="整改" ToolTip="整改" Icon="Accept" runat="server"  OnClick="btnRectification_Click">
+                                </f:Button>
                                 <f:Button ID="btnAccept" Text="验收" ToolTip="验收" Icon="Accept" runat="server"  OnClick="btnAccept_Click">
                                 </f:Button>
                                 <f:Button ID="btnImportQRCode" Text="导入二维码信息" ToolTip="导入二维码信息" Icon="PackageIn" runat="server" OnClick="btnImportQRCode_Click">
@@ -158,6 +160,10 @@
                                 <f:RenderField Width="120px" ColumnID="ReceiveDate" DataField="ReceiveDate" FieldType="String"
                                     HeaderText="验收时间" HeaderTextAlign="Center" TextAlign="Center">
                                 </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="Remark" DataField="Remark" SortField="Remark"
+                                               FieldType="String" HeaderText="备注" HeaderTextAlign="Center"
+                                               TextAlign="Left">
+                                </f:RenderField>
                                 <f:LinkButtonField Width="120px" TextAlign="Center" CommandName="cmd_print" Text="预览打印" />
 
                             </Columns>

SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs

@@ -242,7 +242,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </summary>
         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)
         {

SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs

@@ -212,6 +212,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill2;
 
+        /// <summary>
+        /// btnRectification 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRectification;
+
         /// <summary>
         /// btnAccept 控件。
         /// </summary>

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)));

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; }   

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; }

SGGL/Model/Model.cs

@@ -259490,6 +259490,10 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _AuditDate2;
 		
+		private string _WarehouseMan;
+		
+		private System.Nullable<System.DateTime> _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<System.DateTime> value);
     partial void OnAuditDate2Changed();
+    partial void OnWarehouseManChanging(string value);
+    partial void OnWarehouseManChanged();
+    partial void OnWarehouseDateChanging(System.Nullable<System.DateTime> 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<System.DateTime> 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<System.DateTime> _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<System.DateTime> 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<System.DateTime> 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<System.DateTime> _AuditDate;
 		
+		private string _WarehouseMan;
+		
+		private System.Nullable<System.DateTime> _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<System.DateTime> value);
     partial void OnAuditDateChanged();
+    partial void OnWarehouseManChanging(string value);
+    partial void OnWarehouseManChanged();
+    partial void OnWarehouseDateChanging(System.Nullable<System.DateTime> 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<System.DateTime> 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;