20250227 机具报验导入

This commit is contained in:
毕文静 2025-02-27 11:51:00 +08:00
parent 96edb3bd23
commit c3d34b4096
13 changed files with 2135 additions and 102 deletions

File diff suppressed because one or more lines are too long

View File

@ -28,9 +28,9 @@
<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" EnableAjax="false" ShowHeader="false" Title="机具报验" EnableCollapse="true" OnPageIndexChange="Grid1_PageIndexChange"
runat="server" BoxFlex="1" DataKeyNames="InspectionMachineId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="InspectionMachineId" AllowSorting="true" SortField="InspectionDate"
SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnRowDataBound="Grid1_RowDataBound"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="机具报验" EnableCollapse="true" OnPageIndexChange="Grid1_PageIndexChange"
runat="server" BoxFlex="1" DataKeyNames="InspectionMachineId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="InspectionMachineId" AllowSorting="true" SortField="RemarkCode"
SortDirection="ASC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnRowDataBound="Grid1_RowDataBound"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
@ -137,7 +137,7 @@
</f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="700px" Height="560px">
Width="1200px" Height="600px">
</f:Window>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"

View File

@ -231,7 +231,7 @@ namespace FineUIPro.Web.Comprehensive
/// <param name="e"></param>
protected void btnImport_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("InspectionMachineDataIn.aspx", "导入 - ")));
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("InspectionMachineDataInNew.aspx", "导入 - ")));
}
#endregion

View File

@ -0,0 +1,190 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionMachineDataInNew.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.InspectionMachineDataInNew" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>施工机具/计量器具报验导入</title>
<style type="text/css">
.f-grid-row.red {
background-color: LightCoral;
}
.Label {
font-size: larger;
font-weight: bold;
}
</style>
<style type="text/css">
/*定义父容器*/
.content {
width: 550px;
height: 30px;
background: #E4F1FB;
margin: 0 auto;
}
/*定义进度条*/
.box {
width: 0px;
height: 30px;
line-height: 30px;
text-align: center;
background: #3BAAE3;
color: #fff;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:HiddenField ID="id" ClientIDMode="Static" runat="server"></f:HiddenField>
<f:Panel ID="Panel1" runat="server" Margin="2px" BodyPadding="2px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:HiddenField ID="hdfileName" runat="server"></f:HiddenField>
<f:FileUpload ID="FileExcel" runat="server" Label="数据文件" EmptyText="请上传EXCEl格式文件" Width="350px" LabelWidth="90px" LabelAlign="Right"></f:FileUpload>
<f:Button ID="imgbtnImport" runat="server" Text="上传" ToolTip="文件上传" OnClick="imgbtnImport_Click"></f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<%--<f:CheckBox ID="ckUpdate" runat="server" Text="更新导入"></f:CheckBox>--%>
<f:Button ID="btnSave" runat="server" Text="保存" ToolTip="审核保存" Icon="SystemSave" OnClick="btnSave_Click"></f:Button>
<f:Button ID="btnRefresh" runat="server" ClientIDMode="Static" Text="刷新" Icon="SystemSave" OnClick="btnRefresh_Click" Hidden="true"></f:Button>
<f:Button ID="btnAllDelete" runat="server" Icon="Delete" Text="删除记录" ToolTip="删除当前人所有临时导入记录" ConfirmText="删除当前人所有临时导入记录?"
ConfirmTarget="Top" OnClick="btnAllDelete_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
EnableAjax="false" DisableControlBeforePostBack="false" Hidden="true">
</f:Button>
<f:Button ID="imgbtnUpload" runat="server" Icon="DiskDownload" Text="模板下载" OnClick="imgbtnUpload_Click" EnableAjaxLoading="false"></f:Button>
<%--<f:Button ID="lkAchievements" runat="server" Icon="DiskDownload" Text="导入说明" OnClick="lkAchievements_Click" EnableAjaxLoading="false"></f:Button>--%>
</Items>
<Items>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据导入" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="TempId" AllowCellEditing="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="TempId" AllowSorting="true"
SortField="RowNo" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField Width="70px" HeaderText="行号" ColumnID="RowNo" DataField="RowNo" SortField="RowNo"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" HeaderText="报验单位" ColumnID="Value1" DataField="Value1" SortField="Value1"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:WindowField ColumnID="Value2" HeaderTextAlign="Center" TextAlign="Left" Width="150px" WindowID="Window1" HeaderText="报验编号"
DataTextField="Value2" DataIFrameUrlFields="TempId" DataIFrameUrlFormatString="InspectionMachineDataInNewEdit.aspx?TempId={0}"
Title="报验编号" DataToolTipField="ToopValue" SortField="Value2">
</f:WindowField>
<f:RenderField Width="150px" HeaderText="机具名称" ColumnID="Value3" DataField="Value3" SortField="Value3"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" HeaderText="专业名称" ColumnID="Value4" DataField="Value4" SortField="Value4"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="90px" HeaderText="类型" ColumnID="Value5" DataField="Value5" SortField="Value5"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" HeaderText="规格型号" ColumnID="Value6" DataField="Value6" SortField="Value6"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="下次检验日期" ColumnID="Value7" DataField="Value7" SortField="Value7"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="检验周期" ColumnID="Value8" DataField="Value8" SortField="Value8"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="是否在校验期内" ColumnID="Value9" DataField="Value9" SortField="Value9"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="报验日期" ColumnID="Value10" DataField="Value10" SortField="Value10"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="是否在场" ColumnID="Value11" DataField="Value11" SortField="Value11"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="台数" ColumnID="Value12" DataField="Value12" SortField="Value12"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="校验合格" ColumnID="Value13" DataField="Value13" SortField="Value13"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="离场时间" ColumnID="Value14" DataField="Value14" SortField="Value14"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="标识编号" ColumnID="Value15" DataField="Value15" SortField="Value15"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<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" Selected="true" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
</f:DropDownList>
<f:Label Label="错误记录数" runat="server" ID="lbDataCout" CssClass="Label" LabelAlign="right" LabelWidth="120px"></f:Label>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="数据信息" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="true" runat="server"
IsModal="true" Width="1200px" Height="600px">
</f:Window>
<f:Window ID="Window2" Hidden="true" runat="server" MinHeight="30px"
Target="Parent" ShowHeader="false" BodyPadding="0" Margin="0"
IsModal="true" Width="550px" Height="32px">
<Items>
<f:ContentPanel ShowBorder="false" Height="30px" ShowHeader="false" ID="ContentPanel3" runat="server">
<div class="content" id="content">
<div class="box" id="box"></div>
</div>
</f:ContentPanel>
</Items>
</f:Window>
<f:Menu ID="Menu1" ClientIDMode="Static" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
runat="server" Text="编辑" Icon="TableEdit">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
ConfirmText="删除选中行?" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete">
</f:MenuButton>
</f:Menu>
<asp:ScriptManager ID="ScriptManager2" runat="server" EnablePageMethods="true">
<Scripts>
<asp:ScriptReference Path="~/res/DataInTable.js" />
</Scripts>
</asp:ScriptManager>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
</script>
</body>
</html>

View File

@ -0,0 +1,615 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Threading;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class InspectionMachineDataInNew : PageBase
{
/// <summary>
/// 错误集合
/// </summary>
public static string errorInfos = string.Empty;
#region
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
if (percent == null)
{
percent = new Dictionary<string, int>();
}
this.id.Text = this.CurrUser.UserId;
this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
this.BindGrid();
}
else if (GetRequestEventArgument() == "reloadGrid")
{
BindGrid();
}
}
#endregion
#region
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT TempId,ProjectId,UserId,Time,RowNo,ToopValue,Value1,Value2,Value3,Value4,Value5,Value6,Value7,Value8,Value9,Value10"
+ @" ,Value11,Value12,Value13,Value14,Value15,Value16,Value17,Value18,Value19,Value20"
+ @",ToopValue,Type"
+ @" FROM Sys_CQMS_DataInTemp "
+ @" WHERE ProjectId=@ProjectId AND UserId=@UserId AND Type=@Type";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@UserId", this.CurrUser.UserId));
listStr.Add(new SqlParameter("@Type", "InspectionMachine"));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
var dataInTempAll = from x in Funs.DB.Sys_CQMS_DataInTemp
where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId && x.Type == "InspectionMachine"
select x;
for (int i = 0; i < Grid1.Rows.Count; i++)
{
var dataInTemp = dataInTempAll.FirstOrDefault(x => x.TempId == Grid1.Rows[i].DataKeys[0].ToString());
if (dataInTemp != null)
{
if (!string.IsNullOrEmpty(dataInTemp.ToopValue))
{
Grid1.Rows[i].RowCssClass = "red";
}
}
}
var errData = from x in dataInTempAll where x.ToopValue != null select x;
this.lbDataCout.Text = errData.Count().ToString();
}
#endregion
#region
/// <summary>
/// Grid行双击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请选择一条记录!", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionMachineDataInNewEdit.aspx?TempId={0}", Grid1.SelectedRowID, "维护 - ")));
}
#endregion
#region
/// <summary>
/// 导入信息编辑
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuEdit_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请选择一条记录!", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionMachineDataInNewEdit.aspx?TempId={0}", Grid1.SelectedRowID, "维护 - ")));
}
/// <summary>
/// 删除按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuDelete_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请选择一条记录!", MessageBoxIcon.Warning);
return;
}
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
BLL.Sys_CQMS_DataInTempService.DeleteDataInTempByDataInTempID(rowID);
}
ShowNotify("删除成功!", MessageBoxIcon.Success);
this.BindGrid();
}
#endregion
#region
/// <summary>
/// 分页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页显示条数下拉框
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid();
}
#endregion
#region
/// <summary>
/// 文件上传
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void imgbtnImport_Click(object sender, EventArgs e)
{
try
{
if (this.FileExcel.HasFile == false)
{
ShowNotify("请选择Excel文件!", MessageBoxIcon.Warning);
return;
}
string IsXls = Path.GetExtension(this.FileExcel.FileName).ToString().Trim().ToLower();
if (IsXls != ".xls" && IsXls != ".xlsx")
{
ShowNotify("只能选择Excel文件!", MessageBoxIcon.Warning);
return;
}
string rootPath = Server.MapPath("~/");
string initFullPath = rootPath + Const.ExcelUrl;
if (!Directory.Exists(initFullPath))
{
Directory.CreateDirectory(initFullPath);
}
//指定上传文件名称
this.hdfileName.Text = BLL.Funs.GetNewFileName() + IsXls;
//上传文件路径
string filePath = initFullPath + this.hdfileName.Text;
//文件上传服务器
this.FileExcel.PostedFile.SaveAs(filePath);
//文件上传服务器后的名称
string fileName = rootPath + Const.ExcelUrl + this.hdfileName.Text;
//读取Excel
DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out errorInfos, true);
//验证Excel读取是否有误
if (!string.IsNullOrEmpty(errorInfos))
{
ShowNotify(errorInfos, MessageBoxIcon.Warning);
return;
}
if (ds.Tables.Count > 0)
{
for (int i = 1; i < ds.Tables[0].Rows.Count; i++)
{
Sys_CQMS_DataInTemp newDataInTemp = new Sys_CQMS_DataInTemp();
newDataInTemp.TempId = SQLHelper.GetNewID(typeof(Model.Sys_CQMS_DataInTemp));
newDataInTemp.ProjectId = this.CurrUser.LoginProjectId;
newDataInTemp.UserId = this.CurrUser.UserId;
newDataInTemp.Time = System.DateTime.Now;
newDataInTemp.Type = "InspectionMachine";
newDataInTemp.RowNo = i + 2;
newDataInTemp.Value1 = ds.Tables[0].Rows[i][0].ToString();
newDataInTemp.Value2 = ds.Tables[0].Rows[i][1].ToString();
newDataInTemp.Value3 = ds.Tables[0].Rows[i][2].ToString();
newDataInTemp.Value4 = ds.Tables[0].Rows[i][3].ToString();
newDataInTemp.Value5 = ds.Tables[0].Rows[i][4].ToString();
newDataInTemp.Value6 = ds.Tables[0].Rows[i][5].ToString();
newDataInTemp.Value7 = ds.Tables[0].Rows[i][6].ToString();
newDataInTemp.Value8 = ds.Tables[0].Rows[i][7].ToString();
newDataInTemp.Value9 = ds.Tables[0].Rows[i][8].ToString();
newDataInTemp.Value10 = ds.Tables[0].Rows[i][9].ToString();
newDataInTemp.Value11 = ds.Tables[0].Rows[i][10].ToString();
newDataInTemp.Value12 = ds.Tables[0].Rows[i][11].ToString();
newDataInTemp.Value13 = ds.Tables[0].Rows[i][12].ToString();
newDataInTemp.Value14 = ds.Tables[0].Rows[i][13].ToString();
newDataInTemp.Value15 = ds.Tables[0].Rows[i][14].ToString();
BLL.Sys_CQMS_DataInTempService.AddDataInTemp(newDataInTemp);
}
this.BindGrid();
ShowNotify("数据已导入临时表!", MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop("导入数据为空!", MessageBoxIcon.Success);
return;
}
}
catch (Exception ex)
{
Alert.ShowInTop("'" + ex.Message + "'", MessageBoxIcon.Warning);
}
}
#endregion
#region
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("机具报验" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
#endregion
#region
/// <summary>
/// 保存审核事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
Thread t = new Thread(new ThreadStart(() => { btnSaveMethod(this.CurrUser.LoginProjectId, this.CurrUser.UserId, "InspectionMachine"); }));
t.Start();
if (percent.ContainsKey(this.CurrUser.UserId))
{
percent[CurrUser.UserId] = 0;
}
else
{
percent.Add(CurrUser.UserId, 0);
}
PageContext.RegisterStartupScript("printX()");
}
protected void btnRefresh_Click(object sender, EventArgs e)
{
this.BindGrid();
}
protected void btnSaveMethod(string LoginProjectId, string UserId, string IsPDMS)
{
var oldViewInfos = from x in Funs.DB.Comprehensive_InspectionMachine
where x.ProjectId == this.CurrUser.LoginProjectId
select x;
var units = from x in Funs.DB.Base_Unit
join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
where y.ProjectId == this.CurrUser.LoginProjectId
select x;
var cns = from x in Funs.DB.Base_CNProfessional select x;
var dataInTemp = from x in Funs.DB.Sys_CQMS_DataInTemp
where x.ProjectId == LoginProjectId && x.UserId == UserId && x.Type == "InspectionMachine"
select x;
int okCount = 0;
int i = 0;
int ir = dataInTemp.Count();
string erreMessage = "";
foreach (var tempData in dataInTemp)
{
if (tempData != null)
{
i++;
percent[UserId] = (int)(100 * i / ir);
string errInfo = string.Empty;
Model.Comprehensive_InspectionMachine Ins = new Model.Comprehensive_InspectionMachine();
if (!string.IsNullOrEmpty(tempData.Value1.Trim()))
{
var unit = units.FirstOrDefault(x => x.UnitName == tempData.Value1.Trim());
if (unit == null)
{
errInfo += "报验单位[" + tempData.Value1.Trim() + "]不存在;";
}
else
{
Ins.UnitId = unit.UnitId;
}
}
else
{
errInfo += "报验单位为必填项;";
}
if (!string.IsNullOrEmpty(tempData.Value2.Trim()))
{
Ins.InspectionMachineCode = tempData.Value2.Trim();
}
else
{
errInfo += "报验编号为必填项;";
}
if (!string.IsNullOrEmpty(tempData.Value3.Trim()))
{
Ins.InspectionMachineName = tempData.Value3.Trim();
}
else
{
errInfo += "机具名称为必填项;";
}
if (!string.IsNullOrEmpty(tempData.Value4.Trim()))
{
var cn = cns.Where(x => x.ProfessionalName == tempData.Value4.Trim()).FirstOrDefault();
if (cn == null)
{
errInfo += "专业名称[" + tempData.Value4.Trim() + "]不存在;";
}
else
{
Ins.CNProfessionalId = cn.CNProfessionalId;
}
}
if (!string.IsNullOrEmpty(tempData.Value5.Trim()))
{
if (tempData.Value5 != "施工" && tempData.Value5.Trim() != "计量")
{
errInfo += "类型[" + tempData.Value5.Trim() + "]错误;";
}
else
{
Ins.InspectionType = tempData.Value5.Trim();
}
}
else
{
Ins.InspectionType = "施工";
}
if (!string.IsNullOrEmpty(tempData.Value6.Trim()))
{
Ins.SpecificationModel = tempData.Value6.Trim();
}
if (!string.IsNullOrEmpty(tempData.Value7.Trim()))
{
try
{
Ins.NextTestDate = Funs.GetNewDateTime(tempData.Value7.Trim());
if (Ins.NextTestDate == null)
{
errInfo += "下次检验日期 [" + tempData.Value7.Trim() + "]错误;";
}
}
catch (Exception)
{
errInfo += "下次检验日期 [" + tempData.Value7.Trim() + "]错误;";
}
}
if (!string.IsNullOrEmpty(tempData.Value8.Trim()))
{
Ins.TestCycle = tempData.Value8.Trim();
}
if (!string.IsNullOrEmpty(tempData.Value9.Trim()))
{
if (tempData.Value9.Trim() != "是" && tempData.Value9.Trim() != "否")
{
errInfo += "是否在校验期内[" + tempData.Value9.Trim() + "]错误;";
}
else
{
Ins.IsVerification = tempData.Value9.Trim() == "是" ? true : false;
}
}
else
{
errInfo += "是否在校验期内为必填项;";
}
if (!string.IsNullOrEmpty(tempData.Value10.Trim()))
{
try
{
Ins.InspectionDate = Funs.GetNewDateTime(tempData.Value10.Trim());
if (Ins.InspectionDate == null)
{
errInfo += "报验日期[" + tempData.Value10.Trim() + "]错误;";
}
}
catch (Exception)
{
errInfo += "报验日期[" + tempData.Value10.Trim() + "]错误;";
}
}
if (!string.IsNullOrEmpty(tempData.Value11.Trim()))
{
if (tempData.Value11.Trim() != "是" && tempData.Value11.Trim() != "否")
{
errInfo += "是否在场[" + tempData.Value11.Trim() + "]错误;";
}
else
{
Ins.IsOnSite = tempData.Value11.Trim() == "是" ? true : false;
}
}
else
{
errInfo += "是否在场为必填项;";
}
if (!string.IsNullOrEmpty(tempData.Value12.Trim()))
{
try
{
Ins.UnitsCount = Funs.GetNewInt(tempData.Value12.Trim());
if (Ins.UnitsCount==null)
{
errInfo += "台数[" + tempData.Value12.Trim() + "]错误;";
}
}
catch (Exception)
{
errInfo += "台数[" + tempData.Value12.Trim() + "]错误;";
}
}
if (!string.IsNullOrEmpty(tempData.Value13.Trim()))
{
if (tempData.Value13.Trim() != "是" && tempData.Value13.Trim() != "否")
{
errInfo += "校验合格[" + tempData.Value13.Trim() + "]错误;";
}
else
{
Ins.IsCheckOK = tempData.Value13.Trim() == "是" ? true : false;
}
}
else
{
errInfo += "校验合格为必填项;";
}
if (!string.IsNullOrEmpty(tempData.Value14.Trim()))
{
try
{
Ins.LeaveDate = Funs.GetNewDateTime(tempData.Value14.Trim());
if (Ins.LeaveDate==null)
{
errInfo += "离场时间[" + tempData.Value14.Trim() + "]错误;";
}
}
catch (Exception)
{
errInfo += "离场时间[" + tempData.Value14.Trim() + "]错误;";
}
}
if (!string.IsNullOrEmpty(tempData.Value15.Trim()))
{
try
{
Ins.RemarkCode = Convert.ToInt32(tempData.Value15.Trim());
if (Ins.RemarkCode == null)
{
errInfo += "标志编号[" + tempData.Value15.Trim() + "]格式错误;";
}
}
catch (Exception)
{
errInfo += "标志编号[" + tempData.Value15.Trim() + "]格式错误;";
}
}
else
{
errInfo += "标志编号为必填项;";
}
Ins.CompileMan = this.CurrUser.UserId;
Ins.CompileDate = DateTime.Now.Date;
if (string.IsNullOrEmpty(errInfo)) ////所有信息正确的话 插入数据
{
Ins.ProjectId = LoginProjectId;
var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.UnitId == Ins.UnitId
&& x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value15));
if (isExitISOValue != null) ///已存在
{
Ins.InspectionMachineId = isExitISOValue.InspectionMachineId;
BLL.InspectionMachineService.UpdateInspectionMachine(Ins);
}
else
{
Ins.Status = BLL.Const.Comprehensive_Compile;
Ins.InspectionMachineId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachine));
BLL.InspectionMachineService.AddInspectionMachine(Ins);
}
BLL.Sys_CQMS_DataInTempService.DeleteDataInTempByDataInTempID(tempData.TempId);
okCount++;
}
if (!string.IsNullOrEmpty(errInfo))
{
tempData.ToopValue = errInfo;
BLL.Sys_CQMS_DataInTempService.UpdateDataInTemp(tempData);
erreMessage += errInfo + ";";
}
}
}
}
#endregion
#region
/// <summary>
/// 删除所有数据事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAllDelete_Click(object sender, EventArgs e)
{
//先删除临时表中 该人员以前导入的数据
BLL.Sys_CQMS_DataInTempService.DeleteDataInTempByProjectIdUserId(this.CurrUser.LoginProjectId, this.CurrUser.UserId, "InspectionMachine");
this.BindGrid();
ShowNotify("删除成功!", MessageBoxIcon.Success);
this.lbDataCout.Text = string.Empty;
}
#endregion
#region
/// <summary>
/// 下载模版
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void imgbtnUpload_Click(object sender, EventArgs e)
{
string rootPath = Server.MapPath("~/");
string uploadfilepath = rootPath + Const.InspectionMachineDataInUrl;
string filePath = Const.InspectionMachineDataInUrl;
string fileName = Path.GetFileName(filePath);
FileInfo info = new FileInfo(uploadfilepath);
long fileSize = info.Length;
Response.ClearContent();
Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
Response.ContentType = "excel/plain";
Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.AddHeader("Content-Length", fileSize.ToString().Trim());
Response.TransmitFile(uploadfilepath, 0, fileSize);
Response.End();
}
#endregion
public static Dictionary<string, int> percent { get; set; }
public static Dictionary<string, string> url { get; set; }
[System.Web.Services.WebMethod]
public static int getPercent(string id)
{
return percent[id];
}
}
}

View File

@ -0,0 +1,251 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class InspectionMachineDataInNew
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// id 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField id;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdfileName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdfileName;
/// <summary>
/// FileExcel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FileUpload FileExcel;
/// <summary>
/// imgbtnImport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button imgbtnImport;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnRefresh 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnRefresh;
/// <summary>
/// btnAllDelete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAllDelete;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// imgbtnUpload 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button imgbtnUpload;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <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>
/// lbDataCout 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbDataCout;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// ContentPanel3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel3;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDelete;
/// <summary>
/// ScriptManager2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.ScriptManager ScriptManager2;
}
}

View File

@ -0,0 +1,83 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionMachineDataInNewEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.InspectionMachineDataInNewEdit" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>施工机具/计量器具报验导入编辑</title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtValue1" Label="报验单位" ShowRedStar="true" Required="true" runat="server" FocusOnPageLoad="true" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue2" Label="报验编号" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue3" Label="机具名称" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue4" Label="专业名称" runat="server" LabelWidth="120px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtValue5" Label="类型" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue6" Label="规格型号" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue7" Label="下次检验日期" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue8" Label="检验周期" runat="server" LabelWidth="120px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtValue9" Label="是否在校验期内" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
</f:TextBox>
<f:TextBox ID="txtValue10" Label="报验日期" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue11" Label="是否在场" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
</f:TextBox>
<f:TextBox ID="txtValue12" Label="台数" runat="server" LabelWidth="120px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtValue13" Label="校验合格" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
</f:TextBox>
<f:TextBox ID="txtValue14" Label="离场时间" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue15" Label="标识编号" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
</f:TextBox>
<f:CheckBox ID="ckAll" runat="server" Checked="true" Text="是否批量修改"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea runat="server" Label="错误信息" ID="lbErrCout" Readonly="true" LabelWidth="120px"></f:TextArea>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</form>
</body>
</html>

View File

@ -0,0 +1,291 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class InspectionMachineDataInNewEdit : PageBase
{
#region
/// <summary>
/// 临时表主键
/// </summary>
public string TempId
{
get
{
return (string)ViewState["TempId"];
}
set
{
ViewState["TempId"] = value;
}
}
#endregion
#region
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.TempId = Request.Params["TempId"];
this.txtValue1.Focus();
var dataInTemp = BLL.Sys_CQMS_DataInTempService.GetDataInTempByTempId(this.TempId);
if (dataInTemp != null)
{
this.txtValue1.Text = dataInTemp.Value1;
this.txtValue2.Text = dataInTemp.Value2;
this.txtValue3.Text = dataInTemp.Value3;
this.txtValue4.Text = dataInTemp.Value4;
this.txtValue5.Text = dataInTemp.Value5;
this.txtValue6.Text = dataInTemp.Value6;
this.txtValue7.Text = dataInTemp.Value7;
this.txtValue8.Text = dataInTemp.Value8;
this.txtValue9.Text = dataInTemp.Value9;
this.txtValue10.Text = dataInTemp.Value10;
this.txtValue11.Text = dataInTemp.Value11;
this.txtValue12.Text = dataInTemp.Value12;
this.txtValue13.Text = dataInTemp.Value13;
this.txtValue14.Text = dataInTemp.Value14;
this.txtValue15.Text = dataInTemp.Value15;
this.lbErrCout.Text = dataInTemp.ToopValue;
}
}
}
#endregion
#region
/// <summary>
/// 保存按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
var dataInTemp = BLL.Sys_CQMS_DataInTempService.GetDataInTempByTempId(this.TempId);
if (this.ckAll.Checked)
{
var allDataInTemp = from x in Funs.DB.Sys_CQMS_DataInTemp where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId && x.Type == "InspectionMachine" select x;
if (dataInTemp.Value1 != this.txtValue1.Text.Trim())
{
var tempValue1 = allDataInTemp.Where(x => x.Value1 == dataInTemp.Value1 || (x.Value1 == null && dataInTemp.Value1 == null));
if (tempValue1 != null)
{
foreach (var item in tempValue1)
{
item.Value1 = this.txtValue1.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value2 != this.txtValue2.Text.Trim())
{
var tempValue2 = allDataInTemp.Where(x => x.Value2 == dataInTemp.Value2 || (x.Value2 == null && dataInTemp.Value2 == null));
if (tempValue2 != null)
{
foreach (var item in tempValue2)
{
item.Value2 = this.txtValue2.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value3 != this.txtValue3.Text.Trim())
{
var tempValue3 = allDataInTemp.Where(x => x.Value3 == dataInTemp.Value3 || (x.Value3 == null && dataInTemp.Value3 == null));
if (tempValue3 != null)
{
foreach (var item in tempValue3)
{
item.Value3 = this.txtValue3.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value5 != this.txtValue5.Text.Trim())
{
var tempValue5 = allDataInTemp.Where(x => x.Value5 == dataInTemp.Value5 || (x.Value5 == null && dataInTemp.Value5 == null));
if (tempValue5 != null)
{
foreach (var item in tempValue5)
{
item.Value5 = this.txtValue5.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value6 != this.txtValue6.Text.Trim())
{
var tempValue6 = allDataInTemp.Where(x => x.Value6 == dataInTemp.Value6 || (x.Value6 == null && dataInTemp.Value6 == null));
if (tempValue6 != null)
{
foreach (var item in tempValue6)
{
item.Value6 = this.txtValue6.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value7 != this.txtValue7.Text.Trim())
{
var tempValue7 = allDataInTemp.Where(x => x.Value7 == dataInTemp.Value7 || (x.Value7 == null && dataInTemp.Value7 == null));
if (tempValue7 != null)
{
foreach (var item in tempValue7)
{
item.Value7 = this.txtValue7.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value8 != this.txtValue8.Text.Trim())
{
var tempValue8 = allDataInTemp.Where(x => x.Value8 == dataInTemp.Value8 || (x.Value8 == null && dataInTemp.Value8 == null));
if (tempValue8 != null)
{
foreach (var item in tempValue8)
{
item.Value8 = this.txtValue8.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value9 != this.txtValue9.Text.Trim())
{
var tempValue9 = allDataInTemp.Where(x => x.Value9 == dataInTemp.Value9 || (x.Value9 == null && dataInTemp.Value9 == null));
if (tempValue9 != null)
{
foreach (var item in tempValue9)
{
item.Value9 = this.txtValue9.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value10 != this.txtValue10.Text.Trim())
{
var tempValue10 = allDataInTemp.Where(x => x.Value10 == dataInTemp.Value10 || (x.Value10 == null && dataInTemp.Value10 == null));
if (tempValue10 != null)
{
foreach (var item in tempValue10)
{
item.Value10 = this.txtValue10.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value11 != this.txtValue11.Text.Trim())
{
var tempValue11 = allDataInTemp.Where(x => x.Value11 == dataInTemp.Value11 || (x.Value11 == null && dataInTemp.Value11 == null));
if (tempValue11 != null)
{
foreach (var item in tempValue11)
{
item.Value11 = this.txtValue11.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value12 != this.txtValue12.Text.Trim())
{
var tempValue12 = allDataInTemp.Where(x => x.Value12 == dataInTemp.Value12 || (x.Value12 == null && dataInTemp.Value12 == null));
if (tempValue12 != null)
{
foreach (var item in tempValue12)
{
item.Value12 = this.txtValue12.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value13 != this.txtValue13.Text.Trim())
{
var tempValue13 = allDataInTemp.Where(x => x.Value13 == dataInTemp.Value13 || (x.Value13 == null && dataInTemp.Value13 == null));
if (tempValue13 != null)
{
foreach (var item in tempValue13)
{
item.Value13 = this.txtValue13.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value14 != this.txtValue14.Text.Trim())
{
var tempValue14 = allDataInTemp.Where(x => x.Value14 == dataInTemp.Value14 || (x.Value14 == null && dataInTemp.Value14 == null));
if (tempValue14 != null)
{
foreach (var item in tempValue14)
{
item.Value14 = this.txtValue14.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value15 != this.txtValue15.Text.Trim())
{
var tempValue15 = allDataInTemp.Where(x => x.Value15 == dataInTemp.Value15 || (x.Value15 == null && dataInTemp.Value15 == null));
if (tempValue15 != null)
{
foreach (var item in tempValue15)
{
item.Value15 = this.txtValue15.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue);
if (toopValue != null)
{
foreach (var item in toopValue)
{
item.ToopValue = null;
Funs.DB.SubmitChanges();
}
}
}
else
{
Model.Sys_CQMS_DataInTemp newDataInTemp = new Model.Sys_CQMS_DataInTemp();
newDataInTemp.ProjectId = this.CurrUser.ProjectId;
newDataInTemp.UserId = this.CurrUser.UserId;
newDataInTemp.Time = System.DateTime.Now;
newDataInTemp.Type = "InspectionMachine";
newDataInTemp.Value1 = this.txtValue1.Text.Trim();
newDataInTemp.Value2 = this.txtValue2.Text.Trim();
newDataInTemp.Value3 = this.txtValue3.Text.Trim();
newDataInTemp.Value4 = this.txtValue4.Text.Trim();
newDataInTemp.Value5 = this.txtValue5.Text.Trim();
newDataInTemp.Value6 = this.txtValue6.Text.Trim();
newDataInTemp.Value7 = this.txtValue7.Text.Trim();
newDataInTemp.Value8 = this.txtValue8.Text.Trim();
newDataInTemp.Value9 = this.txtValue9.Text.Trim();
newDataInTemp.Value10 = this.txtValue10.Text.Trim();
newDataInTemp.Value11 = this.txtValue11.Text.Trim();
newDataInTemp.Value12 = this.txtValue12.Text.Trim();
newDataInTemp.Value13 = this.txtValue13.Text.Trim();
newDataInTemp.Value14 = this.txtValue14.Text.Trim();
newDataInTemp.Value15 = this.txtValue15.Text.Trim();
if (!string.IsNullOrEmpty(this.TempId))
{
newDataInTemp.TempId = this.TempId;
newDataInTemp.ToopValue = null;
BLL.Sys_CQMS_DataInTempService.UpdateDataInTemp(newDataInTemp);
}
}
ShowNotify("信息修改完成!", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
#endregion
}
}

View File

@ -0,0 +1,224 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class InspectionMachineDataInNewEdit
{
/// <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>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// txtValue1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue1;
/// <summary>
/// txtValue2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue2;
/// <summary>
/// txtValue3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue3;
/// <summary>
/// txtValue4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue4;
/// <summary>
/// txtValue5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue5;
/// <summary>
/// txtValue6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue6;
/// <summary>
/// txtValue7 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue7;
/// <summary>
/// txtValue8 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue8;
/// <summary>
/// txtValue9 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue9;
/// <summary>
/// txtValue10 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue10;
/// <summary>
/// txtValue11 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue11;
/// <summary>
/// txtValue12 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue12;
/// <summary>
/// txtValue13 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue13;
/// <summary>
/// txtValue14 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue14;
/// <summary>
/// txtValue15 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue15;
/// <summary>
/// ckAll 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckAll;
/// <summary>
/// lbErrCout 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea lbErrCout;
}
}

View File

@ -79,7 +79,7 @@
bordercolor="#bcd2e7" bordercolordark="#bcd2e7" bordercolorlight="#bcd2e7">
<tr>
<td align="center" style="width: 24%;" rowspan="2">
<img alt="" src="../../Images/Logo.jpg" />
<img alt="" src="../../Images/NewLogo.jpg" width="380" height="120" />
</td>
<td align="center" style="width: 46%; height: 30px; vertical-align: middle; font-size: 12pt;">
<asp:Label ID="lblProjectName" runat="server"></asp:Label>

View File

@ -2868,6 +2868,167 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ShowNotify("编辑成功!", MessageBoxIcon.Success);
//PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId);
if (weekAndMonthReport != null)
{
if (weekAndMonthReport.SortId != null)
{
this.txtPeriod.Text = Convert.ToString(weekAndMonthReport.SortId);
}
if (weekAndMonthReport.StartDate != null)
{
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.StartDate);
}
if (weekAndMonthReport.EndDate != null)
{
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.EndDate);
}
}
AddOrUpdate = "update";
#region
detailsGrid1.Clear();
detailsGrid1 = (from x in db.Report_CqmsTarget
where x.ReportId == this.ReportId
orderby x.SortId
select x).ToList();
if (detailsGrid1.Count > 0)
{
Grid1.Hidden = false;
Grid1.DataSource = detailsGrid1;
Grid1.DataBind();
}
#endregion
#region 7.2 PQR/WPS报验情况
var detailsGrid9 = (from x in db.Report_Construction_Plan
where x.ReportId == ReportId && x.ReType == "5"
select x).ToList();
if (detailsGrid9.Count > 0)
{
Grid9.Hidden = false;
Grid9.DataSource = detailsGrid9;
Grid9.DataBind();
}
if (!string.IsNullOrEmpty(Request.Params["view"]))
{
//查看页面
Button4.Hidden = true;
Button3.Hidden = true;
//合计
OutPutSummaryGrid9();
Grid1.FindColumn("Delete1").Hidden = true;
Grid9.FindColumn("Delete9").Hidden = true;
}
#endregion
#region 18.
//(1)原材料问题
rowMaterialProblemLists.Clear();
rowMaterialProblemLists = (from x in db.Report_RowMaterialProblem
where x.ReportId == this.ReportId
select x).ToList();
if (rowMaterialProblemLists.Count > 0)
{
gvRowMaterialProblem.Hidden = false;
gvRowMaterialProblem.DataSource = rowMaterialProblemLists;
gvRowMaterialProblem.DataBind();
}
//(2)施工过程问题
constructionProblemsLists.Clear();
constructionProblemsLists = (from x in db.Report_ConstructionProblems
where x.ReportId == this.ReportId
select x).ToList();
if (constructionProblemsLists.Count > 0)
{
gvConstructionProblems.Hidden = false;
gvConstructionProblems.DataSource = constructionProblemsLists;
gvConstructionProblems.DataBind();
}
#endregion
#region 19.
nextQualityControlLists.Clear();
nextQualityControlLists = (from x in db.Report_NextQualityControl
where x.ReportId == this.ReportId
select x).ToList();
if (nextQualityControlLists.Count > 0)
{
gvNextQualityControl.Hidden = false;
gvNextQualityControl.DataSource = nextQualityControlLists;
gvNextQualityControl.DataBind();
}
#endregion
#region
var txtReportList = db.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
if (txtReportList.Count > 0)
{
if (txtReportList.FirstOrDefault(x => x.ContentType == "0") != null)
{
txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "1") != null)
{
txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "2") != null)
{
txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "20") != null)
{
txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "21") != null)
{
txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "22") != null)
{
txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "8") != null)
{
txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-1") != null)
{
imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-2") != null)
{
imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-3") != null)
{
imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-4") != null)
{
imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-5") != null)
{
imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-6") != null)
{
imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
}
}
#endregion
//加载所有grid
lodAllGrid("1");
}
private void SaveMethod()
@ -2904,7 +3065,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//CqmsTargetService.Delete(ReportId);
//所有文本框表
TextBoxContentService.Delete(ReportId);
//TextBoxContentService.Delete(ReportId);
//删除施工方案及检验试验计划审批情况
//BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId);
@ -2997,7 +3158,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region
void saveTarget()
{
CqmsTargetService.Delete(ReportId);//本月质量目标管理情况
List<Model.Report_CqmsTarget> detailLists = new List<Model.Report_CqmsTarget>();
JArray teamGroupData = Grid1.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3006,7 +3166,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
ReportId = ReportId,
ProStage = values.Value<string>("ProStage"),
ProDescribe = values.Value<string>("ProDescribe"),
@ -3015,16 +3175,24 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Remarks = values.Value<string>("Remarks"),
SortId = rowIndex + 1
};
//if (Grid1.Rows[rowIndex].DataKeys.Length > 0)
//{
// newDetail.Id = Grid1.Rows[rowIndex].DataKeys[0].ToString();
//}
if (Grid1.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.Id = Grid1.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
db.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
CqmsTargetService.Delete(ReportId);//本月质量目标管理情况
db.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
@ -3032,7 +3200,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region PQR/WPS报验情况
void savePqrWps()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "5");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid9.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3057,8 +3224,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "5");
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
@ -3069,7 +3244,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveYbsgfa()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "0");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid2.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3094,8 +3268,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "0");
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
@ -3104,7 +3286,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveWdgcfa()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "1");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid3.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3130,8 +3311,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "1");
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
@ -3140,7 +3329,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveJysyjh()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "2");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid4.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3165,8 +3353,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "2");
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
@ -3177,7 +3373,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveSjjd()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "3");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid5.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3202,8 +3397,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "3");
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
@ -3214,7 +3417,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveTzhs()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "4");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid6.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3239,8 +3441,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "4");
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
@ -3251,7 +3461,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveSbclBy()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "6");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid11.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3277,8 +3486,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "6");
db.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
@ -3341,15 +3558,22 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
model8.ContentText = txtAre8.Text;
txtContentList.Add(model8);
#endregion
db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
db.SubmitChanges();
try
{
TextBoxContentService.Delete(ReportId);
db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
#endregion
#region 9.
void saveMeasuringInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "9");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvMeasuringInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3375,8 +3599,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "9");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
@ -3384,7 +3616,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10.
void saveTjInspection() //检验批统计:土建
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-1");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvTj.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3412,13 +3643,20 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-1");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
void saveSbInspection() //检验批统计:设备
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-2");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvSb.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3446,13 +3684,20 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-2");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
void saveGDInspection() //检验批统计:管道
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-3");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvGD.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3480,14 +3725,21 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-3");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
void saveDQInspection() //检验批统计:电气
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-4");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvDq.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3517,13 +3769,20 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-4");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
void saveYBInspection() //检验批统计:仪表
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-5");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvYb.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3553,13 +3812,20 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-5");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
void saveFFInspection() //检验批统计:防腐
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-6");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvFf.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3589,13 +3855,20 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-6");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
void saveXFInspection() //检验批统计:消防
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-7");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvXf.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3625,13 +3898,20 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-7");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
void saveInspectionDataInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvInspectionDataInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3663,17 +3943,23 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
#region 11.
void savePressureInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "11");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvPressureInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3700,17 +3986,23 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "11");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
#region 12.
void savePipingInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "12");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvPipingInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3737,8 +4029,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "12");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
@ -3747,7 +4047,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 13.
void saveSpecialInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "13");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvSpecialInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3774,17 +4073,23 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "13");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
#region 14.NCR管理情况
void saveNcrManagementInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "14");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvNcrManagementInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3810,9 +4115,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "14");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
@ -3823,7 +4135,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveQualityInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "1");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvQualityInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3849,8 +4160,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "1");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
@ -3861,7 +4180,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveSpecialCheck()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "2");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvSpecialCheck.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3886,8 +4204,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "2");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
@ -3898,7 +4224,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveFileReport()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "3");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvFileReport.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3924,8 +4249,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "3");
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
@ -3936,7 +4269,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveRowMaterialProblem()
{
BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
List<Model.Report_RowMaterialProblem> detailLists = new List<Model.Report_RowMaterialProblem>();
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3961,8 +4293,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_RowMaterialProblem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
db.Report_RowMaterialProblem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
@ -3971,7 +4312,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveConstructionProblems()
{
BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId);
List<Model.Report_ConstructionProblems> detailLists = new List<Model.Report_ConstructionProblems>();
JArray teamGroupData = gvConstructionProblems.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3996,8 +4336,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_ConstructionProblems.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId);
db.Report_ConstructionProblems.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
@ -4009,7 +4357,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveNextQualityControl()
{
BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId);
List<Model.Report_NextQualityControl> detailLists = new List<Model.Report_NextQualityControl>();
JArray teamGroupData = gvNextQualityControl.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -4030,8 +4377,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_NextQualityControl.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
try
{
BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId);
db.Report_NextQualityControl.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
}
#endregion
@ -4088,8 +4443,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
imgage6.ImageUrl = imgPhoto6.ImageUrl.Substring(imgPhoto6.ImageUrl.IndexOf("/") + 1);
ImageLists.Add(imgage6);
db.Report_TextBoxContent.InsertAllOnSubmit(ImageLists);
db.SubmitChanges();
try
{
db.Report_TextBoxContent.InsertAllOnSubmit(ImageLists);
db.SubmitChanges();
}
catch (Exception)
{
return;
}
}
#endregion

View File

@ -465,6 +465,8 @@
<Content Include="CQMS\Comprehensive\InspectionMachine.aspx" />
<Content Include="CQMS\Comprehensive\InspectionMachineApprove.aspx" />
<Content Include="CQMS\Comprehensive\InspectionMachineDataIn.aspx" />
<Content Include="CQMS\Comprehensive\InspectionMachineDataInNew.aspx" />
<Content Include="CQMS\Comprehensive\InspectionMachineDataInNewEdit.aspx" />
<Content Include="CQMS\Comprehensive\InspectionMachineEdit.aspx" />
<Content Include="CQMS\Comprehensive\InspectionPerson.aspx" />
<Content Include="CQMS\Comprehensive\InspectionPersonApprove.aspx" />
@ -1387,6 +1389,7 @@
<Content Include="Images\msc_cntr_1.txt" />
<Content Include="Images\msc_cntr_2.txt" />
<Content Include="Images\msc_cntr_3.txt" />
<Content Include="Images\NewLogo.jpg" />
<Content Include="Images\Null.jpg" />
<Content Include="Images\Null.png" />
<Content Include="Images\Organization.gif" />
@ -7714,6 +7717,20 @@
<Compile Include="CQMS\Comprehensive\InspectionMachineDataIn.aspx.designer.cs">
<DependentUpon>InspectionMachineDataIn.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\Comprehensive\InspectionMachineDataInNew.aspx.cs">
<DependentUpon>InspectionMachineDataInNew.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\Comprehensive\InspectionMachineDataInNew.aspx.designer.cs">
<DependentUpon>InspectionMachineDataInNew.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\Comprehensive\InspectionMachineDataInNewEdit.aspx.cs">
<DependentUpon>InspectionMachineDataInNewEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\Comprehensive\InspectionMachineDataInNewEdit.aspx.designer.cs">
<DependentUpon>InspectionMachineDataInNewEdit.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\Comprehensive\InspectionMachineEdit.aspx.cs">
<DependentUpon>InspectionMachineEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB