焊接修改

2024-12-10 15:18:31 +08:00
parent f4f7f93835
commit b70dec0803
22 changed files with 266 additions and 204 deletions
@@ -130,6 +130,10 @@
                                            HeaderText="总焊口量" HeaderTextAlign="Center"
                                            TextAlign="Right">
                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="ShopJointCount" DataField="ShopJointCount" FieldType="Int"
+                                                       HeaderText="预制口量" HeaderTextAlign="Center"
+                                                       TextAlign="Right">
+                                        </f:RenderField>
                                        <f:RenderField Width="200px" ColumnID="PipeAreaStr" DataField="PipeAreaStr" SortField="PipeAreaStr"
                                            FieldType="String" HeaderText="管线划分" HeaderTextAlign="Center" 
                                            TextAlign="Center">
@@ -317,6 +317,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
                         完成焊口=x.FinishJointCount,
                         总达因数 =x.TotalDin,
                         总焊口量=x.JointCount,
+                         预制口量=x.ShopJointCount,
                         管线划分 = x.PipeAreaStr,
                         无损检测类型=x.DetectionTypeCode,
                         探伤比例 =x.DetectionRateCode,
@@ -87,9 +87,7 @@
                                        <f:ToolbarFill runat="server"></f:ToolbarFill> 
                                        <f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="预制组件打印" ToolTip="预制组件打印" OnClick="btnPrint_Click"></f:Button>
                                        <f:Button ID="btnPassMaster" Text="专工审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster_OnClick" >
-                                        </f:Button>
-                                        <f:Button ID="btnPassMaster2" Text="材控审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster2_OnClick"  >
-                                        </f:Button>
+                                        </f:Button> 
                                        <f:Button ID="btnPrintTask" runat="server" Icon="Printer" EnableAjax="false" Text="焊接任务单打印" ToolTip="焊接任务单打印" OnClick="btnPrintTask_Click"></f:Button>
                                        <f:DatePicker ID="txtTaskDate" Label="计划焊接日期" runat="server"
                                            DateFormatString="yyyy-MM-dd" LabelAlign="Left" LabelWidth="110px" Hidden="true">
@@ -1362,15 +1362,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                            where x.ProjectId == this.CurrUser.LoginProjectId &&
                                                  x.UnitWorkId == tvControlItem.SelectedNodeID.Split('|')[0] &&
                                                  x.UnitId == tvControlItem.SelectedNodeID.Split('|')[1]
-                                                  && x.TaskDate.Value.Date == time.Date && x.AuditMan != null && x.AuditMan2 != null &&
+                                                  && x.TaskDate.Value.Date == time.Date && x.AuditMan != null  &&
                                                  x.Tabler != null
                                            select x).FirstOrDefault();
                            Model.Tw_PrintMaster printMaster = new Model.Tw_PrintMaster
                            {

                                CreateManName = !string.IsNullOrEmpty(weldTask_CreateName?.Tabler) ? BLL.Person_PersonsService.getSignatureUrl(weldTask_CreateName.Tabler) : "",
-                                AuditManName = !string.IsNullOrEmpty(weldTask?.AuditMan) ? BLL.Person_PersonsService.getSignatureUrl(weldTask.AuditMan) : "",
-                                AuditManName2 = !string.IsNullOrEmpty(weldTask?.AuditMan2) ? BLL.Person_PersonsService.getSignatureUrl(weldTask.AuditMan2) : "",
+                                AuditManName = !string.IsNullOrEmpty(weldTask?.AuditMan) ? BLL.Person_PersonsService.getSignatureUrl(weldTask.AuditMan) : "", 
                            };
                            tw_PrintMasters.Add(printMaster);
                            DataTable Table1 = LINQToDataTable(tw_PrintMasters);
@@ -230,15 +230,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
        /// </remarks>
        protected global::FineUIPro.Button btnPassMaster;

-        /// <summary>
-        /// btnPassMaster2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnPassMaster2;
-
        /// <summary>
        /// btnPrintTask 控件。
        /// </summary>