feat:增加图纸信息表,修改焊口标注功能
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
IF OBJECT_ID(N'dbo.HJGL_DrawingInfo', N'U') IS NULL
|
||||
BEGIN
|
||||
CREATE TABLE dbo.HJGL_DrawingInfo
|
||||
(
|
||||
DrawingInfoId NVARCHAR(50) NOT NULL,
|
||||
AttachFileId NVARCHAR(50) NOT NULL,
|
||||
DrawingName NVARCHAR(255) NULL,
|
||||
DrawingJson NVARCHAR(MAX) NULL,
|
||||
CONSTRAINT PK_HJGL_DrawingInfo PRIMARY KEY (DrawingInfoId)
|
||||
);
|
||||
END;
|
||||
@@ -216,6 +216,7 @@
|
||||
<Compile Include="HJGL\CheckManage\HJGL_RemakeReasonService.cs" />
|
||||
<Compile Include="HJGL\CheckManage\HJGL_TestingReportPrintService.cs" />
|
||||
<Compile Include="HJGL\DataIn\DataInTempService.cs" />
|
||||
<Compile Include="HJGL\JoinMarking\DrawingInfoService.cs" />
|
||||
<Compile Include="HJGL\HotHardManage\HJGL_CH_HardTestReportService.cs" />
|
||||
<Compile Include="HJGL\HotHardManage\HJGL_CH_HardTestResultService.cs" />
|
||||
<Compile Include="HJGL\HotProessManage\HJGL_CH_HotProessResultService.cs" />
|
||||
@@ -358,4 +359,4 @@
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
/// <summary>
|
||||
/// 图纸标注信息服务。
|
||||
/// </summary>
|
||||
public static class DrawingInfoService
|
||||
{
|
||||
/// <summary>
|
||||
/// 根据附件文件标识获取图纸 JSON。
|
||||
/// </summary>
|
||||
public static string GetDrawingJson(string attachFileId)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(attachFileId))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return Funs.DB.HJGL_DrawingInfo
|
||||
.Where(x => x.AttachFileId == attachFileId)
|
||||
.Select(x => x.DrawingJson)
|
||||
.FirstOrDefault();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 新增或更新图纸标注信息,同一 AttachFileId 只保留一条记录。
|
||||
/// </summary>
|
||||
public static void SaveDrawingInfo(string attachFileId, string drawingName, string drawingJson)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(attachFileId))
|
||||
{
|
||||
throw new ArgumentException("附件文件标识不能为空。", "attachFileId");
|
||||
}
|
||||
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.HJGL_DrawingInfo drawingInfo = db.HJGL_DrawingInfo
|
||||
.FirstOrDefault(x => x.AttachFileId == attachFileId);
|
||||
|
||||
if (drawingInfo == null)
|
||||
{
|
||||
drawingInfo = new Model.HJGL_DrawingInfo
|
||||
{
|
||||
DrawingInfoId = SQLHelper.GetNewID(),
|
||||
AttachFileId = attachFileId
|
||||
};
|
||||
db.HJGL_DrawingInfo.InsertOnSubmit(drawingInfo);
|
||||
}
|
||||
|
||||
drawingInfo.DrawingName = string.IsNullOrWhiteSpace(drawingName) ? null : drawingName;
|
||||
drawingInfo.DrawingJson = string.IsNullOrWhiteSpace(drawingJson) ? "{}" : drawingJson;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7026,7 +7026,7 @@
|
||||
</Compile>
|
||||
<Compile Include="JGZL\Cover.aspx.cs">
|
||||
<DependentUpon>Cover.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="JGZL\Cover.aspx.designer.cs">
|
||||
<DependentUpon>Cover.aspx</DependentUpon>
|
||||
@@ -7159,7 +7159,7 @@
|
||||
</Compile>
|
||||
<Compile Include="JGZL\CommencementReportEdit.aspx.cs">
|
||||
<DependentUpon>CommencementReportEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="JGZL\CommencementReportEdit.aspx.designer.cs">
|
||||
<DependentUpon>CommencementReportEdit.aspx</DependentUpon>
|
||||
|
||||
@@ -44,6 +44,7 @@
|
||||
<input id="hdpdfurl" type="hidden" value="<%=URL %>"/>
|
||||
<input id="hdjoinInfo" type="hidden" runat="server"/>
|
||||
<input id="hdworkRecord" type="hidden" runat="server"/>
|
||||
<input id="annotionData" type="hidden" runat="server"/>
|
||||
<input id="imgurl1" type="hidden" value="">
|
||||
<input id="imgurl2"type="hidden" value="">
|
||||
|
||||
@@ -53,7 +54,10 @@
|
||||
<f:Toolbar runat="server" Position="Bottom" ToolbarAlign="Right" >
|
||||
<Items>
|
||||
<f:Button ID="btnNext" runat="server" Text="下一步" OnClick="btnNext_Click"></f:Button>
|
||||
<f:Button ID="btnClear" runat="server" Text="清空临时数据" Hidden="true" OnClick="btnClear_Click"></f:Button>
|
||||
<f:Button ID="btnOut2" OnClick="btnOut2_Click" runat="server" Text="按导入模板导出" Icon="Accept"
|
||||
Hidden="true" EnableAjax="false" DisableControlBeforePostBack="false">
|
||||
</f:Button>
|
||||
<f:Button ID="btnClear" runat="server" Text="清空临时数据" Hidden="true" OnClick="btnClear_Click"></f:Button>
|
||||
<f:Button ID="btnImport" runat="server" Text="导入数据库" Hidden="true" OnClick="btnSave_Click"></f:Button>
|
||||
|
||||
</Items>
|
||||
@@ -227,4 +231,4 @@
|
||||
function reloadGrid() {
|
||||
__doPostBack(null, 'reloadGrid');
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
||||
@@ -73,6 +73,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
|
||||
ISO_ID = Request.Params["ISO_ID"];
|
||||
FileId = Request.Params["FileId"];
|
||||
URL = Funs. HJGLUrl + Request.Params["pdfurl"];
|
||||
annotionData.Value = DrawingInfoService.GetDrawingJson(FileId) ?? "{}";
|
||||
this.IsPDMS = "0";
|
||||
|
||||
}
|
||||
@@ -799,44 +800,84 @@ namespace FineUIPro.Web.HJGL.JoinMarking
|
||||
Grid1.Hidden = false;
|
||||
contentPanel.Hidden = true;
|
||||
btnNext.Hidden = true;
|
||||
btnClear.Hidden = false;
|
||||
var json = hdworkRecord.Value;
|
||||
if (json != "{}")
|
||||
btnOut2.Hidden = btnClear.Hidden = false;
|
||||
string json = string.IsNullOrWhiteSpace(hdworkRecord.Value) ? "{}" : hdworkRecord.Value;
|
||||
JObject jsonObject = JObject.Parse(json);
|
||||
string drawingName = jsonObject.Value<string>("sourceFile");
|
||||
if (string.IsNullOrWhiteSpace(drawingName))
|
||||
{
|
||||
drawingName = Path.GetFileName(Request.Params["pdfurl"]);
|
||||
}
|
||||
DrawingInfoService.SaveDrawingInfo(FileId, drawingName, json);
|
||||
|
||||
JObject annotations = jsonObject.Value<JObject>("annotations");
|
||||
if (annotations != null)
|
||||
{
|
||||
var jsonObc = JObject.Parse(json);
|
||||
var jsonArray = jsonObc.Value<JObject>("annotations").Value<JArray>("1");
|
||||
var iso = Funs.DB.HJGL_PW_IsoInfo.FirstOrDefault(x => x.ISO_ID == ISO_ID);
|
||||
if (iso != null)
|
||||
{
|
||||
var unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == iso.BSU_ID);
|
||||
List<Model.HJGL_Sys_DataInTemp> newDataInTempList = new List<Model.HJGL_Sys_DataInTemp>();
|
||||
for (int i = 0; i < jsonArray.Count; i++)
|
||||
{
|
||||
JObject item = jsonArray[i] as JObject;
|
||||
var unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == iso.BSU_ID);
|
||||
HashSet<string> existingJointNos = new HashSet<string>(
|
||||
Funs.DB.HJGL_PW_JointInfo
|
||||
.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.ISO_ID == ISO_ID)
|
||||
.Select(x => x.JOT_JointNo)
|
||||
.ToList()
|
||||
.Where(x => !string.IsNullOrWhiteSpace(x))
|
||||
.Select(x => x.Trim()),
|
||||
StringComparer.OrdinalIgnoreCase);
|
||||
IEnumerable<string> tempJointNos = Funs.DB.HJGL_Sys_DataInTemp
|
||||
.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.Value3 == iso.ISO_IsoNo)
|
||||
.Select(x => x.Value4)
|
||||
.ToList()
|
||||
.Where(x => !string.IsNullOrWhiteSpace(x))
|
||||
.Select(x => x.Trim());
|
||||
existingJointNos.UnionWith(tempJointNos);
|
||||
|
||||
//if (!string.IsNullOrEmpty(pds.Rows[i][3].ToString()))
|
||||
HashSet<string> addedJointNos = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
|
||||
List<Model.HJGL_Sys_DataInTemp> newDataInTempList = new List<Model.HJGL_Sys_DataInTemp>();
|
||||
|
||||
List<JObject> annotationItems = annotations.Properties()
|
||||
.SelectMany(x => (x.Value as JArray) ?? new JArray())
|
||||
.OfType<JObject>()
|
||||
.ToList();
|
||||
|
||||
for (int i = 0; i < annotationItems.Count; i++)
|
||||
{
|
||||
JObject item = annotationItems[i];
|
||||
string jointNo = item.Value<string>("label");
|
||||
if (string.IsNullOrWhiteSpace(jointNo))
|
||||
{
|
||||
Model.HJGL_Sys_DataInTemp newDataInTemp = new Model.HJGL_Sys_DataInTemp();
|
||||
newDataInTemp.TempId = SQLHelper.GetNewID(typeof(Model.HJGL_Sys_DataInTemp));
|
||||
newDataInTemp.ProjectId = this.CurrUser.LoginProjectId;
|
||||
newDataInTemp.UserId = this.CurrUser.UserId;
|
||||
newDataInTemp.Time = System.DateTime.Now;
|
||||
newDataInTemp.Type = this.IsPDMS;
|
||||
newDataInTemp.RowNo = i + 2;
|
||||
newDataInTemp.Value1 = unit!=null? unit.UnitCode:null;
|
||||
newDataInTemp.Value3 = iso.ISO_IsoNo;
|
||||
newDataInTemp.Value4 = item.Value<string>("label");
|
||||
newDataInTemp.Value46 = item.Value<string>("x");
|
||||
newDataInTemp.Value47 = item.Value<string>("y");
|
||||
newDataInTemp.Value48 = item.Value<string>("x2");
|
||||
newDataInTemp.Value49 = item.Value<string>("y2");
|
||||
|
||||
newDataInTempList.Add(newDataInTemp);
|
||||
continue;
|
||||
}
|
||||
|
||||
jointNo = jointNo.Trim();
|
||||
if (existingJointNos.Contains(jointNo) || !addedJointNos.Add(jointNo))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
Model.HJGL_Sys_DataInTemp newDataInTemp = new Model.HJGL_Sys_DataInTemp();
|
||||
newDataInTemp.TempId = SQLHelper.GetNewID(typeof(Model.HJGL_Sys_DataInTemp));
|
||||
newDataInTemp.ProjectId = this.CurrUser.LoginProjectId;
|
||||
newDataInTemp.UserId = this.CurrUser.UserId;
|
||||
newDataInTemp.Time = System.DateTime.Now;
|
||||
newDataInTemp.Type = this.IsPDMS;
|
||||
newDataInTemp.RowNo = i + 2;
|
||||
newDataInTemp.Value1 = unit != null ? unit.UnitCode : null;
|
||||
newDataInTemp.Value3 = iso.ISO_IsoNo;
|
||||
newDataInTemp.Value4 = jointNo;
|
||||
newDataInTemp.Value46 = item.Value<string>("x");
|
||||
newDataInTemp.Value47 = item.Value<string>("y");
|
||||
newDataInTemp.Value48 = item.Value<string>("x2");
|
||||
newDataInTemp.Value49 = item.Value<string>("y2");
|
||||
|
||||
newDataInTempList.Add(newDataInTemp);
|
||||
}
|
||||
|
||||
BLL.DataInTempService.AddDataInTemp(newDataInTempList);
|
||||
|
||||
if (newDataInTempList.Count > 0)
|
||||
{
|
||||
BLL.DataInTempService.AddDataInTemp(newDataInTempList);
|
||||
}
|
||||
}
|
||||
}
|
||||
BindGrid();
|
||||
@@ -847,6 +888,151 @@ namespace FineUIPro.Web.HJGL.JoinMarking
|
||||
BindGrid();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 按焊口信息导入模板导出当前管线临时数据。
|
||||
/// </summary>
|
||||
protected void btnOut2_Click(object sender, EventArgs e)
|
||||
{
|
||||
Model.HJGL_PW_IsoInfo iso = Funs.DB.HJGL_PW_IsoInfo
|
||||
.FirstOrDefault(x => x.ISO_ID == this.ISO_ID);
|
||||
if (iso == null)
|
||||
{
|
||||
Alert.ShowInTop("当前管线不存在,无法导出!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
List<Model.HJGL_Sys_DataInTemp> tempDataList = Funs.DB.HJGL_Sys_DataInTemp
|
||||
.Where(x => x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.UserId == this.CurrUser.UserId
|
||||
&& x.Type == this.IsPDMS
|
||||
&& x.Value3 == iso.ISO_IsoNo)
|
||||
.OrderBy(x => x.RowNo)
|
||||
.ToList();
|
||||
if (tempDataList.Count == 0)
|
||||
{
|
||||
Alert.ShowInTop("当前管线无临时数据,无法导出!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
Model.Base_Project project = Funs.DB.Base_Project
|
||||
.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId);
|
||||
List<Model.Project_Installation> installations = Funs.DB.Project_Installation
|
||||
.Where(x => x.ProjectId == this.CurrUser.LoginProjectId)
|
||||
.ToList();
|
||||
List<Model.HJGL_BS_JointType> jointTypes = Funs.DB.HJGL_BS_JointType.ToList();
|
||||
List<Model.HJGL_BS_SlopeType> slopeTypes = Funs.DB.HJGL_BS_SlopeType.ToList();
|
||||
List<Model.HJGL_BS_WeldMethod> weldMethods = Funs.DB.HJGL_BS_WeldMethod.ToList();
|
||||
List<Model.HJGL_BS_Component> components = Funs.DB.HJGL_BS_Component.ToList();
|
||||
List<Model.HJGL_BS_NDTRate> ndtRates = Funs.DB.HJGL_BS_NDTRate.ToList();
|
||||
|
||||
string templatePath = Server.MapPath("~/") + Const.JointInTemplateUrl;
|
||||
string exportPath = Path.Combine(
|
||||
Path.GetDirectoryName(templatePath),
|
||||
"焊口信息_" + SQLHelper.GetNewID() + Path.GetExtension(templatePath));
|
||||
File.Copy(templatePath, exportPath);
|
||||
|
||||
NPOI.SS.UserModel.IWorkbook workbook;
|
||||
using (FileStream stream = new FileStream(exportPath, FileMode.Open, FileAccess.Read))
|
||||
{
|
||||
workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream);
|
||||
}
|
||||
|
||||
NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle();
|
||||
cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
|
||||
cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
|
||||
cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
|
||||
cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
|
||||
cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
|
||||
cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
|
||||
cellStyle.WrapText = true;
|
||||
NPOI.SS.UserModel.IFont font = workbook.CreateFont();
|
||||
font.FontHeightInPoints = 11;
|
||||
cellStyle.SetFont(font);
|
||||
|
||||
NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
|
||||
int rowIndex = 1;
|
||||
foreach (Model.HJGL_Sys_DataInTemp tempData in tempDataList)
|
||||
{
|
||||
Model.Project_Installation installation = installations
|
||||
.FirstOrDefault(x => x.InstallationCode == tempData.Value2);
|
||||
Model.HJGL_BS_JointType jointType = jointTypes
|
||||
.FirstOrDefault(x => x.JOTY_Code == tempData.Value8);
|
||||
Model.HJGL_BS_SlopeType slopeType = slopeTypes
|
||||
.FirstOrDefault(x => x.JST_Code == tempData.Value22);
|
||||
Model.HJGL_BS_WeldMethod weldMethod = weldMethods
|
||||
.FirstOrDefault(x => x.WME_Code == tempData.Value14);
|
||||
Model.HJGL_BS_Component component1 = components
|
||||
.FirstOrDefault(x => x.COM_Code == tempData.Value24);
|
||||
Model.HJGL_BS_Component component2 = components
|
||||
.FirstOrDefault(x => x.COM_Code == tempData.Value25);
|
||||
Model.HJGL_BS_NDTRate ndtRate = ndtRates
|
||||
.FirstOrDefault(x => x.NDTR_Code == tempData.Value7);
|
||||
|
||||
string[] values =
|
||||
{
|
||||
project != null ? project.ProjectCode : string.Empty, // 0 施工号
|
||||
tempData.Value3, // 1 管线号
|
||||
tempData.Value4, // 2 焊口号
|
||||
installation != null ? installation.InstallationName : tempData.Value2, // 3 装置
|
||||
tempData.Value5, // 4 材质一
|
||||
tempData.Value6, // 5 材质二
|
||||
jointType != null ? jointType.JOTY_Name : tempData.Value8, // 6 焊缝类型
|
||||
slopeType != null ? slopeType.JST_Name : tempData.Value22, // 7 坡口类型
|
||||
tempData.Value10, // 8 焊口属性
|
||||
weldMethod != null ? weldMethod.WME_Name : tempData.Value14, // 9 焊接方法
|
||||
tempData.Value32, // 10 外径
|
||||
tempData.Value13, // 11 壁厚
|
||||
tempData.Value11, // 12 寸径
|
||||
tempData.Value9, // 13 焊接区域
|
||||
component1 != null ? component1.COM_Name : tempData.Value24, // 14 组件一
|
||||
component2 != null ? component2.COM_Name : tempData.Value25, // 15 组件二
|
||||
string.Empty, // 16 后热温度
|
||||
string.Empty, // 17 层间温度
|
||||
tempData.Value29, // 18 预热温度
|
||||
tempData.Value17, // 19 焊丝
|
||||
tempData.Value16, // 20 焊条
|
||||
string.Empty, // 21 焊接电流
|
||||
string.Empty, // 22 焊接电压
|
||||
tempData.Value30, // 23 是否热处理
|
||||
string.Empty, // 24 热处理类型
|
||||
string.Empty, // 25 是否特殊
|
||||
ndtRate != null ? ndtRate.NDTR_Name : tempData.Value7, // 26 探伤比例
|
||||
string.Empty, // 27 合格等级
|
||||
string.Empty, // 28 硬度合格标准
|
||||
string.Empty, // 29 非常焊缝
|
||||
string.Empty, // 30 是否黄金口
|
||||
string.Empty // 31 备注
|
||||
};
|
||||
|
||||
NPOI.SS.UserModel.IRow row = sheet.CreateRow(rowIndex++);
|
||||
for (int columnIndex = 0; columnIndex < values.Length; columnIndex++)
|
||||
{
|
||||
NPOI.SS.UserModel.ICell cell = row.CreateCell(columnIndex);
|
||||
cell.CellStyle = cellStyle;
|
||||
cell.SetCellValue(values[columnIndex] ?? string.Empty);
|
||||
}
|
||||
}
|
||||
|
||||
using (FileStream stream = new FileStream(exportPath, FileMode.Create, FileAccess.Write))
|
||||
{
|
||||
workbook.Write(stream);
|
||||
workbook.Close();
|
||||
}
|
||||
|
||||
byte[] fileBytes = File.ReadAllBytes(exportPath);
|
||||
File.Delete(exportPath);
|
||||
string fileName = "焊口信息" + Path.GetExtension(templatePath);
|
||||
Response.Clear();
|
||||
Response.ContentType = "application/vnd.ms-excel";
|
||||
Response.AddHeader(
|
||||
"Content-Disposition",
|
||||
"attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
|
||||
Response.AddHeader("Content-Length", fileBytes.Length.ToString());
|
||||
Response.BinaryWrite(fileBytes);
|
||||
Response.Flush();
|
||||
Response.Close();
|
||||
}
|
||||
|
||||
protected void btnClear_Click(object sender, EventArgs e)
|
||||
{ ////先删除临时表中 该人员以前导入的数据
|
||||
BLL.DataInTempService.DeleteDataInTempByProjectIdUserId(this.CurrUser.LoginProjectId, this.CurrUser.UserId, this.IsPDMS);
|
||||
@@ -855,4 +1041,4 @@ namespace FineUIPro.Web.HJGL.JoinMarking
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,6 +41,15 @@ namespace FineUIPro.Web.HJGL.JoinMarking
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hdworkRecord;
|
||||
|
||||
/// <summary>
|
||||
/// annotionData 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlInputHidden annotionData;
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
@@ -68,6 +77,15 @@ namespace FineUIPro.Web.HJGL.JoinMarking
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnNext;
|
||||
|
||||
/// <summary>
|
||||
/// btnOut2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnOut2;
|
||||
|
||||
/// <summary>
|
||||
/// btnClear 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<FineUIPro DebugMode="false" Theme="Cupertino"/>
|
||||
<appSettings>
|
||||
<!--连接字符串-->
|
||||
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
|
||||
<add key="ConnectionString" value="Server=.\MSSQLSERVER2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
|
||||
<!--系统名称-->
|
||||
<add key="SystemName" value="诺必达焊接管理系统"/>
|
||||
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
|
||||
@@ -67,7 +67,7 @@
|
||||
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
|
||||
<add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
|
||||
</httpHandlers>
|
||||
<compilation debug="false" targetFramework="4.6.1">
|
||||
<compilation debug="true" targetFramework="4.6.1">
|
||||
<assemblies>
|
||||
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
</assemblies>
|
||||
|
||||
@@ -245,6 +245,9 @@ namespace Model
|
||||
partial void InsertHJGL_CH_TrustItem(HJGL_CH_TrustItem instance);
|
||||
partial void UpdateHJGL_CH_TrustItem(HJGL_CH_TrustItem instance);
|
||||
partial void DeleteHJGL_CH_TrustItem(HJGL_CH_TrustItem instance);
|
||||
partial void InsertHJGL_DrawingInfo(HJGL_DrawingInfo instance);
|
||||
partial void UpdateHJGL_DrawingInfo(HJGL_DrawingInfo instance);
|
||||
partial void DeleteHJGL_DrawingInfo(HJGL_DrawingInfo instance);
|
||||
partial void InsertHJGL_ElectrodeBake(HJGL_ElectrodeBake instance);
|
||||
partial void UpdateHJGL_ElectrodeBake(HJGL_ElectrodeBake instance);
|
||||
partial void DeleteHJGL_ElectrodeBake(HJGL_ElectrodeBake instance);
|
||||
@@ -1326,6 +1329,14 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
public System.Data.Linq.Table<HJGL_DrawingInfo> HJGL_DrawingInfo
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.GetTable<HJGL_DrawingInfo>();
|
||||
}
|
||||
}
|
||||
|
||||
public System.Data.Linq.Table<HJGL_ElectrodeBake> HJGL_ElectrodeBake
|
||||
{
|
||||
get
|
||||
@@ -2894,6 +2905,14 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
public System.Data.Linq.Table<View_PrintJointInfo> View_PrintJointInfo
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.GetTable<View_PrintJointInfo>();
|
||||
}
|
||||
}
|
||||
|
||||
public System.Data.Linq.Table<View_Report_SolderBakingRecord> View_Report_SolderBakingRecord
|
||||
{
|
||||
get
|
||||
@@ -39076,6 +39095,140 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_DrawingInfo")]
|
||||
public partial class HJGL_DrawingInfo : INotifyPropertyChanging, INotifyPropertyChanged
|
||||
{
|
||||
|
||||
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
|
||||
|
||||
private string _DrawingInfoId;
|
||||
|
||||
private string _AttachFileId;
|
||||
|
||||
private string _DrawingName;
|
||||
|
||||
private string _DrawingJson;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
partial void OnLoaded();
|
||||
partial void OnValidate(System.Data.Linq.ChangeAction action);
|
||||
partial void OnCreated();
|
||||
partial void OnDrawingInfoIdChanging(string value);
|
||||
partial void OnDrawingInfoIdChanged();
|
||||
partial void OnAttachFileIdChanging(string value);
|
||||
partial void OnAttachFileIdChanged();
|
||||
partial void OnDrawingNameChanging(string value);
|
||||
partial void OnDrawingNameChanged();
|
||||
partial void OnDrawingJsonChanging(string value);
|
||||
partial void OnDrawingJsonChanged();
|
||||
#endregion
|
||||
|
||||
public HJGL_DrawingInfo()
|
||||
{
|
||||
OnCreated();
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrawingInfoId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
|
||||
public string DrawingInfoId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._DrawingInfoId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._DrawingInfoId != value))
|
||||
{
|
||||
this.OnDrawingInfoIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._DrawingInfoId = value;
|
||||
this.SendPropertyChanged("DrawingInfoId");
|
||||
this.OnDrawingInfoIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachFileId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
|
||||
public string AttachFileId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._AttachFileId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._AttachFileId != value))
|
||||
{
|
||||
this.OnAttachFileIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._AttachFileId = value;
|
||||
this.SendPropertyChanged("AttachFileId");
|
||||
this.OnAttachFileIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrawingName", DbType="NVarChar(255)")]
|
||||
public string DrawingName
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._DrawingName;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._DrawingName != value))
|
||||
{
|
||||
this.OnDrawingNameChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._DrawingName = value;
|
||||
this.SendPropertyChanged("DrawingName");
|
||||
this.OnDrawingNameChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrawingJson", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
|
||||
public string DrawingJson
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._DrawingJson;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._DrawingJson != value))
|
||||
{
|
||||
this.OnDrawingJsonChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._DrawingJson = value;
|
||||
this.SendPropertyChanged("DrawingJson");
|
||||
this.OnDrawingJsonChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public event PropertyChangingEventHandler PropertyChanging;
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
protected virtual void SendPropertyChanging()
|
||||
{
|
||||
if ((this.PropertyChanging != null))
|
||||
{
|
||||
this.PropertyChanging(this, emptyChangingEventArgs);
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void SendPropertyChanged(String propertyName)
|
||||
{
|
||||
if ((this.PropertyChanged != null))
|
||||
{
|
||||
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_ElectrodeBake")]
|
||||
public partial class HJGL_ElectrodeBake : INotifyPropertyChanging, INotifyPropertyChanged
|
||||
{
|
||||
@@ -132951,6 +133104,195 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_PrintJointInfo")]
|
||||
public partial class View_PrintJointInfo
|
||||
{
|
||||
|
||||
private string _JOT_ID;
|
||||
|
||||
private string _ProjectId;
|
||||
|
||||
private string _ISO_ID;
|
||||
|
||||
private string _UnitName;
|
||||
|
||||
private string _InstallationName;
|
||||
|
||||
private string _ISO_IsoNo;
|
||||
|
||||
private string _JOT_JointNo;
|
||||
|
||||
private string _JOT_JointDesc;
|
||||
|
||||
private string _STE_Code;
|
||||
|
||||
private string _QRCodeAttachUrl;
|
||||
|
||||
public View_PrintJointInfo()
|
||||
{
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JOT_ID", DbType="VarChar(50) NOT NULL", CanBeNull=false)]
|
||||
public string JOT_ID
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._JOT_ID;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._JOT_ID != value))
|
||||
{
|
||||
this._JOT_ID = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
|
||||
public string ProjectId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._ProjectId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._ProjectId != value))
|
||||
{
|
||||
this._ProjectId = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ISO_ID", DbType="VarChar(50) NOT NULL", CanBeNull=false)]
|
||||
public string ISO_ID
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._ISO_ID;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._ISO_ID != value))
|
||||
{
|
||||
this._ISO_ID = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(50)")]
|
||||
public string UnitName
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._UnitName;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._UnitName != value))
|
||||
{
|
||||
this._UnitName = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationName", DbType="NVarChar(50)")]
|
||||
public string InstallationName
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._InstallationName;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._InstallationName != value))
|
||||
{
|
||||
this._InstallationName = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ISO_IsoNo", DbType="VarChar(50)")]
|
||||
public string ISO_IsoNo
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._ISO_IsoNo;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._ISO_IsoNo != value))
|
||||
{
|
||||
this._ISO_IsoNo = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JOT_JointNo", DbType="VarChar(50) NOT NULL", CanBeNull=false)]
|
||||
public string JOT_JointNo
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._JOT_JointNo;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._JOT_JointNo != value))
|
||||
{
|
||||
this._JOT_JointNo = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JOT_JointDesc", DbType="VarChar(100)")]
|
||||
public string JOT_JointDesc
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._JOT_JointDesc;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._JOT_JointDesc != value))
|
||||
{
|
||||
this._JOT_JointDesc = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_STE_Code", DbType="NVarChar(50)")]
|
||||
public string STE_Code
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._STE_Code;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._STE_Code != value))
|
||||
{
|
||||
this._STE_Code = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QRCodeAttachUrl", DbType="NVarChar(200)")]
|
||||
public string QRCodeAttachUrl
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._QRCodeAttachUrl;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._QRCodeAttachUrl != value))
|
||||
{
|
||||
this._QRCodeAttachUrl = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Report_SolderBakingRecord")]
|
||||
public partial class View_Report_SolderBakingRecord
|
||||
{
|
||||
|
||||
@@ -136,4 +136,4 @@
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
</Project>
|
||||
|
||||
Reference in New Issue
Block a user