gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20260316 交工资料

This commit is contained in:
毕文静 2026-03-16 16:51:55 +08:00
parent 5f72f3f0b0
commit 93be33cb2f
10 changed files with 223 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管件宏观检查记录表.frx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="01/27/2026 14:57:52" ReportInfo.Modified="03/13/2026 13:09:15" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="01/27/2026 14:57:52" ReportInfo.Modified="03/16/2026 15:50:21" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -42,7 +42,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFnLKDaocXR5epOSosKSnTcQ==">
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFLqIlIgZXSpuHRnSqyOh9GQ==">
<TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
<Column Name="Name" DataType="System.String" PropName="attach_image_id"/>
<Column Name="ContractNo" DataType="System.String" PropName="image_series"/>

7
HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/钢管检查验收记录.frx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="01/28/2026 09:20:32" ReportInfo.Modified="03/13/2026 11:25:11" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="01/28/2026 09:20:32" ReportInfo.Modified="03/16/2026 15:10:51" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -72,7 +72,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF0vrjqw4AHv0MUA8eCRim2w==">
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFTq9zo4jAtdMCqGFkwBdvfA==">
<TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
<Column Name="Name" DataType="System.String" PropName="attach_image_id"/>
<Column Name="Material" DataType="System.String" PropName="image_series"/>
@ -105,7 +105,6 @@ namespace FastReport
<Column Name="ShrinkageHole" DataType="System.String" PropName="Column"/>
<Column Name="HeavyLeather" DataType="System.String" PropName="Column"/>
<Column Name="Other" DataType="System.String" PropName="Column"/>
<Column Name="ImageUrl" DataType="System.String" PropName="Column"/>
</TableDataSource>
</MsSqlDataConnection>
<Parameter Name="ProjectName" DataType="System.String"/>
@ -259,7 +258,7 @@ namespace FastReport
</TableRow>
<TableRow Name="Row8" Height="106.3">
<TableCell Name="Cell79" ColSpan="6">
<PictureObject Name="Picture1" Left="170.1" Top="18.9" Width="274.05" Height="85.05" DataColumn="MData.ImageUrl"/>
<PictureObject Name="Picture1" Left="170.1" Top="18.9" Width="274.05" Height="85.05"/>
</TableCell>
<TableCell Name="Cell80"/>
<TableCell Name="Cell81"/>

23
HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecord.aspx.cs
View File

@ -7,6 +7,7 @@ using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Web;
namespace FineUIPro.Web.JGZL
@ -93,7 +94,11 @@ namespace FineUIPro.Web.JGZL
{
newReport.STE_ID = BLL.HJGL_MaterialService.GetSteelBySteID(item.STE_ID).STE_Code;
}
newReport.Specifications = item.Specification;
newReport.Specifications = HttpUtility.HtmlDecode((from x in Funs.DB.HJGL_PW_JointInfo where x.ISO_ID == item.ISO_ID select x.JOT_JointDesc).FirstOrDefault());
newReport.TubeIdentificationStatus = "清晰";
newReport.PipeFittingName = "/";
newReport.PipeFittingStatus = "/";
newReport.Conclusion = "合格";
reportLists.Add(newReport);
}
}
@ -117,7 +122,11 @@ namespace FineUIPro.Web.JGZL
{
newReport.STE_ID = BLL.HJGL_MaterialService.GetSteelBySteID(iso.STE_ID).STE_Code;
}
newReport.Specifications = iso.Specification;
newReport.Specifications = HttpUtility.HtmlDecode((from x in Funs.DB.HJGL_PW_JointInfo where x.ISO_ID == iso.ISO_ID select x.JOT_JointDesc).FirstOrDefault());
newReport.TubeIdentificationStatus = "清晰";
newReport.PipeFittingName = "/";
newReport.PipeFittingStatus = "/";
newReport.Conclusion = "合格";
items.Add(newReport);
}
@ -374,10 +383,10 @@ namespace FineUIPro.Web.JGZL
{ "STE_Code", "" },
{ "Specifications", "" },
{ "PrescribedColor", "" },
{ "TubeIdentificationStatus", "" },
{ "PipeFittingName", "" },
{ "PipeFittingStatus", "" },
{ "Conclusion", "" },
{ "TubeIdentificationStatus", "清晰" },
{ "PipeFittingName", "/" },
{ "PipeFittingStatus", "/" },
{ "Conclusion", "合格" },
{
"Delete3",
String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>",
@ -436,7 +445,7 @@ namespace FineUIPro.Web.JGZL
ProjectId = this.ProjectId,
ISO_Id = values.Value<string>("ISO_Id"),
STE_ID = values.Value<string>("STE_ID"),
Specifications = values.Value<string>("Specifications"),
Specifications = HttpUtility.HtmlDecode(values.Value<string>("Specifications")),
PrescribedColor = values.Value<string>("PrescribedColor"),
TubeIdentificationStatus = values.Value<string>("TubeIdentificationStatus"),
PipeFittingName = values.Value<string>("PipeFittingName"),

20
HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx
View File

@ -79,7 +79,7 @@
<f:RenderField HeaderText="数量" ColumnID="ArrivalNum" DataField="ArrivalNum" SortField="ArrivalNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="60px">
<Editor>
<f:NumberBox ID="txtArrivalNum" runat="server" NoDecimal="true" NoNegative="true"></f:NumberBox>
<f:NumberBox ID="txtArrivalNum" runat="server" NoDecimal="true" NoNegative="true"></f:NumberBox>
</Editor>
</f:RenderField>
</Columns>
@ -105,7 +105,7 @@
<f:RenderField HeaderText="检验数量" ColumnID="InspectionNum" DataField="InspectionNum" SortField="InspectionNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
<Editor>
<f:NumberBox ID="txtInspectionNum" runat="server" NoDecimal="true" NoNegative="true"></f:NumberBox>
<f:NumberBox ID="txtInspectionNum" runat="server" NoDecimal="true" NoNegative="true"></f:NumberBox>
</Editor>
</f:RenderField>
<f:GroupField EnableLock="true" HeaderText="几何尺寸" TextAlign="Center">
@ -154,6 +154,9 @@
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="140px" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
@ -176,6 +179,19 @@
Target="Top" EnableResize="true" runat="server" IsModal="true" Width="1024px"
Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnCopy" OnClick="btnCopy_Click" EnablePostBack="true"
runat="server" Text="复制" Icon="PageWhitePaste">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
</script>
</body>
</html>

49
HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx.cs
View File

@ -414,5 +414,54 @@ namespace FineUIPro.Web.JGZL
}
}
#endregion
protected void btnCopy_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
JArray teamGroupData = Grid1.GetMergedData();
List<JObject> list = new List<JObject>();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
list.Add(values);
}
int index = Grid1.SelectedRowIndex;
JObject defaultObj = new JObject
{
{ "RecordId", Guid.NewGuid() },
{ "Name", Grid1.Rows[index].Values[1].ToString()},
{ "ContractNo", Grid1.Rows[index].Values[2].ToString()},
{ "ArrivalUnit", Grid1.Rows[index].Values[4].ToString() },
{ "ArrivalNum", Grid1.Rows[index].Values[5].ToString() },
{ "MaterialCertificateNumber", Grid1.Rows[index].Values[6].ToString() },
{ "Material", Grid1.Rows[index].Values[7].ToString() },
{ "Specifications", Grid1.Rows[index].Values[8].ToString() },
{ "InspectionNum", Grid1.Rows[index].Values[9].ToString()},
{ "ODVariation", Grid1.Rows[index].Values[11].ToString() },
{ "IDVariation", Grid1.Rows[index].Values[12].ToString() },
{ "WallVariation", Grid1.Rows[index].Values[13].ToString() },
{ "OtherVariation", Grid1.Rows[index].Values[14].ToString() },
{ "AppearanceQuality", Grid1.Rows[index].Values[15].ToString() },
{ "Result", Grid1.Rows[index].Values[16].ToString()},
{
"Delete3",
String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>",
GetDeleteScriptGrid1(), IconHelper.GetResolvedIconUrl(Icon.Delete))
}
};
list.Add(defaultObj);
Grid1.DataSource = list;
Grid1.DataBind();
}
else
{
Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning);
return;
}
}
}
}

18
HJGL_DS/FineUIPro.Web/JGZL/PipeFittingInspectionRecord.aspx.designer.cs generated
View File

@ -301,5 +301,23 @@ namespace FineUIPro.Web.JGZL
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowPrint;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnCopy 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnCopy;
}
}

10
HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx
View File

@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SteelPipeCheckRecord.aspx.cs" Inherits="FineUIPro.Web.JGZL.SteelPipeCheckRecord" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SteelPipeCheckRecord.aspx.cs" Inherits="FineUIPro.Web.JGZL.SteelPipeCheckRecord" ValidateRequest="false" %>
<!DOCTYPE html>
@ -147,7 +147,7 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<%--<f:FormRow>
<Items>
<f:Label ID="Label1" runat="server"></f:Label>
<f:Image ID="imgPicture" CssClass="userphoto" ImageUrl="" ImageWidth="350px" ImageHeight="120px"
@ -155,8 +155,8 @@
</f:Image>
<f:Label ID="Label2" runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="45% 10% 45%">
</f:FormRow>--%>
<%--<f:FormRow ColumnWidths="45% 10% 45%">
<Items>
<f:Label ID="Label3" runat="server"></f:Label>
<f:FileUpload ID="filePicture" runat="server" ButtonText="上传图片" ButtonOnly="true"
@ -164,7 +164,7 @@
</f:FileUpload>
<f:Label ID="Label4" runat="server"></f:Label>
</Items>
</f:FormRow>
</f:FormRow>--%>
</Items>
</f:Form>
</Items>

158
HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL;
using FastReport.DevComponents.DotNetBar;
using Model;
using Newtonsoft.Json.Linq;
using System;
@ -7,6 +8,8 @@ using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.JGZL
{
public partial class SteelPipeCheckRecord : PageBase
@ -46,6 +49,11 @@ namespace FineUIPro.Web.JGZL
}
}
/// <summary>
/// 定义集合
/// </summary>
private static List<Model.JGZL_SteelPipeCheckRecordItem1> items = new List<Model.JGZL_SteelPipeCheckRecordItem1>();
#endregion
#region 加载页面
@ -151,35 +159,91 @@ namespace FineUIPro.Web.JGZL
if (report != null)
{
this.RecordId = report.RecordId;
this.txtContractCode.Text= report.ContractCode;
this.txtArrivalDate.Text =string.Format("{0:yyyy-MM-dd}",report.ArrivalDate);
this.txtContractCode.Text = report.ContractCode;
this.txtArrivalDate.Text = string.Format("{0:yyyy-MM-dd}", report.ArrivalDate);
this.txtExecutionStandard.Text = report.ExecutionStandard;
this.drpCrack.SelectedValue = report.Crack;
this.drpSlagInclusion.SelectedValue = report.SlagInclusion;
this.drpShrinkageHole.SelectedValue = report.ShrinkageHole;
this.drpHeavyLeather.SelectedValue = report.HeavyLeather;
this.drpOther.SelectedValue = report.Other;
this.imgPicture.ImageUrl = report.Remark;
//this.imgPicture.ImageUrl = report.Remark;
BindGrid();
}
else
{
//默认
this.RecordId = string.Empty;
this.txtContractCode.Text = string.Empty;
this.txtContractCode.Text = BLL.Base_ProjectService.GetProjectCode(this.ProjectId);
this.txtArrivalDate.Text = string.Empty;
this.txtExecutionStandard.Text = string.Empty;
this.txtExecutionStandard.Text = "SH/T3501-2021";
this.drpCrack.SelectedValue = "合格";
this.drpSlagInclusion.SelectedValue = "合格";
this.drpShrinkageHole.SelectedValue = "合格";
this.drpHeavyLeather.SelectedValue = "合格";
this.drpOther.SelectedValue= "合格";
this.imgPicture.ImageUrl = string.Empty;
this.drpOther.SelectedValue = "合格";
//this.imgPicture.ImageUrl = string.Empty;
InitGrid1(this.ProjectId);
}
BindGrid();
BindGrid2();
}
}
private void InitGrid1(string projectId)
{
var reportLists = (from x in Funs.DB.JGZL_SteelPipeCheckRecordItem1
join y in Funs.DB.JGZL_SteelPipeCheckRecord on x.RecordId equals y.RecordId
where y.ProjectId == projectId
select x).ToList();
if (reportLists.Count > 0)
{
var isoLists = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(projectId);
foreach (var item in isoLists)
{
var iso = (from x in Funs.DB.JGZL_SteelPipeCheckRecordItem1
join y in Funs.DB.JGZL_SteelPipeCheckRecord on x.RecordId equals y.RecordId
join z in Funs.DB.HJGL_BS_Steel on x.Material equals z.STE_Code
where y.ProjectId == projectId && z.STE_ID == item.STE_ID
&& x.Specifications == (from j in Funs.DB.HJGL_PW_JointInfo where j.ISO_ID == item.ISO_ID select j.JOT_JointDesc).FirstOrDefault()
select x).FirstOrDefault();
if (iso == null)
{
Model.JGZL_SteelPipeCheckRecordItem1 newReport = new Model.JGZL_SteelPipeCheckRecordItem1();
newReport.RecordItemId = SQLHelper.GetNewID();
newReport.Name = "无缝钢管";
if (!string.IsNullOrEmpty(item.STE_ID))
{
newReport.Material = BLL.HJGL_MaterialService.GetSteelBySteID(item.STE_ID).STE_Code;
}
newReport.Specifications = HttpUtility.HtmlDecode((from x in Funs.DB.HJGL_PW_JointInfo where x.ProjectId == projectId && x.ISO_ID == item.ISO_ID select x.JOT_JointDesc).FirstOrDefault());
reportLists.Add(newReport);
}
}
this.Grid1.DataSource = reportLists;
this.Grid1.DataBind();
}
else
{
items.Clear();
var isoLists = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(projectId);
foreach (var iso in isoLists)
{
Model.JGZL_SteelPipeCheckRecordItem1 newReport = new Model.JGZL_SteelPipeCheckRecordItem1();
newReport.RecordItemId = SQLHelper.GetNewID();
newReport.Name = "无缝钢管";
if (!string.IsNullOrEmpty(iso.STE_ID))
{
newReport.Material = BLL.HJGL_MaterialService.GetSteelBySteID(iso.STE_ID).STE_Code;
}
newReport.Specifications = HttpUtility.HtmlDecode((from x in Funs.DB.HJGL_PW_JointInfo where x.ProjectId == projectId && x.ISO_ID == iso.ISO_ID select x.JOT_JointDesc).FirstOrDefault());
items.Add(newReport);
}
this.Grid1.DataSource = items;
this.Grid1.DataBind();
}
}
/// <summary>
/// 数据绑定
/// </summary>
@ -265,7 +329,7 @@ namespace FineUIPro.Web.JGZL
dtMainData.Columns.Add("ShrinkageHole");
dtMainData.Columns.Add("HeavyLeather");
dtMainData.Columns.Add("Other");
dtMainData.Columns.Add("ImageUrl");
//dtMainData.Columns.Add("ImageUrl");
var newMainData = dtMainData.NewRow();
newMainData["ProjectName"] = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId).ProjectName;
@ -278,10 +342,10 @@ namespace FineUIPro.Web.JGZL
newMainData["ShrinkageHole"] = report.ShrinkageHole;
newMainData["HeavyLeather"] = report.HeavyLeather;
newMainData["Other"] = report.Other;
if (!string.IsNullOrEmpty(report.Remark))
{
newMainData["ImageUrl"] = Funs.RootPath + report.Remark.Substring(report.Remark.IndexOf('/'));
}
//if (!string.IsNullOrEmpty(report.Remark))
//{
// newMainData["ImageUrl"] = Funs.RootPath + report.Remark.Substring(report.Remark.IndexOf('/'));
//}
dtMainData.Rows.Add(newMainData);
BLL.Common.FastReportService.AddFastreportTable(dtMainData);
@ -417,7 +481,7 @@ namespace FineUIPro.Web.JGZL
JObject defaultObj = new JObject
{
{ "RecordItemId", Guid.NewGuid() },
{ "Name", ""},
{ "Name", "无缝钢管"},
{ "Material", "" },
{ "Specifications", "" },
{ "Quantity", "" },
@ -523,24 +587,24 @@ namespace FineUIPro.Web.JGZL
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void filePicture_FileSelected(object sender, EventArgs e)
{
if (filePicture.HasFile)
{
string fileName = filePicture.ShortFileName;
if (!ValidateFileType(fileName))
{
ShowNotify("无效的文件类型！");
return;
}
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePicture.SaveAs(Server.MapPath("~/upload/" + fileName));
imgPicture.ImageUrl = "~/upload/" + fileName;
// 清空文件上传组件
filePicture.Reset();
}
}
//protected void filePicture_FileSelected(object sender, EventArgs e)
//{
// if (filePicture.HasFile)
// {
// string fileName = filePicture.ShortFileName;
// if (!ValidateFileType(fileName))
// {
// ShowNotify("无效的文件类型！");
// return;
// }
// fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
// fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
// filePicture.SaveAs(Server.MapPath("~/upload/" + fileName));
// imgPicture.ImageUrl = "~/upload/" + fileName;
// // 清空文件上传组件
// filePicture.Reset();
// }
//}
#endregion
#region 保存
@ -563,22 +627,22 @@ namespace FineUIPro.Web.JGZL
newReport.ShrinkageHole= this.drpShrinkageHole.SelectedValue;
newReport.HeavyLeather = this.drpHeavyLeather.SelectedValue;
newReport.Other = this.drpOther.SelectedValue;
newReport.Remark = imgPicture.ImageUrl;//图片
//newReport.Remark = imgPicture.ImageUrl;//图片
if (!string.IsNullOrEmpty(this.RecordId))
{
var r = BLL.SteelPipeCheckRecordService.GetSteelPipeReportById(this.RecordId);
if (r != null)
{
if (!string.IsNullOrEmpty(r.Remark))
{
string url = r.Remark.Substring(r.Remark.IndexOf('/'));
if (File.Exists(Funs.RootPath + url))
{
//删除被覆盖的图片
File.Delete(Funs.RootPath + url);
}
}
}
//var r = BLL.SteelPipeCheckRecordService.GetSteelPipeReportById(this.RecordId);
//if (r != null)
//{
// if (!string.IsNullOrEmpty(r.Remark))
// {
// string url = r.Remark.Substring(r.Remark.IndexOf('/'));
// if (File.Exists(Funs.RootPath + url))
// {
// //删除被覆盖的图片
// File.Delete(Funs.RootPath + url);
// }
// }
//}
newReport.RecordId = this.RecordId;
BLL.SteelPipeCheckRecordService.UpdateSteelPipeReport(newReport);
}
@ -606,7 +670,7 @@ namespace FineUIPro.Web.JGZL
RecordId = this.RecordId,
Name = values.Value<string>("Name"),
Material = values.Value<string>("Material"),
Specifications = values.Value<string>("Specifications"),
Specifications = HttpUtility.HtmlDecode(values.Value<string>("Specifications")),
Quantity = values.Value<string>("Quantity"),
MaterialCertificateCode = values.Value<string>("MaterialCertificateCode"),
HeatCode = values.Value<string>("HeatCode"),

54
HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.designer.cs generated
View File

@ -293,60 +293,6 @@ namespace FineUIPro.Web.JGZL
/// </remarks>
protected global::FineUIPro.DropDownList drpOther;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// imgPicture 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image imgPicture;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// filePicture 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FileUpload filePicture;
/// <summary>
/// Label4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label4;
/// <summary>
/// Grid2 控件。
/// </summary>

2
HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.cs
View File

@ -159,7 +159,7 @@
}
if (!string.IsNullOrEmpty(person.PhotoUrl))
{
imgPhoto1.ImageUrl = "~/" + person.PhotoUrl;
imgPhoto1.ImageUrl = person.PhotoUrl;
}
}
else