feat:增加焊前管理，材料管理条码扫码接口，材料信息导入支持无炉批号/有炉批号 多种导入方式

SGGL/BLL/API/APIBaseInfoService.cs

@@ -208,6 +208,27 @@ namespace BLL
                 return getDataLists;
             }
         }
+
+        /// <summary>
+        /// 获取坡口类型
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.BaseInfoItem> getGrooveType()
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var getDataLists = (from x in db.Base_GrooveType
+                                    orderby x.GrooveTypeCode
+                                    select new Model.BaseInfoItem
+                                    {
+                                        BaseInfoId = x.GrooveTypeId,
+                                        BaseInfoCode = x.GrooveTypeCode,
+                                        BaseInfoName = x.GrooveTypeName
+                                    }
+                                ).ToList();
+                return getDataLists;
+            }
+        }
         #endregion
 
         #region 根据类型获取巡检隐患类型表

SGGL/BLL/API/HJGL/APIPreWeldInspectionService.cs

@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 小程序焊前抽检接口服务
+    /// </summary>
+    public static class APIPreWeldInspectionService
+    {
+        /// <summary>
+        /// 根据焊口ID获取焊前抽检基础信息
+        /// </summary>
+        /// <param name="weldJointId">焊口ID</param>
+        /// <returns>焊口基础信息</returns>
+        public static Model.PreWeldJointItem GetPreWeldJointByWeldJointId(string weldJointId)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var query = from x in db.HJGL_WeldJoint
+                            join g in db.Base_GrooveType on x.GrooveTypeId equals g.GrooveTypeId into grooveTypes
+                            from g in grooveTypes.DefaultIfEmpty()
+                            where x.WeldJointId == weldJointId
+                            select new Model.PreWeldJointItem
+                            {
+                                WeldJointId = x.WeldJointId,
+                                WeldJointCode = x.WeldJointCode,
+                                PipelineId = x.PipelineId,
+                                PipelineCode = x.PipelineCode,
+                                ProjectId = x.ProjectId,
+                                GrooveTypeId = x.GrooveTypeId,
+                                GrooveTypeCode = g == null ? string.Empty : g.GrooveTypeCode,
+                                GrooveTypeName = g == null ? string.Empty : g.GrooveTypeName,
+                                GrooveProcessType = x.GrooveProcessType,
+                                GrooveAngle = x.GrooveAngle,
+                                FitupGap = x.FitupGap,
+                                Misalignment = x.Misalignment
+                            };
+
+                return query.FirstOrDefault();
+            }
+        }
+
+        /// <summary>
+        /// 保存下料抽检，已存在同一焊口记录时更新原记录
+        /// </summary>
+        /// <param name="item">下料抽检参数</param>
+        public static void SaveCuttingCheck(Model.PreWeldCuttingCheckItem item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException("item");
+            }
+            if (string.IsNullOrEmpty(item.WeldJointId))
+            {
+                throw new ArgumentException("焊口ID不能为空。");
+            }
+
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var weldJoint = db.HJGL_WeldJoint.FirstOrDefault(x => x.WeldJointId == item.WeldJointId);
+                if (weldJoint == null)
+                {
+                    throw new ArgumentException("未找到对应焊口。");
+                }
+
+                var check = db.HJGL_PreWeldCuttingCheck.FirstOrDefault(x => x.WeldJointId == item.WeldJointId);
+                if (check == null)
+                {
+                    check = new Model.HJGL_PreWeldCuttingCheck
+                    {
+                        CuttingCheckId = Guid.NewGuid().ToString(),
+                        WeldJointId = item.WeldJointId,
+                        ProjectId = string.IsNullOrEmpty(item.ProjectId) ? weldJoint.ProjectId : item.ProjectId,
+                        CreateUser = item.CreateUser ?? item.CheckPerson,
+                        CreateTime = DateTime.Now
+                    };
+                    db.HJGL_PreWeldCuttingCheck.InsertOnSubmit(check);
+                }
+
+                check.ProjectId = string.IsNullOrEmpty(item.ProjectId) ? weldJoint.ProjectId : item.ProjectId;
+                check.IsMaterialCodeBatchNoAccurate = item.IsMaterialCodeBatchNoAccurate;
+                check.IsMaterialQuantityAccurate = item.IsMaterialQuantityAccurate;
+                // 下料抽检合格规则：材料编码及炉批号、材料数量两个检查项均准确才合格。
+                check.IsQualified = item.IsMaterialCodeBatchNoAccurate && item.IsMaterialQuantityAccurate;
+                check.CheckPerson = item.CheckPerson;
+                check.CheckTime = item.CheckTime ?? DateTime.Now;
+                check.Remark = item.Remark;
+
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 保存组对抽检，已存在同一焊口记录时更新原记录并回写焊口主表
+        /// </summary>
+        /// <param name="item">组对抽检参数</param>
+        public static void SaveFitupCheck(Model.PreWeldFitupCheckItem item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException("item");
+            }
+            if (string.IsNullOrEmpty(item.WeldJointId))
+            {
+                throw new ArgumentException("焊口ID不能为空。");
+            }
+            if (string.IsNullOrEmpty(item.GrooveTypeId))
+            {
+                throw new ArgumentException("坡口类型不能为空。");
+            }
+
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var weldJoint = db.HJGL_WeldJoint.FirstOrDefault(x => x.WeldJointId == item.WeldJointId);
+                if (weldJoint == null)
+                {
+                    throw new ArgumentException("未找到对应焊口。");
+                }
+                if (!db.Base_GrooveType.Any(x => x.GrooveTypeId == item.GrooveTypeId))
+                {
+                    throw new ArgumentException("坡口类型不存在。");
+                }
+
+                var check = db.HJGL_PreWeldFitupCheck.FirstOrDefault(x => x.WeldJointId == item.WeldJointId);
+                if (check == null)
+                {
+                    check = new Model.HJGL_PreWeldFitupCheck
+                    {
+                        FitupCheckId = Guid.NewGuid().ToString(),
+                        WeldJointId = item.WeldJointId,
+                        ProjectId = string.IsNullOrEmpty(item.ProjectId) ? weldJoint.ProjectId : item.ProjectId,
+                        CreateUser = item.CreateUser ?? item.CheckPerson,
+                        CreateTime = DateTime.Now
+                    };
+                    db.HJGL_PreWeldFitupCheck.InsertOnSubmit(check);
+                }
+
+                check.ProjectId = string.IsNullOrEmpty(item.ProjectId) ? weldJoint.ProjectId : item.ProjectId;
+                check.GrooveTypeId = item.GrooveTypeId;
+                check.GrooveProcessType = item.GrooveProcessType;
+                check.GrooveAngle = item.GrooveAngle;
+                check.FitupGap = item.FitupGap;
+                check.Misalignment = item.Misalignment;
+                check.CheckPerson = item.CheckPerson;
+                check.CheckTime = item.CheckTime ?? DateTime.Now;
+                check.Remark = item.Remark;
+
+                // 组对抽检字段需同步回写焊口主表，供焊口台账和后续业务复用。
+                weldJoint.GrooveTypeId = item.GrooveTypeId;
+                weldJoint.GrooveProcessType = item.GrooveProcessType;
+                weldJoint.GrooveAngle = item.GrooveAngle;
+                weldJoint.FitupGap = item.FitupGap;
+                weldJoint.Misalignment = item.Misalignment;
+
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/BLL.csproj

@@ -203,6 +203,7 @@
     <Compile Include="API\HJGL\APINDETrustService.cs" />
     <Compile Include="API\HJGL\APIPipeJointService.cs" />
     <Compile Include="API\HJGL\APIPipelineComponentService.cs" />
+    <Compile Include="API\HJGL\APIPreWeldInspectionService.cs" />
     <Compile Include="API\HJGL\APIPreWeldingDailyService.cs" />
     <Compile Include="API\HJGL\APIReportQueryService.cs" />
     <Compile Include="API\HJGL\APITestPackageService.cs" />
@@ -461,6 +462,7 @@
     <Compile Include="HJGL\WeldingManage\PipelineComponentService.cs" />
     <Compile Include="HJGL\WeldingManage\PipelineMatService.cs" />
     <Compile Include="HJGL\WeldingManage\PipelineService.cs" />
+    <Compile Include="HJGL\WeldingManage\PreWeldInspectionService.cs" />
     <Compile Include="HJGL\WeldingManage\WeldingDailyService.cs" />
     <Compile Include="HJGL\WeldingManage\WeldJointService.cs" />
     <Compile Include="HJGL\WeldingManage\WeldTaskService.cs" />

SGGL/BLL/CLGL/TwInOutplanmasterService.cs

@@ -247,6 +247,12 @@ namespace BLL
             try
             {
                 temeplateDtoIns = MiniExcel.Query<Tw_InputDataIn>(path, startCell: "A1").ToList();
+                foreach (var item in temeplateDtoIns)
+                {
+                    item.MaterialCode = item.MaterialCode.Trim();
+                    item.HeatNo = item.HeatNo.Trim();
+                    item.BatchNo = item.BatchNo.Trim();
+                }
             }
             catch (Exception ex)
             {
@@ -621,12 +627,12 @@ namespace BLL
 
         private static string CleanImportText(string value)
         {
-            return Convert.ToString(value).Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", "").Trim();
+            return (value ?? string.Empty).Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", "").Trim();
         }
 
         private static string CleanImportDateText(string value)
         {
-            return Convert.ToString(value).Replace("\n", "").Replace("\t", " ").Replace("\r", "").Trim();
+            return (value ?? string.Empty).Replace("\n", "").Replace("\t", " ").Replace("\r", "").Trim();
         }
 
         private static bool TryParseImportDate(string value, out DateTime date)

SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs

@@ -50,7 +50,9 @@ namespace BLL
                         BatchNo = mat.BatchNo,
                         MaterialName = mat.MaterialName,
                         MaterialDef = mat.MaterialDef,
-                        BarCode = x.BarCode
+                        MaterialSpec = mat.MaterialSpec,
+                        MaterialUnit = mat.MaterialUnit,
+                        BarCode = x.MaterialCode
                     };
 
             return q.ToList();
@@ -119,7 +121,7 @@ namespace BLL
         /// </summary>
         public static string BuildBarCode(Tw_InputMaster inputMaster, Tw_InputDetail inputDetail, string barCodeDetailId)
         {
-            return "IB" + barCodeDetailId.Replace("-", string.Empty).ToUpperInvariant();
+            return inputDetail == null ? string.Empty : inputDetail.MaterialCode;
         }
     }
 }

SGGL/BLL/Common/Const.cs

@@ -2939,6 +2939,16 @@ namespace BLL
         /// 焊接日常管理
         /// </summary>
         public const string HJGL_WeldReportMenuId = "5TYHMD2F-2582-4DEB-905E-6E9DCFEFBGHO";
+
+        /// <summary>
+        /// 下料抽检记录台账
+        /// </summary>
+        public const string HJGL_PreWeldCuttingCheckMenuId = "D1B5A8B7-5D2A-4C51-9B7E-6A2F15B7F002";
+
+        /// <summary>
+        /// 组对抽检列表台账
+        /// </summary>
+        public const string HJGL_PreWeldFitupCheckMenuId = "D1B5A8B7-5D2A-4C51-9B7E-6A2F15B7F003";
         #endregion
 
         #region 预制设计
@@ -3456,6 +3466,11 @@ namespace BLL
         /// </summary>
         public const string PipelineMatTemplateUrl = "File\\Excel\\DataIn\\PipelineMat.xlsx";
 
+        /// <summary>
+        /// 管线材料导入模板（包含炉号、批号）
+        /// </summary>
+        public const string PipelineMatWithBatchTemplateUrl = "File\\Excel\\DataIn\\PipelineMatWithBatch.xlsx";
+
         /// <summary>
         /// 材料信息数据导入模板
         /// </summary>

SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs

@@ -14,6 +14,27 @@
         {
             return Funs.DB.HJGL_MaterialCodeLib.FirstOrDefault(e => e.MaterialCode == materialCode);
         }
+
+        /// <summary>
+        /// 根据材料主编码获取条码扫码所需的材料信息。
+        /// </summary>
+        public static Model.MaterialCodeLibBarCodeOutput GetBarCodeMaterialInfo(string materialCode)
+        {
+            return (from x in Funs.DB.HJGL_MaterialCodeLib
+                    where x.MaterialCode == materialCode
+                    select new Model.MaterialCodeLibBarCodeOutput
+                    {
+                        MaterialCode = x.MaterialCode,
+                        Code = x.Code,
+                        HeatNo = x.HeatNo,
+                        BatchNo = x.BatchNo,
+                        MaterialName = x.MaterialName,
+                        MaterialDef = x.MaterialDef,
+                        MaterialSpec = x.MaterialSpec,
+                        MaterialUnit = x.MaterialUnit
+                    }).FirstOrDefault();
+        }
+
         public static List<Model.HJGL_MaterialCodeLib> GetMaterialCodeLibList()
         {
             var q = (from x in Funs.DB.HJGL_MaterialCodeLib select x).ToList();

SGGL/BLL/HJGL/WeldingManage/PreWeldInspectionService.cs

@@ -0,0 +1,151 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 焊前抽检台账服务
+    /// </summary>
+    public static class PreWeldInspectionService
+    {
+        /// <summary>
+        /// 获取下料抽检台账
+        /// </summary>
+        public static Tuple<List<Model.PreWeldCuttingCheckItem>, int> GetCuttingCheckList(string projectId, string pipelineCode, string weldJointCode, int pageIndex, int pageSize)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var query = from c in db.HJGL_PreWeldCuttingCheck
+                            join w in db.HJGL_WeldJoint on c.WeldJointId equals w.WeldJointId
+                            join p in db.Person_Persons on c.CheckPerson equals p.PersonId into persons
+                            from p in persons.DefaultIfEmpty()
+                            where string.IsNullOrEmpty(projectId) || c.ProjectId == projectId || w.ProjectId == projectId
+                            select new
+                            {
+                                c,
+                                w,
+                                CheckPersonName = p == null ? string.Empty : p.PersonName
+                            };
+
+                if (!string.IsNullOrEmpty(pipelineCode))
+                {
+                    query = query.Where(x => x.w.PipelineCode.Contains(pipelineCode));
+                }
+                if (!string.IsNullOrEmpty(weldJointCode))
+                {
+                    query = query.Where(x => x.w.WeldJointCode.Contains(weldJointCode));
+                }
+
+                int total = query.Count();
+                var data = query.OrderByDescending(x => x.c.CheckTime)
+                    .Skip(pageIndex * pageSize)
+                    .Take(pageSize)
+                    .Select(x => new Model.PreWeldCuttingCheckItem
+                    {
+                        CuttingCheckId = x.c.CuttingCheckId,
+                        ProjectId = x.c.ProjectId,
+                        WeldJointId = x.c.WeldJointId,
+                        PipelineCode = x.w.PipelineCode,
+                        WeldJointCode = x.w.WeldJointCode,
+                        IsMaterialCodeBatchNoAccurate = x.c.IsMaterialCodeBatchNoAccurate,
+                        IsMaterialQuantityAccurate = x.c.IsMaterialQuantityAccurate,
+                        IsQualified = x.c.IsQualified,
+                        CheckPerson = x.c.CheckPerson,
+                        CheckPersonName = x.CheckPersonName,
+                        CheckTime = x.c.CheckTime,
+                        CreateUser = x.c.CreateUser,
+                        CreateTime = x.c.CreateTime,
+                        Remark = x.c.Remark
+                    })
+                    .ToList();
+
+                return Tuple.Create(data, total);
+            }
+        }
+
+        /// <summary>
+        /// 获取组对抽检台账
+        /// </summary>
+        public static Tuple<List<Model.PreWeldFitupCheckItem>, int> GetFitupCheckList(string projectId, string pipelineCode, string weldJointCode, int pageIndex, int pageSize)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var query = from f in db.HJGL_PreWeldFitupCheck
+                            join w in db.HJGL_WeldJoint on f.WeldJointId equals w.WeldJointId
+                            join g in db.Base_GrooveType on f.GrooveTypeId equals g.GrooveTypeId into grooveTypes
+                            from g in grooveTypes.DefaultIfEmpty()
+                            join p in db.Person_Persons on f.CheckPerson equals p.PersonId into persons
+                            from p in persons.DefaultIfEmpty()
+                            where string.IsNullOrEmpty(projectId) || f.ProjectId == projectId || w.ProjectId == projectId
+                            select new
+                            {
+                                f,
+                                w,
+                                g,
+                                CheckPersonName = p == null ? string.Empty : p.PersonName
+                            };
+
+                if (!string.IsNullOrEmpty(pipelineCode))
+                {
+                    query = query.Where(x => x.w.PipelineCode.Contains(pipelineCode));
+                }
+                if (!string.IsNullOrEmpty(weldJointCode))
+                {
+                    query = query.Where(x => x.w.WeldJointCode.Contains(weldJointCode));
+                }
+
+                int total = query.Count();
+                var data = query.OrderBy(x => x.w.PipelineCode).ThenBy(x => x.w.WeldJointCode)
+                    .Skip(pageIndex * pageSize)
+                    .Take(pageSize)
+                    .Select(x => new Model.PreWeldFitupCheckItem
+                    {
+                        FitupCheckId = x.f.FitupCheckId,
+                        ProjectId = x.f.ProjectId,
+                        WeldJointId = x.w.WeldJointId,
+                        PipelineCode = x.w.PipelineCode,
+                        WeldJointCode = x.w.WeldJointCode,
+                        GrooveTypeId = x.f.GrooveTypeId,
+                        GrooveTypeCode = x.g == null ? string.Empty : x.g.GrooveTypeCode,
+                        GrooveTypeName = x.g == null ? string.Empty : x.g.GrooveTypeName,
+                        GrooveProcessType = x.f.GrooveProcessType,
+                        GrooveAngle = x.f.GrooveAngle,
+                        FitupGap = x.f.FitupGap,
+                        Misalignment = x.f.Misalignment,
+                        CheckPerson = x.f.CheckPerson,
+                        CheckPersonName = x.CheckPersonName,
+                        CheckTime = x.f.CheckTime,
+                        CreateUser = x.f.CreateUser,
+                        CreateTime = x.f.CreateTime,
+                        Remark = x.f.Remark
+                    })
+                    .ToList();
+
+                return Tuple.Create(data, total);
+            }
+        }
+
+        /// <summary>
+        /// 获取下料抽检实体
+        /// </summary>
+        public static Model.HJGL_PreWeldCuttingCheck GetCuttingCheckById(string cuttingCheckId)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                return db.HJGL_PreWeldCuttingCheck.FirstOrDefault(x => x.CuttingCheckId == cuttingCheckId);
+            }
+        }
+
+        /// <summary>
+        /// 获取组对抽检实体
+        /// </summary>
+        public static Model.HJGL_PreWeldFitupCheck GetFitupCheckByWeldJointId(string weldJointId)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                return db.HJGL_PreWeldFitupCheck.FirstOrDefault(x => x.WeldJointId == weldJointId);
+            }
+        }
+    }
+}

SGGL/FineUIPro.Web/CLGL/InputMaster.aspx

@@ -159,7 +159,7 @@
                                                     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" ExpandUnusedSpace="True">
+                                                    FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center" >
                                                 </f:RenderField>
                                                 <f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
                                                     FieldType="String" HeaderText="计划数量" TextAlign="Left" HeaderTextAlign="Center">
@@ -203,7 +203,13 @@
                                                     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" ExpandUnusedSpace="True">
+                                                    FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center" >
+                                                </f:RenderField>
+                                                <f:RenderField Width="150px" ColumnID="MaterialSpec" DataField="MaterialSpec" SortField="MaterialSpec"
+                                                    FieldType="String" HeaderText="规格" TextAlign="Left" HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="120px" ColumnID="MaterialUnit" DataField="MaterialUnit" SortField="MaterialUnit"
+                                                    FieldType="String" HeaderText="单位" TextAlign="Left" HeaderTextAlign="Center">
                                                 </f:RenderField>
                                                 <f:RenderField Width="360px" ColumnID="BarCode" DataField="BarCode" SortField="BarCode"
                                                     FieldType="String" HeaderText="条码内容" TextAlign="Left" HeaderTextAlign="Center">

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

@@ -1,26 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="05/18/2026 00:00:00" ReportInfo.Modified="05/18/2026 00:00:00" ReportInfo.CreatorVersion="2021.3.0.0">
-  <ScriptText>using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Windows.Forms;
-using System.Drawing;
-using System.Data;
-using FastReport;
-using FastReport.Data;
-using FastReport.Dialog;
-using FastReport.Barcode;
-using FastReport.Table;
-using FastReport.Utils;
-
-namespace FastReport
-{
-  public class ReportScript
-  {
-  }
-}
-</ScriptText>
+<?xml version="1.0" encoding="utf-8"?>
+<Report ScriptLanguage="CSharp" ReportInfo.Created="2026-05-18" ReportInfo.Modified="06/17/2026 10:53:39" ReportInfo.CreatorVersion="2017.1.16.0">
   <Dictionary>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="Id" DataType="System.String"/>
@@ -34,8 +13,8 @@ namespace FastReport
     </TableDataSource>
   </Dictionary>
   <ReportPage Name="Page1" PaperWidth="80" PaperHeight="30" LeftMargin="0" TopMargin="0" RightMargin="0" BottomMargin="0">
-    <DataBand Name="Data1" Width="302.4" Height="113.4" DataSource="Table1">
-      <BarcodeObject Name="Barcode1" Left="18.9" Top="18.9" Width="264.6" Height="75.6" AutoSize="false" Text="[Table1.BarCode]" ShowText="true" AllowExpressions="true" Barcode="Code128"/>
+    <DataBand Name="Data1" Width="302.4" Height="122.93" DataSource="Table1">
+      <BarcodeObject Name="Barcode1" Left="9.45" Top="18.9" Width="281.91" Height="85.43" AutoSize="false" Text="[Table1.BarCode]" AllowExpressions="true" Barcode="Code128" Barcode.AutoEncode="true"/>
     </DataBand>
   </ReportPage>
 </Report>

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1647,6 +1647,10 @@
     <Content Include="HJGL\PreDesign\PackagingManageSelect.aspx" />
     <Content Include="HJGL\PreDesign\PackagingManageSelectStock.aspx" />
     <Content Include="HJGL\PreDesign\PackagingManageView.aspx" />
+    <Content Include="HJGL\PreWeld\CuttingCheck.aspx" />
+    <Content Include="HJGL\PreWeld\CuttingCheckEdit.aspx" />
+    <Content Include="HJGL\PreWeld\FitupCheck.aspx" />
+    <Content Include="HJGL\PreWeld\FitupCheckEdit.aspx" />
     <Content Include="HJGL\PreDesign\InstallList.aspx" />
     <Content Include="HJGL\PreDesign\PrePipelineComponentJointIn.aspx" />
     <Content Include="HJGL\PreDesign\PrePipelineQRCodeIn.aspx" />
@@ -11037,6 +11041,34 @@
     <Compile Include="HJGL\PreDesign\PackagingManageView.aspx.designer.cs">
       <DependentUpon>PackagingManageView.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HJGL\PreWeld\CuttingCheck.aspx.cs">
+      <DependentUpon>CuttingCheck.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\PreWeld\CuttingCheck.aspx.designer.cs">
+      <DependentUpon>CuttingCheck.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\PreWeld\CuttingCheckEdit.aspx.cs">
+      <DependentUpon>CuttingCheckEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\PreWeld\CuttingCheckEdit.aspx.designer.cs">
+      <DependentUpon>CuttingCheckEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\PreWeld\FitupCheck.aspx.cs">
+      <DependentUpon>FitupCheck.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\PreWeld\FitupCheck.aspx.designer.cs">
+      <DependentUpon>FitupCheck.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\PreWeld\FitupCheckEdit.aspx.cs">
+      <DependentUpon>FitupCheckEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\PreWeld\FitupCheckEdit.aspx.designer.cs">
+      <DependentUpon>FitupCheckEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HJGL\PreDesign\InstallList.aspx.cs">
       <DependentUpon>InstallList.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/HJGL/PreWeld/CuttingCheck.aspx

@@ -0,0 +1,85 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CuttingCheck.aspx.cs" Inherits="FineUIPro.Web.HJGL.PreWeld.CuttingCheck" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>下料抽检记录台账</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="下料抽检记录台账"
+                runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="CuttingCheckId"
+                DataIDField="CuttingCheckId" AllowPaging="true" IsDatabasePaging="true" PageSize="15"
+                OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
+                OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                        <Items>
+                            <f:TextBox ID="txtPipelineCode" runat="server" Label="管线号" EmptyText="输入查询条件"
+                                Width="260px" LabelWidth="90px" LabelAlign="Right">
+                            </f:TextBox>
+                            <f:TextBox ID="txtWeldJointCode" runat="server" Label="焊口号" EmptyText="输入查询条件"
+                                Width="260px" LabelWidth="90px" LabelAlign="Right">
+                            </f:TextBox>
+                            <f:Button ID="btnQuery" Text="查询" Icon="SystemSearch" EnablePostBack="true"
+                                OnClick="btnQuery_Click" runat="server">
+                            </f:Button>
+                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                            </f:ToolbarFill>
+                            <f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="true"
+                                runat="server" OnClick="btnNew_Click">
+                            </f:Button>
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>
+                <Columns>
+                    <f:RenderField Width="220px" ColumnID="PipelineCode" DataField="PipelineCode" FieldType="String"
+                        HeaderText="管线号" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="140px" ColumnID="WeldJointCode" DataField="WeldJointCode" FieldType="String"
+                        HeaderText="焊口号" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:CheckBoxField Width="150px" ColumnID="IsMaterialCodeBatchNoAccurate" DataField="IsMaterialCodeBatchNoAccurate"
+                        HeaderText="材料准确" HeaderTextAlign="Center" TextAlign="Center" RenderAsStaticField="true">
+                    </f:CheckBoxField>
+                    <f:CheckBoxField Width="170px" ColumnID="IsMaterialQuantityAccurate" DataField="IsMaterialQuantityAccurate"
+                        HeaderText="材料数量准确" HeaderTextAlign="Center" TextAlign="Center" RenderAsStaticField="true">
+                    </f:CheckBoxField>
+                    <f:RenderField Width="120px" ColumnID="CheckPersonName" DataField="CheckPersonName" FieldType="String"
+                        HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="170px" ColumnID="CheckTime" DataField="CheckTime" FieldType="Date"
+                        RendererArgument="yyyy-MM-dd HH:mm" HeaderText="检查时间" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:CheckBoxField Width="120px" ColumnID="IsQualified" DataField="IsQualified"
+                        HeaderText="是否合格" HeaderTextAlign="Center" TextAlign="Center" RenderAsStaticField="true">
+                    </f:CheckBoxField>
+                </Columns>
+                <PageItems>
+                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                    </f:ToolbarSeparator>
+                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                    </f:ToolbarText>
+                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        <f:ListItem Text="10" Value="10" />
+                        <f:ListItem Text="15" Value="15" />
+                        <f:ListItem Text="20" Value="20" />
+                        <f:ListItem Text="25" Value="25" />
+                    </f:DropDownList>
+                </PageItems>
+            </f:Grid>
+        </Items>
+    </f:Panel>
+    <f:Window ID="Window1" Title="下料抽检" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+        Width="720px" Height="420px">
+    </f:Window>
+    </form>
+</body>
+</html>

SGGL/FineUIPro.Web/HJGL/PreWeld/CuttingCheck.aspx.cs

@@ -0,0 +1,74 @@
+using BLL;
+using System;
+
+namespace FineUIPro.Web.HJGL.PreWeld
+{
+    public partial class CuttingCheck : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BindGrid();
+            }
+        }
+
+        private void BindGrid()
+        {
+            var result = PreWeldInspectionService.GetCuttingCheckList(
+                CurrUser.LoginProjectId,
+                txtPipelineCode.Text.Trim(),
+                txtWeldJointCode.Text.Trim(),
+                Grid1.PageIndex,
+                Grid1.PageSize);
+            Grid1.RecordCount = result.Item2;
+            Grid1.DataSource = result.Item1;
+            Grid1.DataBind();
+        }
+
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            Grid1.PageIndex = 0;
+            BindGrid();
+        }
+
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.PersonId, Const.HJGL_PreWeldCuttingCheckMenuId, Const.BtnAdd))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference("CuttingCheckEdit.aspx"));
+            }
+        }
+
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.PersonId, Const.HJGL_PreWeldCuttingCheckMenuId, Const.BtnModify))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("CuttingCheckEdit.aspx?CuttingCheckId={0}", Grid1.SelectedRowID)));
+            }
+        }
+    }
+}

SGGL/FineUIPro.Web/HJGL/PreWeld/CuttingCheck.aspx.designer.cs

@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.PreWeld
+{
+
+
+    public partial class CuttingCheck
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtPipelineCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPipelineCode;
+
+        /// <summary>
+        /// txtWeldJointCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldJointCode;
+
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+    }
+}

SGGL/FineUIPro.Web/HJGL/PreWeld/CuttingCheckEdit.aspx

@@ -0,0 +1,65 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CuttingCheckEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.PreWeld.CuttingCheckEdit" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>编辑下料抽检</title>
+    <base target="_self" />
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+        <Rows>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="drpWeldJoint" runat="server" Label="焊口" Required="true"
+                        ShowRedStar="true" LabelWidth="170px" EnableEdit="true">
+                    </f:DropDownList>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:CheckBox ID="chkMaterialCodeBatchNo" runat="server" Label="材料编码及炉批号校验"
+                        LabelWidth="170px">
+                    </f:CheckBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:CheckBox ID="chkMaterialQuantity" runat="server" Label="材料数量校验"
+                        LabelWidth="170px">
+                    </f:CheckBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DatePicker ID="dpCheckTime" runat="server" Label="检查时间" LabelWidth="170px"
+                        DateFormatString="yyyy-MM-dd">
+                    </f:DatePicker>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelWidth="170px">
+                    </f:TextArea>
+                </Items>
+            </f:FormRow>
+        </Rows>
+        <Toolbars>
+            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                <Items>
+                    <f:Button ID="btnSave" Text="保存" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
+                        OnClick="btnSave_Click">
+                    </f:Button>
+                    <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
+                    </f:Button>
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+    </f:Form>
+    </form>
+</body>
+</html>

SGGL/FineUIPro.Web/HJGL/PreWeld/CuttingCheckEdit.aspx.cs

@@ -0,0 +1,92 @@
+using BLL;
+using System;
+using System.Linq;
+
+namespace FineUIPro.Web.HJGL.PreWeld
+{
+    public partial class CuttingCheckEdit : PageBase
+    {
+        public string CuttingCheckId
+        {
+            get { return (string)ViewState["CuttingCheckId"]; }
+            set { ViewState["CuttingCheckId"] = value; }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                CuttingCheckId = Request.Params["CuttingCheckId"];
+                BindWeldJoint();
+                if (!string.IsNullOrEmpty(CuttingCheckId))
+                {
+                    BindData();
+                }
+                else
+                {
+                    dpCheckTime.SelectedDate = DateTime.Now;
+                }
+            }
+        }
+
+        private void BindWeldJoint()
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var data = (from x in db.HJGL_WeldJoint
+                            where x.ProjectId == CurrUser.LoginProjectId
+                            orderby x.PipelineCode, x.WeldJointCode
+                            select new
+                            {
+                                x.WeldJointId,
+                                WeldJointName = x.PipelineCode + " / " + x.WeldJointCode
+                            }).ToList();
+                drpWeldJoint.DataTextField = "WeldJointName";
+                drpWeldJoint.DataValueField = "WeldJointId";
+                drpWeldJoint.DataSource = data;
+                drpWeldJoint.DataBind();
+            }
+        }
+
+        private void BindData()
+        {
+            var model = PreWeldInspectionService.GetCuttingCheckById(CuttingCheckId);
+            if (model == null)
+            {
+                return;
+            }
+
+            drpWeldJoint.SelectedValue = model.WeldJointId;
+            chkMaterialCodeBatchNo.Checked = model.IsMaterialCodeBatchNoAccurate;
+            chkMaterialQuantity.Checked = model.IsMaterialQuantityAccurate;
+            dpCheckTime.SelectedDate = model.CheckTime;
+            txtRemark.Text = model.Remark;
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (!CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.PersonId, Const.HJGL_PreWeldCuttingCheckMenuId, Const.BtnSave))
+            {
+                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            var item = new Model.PreWeldCuttingCheckItem
+            {
+                ProjectId = CurrUser.LoginProjectId,
+                WeldJointId = drpWeldJoint.SelectedValue,
+                IsMaterialCodeBatchNoAccurate = chkMaterialCodeBatchNo.Checked,
+                IsMaterialQuantityAccurate = chkMaterialQuantity.Checked,
+                CheckPerson = CurrUser.PersonId,
+                CheckTime = dpCheckTime.SelectedDate ?? DateTime.Now,
+                CreateUser = CurrUser.PersonId,
+                Remark = txtRemark.Text.Trim()
+            };
+
+            APIPreWeldInspectionService.SaveCuttingCheck(item);
+            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+        }
+    }
+}

SGGL/FineUIPro.Web/HJGL/PreWeld/CuttingCheckEdit.aspx.designer.cs

@@ -0,0 +1,116 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.PreWeld
+{
+
+
+    public partial class CuttingCheckEdit
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// drpWeldJoint 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWeldJoint;
+
+        /// <summary>
+        /// chkMaterialCodeBatchNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox chkMaterialCodeBatchNo;
+
+        /// <summary>
+        /// chkMaterialQuantity 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox chkMaterialQuantity;
+
+        /// <summary>
+        /// dpCheckTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker dpCheckTime;
+
+        /// <summary>
+        /// txtRemark 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+    }
+}

SGGL/FineUIPro.Web/HJGL/PreWeld/FitupCheck.aspx

@@ -0,0 +1,85 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FitupCheck.aspx.cs" Inherits="FineUIPro.Web.HJGL.PreWeld.FitupCheck" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>组对抽检列表台账</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="组对抽检列表台账"
+                runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WeldJointId"
+                DataIDField="WeldJointId" AllowPaging="true" IsDatabasePaging="true" PageSize="15"
+                OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
+                OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                        <Items>
+                            <f:TextBox ID="txtPipelineCode" runat="server" Label="管线号" EmptyText="输入查询条件"
+                                Width="260px" LabelWidth="90px" LabelAlign="Right">
+                            </f:TextBox>
+                            <f:TextBox ID="txtWeldJointCode" runat="server" Label="焊口号" EmptyText="输入查询条件"
+                                Width="260px" LabelWidth="90px" LabelAlign="Right">
+                            </f:TextBox>
+                            <f:Button ID="btnQuery" Text="查询" Icon="SystemSearch" EnablePostBack="true"
+                                OnClick="btnQuery_Click" runat="server">
+                            </f:Button>
+                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                            </f:ToolbarFill>
+                            <f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="true"
+                                runat="server" OnClick="btnNew_Click">
+                            </f:Button>
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>
+                <Columns>
+                    <f:RenderField Width="220px" ColumnID="PipelineCode" DataField="PipelineCode" FieldType="String"
+                        HeaderText="管线号" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="140px" ColumnID="WeldJointCode" DataField="WeldJointCode" FieldType="String"
+                        HeaderText="焊口号" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="180px" ColumnID="GrooveTypeCode" DataField="GrooveTypeCode" FieldType="String"
+                        HeaderText="坡口类型" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="170px" ColumnID="GrooveProcessType" DataField="GrooveProcessType" FieldType="String"
+                        HeaderText="坡口加工类型" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="GrooveAngle" DataField="GrooveAngle" FieldType="Double"
+                        HeaderText="坡口角度" HeaderTextAlign="Center" TextAlign="Right">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="FitupGap" DataField="FitupGap" FieldType="Double"
+                        HeaderText="组对间隙" HeaderTextAlign="Center" TextAlign="Right">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="Misalignment" DataField="Misalignment" FieldType="Double"
+                        HeaderText="错边量" HeaderTextAlign="Center" TextAlign="Right">
+                    </f:RenderField>
+                </Columns>
+                <PageItems>
+                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                    </f:ToolbarSeparator>
+                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                    </f:ToolbarText>
+                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        <f:ListItem Text="10" Value="10" />
+                        <f:ListItem Text="15" Value="15" />
+                        <f:ListItem Text="20" Value="20" />
+                        <f:ListItem Text="25" Value="25" />
+                    </f:DropDownList>
+                </PageItems>
+            </f:Grid>
+        </Items>
+    </f:Panel>
+    <f:Window ID="Window1" Title="组对抽检" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+        Width="760px" Height="520px">
+    </f:Window>
+    </form>
+</body>
+</html>

SGGL/FineUIPro.Web/HJGL/PreWeld/FitupCheck.aspx.cs

@@ -0,0 +1,74 @@
+using BLL;
+using System;
+
+namespace FineUIPro.Web.HJGL.PreWeld
+{
+    public partial class FitupCheck : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BindGrid();
+            }
+        }
+
+        private void BindGrid()
+        {
+            var result = PreWeldInspectionService.GetFitupCheckList(
+                CurrUser.LoginProjectId,
+                txtPipelineCode.Text.Trim(),
+                txtWeldJointCode.Text.Trim(),
+                Grid1.PageIndex,
+                Grid1.PageSize);
+            Grid1.RecordCount = result.Item2;
+            Grid1.DataSource = result.Item1;
+            Grid1.DataBind();
+        }
+
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            Grid1.PageIndex = 0;
+            BindGrid();
+        }
+
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.PersonId, Const.HJGL_PreWeldFitupCheckMenuId, Const.BtnAdd))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference("FitupCheckEdit.aspx"));
+            }
+        }
+
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.PersonId, Const.HJGL_PreWeldFitupCheckMenuId, Const.BtnModify))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("FitupCheckEdit.aspx?WeldJointId={0}", Grid1.SelectedRowID)));
+            }
+        }
+    }
+}

SGGL/FineUIPro.Web/HJGL/PreWeld/FitupCheck.aspx.designer.cs

@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.PreWeld
+{
+
+
+    public partial class FitupCheck
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtPipelineCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPipelineCode;
+
+        /// <summary>
+        /// txtWeldJointCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldJointCode;
+
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+    }
+}

SGGL/FineUIPro.Web/HJGL/PreWeld/FitupCheckEdit.aspx

@@ -0,0 +1,82 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FitupCheckEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.PreWeld.FitupCheckEdit" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>编辑组对抽检</title>
+    <base target="_self" />
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+        <Rows>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="drpWeldJoint" runat="server" Label="焊口" Required="true"
+                        ShowRedStar="true" LabelWidth="170px" EnableEdit="true">
+                    </f:DropDownList>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="drpGrooveType" runat="server" Label="坡口类型" Required="true"
+                        ShowRedStar="true" LabelWidth="170px">
+                    </f:DropDownList>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtGrooveProcessType" runat="server" Label="坡口加工类型" LabelWidth="170px">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:NumberBox ID="numGrooveAngle" runat="server" Label="坡口角度" LabelWidth="170px" DecimalPrecision="2">
+                    </f:NumberBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:NumberBox ID="numFitupGap" runat="server" Label="组对间隙" LabelWidth="170px" DecimalPrecision="2">
+                    </f:NumberBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:NumberBox ID="numMisalignment" runat="server" Label="错边量" LabelWidth="170px" DecimalPrecision="2">
+                    </f:NumberBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DatePicker ID="dpCheckTime" runat="server" Label="检查时间" LabelWidth="170px"
+                        DateFormatString="yyyy-MM-dd">
+                    </f:DatePicker>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelWidth="170px">
+                    </f:TextArea>
+                </Items>
+            </f:FormRow>
+        </Rows>
+        <Toolbars>
+            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                <Items>
+                    <f:Button ID="btnSave" Text="保存" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
+                        OnClick="btnSave_Click">
+                    </f:Button>
+                    <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
+                    </f:Button>
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+    </f:Form>
+    </form>
+</body>
+</html>

SGGL/FineUIPro.Web/HJGL/PreWeld/FitupCheckEdit.aspx.cs

@@ -0,0 +1,133 @@
+using BLL;
+using System;
+using System.Linq;
+
+namespace FineUIPro.Web.HJGL.PreWeld
+{
+    public partial class FitupCheckEdit : PageBase
+    {
+        public string WeldJointId
+        {
+            get { return (string)ViewState["WeldJointId"]; }
+            set { ViewState["WeldJointId"] = value; }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                WeldJointId = Request.Params["WeldJointId"];
+                BindWeldJoint();
+                BindGrooveType();
+                if (!string.IsNullOrEmpty(WeldJointId))
+                {
+                    BindData();
+                }
+                else
+                {
+                    dpCheckTime.SelectedDate = DateTime.Now;
+                }
+            }
+        }
+
+        private void BindWeldJoint()
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var data = (from x in db.HJGL_WeldJoint
+                            where x.ProjectId == CurrUser.LoginProjectId
+                            orderby x.PipelineCode, x.WeldJointCode
+                            select new
+                            {
+                                x.WeldJointId,
+                                WeldJointName = x.PipelineCode + " / " + x.WeldJointCode
+                            }).ToList();
+                drpWeldJoint.DataTextField = "WeldJointName";
+                drpWeldJoint.DataValueField = "WeldJointId";
+                drpWeldJoint.DataSource = data;
+                drpWeldJoint.DataBind();
+            }
+        }
+
+        private void BindGrooveType()
+        {
+            drpGrooveType.DataTextField = "BaseInfoName";
+            drpGrooveType.DataValueField = "BaseInfoId";
+            drpGrooveType.DataSource = APIBaseInfoService.getGrooveType();
+            drpGrooveType.DataBind();
+        }
+
+        private void BindData()
+        {
+            var model = PreWeldInspectionService.GetFitupCheckByWeldJointId(WeldJointId);
+            var weldJoint = APIPreWeldInspectionService.GetPreWeldJointByWeldJointId(WeldJointId);
+            if (weldJoint != null)
+            {
+                drpWeldJoint.SelectedValue = weldJoint.WeldJointId;
+                drpWeldJoint.Enabled = false;
+                drpGrooveType.SelectedValue = weldJoint.GrooveTypeId;
+                txtGrooveProcessType.Text = weldJoint.GrooveProcessType;
+                if (weldJoint.GrooveAngle.HasValue)
+                {
+                    numGrooveAngle.Text = weldJoint.GrooveAngle.Value.ToString();
+                }
+                if (weldJoint.FitupGap.HasValue)
+                {
+                    numFitupGap.Text = weldJoint.FitupGap.Value.ToString();
+                }
+                if (weldJoint.Misalignment.HasValue)
+                {
+                    numMisalignment.Text = weldJoint.Misalignment.Value.ToString();
+                }
+            }
+            if (model != null)
+            {
+                drpGrooveType.SelectedValue = model.GrooveTypeId;
+                txtGrooveProcessType.Text = model.GrooveProcessType;
+                if (model.GrooveAngle.HasValue)
+                {
+                    numGrooveAngle.Text = model.GrooveAngle.Value.ToString();
+                }
+                if (model.FitupGap.HasValue)
+                {
+                    numFitupGap.Text = model.FitupGap.Value.ToString();
+                }
+                if (model.Misalignment.HasValue)
+                {
+                    numMisalignment.Text = model.Misalignment.Value.ToString();
+                }
+                dpCheckTime.SelectedDate = model.CheckTime;
+                txtRemark.Text = model.Remark;
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (!CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.PersonId, Const.HJGL_PreWeldFitupCheckMenuId, Const.BtnSave))
+            {
+                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            var item = new Model.PreWeldFitupCheckItem
+            {
+                ProjectId = CurrUser.LoginProjectId,
+                WeldJointId = drpWeldJoint.SelectedValue,
+                GrooveTypeId = drpGrooveType.SelectedValue,
+                GrooveProcessType = txtGrooveProcessType.Text.Trim(),
+                GrooveAngle = string.IsNullOrWhiteSpace(numGrooveAngle.Text) ? (decimal?)null : Convert.ToDecimal(numGrooveAngle.Text),
+                FitupGap = string.IsNullOrWhiteSpace(numFitupGap.Text) ? (decimal?)null : Convert.ToDecimal(numFitupGap.Text),
+                Misalignment = string.IsNullOrWhiteSpace(numMisalignment.Text) ? (decimal?)null : Convert.ToDecimal(numMisalignment.Text),
+                CheckPerson = CurrUser.PersonId,
+                CheckTime = dpCheckTime.SelectedDate ?? DateTime.Now,
+                CreateUser = CurrUser.PersonId,
+                Remark = txtRemark.Text.Trim()
+            };
+
+            APIPreWeldInspectionService.SaveFitupCheck(item);
+            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+        }
+    }
+}

SGGL/FineUIPro.Web/HJGL/PreWeld/FitupCheckEdit.aspx.designer.cs

@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.PreWeld
+{
+
+
+    public partial class FitupCheckEdit
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// drpWeldJoint 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWeldJoint;
+
+        /// <summary>
+        /// drpGrooveType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpGrooveType;
+
+        /// <summary>
+        /// txtGrooveProcessType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtGrooveProcessType;
+
+        /// <summary>
+        /// numGrooveAngle 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox numGrooveAngle;
+
+        /// <summary>
+        /// numFitupGap 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox numFitupGap;
+
+        /// <summary>
+        /// numMisalignment 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox numMisalignment;
+
+        /// <summary>
+        /// dpCheckTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker dpCheckTime;
+
+        /// <summary>
+        /// txtRemark 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+    }
+}

SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx

@@ -22,6 +22,8 @@
                             <f:ListItem Text="补充导入" Value="0" />
                             <f:ListItem Text="更新导入" Value="1" />
                         </f:DropDownList>
+                        <f:CheckBox ID="ckIncludeBatch" runat="server" Label="导入类别" Text="是否包含炉批号" Checked="false">
+                        </f:CheckBox>
                         <f:ToolbarFill runat="server"></f:ToolbarFill>
                         <f:HiddenField ID="hdFileName" runat="server">
                         </f:HiddenField>

SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs

@@ -117,8 +117,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             if (e.EventArgument == "Confirm_OK")
             {
                 string rootPath = Server.MapPath("~/");
-                string uploadfilepath = rootPath + Const.PipelineMatTemplateUrl;
-                string filePath = Const.PipelineMatTemplateUrl;
+                string filePath = ckIncludeBatch.Checked ? Const.PipelineMatWithBatchTemplateUrl : Const.PipelineMatTemplateUrl;
+                string uploadfilepath = rootPath + filePath;
                 string fileName = Path.GetFileName(filePath);
                 FileInfo info = new FileInfo(uploadfilepath);
                 long fileSize = info.Length;
@@ -137,8 +137,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             Model.ResponeData responeData = new Model.ResponeData();
             List<string> result = new List<string>();
+            bool includeBatch = ckIncludeBatch.Checked;
+            int minColumnCount = includeBatch ? 7 : 5;
 
-            if (count < 5)
+            matList.Clear();
+            if (count < minColumnCount)
             {
                 responeData.code = 0;
                 responeData.message = "导入Excel格式错误！Excel只有" + count.ToString().Trim() + "列";
@@ -204,14 +207,38 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     if (pds[i].D != null && !string.IsNullOrEmpty(pds[i].D.ToString()))
                     {
                         string materialCode = pds[i].D.ToString().Trim();
-                        var lib = from x in Funs.DB.HJGL_MaterialCodeLib where  x.Code == materialCode select x;
-                        if (lib.Count() > 0)
+                        item.MaterialCode2 = materialCode;
+                        if (includeBatch)
                         {
-                            item.MaterialCode2 = materialCode;
+                            string heatNo = pds[i].F == null ? string.Empty : pds[i].F.ToString().Trim();
+                            string batchNo = pds[i].G == null ? string.Empty : pds[i].G.ToString().Trim();
+                            if (string.IsNullOrEmpty(heatNo))
+                            {
+                                result.Add((i + 2) + "Line, [炉号] 不能为空</br>");
+                            }
+                            if (string.IsNullOrEmpty(batchNo))
+                            {
+                                result.Add((i + 2) + "Line, [批号] 不能为空</br>");
+                            }
+
+                            string mainMaterialCode = materialCode + "-" + heatNo + "-" + batchNo;
+                            var lib = from x in Funs.DB.HJGL_MaterialCodeLib where x.MaterialCode == mainMaterialCode select x;
+                            if (lib.Count() > 0)
+                            {
+                                item.MaterialCode = lib.First().MaterialCode;
+                            }
+                            else
+                            {
+                                result.Add("第" + (i + 2).ToString() + "行,材料编码库不存在此材料主编码-" + mainMaterialCode + "</br>");
+                            }
                         }
                         else
                         {
-                            result.Add("第" + (i + 2).ToString() + "行,材料编码库不存在此材料编码-" + materialCode + "</br>");
+                            var lib = from x in Funs.DB.HJGL_MaterialCodeLib where x.Code == materialCode select x;
+                            if (lib.Count() == 0)
+                            {
+                                result.Add("第" + (i + 2).ToString() + "行,材料编码库不存在此材料编码-" + materialCode + "</br>");
+                            }
                         }
                     }
                     else
@@ -252,7 +279,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                             // result.Add((i + 2) + "Line, [预制组件] 不能为空</br>");
                         }
                     }
-                    var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode2 == item.MaterialCode2 && x.WeldJointId == item.WeldJointId && x.PrefabricatedComponents == item.PrefabricatedComponents);
+                    var model = includeBatch
+                        ? matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode && x.WeldJointId == item.WeldJointId && x.PrefabricatedComponents == item.PrefabricatedComponents)
+                        : matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode2 == item.MaterialCode2 && x.WeldJointId == item.WeldJointId && x.PrefabricatedComponents == item.PrefabricatedComponents);
                     if (model.Count() == 0)
                     {
                         matList.Add(item);
@@ -488,6 +517,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                         && x.WeldJointId == item.WeldJointId
                                         && x.PipelineId == item.PipelineId
                                         && x.PrefabricatedComponents == item.PrefabricatedComponents
+                                        && (string.IsNullOrEmpty(item.MaterialCode) || x.MaterialCode == item.MaterialCode)
                                   select x;
                 if (pipeLineMat.Count() == 0 || pipeLineMat == null)
                 {

SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.designer.cs

@@ -68,6 +68,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </remarks>
         protected global::FineUIPro.DropDownList DrpType;
 
+        /// <summary>
+        /// ckIncludeBatch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckIncludeBatch;
+
         /// <summary>
         /// hdFileName 控件。
         /// </summary>

SGGL/FineUIPro.Web/common/Menu_HJGL.xml

@@ -44,6 +44,9 @@
 <TreeNode id="6B16D1D4-FBDA-4B2B-AE0A-B465C686C27D" Text="轴测图" NavigateUrl="HJGL/JoinMarking/JointShow.aspx"></TreeNode>
 <TreeNode id="F4275A19-A72E-448E-B0C1-07DB2FCEE224" Text="焊口台账总览" NavigateUrl="HJGL/InfoQuery/JointQuery.aspx"></TreeNode>
 </TreeNode>
+<TreeNode id="D1B5A8B7-5D2A-4C51-9B7E-6A2F15B7F001" Text="焊前管理" NavigateUrl=""><TreeNode id="D1B5A8B7-5D2A-4C51-9B7E-6A2F15B7F002" Text="下料抽检记录台账" NavigateUrl="HJGL/PreWeld/CuttingCheck.aspx"></TreeNode>
+<TreeNode id="D1B5A8B7-5D2A-4C51-9B7E-6A2F15B7F003" Text="组对抽检列表台账" NavigateUrl="HJGL/PreWeld/FitupCheck.aspx"></TreeNode>
+</TreeNode>
 <TreeNode id="4D36E99E-B3D8-4C61-826A-CBD98EC51515" Text="焊接过程管理" NavigateUrl=""><TreeNode id="E6F6982A-48C7-455C-8EBB-CC7088EBF15A" Text="焊接施工计划" NavigateUrl="HJGL/WeldingManage/WeldingPlan.aspx"></TreeNode>
 <TreeNode id="ADC7EA61-6313-4DF9-913F-E9207F6525CA" Text="材料匹配(工厂预制)" NavigateUrl="HJGL/WeldingManage/WeldMatMatch.aspx?PipeArea=1"></TreeNode>
 <TreeNode id="164E056C-30C9-4C29-A6B6-AF0F0C943A59" Text="材料匹配(现场安装)" NavigateUrl="HJGL/WeldingManage/WeldMatMatch.aspx?PipeArea=2"></TreeNode>

SGGL/Model/APIItem/HJGL/PreWeldInspectionItem.cs

@@ -0,0 +1,110 @@
+using System;
+
+namespace Model
+{
+    /// <summary>
+    /// 焊前抽检焊口信息
+    /// </summary>
+    public class PreWeldJointItem
+    {
+        public string WeldJointId { get; set; }
+
+        public string WeldJointCode { get; set; }
+
+        public string PipelineId { get; set; }
+
+        public string PipelineCode { get; set; }
+
+        public string ProjectId { get; set; }
+
+        public string GrooveTypeId { get; set; }
+
+        public string GrooveTypeCode { get; set; }
+
+        public string GrooveTypeName { get; set; }
+
+        public string GrooveProcessType { get; set; }
+
+        public decimal? GrooveAngle { get; set; }
+
+        public decimal? FitupGap { get; set; }
+
+        public decimal? Misalignment { get; set; }
+    }
+
+    /// <summary>
+    /// 下料抽检保存参数
+    /// </summary>
+    public class PreWeldCuttingCheckItem
+    {
+        public string CuttingCheckId { get; set; }
+
+        public string ProjectId { get; set; }
+
+        public string WeldJointId { get; set; }
+
+        public string PipelineCode { get; set; }
+
+        public string WeldJointCode { get; set; }
+
+        public bool IsMaterialCodeBatchNoAccurate { get; set; }
+
+        public bool IsMaterialQuantityAccurate { get; set; }
+
+        public bool IsQualified { get; set; }
+
+        public string CheckPerson { get; set; }
+
+        public string CheckPersonName { get; set; }
+
+        public DateTime? CheckTime { get; set; }
+
+        public string CreateUser { get; set; }
+
+        public DateTime? CreateTime { get; set; }
+
+        public string Remark { get; set; }
+    }
+
+    /// <summary>
+    /// 组对抽检保存参数
+    /// </summary>
+    public class PreWeldFitupCheckItem
+    {
+        public string FitupCheckId { get; set; }
+
+        public string ProjectId { get; set; }
+
+        public string WeldJointId { get; set; }
+
+        public string PipelineCode { get; set; }
+
+        public string WeldJointCode { get; set; }
+
+        public string GrooveTypeId { get; set; }
+
+        public string GrooveTypeCode { get; set; }
+
+        public string GrooveTypeName { get; set; }
+
+        public string GrooveProcessType { get; set; }
+
+        public decimal? GrooveAngle { get; set; }
+
+        public decimal? FitupGap { get; set; }
+
+        public decimal? Misalignment { get; set; }
+
+        public string CheckPerson { get; set; }
+
+        public string CheckPersonName { get; set; }
+
+        public DateTime? CheckTime { get; set; }
+
+        public string CreateUser { get; set; }
+
+        public DateTime? CreateTime { get; set; }
+
+        public string Remark { get; set; }
+    }
+}

SGGL/Model/CLGL/Tw_InputDetailBarCodeOutput.cs

@@ -12,6 +12,8 @@ namespace Model
         public string BatchNo { get; set; }
         public string MaterialName { get; set; }
         public string MaterialDef { get; set; }
+        public string MaterialSpec { get; set; }
+        public string MaterialUnit { get; set; }
         public string BarCode { get; set; }
     }
 }

SGGL/Model/HJGL/MaterialCodeLibBarCodeOutput.cs

@@ -0,0 +1,14 @@
+namespace Model
+{
+    public class MaterialCodeLibBarCodeOutput
+    {
+        public string MaterialCode { get; set; }
+        public string Code { get; set; }
+        public string HeatNo { get; set; }
+        public string BatchNo { get; set; }
+        public string MaterialName { get; set; }
+        public string MaterialDef { get; set; }
+        public string MaterialSpec { get; set; }
+        public string MaterialUnit { get; set; }
+    }
+}

SGGL/Model/Model.csproj

@@ -126,6 +126,7 @@
     <Compile Include="APIItem\HSSE\HazardListSelectedItem.cs" />
     <Compile Include="APIItem\HSSE\HazardRegisterItem.cs" />
     <Compile Include="APIItem\HJGL\HJGL_PreWeldingDailyItem.cs" />
+    <Compile Include="APIItem\HJGL\PreWeldInspectionItem.cs" />
     <Compile Include="APIItem\HJGL\HotProcessHardItem.cs" />
     <Compile Include="APIItem\HJGL\NDETrustItem.cs" />
     <Compile Include="APIItem\HJGL\WeldJointItem.cs" />
@@ -251,6 +252,7 @@
     <Compile Include="HJGL\3DParameter.cs" />
     <Compile Include="HJGL\BaseInfo\BaseMaterialcolorDataIn.cs" />
     <Compile Include="HJGL\BaseInfo\BaseMaterialcolorOutput.cs" />
+    <Compile Include="HJGL\MaterialCodeLibBarCodeOutput.cs" />
     <Compile Include="HJGL\PreDesign\Material\MaterialStockItem.cs" />
     <Compile Include="APIItem\HJGL\PackagingManageItem.cs" />
     <Compile Include="HJGL\PreDesign\PackagingManage\PackagingManageInput.cs" />

SGGL/WebAPI/Controllers/BaseInfoController.cs

@@ -189,6 +189,27 @@ namespace WebAPI.Controllers
             return responeData;
         }
 
+        /// <summary>
+        /// 根据材料主编码获取材料信息
+        /// </summary>
+        /// <param name="materialCode"></param>
+        /// <returns></returns>
+        public Model.ResponeData GetMaterialInfoByMaterialCode(string materialCode)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = BLL.MaterialCodeLibService.GetBarCodeMaterialInfo(materialCode);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
         /// <summary>
         /// 获取探伤类型
         /// </summary>
@@ -229,6 +250,26 @@ namespace WebAPI.Controllers
             return responeData;
         }
 
+        /// <summary>
+        /// 获取坡口类型
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getGrooveType()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = BLL.APIBaseInfoService.getGrooveType();
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
         #endregion
 
         #region  获取专项检查处理措施

SGGL/WebAPI/Controllers/HJGL/WeldingManage/PreWeldInspectionController.cs

@@ -0,0 +1,77 @@
+using BLL;
+using System;
+using System.Web.Http;
+
+namespace WebAPI.Controllers.HJGL.WeldingManage
+{
+    /// <summary>
+    /// 焊前抽检接口
+    /// </summary>
+    public class PreWeldInspectionController : ApiController
+    {
+        /// <summary>
+        /// 根据焊口ID获取焊前抽检基础信息
+        /// </summary>
+        /// <param name="WeldJointId">焊口ID</param>
+        /// <returns></returns>
+        public Model.ResponeData getPreWeldJointByWeldJointId(string WeldJointId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = APIPreWeldInspectionService.GetPreWeldJointByWeldJointId(WeldJointId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+        /// <summary>
+        /// 保存下料抽检记录
+        /// </summary>
+        /// <param name="item">下料抽检参数</param>
+        /// <returns></returns>
+        [HttpPost]
+        public Model.ResponeData SaveCuttingCheck([FromBody] Model.PreWeldCuttingCheckItem item)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                APIPreWeldInspectionService.SaveCuttingCheck(item);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+        /// <summary>
+        /// 保存组对抽检记录
+        /// </summary>
+        /// <param name="item">组对抽检参数</param>
+        /// <returns></returns>
+        [HttpPost]
+        public Model.ResponeData SaveFitupCheck([FromBody] Model.PreWeldFitupCheckItem item)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                APIPreWeldInspectionService.SaveFitupCheck(item);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+    }
+}

SGGL/WebAPI/ErrLog.txt

@@ -201,3 +201,177 @@ IP地址:::1
 
 出错时间:03/04/2025 14:46:02
 
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:“~/Views/Home/Index.cshtml”处的视图必须派生自 WebViewPage 或 WebViewPage<TModel>。
+错误堆栈:
+   在 System.Web.Mvc.RazorView.RenderView(ViewContext viewContext, TextWriter writer, Object instance)
+   在 System.Web.Mvc.ViewResultBase.ExecuteResult(ControllerContext context)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultFilterRecursive(IList`1 filters, Int32 filterIndex, ResultExecutingContext preContext, ControllerContext controllerContext, ActionResult actionResult)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultFilterRecursive(IList`1 filters, Int32 filterIndex, ResultExecutingContext preContext, ControllerContext controllerContext, ActionResult actionResult)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultWithFilters(ControllerContext controllerContext, IList`1 filters, ActionResult actionResult)
+   在 System.Web.Mvc.Async.AsyncControllerActionInvoker.<>c__DisplayClass3_1.<BeginInvokeAction>b__5(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Async.AsyncControllerActionInvoker.EndInvokeAction(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.<>c.<BeginExecuteCore>b__152_1(IAsyncResult asyncResult, ExecuteCoreState innerState)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.EndExecuteCore(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.EndExecute(IAsyncResult asyncResult)
+   在 System.Web.Mvc.MvcHandler.<>c.<BeginProcessRequest>b__20_1(IAsyncResult asyncResult, ProcessRequestState innerState)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.MvcHandler.EndProcessRequest(IAsyncResult asyncResult)
+   在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:06/16/2026 23:10:50
+出错文件:http://localhost:1766/
+IP地址:::1
+
+出错时间:06/16/2026 23:10:50
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:“~/Views/Home/Index.cshtml”处的视图必须派生自 WebViewPage 或 WebViewPage<TModel>。
+错误堆栈:
+   在 System.Web.Mvc.RazorView.RenderView(ViewContext viewContext, TextWriter writer, Object instance)
+   在 System.Web.Mvc.ViewResultBase.ExecuteResult(ControllerContext context)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultFilterRecursive(IList`1 filters, Int32 filterIndex, ResultExecutingContext preContext, ControllerContext controllerContext, ActionResult actionResult)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultFilterRecursive(IList`1 filters, Int32 filterIndex, ResultExecutingContext preContext, ControllerContext controllerContext, ActionResult actionResult)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultWithFilters(ControllerContext controllerContext, IList`1 filters, ActionResult actionResult)
+   在 System.Web.Mvc.Async.AsyncControllerActionInvoker.<>c__DisplayClass3_1.<BeginInvokeAction>b__5(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Async.AsyncControllerActionInvoker.EndInvokeAction(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.<>c.<BeginExecuteCore>b__152_1(IAsyncResult asyncResult, ExecuteCoreState innerState)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.EndExecuteCore(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.EndExecute(IAsyncResult asyncResult)
+   在 System.Web.Mvc.MvcHandler.<>c.<BeginProcessRequest>b__20_1(IAsyncResult asyncResult, ProcessRequestState innerState)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.MvcHandler.EndProcessRequest(IAsyncResult asyncResult)
+   在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:06/16/2026 23:17:56
+出错文件:http://localhost:1766/
+IP地址:::1
+
+出错时间:06/16/2026 23:17:56
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:“~/Views/Home/Index.cshtml”处的视图必须派生自 WebViewPage 或 WebViewPage<TModel>。
+错误堆栈:
+   在 System.Web.Mvc.RazorView.RenderView(ViewContext viewContext, TextWriter writer, Object instance)
+   在 System.Web.Mvc.ViewResultBase.ExecuteResult(ControllerContext context)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultFilterRecursive(IList`1 filters, Int32 filterIndex, ResultExecutingContext preContext, ControllerContext controllerContext, ActionResult actionResult)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultFilterRecursive(IList`1 filters, Int32 filterIndex, ResultExecutingContext preContext, ControllerContext controllerContext, ActionResult actionResult)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultWithFilters(ControllerContext controllerContext, IList`1 filters, ActionResult actionResult)
+   在 System.Web.Mvc.Async.AsyncControllerActionInvoker.<>c__DisplayClass3_1.<BeginInvokeAction>b__5(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Async.AsyncControllerActionInvoker.EndInvokeAction(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.<>c.<BeginExecuteCore>b__152_1(IAsyncResult asyncResult, ExecuteCoreState innerState)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.EndExecuteCore(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.EndExecute(IAsyncResult asyncResult)
+   在 System.Web.Mvc.MvcHandler.<>c.<BeginProcessRequest>b__20_1(IAsyncResult asyncResult, ProcessRequestState innerState)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.MvcHandler.EndProcessRequest(IAsyncResult asyncResult)
+   在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:06/16/2026 23:20:08
+出错文件:http://localhost:1766/
+IP地址:::1
+
+出错时间:06/16/2026 23:20:10
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:“~/Views/Home/Index.cshtml”处的视图必须派生自 WebViewPage 或 WebViewPage<TModel>。
+错误堆栈:
+   在 System.Web.Mvc.RazorView.RenderView(ViewContext viewContext, TextWriter writer, Object instance)
+   在 System.Web.Mvc.ViewResultBase.ExecuteResult(ControllerContext context)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultFilterRecursive(IList`1 filters, Int32 filterIndex, ResultExecutingContext preContext, ControllerContext controllerContext, ActionResult actionResult)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultFilterRecursive(IList`1 filters, Int32 filterIndex, ResultExecutingContext preContext, ControllerContext controllerContext, ActionResult actionResult)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultWithFilters(ControllerContext controllerContext, IList`1 filters, ActionResult actionResult)
+   在 System.Web.Mvc.Async.AsyncControllerActionInvoker.<>c__DisplayClass3_1.<BeginInvokeAction>b__5(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Async.AsyncControllerActionInvoker.EndInvokeAction(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.<>c.<BeginExecuteCore>b__152_1(IAsyncResult asyncResult, ExecuteCoreState innerState)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.EndExecuteCore(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.EndExecute(IAsyncResult asyncResult)
+   在 System.Web.Mvc.MvcHandler.<>c.<BeginProcessRequest>b__20_1(IAsyncResult asyncResult, ProcessRequestState innerState)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.MvcHandler.EndProcessRequest(IAsyncResult asyncResult)
+   在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:06/16/2026 23:21:02
+出错文件:http://localhost:1766/
+IP地址:::1
+
+出错时间:06/16/2026 23:21:02
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:“~/Views/Home/Index.cshtml”处的视图必须派生自 WebViewPage 或 WebViewPage<TModel>。
+错误堆栈:
+   在 System.Web.Mvc.RazorView.RenderView(ViewContext viewContext, TextWriter writer, Object instance)
+   在 System.Web.Mvc.ViewResultBase.ExecuteResult(ControllerContext context)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultFilterRecursive(IList`1 filters, Int32 filterIndex, ResultExecutingContext preContext, ControllerContext controllerContext, ActionResult actionResult)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultFilterRecursive(IList`1 filters, Int32 filterIndex, ResultExecutingContext preContext, ControllerContext controllerContext, ActionResult actionResult)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultWithFilters(ControllerContext controllerContext, IList`1 filters, ActionResult actionResult)
+   在 System.Web.Mvc.Async.AsyncControllerActionInvoker.<>c__DisplayClass3_1.<BeginInvokeAction>b__5(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Async.AsyncControllerActionInvoker.EndInvokeAction(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.<>c.<BeginExecuteCore>b__152_1(IAsyncResult asyncResult, ExecuteCoreState innerState)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.EndExecuteCore(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.EndExecute(IAsyncResult asyncResult)
+   在 System.Web.Mvc.MvcHandler.<>c.<BeginProcessRequest>b__20_1(IAsyncResult asyncResult, ProcessRequestState innerState)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.MvcHandler.EndProcessRequest(IAsyncResult asyncResult)
+   在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:06/17/2026 09:41:57
+出错文件:http://localhost:1766/
+IP地址:::1
+
+出错时间:06/17/2026 09:41:57
+
+
+错误信息开始=====>
+错误类型:InvalidOperationException
+错误信息:“~/Views/Home/Index.cshtml”处的视图必须派生自 WebViewPage 或 WebViewPage<TModel>。
+错误堆栈:
+   在 System.Web.Mvc.RazorView.RenderView(ViewContext viewContext, TextWriter writer, Object instance)
+   在 System.Web.Mvc.ViewResultBase.ExecuteResult(ControllerContext context)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultFilterRecursive(IList`1 filters, Int32 filterIndex, ResultExecutingContext preContext, ControllerContext controllerContext, ActionResult actionResult)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultFilterRecursive(IList`1 filters, Int32 filterIndex, ResultExecutingContext preContext, ControllerContext controllerContext, ActionResult actionResult)
+   在 System.Web.Mvc.ControllerActionInvoker.InvokeActionResultWithFilters(ControllerContext controllerContext, IList`1 filters, ActionResult actionResult)
+   在 System.Web.Mvc.Async.AsyncControllerActionInvoker.<>c__DisplayClass3_1.<BeginInvokeAction>b__5(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Async.AsyncControllerActionInvoker.EndInvokeAction(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.<>c.<BeginExecuteCore>b__152_1(IAsyncResult asyncResult, ExecuteCoreState innerState)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.EndExecuteCore(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.Controller.EndExecute(IAsyncResult asyncResult)
+   在 System.Web.Mvc.MvcHandler.<>c.<BeginProcessRequest>b__20_1(IAsyncResult asyncResult, ProcessRequestState innerState)
+   在 System.Web.Mvc.Async.AsyncResultWrapper.WrappedAsyncVoid`1.CallEndDelegate(IAsyncResult asyncResult)
+   在 System.Web.Mvc.MvcHandler.EndProcessRequest(IAsyncResult asyncResult)
+   在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:06/17/2026 12:57:31
+出错文件:http://localhost:1766/
+IP地址:::1
+
+出错时间:06/17/2026 12:57:31
+

SGGL/WebAPI/Global.asax.cs

@@ -8,7 +8,7 @@ using System.Web.Http;
 using System.Web.Mvc;
 using System.Web.Optimization;
 using System.Web.Routing;
-using WebAPI.Log;
+using WebAPI;
 
 namespace WebAPI
 {
@@ -33,7 +33,7 @@ namespace WebAPI
 
             // 使api返回为json 
             GlobalConfiguration.Configuration.Formatters.XmlFormatter.SupportedMediaTypes.Clear();
-            GlobalConfiguration.Configuration.MessageHandlers.Add(new CustomMessageHandler());
+           // GlobalConfiguration.Configuration.MessageHandlers.Add(new CustomMessageHandler());
         }
 
         /// <summary>

SGGL/WebAPI/WebAPI.csproj

@@ -213,6 +213,7 @@
     <Compile Include="Controllers\HJGL\HotProcessHardController.cs" />
     <Compile Include="Controllers\HJGL\NDETrustController.cs" />
     <Compile Include="Controllers\HJGL\WeldingManage\PipeJointController.cs" />
+    <Compile Include="Controllers\HJGL\WeldingManage\PreWeldInspectionController.cs" />
     <Compile Include="Controllers\HJGL\WeldingManage\PreWeldingDailyController.cs" />
     <Compile Include="Controllers\HJGL\WeldingManage\ReportQueryController.cs" />
     <Compile Include="Controllers\HJGL\TestPackageController.cs" />
@@ -259,7 +260,6 @@
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
-    <Compile Include="Log\CustomMessageHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -319,6 +319,7 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
     <Folder Include="Images\" />
+    <Folder Include="Log\" />
     <Folder Include="Models\" />
     <Folder Include="Properties\PublishProfiles\" />
     <Folder Include="Views\CQMSPersonManage\" />