修改共检通知单

DataBase/版本日志/SGGLDB_WH_2023-08-10-2.sql

@@ -1 +1,2 @@
 alter table sys_const alter Column ConstValue nvarchar(200)
+GO

DataBase/版本日志/SGGLDB_WH_2023-08-15.sql

@@ -0,0 +1,8 @@
+alter table ProcessControl_InspectionManagement alter column AcceptanceCheckMan nvarchar(500)  null
+GO
+alter table sys_const alter Column ConstValue nvarchar(200)
+GO
+alter table Comprehensive_InspectionPerson alter column InspectionPersonCode nvarchar(100)  null
+GO
+alter table Comprehensive_InspectionMachine alter column InspectionMachineCode nvarchar(100)  null
+GO

SGGL/BLL/BLL.csproj

@@ -31,6 +31,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs

@@ -87,7 +87,7 @@ namespace BLL
             if (!string.IsNullOrEmpty(controlPointType))
             {
                 string[] types = controlPointType.Split(',');
-                q = q.Where(e => types.Contains(e.ControlPointType));
+                q = q.Where(e=> types.Contains(e.ControlPointType));
             }
             if (UnitWorkId != "0")
             {
@@ -196,13 +196,13 @@ namespace BLL
                     dataTable.Columns.Add(row.ToString());
                 }
                 data.Tables.Add(dataTable);
-                for (int i = startRowIndex; i <= (startRowIndex + maximumRows) && i < dataSet.Tables[0].Rows.Count; i++)
+                for (int i = startRowIndex; i <= (startRowIndex + maximumRows)&&i<dataSet.Tables[0].Rows.Count; i++)
                 {
                     var row = dataTable.NewRow();
                     row["AcceptanceCheckMan"] = dataSet.Tables[0].Rows[i]["AcceptanceCheckMan"];
                     row["SunNumber"] = dataSet.Tables[0].Rows[i]["SunNumber"];
                     row["OneStatisticsSunNumber"] = dataSet.Tables[0].Rows[i]["OneStatisticsSunNumber"];
-                    row["OneStatistics"] = dataSet.Tables[0].Rows[i]["OneStatistics"].ToString() + "%";
+                    row["OneStatistics"] = dataSet.Tables[0].Rows[i]["OneStatistics"].ToString() +"%";
                     dataTable.Rows.Add(row);
                 }
                 return data;
@@ -377,8 +377,7 @@ namespace BLL
         /// <summary>
         /// 根据id修改验收日期和是否一次合格
         /// </summary>
-        public static void UpdateByInspectionManagementId(Model.ProcessControl_InspectionManagement inspectionManagement)
+        public static void UpdateByInspectionManagementId(Model.ProcessControl_InspectionManagement inspectionManagement) {
-        {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 Model.ProcessControl_InspectionManagement newInspectionManagement = db.ProcessControl_InspectionManagement.FirstOrDefault(e => e.InspectionId == inspectionManagement.InspectionId);
@@ -386,11 +385,8 @@ namespace BLL
                 {
                     newInspectionManagement.InspectionDate = inspectionManagement.InspectionDate;
                     newInspectionManagement.IsOnceQualified = inspectionManagement.IsOnceQualified;
-                    if (newInspectionManagement.IsOnceQualified == false)
-                    {
-                        newInspectionManagement.UnqualifiedReason = inspectionManagement.UnqualifiedReason;
-                    }
                     newInspectionManagement.InspectionCode = inspectionManagement.InspectionCode;
+                    newInspectionManagement.UnqualifiedReason = inspectionManagement.UnqualifiedReason;
                     db.SubmitChanges();
                 }
             }

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx

@@ -65,9 +65,14 @@
                         <f:RenderField ColumnID="AcceptanceSite" DataField="AcceptanceSite" FieldType="String" HeaderText="验收部位" TextAlign="Center"
                             HeaderTextAlign="Center" Width="150px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="AcceptanceCheckMan" DataField="AcceptanceCheckMan" FieldType="String" HeaderText="检查人" TextAlign="Center"
+                       <%-- <f:RenderField ColumnID="AcceptanceCheckMan" DataField="AcceptanceCheckMan" FieldType="String" HeaderText="检查人" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
+                        </f:RenderField>--%>
+                        <f:TemplateField ColumnID="AcceptanceCheckMan" Width="280px" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertCheckMan(Eval("AcceptanceCheckMan")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
                         <f:RenderField ColumnID="IsOnceQualified" DataField="IsOnceQualified" FieldType="String" HeaderText="是否一次合格" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs

@@ -251,5 +251,21 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             Response.End();
         }
         #endregion
+
+        /// <summary>
+        /// 获取检查人名称
+        /// </summary>
+        /// <param name="CarryUnitIds"></param>
+        /// <returns></returns>
+        protected string ConvertCheckMan(object CarryUnitIds)
+        {
+            var uname = BLL.UserService.getUserNamesUserIds(CarryUnitIds);
+            if (string.IsNullOrEmpty(uname))
+            {
+                uname = CarryUnitIds.ToString();
+            }
+            return uname;
+
+        }
     }
 }

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.ProcessControl {
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
 
 
-    public partial class InspectionManagement {
+    public partial class InspectionManagement
+    {
 
         /// <summary>
         /// form1 控件。
@@ -129,6 +131,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
 
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx

@@ -38,7 +38,7 @@
                             <f:RadioItem Value="True" Text="是" Selected="true" />
                             <f:RadioItem Value="False" Text="否" />
                         </f:RadioButtonList>
-                        <f:DatePicker ID="txtInspectionDate" runat="server" Label="验收日期" LabelAlign="Right" LabelWidth="130px"></f:DatePicker>
+                        <f:DatePicker ID="txtInspectionDate" runat="server" DateFormatString="yyyy-MM-dd HH:mm:ss" ShowTime="true" Label="验收日期" LabelAlign="Right" LabelWidth="130px"></f:DatePicker>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs

@@ -50,7 +50,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                         this.Grid1.DataSource = BLL.InspectionManagementDetailService.GetInspectionDetails(this.hdInspectionNoticeId.Text.Trim());
                         this.Grid1.DataBind();
                         this.txtInspectionCode.Text = inspectionManagement.InspectionCode;
-                        this.txtInspectionDate.Text = inspectionManagement.InspectionDate.HasValue ? string.Format("{0:yyyy-MM-dd}", inspectionManagement.InspectionDate) : "";
+                        this.txtInspectionDate.Text = inspectionManagement.InspectionDate.HasValue ? string.Format("{0:yyyy-MM-dd HH:mm:ss}", inspectionManagement.InspectionDate) : "";
                     }
                 }
             }

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx

@@ -64,9 +64,16 @@
                         <f:RenderField ColumnID="AcceptanceSite" DataField="AcceptanceSite" FieldType="String" HeaderText="验收部位" TextAlign="Center"
                             HeaderTextAlign="Center" Width="150px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="AcceptanceCheckMan" DataField="AcceptanceCheckMan" FieldType="String" HeaderText="检查人" TextAlign="Center"
+                      <%--  <f:RenderField ColumnID="AcceptanceCheckMan" DataField="AcceptanceCheckMan" FieldType="String" HeaderText="检查人" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
+                        </f:RenderField>--%>
+
+                         <f:TemplateField ColumnID="AcceptanceCheckMan" Width="280px" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertCheckMan(Eval("AcceptanceCheckMan")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+
                         <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
                             <ItemTemplate>
                                 <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs

@@ -183,6 +183,14 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
                 return;
             }
+            //合格的情况下不允许修改
+            var model = Funs.DB.ProcessControl_InspectionManagement.FirstOrDefault(x => x.InspectionId == Grid1.SelectedRowID);
+            if (model.IsOnceQualified==true)
+            {
+                Alert.ShowInTop("该共检通知单已合格，不允许修改！", MessageBoxIcon.Warning);
+                return;
+            }
+
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionNoticeEdit.aspx?InspectionId={0}", Grid1.SelectedRowID, "编辑 - ")));
         }
         #endregion
@@ -306,10 +314,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                     var units = (from x in db.Base_Unit
                                  join y in db.Project_ProjectUnit
                                  on x.UnitId equals y.UnitId
-                                 where y.ProjectId == this.CurrUser.LoginProjectId && y.UnitType == BLL.Const.ProjectUnitType_4
+                                 where y.ProjectId==this.CurrUser.LoginProjectId && y.UnitType== BLL.Const.ProjectUnitType_4
                                  orderby x.UnitName
                                  select x).FirstOrDefault();
-                    if (units != null)
+                    if (units!=null)
                     {
                         bookmarkUnitName.Text = units.UnitName;
                     }
@@ -362,7 +370,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                     var valModel = db.Sys_User.Where(x => x.UserId == inspectionModel.CompileMan).FirstOrDefault();
                     if (inspectionModel != null && valModel != null)
                     {
-                        bookmarkunitNamefbs.Text = valModel.UserName;
+                        bookmarkcompileMan.Text = valModel.UserName;
                     }
                 }
                 //总承包商名称
@@ -387,7 +395,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 {
                     if (inspectionModel != null)
                     {
-                        bookmarkinspectionDate.Text = inspectionModel.InspectionDate.ToString().Split(' ')[0].Replace("/", "-");
+                        bookmarkinspectionDate.Text = inspectionModel.InspectionDate.ToString().Replace("/", "-");
                     }
                 }
                 //共检地点
@@ -462,8 +470,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                         {
                             builder.RowFormat.Height = 200 / ManagementDetaillList.Count;
                         }
-                        else
+                        else {
-                        {
                             builder.RowFormat.Height = 20;
                         }
                         builder.CellFormat.Borders.Left.LineWidth = 1;
@@ -484,12 +491,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl
 
                         var ControlPointType = ConvertClass(item.ControlPointType);
                         #region 控制点等级
-                        if (ControlPointType.Contains("A"))
+                        if (ControlPointType.Contains("A") )
                         {
                             builder.Write("■A  ");
                         }
-                        else
+                        else {
-                        {
                             builder.Write("□A  ");
                         }
                         if (ControlPointType.Contains("B"))
@@ -516,7 +522,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                         builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                         builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                         builder.CellFormat.Width = 113.5;
-                        builder.Write("");
+                        var ControlBasis = ConvertBasis(item.ControlPointType);
+                        builder.Write(ControlBasis);
 
                         //合并单元格
                         builder.InsertCell();
@@ -694,23 +701,23 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//水平居中对齐
                 builder.CellFormat.Width = 487.5;
                 builder.ParagraphFormat.LineSpacing = 16; //设置1倍行距 12就是一倍行距
-                builder.Write("备注：\r\r\r\r\r\r验收意见：\r总承包商意见：           □合格  □不合格\r\r监理意见：               □合格  □不合格\r\r业主意见：               □合格  □不合格\r\r\r");
+                builder.Write("备注：\r\r验收意见：\r总承包商意见：           □合格  □不合格\r监理意见：               □合格  □不合格\r业主意见：               □合格  □不合格\r                                                                          ");
+                #region 生成二维码
+
+                string imageUrl = Funs.RootPath + CreateQRCodeService.CreateCode_Simple("InspectionNotice$" + Id);
+                if (File.Exists(imageUrl))
+                {
+                    builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//水平居中对齐
+                    builder.InsertImage(imageUrl, 100, 100);
+                }
+                #endregion
                 builder.EndRow();
 
                 builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//水平居中对齐
                 builder.Write("注：如果业主有规定，执行业主的规定。                                     ");
                 #endregion
 
-                #region 生成二维码
                 
-                string imageUrl = Funs.RootPath + CreateQRCodeService.CreateCode_Simple("InspectionNotice$" + Id);
-                if (File.Exists(imageUrl))
-                {
-                    builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Top;//垂直居中对齐
-                    builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//水平居中对齐
-                    builder.InsertImage(imageUrl, 100, 100);
-                }
-                #endregion
                     doc.Save(newUrl);
                 string fileName = Path.GetFileName(newUrl);
                 FileInfo info = new FileInfo(newUrl);
@@ -732,8 +739,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             }
         }
 
-        public class WorkBranchList
+        public class WorkBranchList {
-        {
             public string UnitWorkId { get; set; }
             public string Branch { get; set; }
         }
@@ -814,6 +820,41 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             }
             return name;
         }
+
+        /// <summary>
+        /// 获取执行依据
+        /// </summary>
+        /// <param name="ControlPointType"></param>
+        /// <returns></returns>
+        protected string ConvertBasis(object ControlPointType)
+        {
+            string name = string.Empty;
+            if (ControlPointType != null)
+            {
+                var controlPointType = BLL.BreakdownProjectService.GetBreakdownProjectById(ControlPointType.ToString());
+                if (controlPointType != null)
+                {
+                    name = controlPointType.Basis;
+                }
+            }
+            return name;
+        }
+
+        /// <summary>
+        /// 获取检查人名称
+        /// </summary>
+        /// <param name="CarryUnitIds"></param>
+        /// <returns></returns>
+        protected string ConvertCheckMan(object CarryUnitIds)
+        {
+            var uname = BLL.UserService.getUserNamesUserIds(CarryUnitIds);
+            if (string.IsNullOrEmpty(uname))
+            {
+                uname = CarryUnitIds.ToString();
+            }
+            return uname;
+            
+        }
         #endregion
         #endregion
     }

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs

@@ -140,6 +140,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
 
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx

@@ -56,14 +56,18 @@
                 </f:FormRow>--%>
                 <f:FormRow ColumnWidths="50% 10% 30%">
                     <Items>
-                        <f:TextBox runat="server" ID="txtAcceptanceCheckMan" Label="检查人"  LabelAlign="Right" LabelWidth="130px" ></f:TextBox>
+                          <f:DropDownList ID="drpAcceptanceCheckMan"  runat="server" Label="检查人" EnableCheckBoxSelect="true"
-                        <f:Label ID="Label1" runat="server" Label="上传附件"
+                        EnableMultiSelect="true">
+                    </f:DropDownList>
+                       <%-- <f:TextBox runat="server" ID="txtAcceptanceCheckMan" Label="检查人"  LabelAlign="Right" LabelWidth="130px" ></f:TextBox>--%>
+                        <f:Label ID="Label1" runat="server" Label="上传附件"  ShowRedStar="true" 
                                     LabelWidth="130px" LabelAlign="Right" >
                                 </f:Label>
                                 <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click" >
                                 </f:Button>
                     </Items>
                 </f:FormRow>
+                 
                 <f:FormRow>
                     <Items>
                         

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs

@@ -21,7 +21,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 GetButtonPower();
                 BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//专业
-
+                UserService.InitUserProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, false);
                 this.hdInspectionNoticeId.Text = Request.Params["inspectionId"];
                 if (!string.IsNullOrEmpty(this.hdInspectionNoticeId.Text))
                 {
@@ -37,7 +37,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                             this.drpCNProfessionalId.SelectedValue = inspectionManagement.CNProfessionalId;
                         }
                         this.txtAcceptanceSite.Text = inspectionManagement.AcceptanceSite;
-                        this.txtAcceptanceCheckMan.Text = inspectionManagement.AcceptanceCheckMan;
+                        if (!string.IsNullOrEmpty(inspectionManagement.AcceptanceCheckMan))
+                        {
+                            this.drpAcceptanceCheckMan.SelectedValueArray = inspectionManagement.AcceptanceCheckMan.Split(',');
+                        }
                         this.txtNoticeCode.Text = inspectionManagement.NoticeCode;
                         this.Grid1.DataSource = BLL.InspectionManagementDetailService.GetInspectionDetails(this.hdInspectionNoticeId.Text.Trim());
                         this.Grid1.DataBind();
@@ -74,6 +77,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 Alert.ShowInTop("请先选择专业！", MessageBoxIcon.Warning);
                 return;
             }
+            
+
             Model.ProcessControl_InspectionManagement inspectionManagement = new Model.ProcessControl_InspectionManagement();
             inspectionManagement.ProjectId = this.CurrUser.LoginProjectId;
             if (this.drpUnit.SelectedValue != BLL.Const._Null)
@@ -86,9 +91,28 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             }
             inspectionManagement.NoticeCode = this.txtNoticeCode.Text.Trim();
             inspectionManagement.AcceptanceSite = this.txtAcceptanceSite.Text.Trim();
-            inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim();
+
+            //检查人
+            string CheckManIds = string.Empty;
+            foreach (var item in this.drpAcceptanceCheckMan.SelectedValueArray)
+            {
+                CheckManIds += item + ",";
+            }
+            if (!string.IsNullOrEmpty(CheckManIds))
+            {
+                CheckManIds = CheckManIds.Substring(0, CheckManIds.LastIndexOf(","));
+            }
+            inspectionManagement.AcceptanceCheckMan = CheckManIds;
+            //inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim();
             if (string.IsNullOrEmpty(Request.Params["inspectionId"]))
             {
+                //编号不能重复
+                var InspectionManagementModel = Funs.DB.ProcessControl_InspectionManagement.FirstOrDefault(x => x.NoticeCode == this.txtNoticeCode.Text.Trim());
+                if (InspectionManagementModel != null)
+                {
+                    ShowNotify("共检通知单编号已存在，不能重复！", MessageBoxIcon.Warning);
+                    return;
+                }
                 inspectionManagement.CompileMan = this.CurrUser.UserId;
                 inspectionManagement.CompileDate = DateTime.Now;
                 if (!string.IsNullOrEmpty(this.hdInspectionNoticeId.Text.Trim()))
@@ -100,13 +124,35 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                     inspectionManagement.InspectionId = SQLHelper.GetNewID(typeof(Model.ProcessControl_InspectionManagement));
                     this.hdInspectionNoticeId.Text = inspectionManagement.InspectionId;
                 }
+                var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionManagement.InspectionId);
+                if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
+                {
+                    Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
+                    return;
+                }
+
                 BLL.InspectionManagementService.AddInspectionManagement(inspectionManagement);
             }
             else
             {
+                //编号不能重复
+                var InspectionManagementModel = Funs.DB.ProcessControl_InspectionManagement.FirstOrDefault(x => x.NoticeCode == this.txtNoticeCode.Text.Trim()
+                && x.InspectionId!= Request.Params["inspectionId"]);
+                if (InspectionManagementModel != null)
+                {
+                    ShowNotify("共检通知单编号已存在，不能重复！", MessageBoxIcon.Warning);
+                    return;
+                }
+
                 Model.ProcessControl_InspectionManagement oldInspectionManagement = BLL.InspectionManagementService.GetInspectionManagementById(this.hdInspectionNoticeId.Text.Trim());
                 inspectionManagement.AttachUrl2 = oldInspectionManagement.AttachUrl2;
                 inspectionManagement.InspectionId = this.hdInspectionNoticeId.Text.Trim();
+                var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == inspectionManagement.InspectionId);
+                if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
+                {
+                    Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
+                    return;
+                }
                 BLL.InspectionManagementService.UpdateInspectionManagement(inspectionManagement);
                 BLL.InspectionManagementDetailService.DeleteAllInspectionDetail(inspectionManagement.InspectionId);
             }

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.ProcessControl {
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
 
 
-    public partial class InspectionNoticeEdit {
+    public partial class InspectionNoticeEdit
+    {
 
         /// <summary>
         /// form1 控件。
@@ -76,13 +78,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         protected global::FineUIPro.TextBox txtAcceptanceSite;
 
         /// <summary>
-        /// txtAcceptanceCheckMan 控件。
+        /// drpAcceptanceCheckMan 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtAcceptanceCheckMan;
+        protected global::FineUIPro.DropDownList drpAcceptanceCheckMan;
 
         /// <summary>
         /// Label1 控件。

SGGL/FineUIPro.Web/ErrLog.txt

@@ -20,3 +20,86 @@ IP地址:::1
 
 出错时间:08/10/2023 11:35:38
 
+
+错误信息开始=====>
+错误类型:ChangeConflictException
+错误信息:找不到行或行已更改。
+错误堆栈:
+   在 FineUIPro.Web.CQMS.Comprehensive.InspectionPersonDataIn.ImportXlsToData2(String fileName) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionPersonDataIn.aspx.cs:行号 391
+   在 FineUIPro.Web.CQMS.Comprehensive.InspectionPersonDataIn.btnImport_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionPersonDataIn.aspx.cs:行号 334
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:08/14/2023 21:31:51
+出错文件:http://localhost:8579/CQMS/Comprehensive/InspectionPersonDataIn.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:08/14/2023 21:31:51
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:将截断字符串或二进制数据。
+语句已终止。
+错误堆栈:
+   在 FineUIPro.Web.CQMS.Comprehensive.InspectionPersonDataIn.ImportXlsToData2(String fileName) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionPersonDataIn.aspx.cs:行号 391
+   在 FineUIPro.Web.CQMS.Comprehensive.InspectionPersonDataIn.btnImport_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionPersonDataIn.aspx.cs:行号 334
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:08/14/2023 21:34:58
+出错文件:http://localhost:8579/CQMS/Comprehensive/InspectionPersonDataIn.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:08/14/2023 21:34:58
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:将截断字符串或二进制数据。
+语句已终止。
+错误堆栈:
+   在 FineUIPro.Web.CQMS.Comprehensive.InspectionMachineDataIn.ImportXlsToData2(String fileName) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionMachineDataIn.aspx.cs:行号 397
+   在 FineUIPro.Web.CQMS.Comprehensive.InspectionMachineDataIn.btnImport_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionMachineDataIn.aspx.cs:行号 340
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:08/14/2023 21:36:04
+出错文件:http://localhost:8579/CQMS/Comprehensive/InspectionMachineDataIn.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:08/14/2023 21:36:04
+
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:e:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\Solution\EditConstructSolution.aspx(135): error CS1061: “ASP.cqms_solution_editconstructsolution_aspx”不包含“btnEditWord_Click”的定义，并且找不到可接受类型为“ASP.cqms_solution_editconstructsolution_aspx”的第一个参数的扩展方法“btnEditWord_Click”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:08/15/2023 15:10:11
+出错文件:http://localhost:8579/CQMS/Solution/EditConstructSolution.aspx
+IP地址:::1
+
+出错时间:08/15/2023 15:10:11
+

SGGL/Model/Model.cs

@@ -260744,7 +260744,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceCheckMan", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceCheckMan", DbType="NVarChar(500)")]
 		public string AcceptanceCheckMan
 		{
 			get
@@ -320055,7 +320055,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstValue", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstValue", DbType="NVarChar(200)")]
 		public string ConstValue
 		{
 			get
@@ -361533,7 +361533,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceCheckMan", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceCheckMan", DbType="NVarChar(500)")]
 		public string AcceptanceCheckMan
 		{
 			get

SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs

@@ -12,6 +12,31 @@ namespace WebAPI.Controllers.CQMS
     /// </summary>
     public class InspectionManagementController : ApiController
     {
+        /// <summary>
+        /// 首次扫描执行，加载数据
+        /// </summary>
+        /// <param name="InspectionNoticeMenuId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData GetPersonQuality(string InspectionNoticeMenuId) {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var model = BLL.InspectionManagementService.GetInspectionManagementById(InspectionNoticeMenuId);
+                if (model!=null)
+                {
+                    responeData.data = model;
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
         #region 根据二维码ID验收日期、是否一次合格
         /// <summary>
         /// 根据二维码ID修改验收日期、是否一次合格
@@ -26,7 +51,7 @@ namespace WebAPI.Controllers.CQMS
             {
                 InspectionManagementService.UpdateByInspectionManagementId(model);
                 //上传附件
-                SaveAttachFile(model.InspectionId + "R", BLL.Const.InspectionNoticeMenuId, model.AttachUrl);
+                SaveAttachFile(model.InspectionId, BLL.Const.InspectionNoticeMenuId, model.AttachUrl);
             }
             catch (Exception ex)
             {

SGGL/WebAPI/WebAPI.csproj

@@ -349,6 +349,9 @@
       <Name>SgManager.AI</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>