This commit is contained in:
gaofei
2022-06-06 11:23:24 +08:00
parent d33b007348
commit e1cca47076
44 changed files with 6410 additions and 383 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ namespace FineUIPro.Web
{
public class PageBase : System.Web.UI.Page
{
/// <summary>
/// <summary>
/// 当前登录人信息。
/// </summary>
public Model.Sys_User CurrUser
+28 -6
View File
@@ -11,7 +11,7 @@
<style>
.wrap {
height: 100%;
padding: 15px;
padding: 15px;
}
.top-wrap {
@@ -331,6 +331,12 @@
</form>
<input id="hdContractQuantitySheets" type="hidden" runat="server" />
<input id="hdMaterialRecords" type="hidden" runat="server" />
<input id="hdTotalQuantity" type="hidden" runat="server" />
<input id="hdQuantity" type="hidden" runat="server" />
<input id="hdOneOKRate" type="hidden" runat="server" />
<input id="hdPressurePackageList" type="hidden" runat="server" />
<input id="hdNdtList" type="hidden" runat="server" />
<input id="hdTailItemList" type="hidden" runat="server" />
</div>
<div class="bw-item-content flex1 pdtb0">
<div class="" style="padding: 0 10px 0; overflow: hidden;">
@@ -427,9 +433,17 @@
<div class="spline"></div>
<div class="t-item ">材料出库情况</div>
<div class="spline"></div>
<div class="t-item">建筑单位工程</div>
<div class="t-item">管道焊接工程</div>
<div class="spline"></div>
<div class="t-item">专业</div>
<div class="t-item">焊接工程量表</div>
<div class="spline"></div>
<div class="t-item">无损检测一次合格率</div>
<div class="spline"></div>
<div class="t-item">试压包量表</div>
<div class="spline"></div>
<div class="t-item">无损检测量表</div>
<div class="spline"></div>
<div class="t-item">尾项清单量表</div>
</div>
</div>
<div class="bw-item-content flex1 flex jd-list-wrap">
@@ -553,7 +567,7 @@
</div>
</div>
</div>
<div class="more js-more-1">更多</div>
<%--<div class="more js-more-1">更多</div>--%>
</div>
</div>
@@ -928,9 +942,17 @@
} else if (index == 2) {
$('#divGZL').html($('#hdMaterialRecords')[0].value);
} else if (index == 4) {
$('#divGZL').html($('#hdTotalQuantity')[0].value);
} else if (index == 6) {
$('#divGZL').html($('#hdQuantity')[0].value);
} else if (index == 8) {
$('#divGZL').html($('#hdOneOKRate')[0].value);
} else if (index == 10) {
$('#divGZL').html($('#hdPressurePackageList')[0].value);
} else if (index == 12) {
$('#divGZL').html($('#hdNdtList')[0].value);
} else if (index == 14) {
$('#divGZL').html($('#hdTailItemList')[0].value);
}
}
})
+151 -4
View File
@@ -98,12 +98,12 @@ namespace FineUIPro.Web.common
i++;
}
}
this.divGZL.InnerHtml= contractQuantitySheetsStr;
this.divGZL.InnerHtml = contractQuantitySheetsStr;
this.hdContractQuantitySheets.Value = contractQuantitySheetsStr;
//材料出库情况
string materialRecordsStr = string.Empty;
var materialRecords= from x in db.CLGL_PickMaterialRecord where x.ProjectId == projectId.ToString() && cnNames.Contains(x.Major) select x;
if (contractQuantitySheets.Count() > 0)
var materialRecords = from x in db.CLGL_PickMaterialRecord where x.ProjectId == projectId.ToString() && cnNames.Contains(x.Major) select x;
if (materialRecords.Count() > 0)
{
materialRecordsStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>领料单号</div><div class='item jd-title'>领料时间</div><div class='item jd-title'>领料单位</div><div class='item jd-title'>领料截止时间</div><div class='item jd-title'>专业</div><div class='item jd-title'>材料编码</div><div class='item jd-title'>位号</div><div class='item jd-title'>申领量</div><div class='item jd-title'>批准量</div><div class='item jd-title'>实发量</div><div class='item jd-title'>装置号</div><div class='item jd-title'>主项号</div><div class='item jd-title'>发料备注</div></div>";
int i = 1;
@@ -112,7 +112,7 @@ namespace FineUIPro.Web.common
materialRecordsStr += "<div class='jd-item'><div class='item'>"
+ i + "</div><div class='item'>"
+ item.PickCode + "</div><div class='item'>"
+ (item.PickDate.HasValue?string.Format("{0:yyyy-MM-dd}", item.PickDate.Value) :"") + "</div><div class='item'>"
+ (item.PickDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.PickDate.Value) : "") + "</div><div class='item'>"
+ item.PickUnit + "</div><div class='item'>"
+ (item.PickLimitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.PickLimitDate.Value) : "") + "</div><div class='item'>"
+ item.Major + "</div><div class='item'>"
@@ -128,6 +128,153 @@ namespace FineUIPro.Web.common
}
}
this.hdMaterialRecords.Value = materialRecordsStr;
//项目管道焊接工程量
string totalQuantityStr = string.Empty;
var totalQuantitys = from x in db.HJGL_FL_TotalQuantity where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceCode select x;
if (totalQuantitys.Count() > 0)
{
totalQuantityStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>装置名称</div><div class='item jd-title'>单元号</div><div class='item jd-title'>施工单位</div><div class='item jd-title'>焊接总量</div><div class='item jd-title'>已完成总量</div></div>";
int i = 1;
foreach (var item in totalQuantitys)
{
totalQuantityStr += "<div class='jd-item'><div class='item'>"
+ i + "</div><div class='item'>"
+ item.DeviceName + "</div><div class='item'>"
+ item.DeviceCode + "</div><div class='item'>"
+ item.Unit + "</div><div class='item'>"
+ item.TotalWeldQuantity + "</div><div class='item'>"
+ item.TotalCompleted + "</div></div>";
i++;
}
}
this.hdTotalQuantity.Value = totalQuantityStr;
//焊接工程量表
string quantityStr = string.Empty;
var quantitys = from x in db.HJGL_FL_Quantity where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceNumber, x.ZoneNumber select x;
if (quantitys.Count() > 0)
{
quantityStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>装置名称</div><div class='item jd-title'>装置号</div><div class='item jd-title'>施工单位</div><div class='item jd-title'>区域号</div><div class='item jd-title'>焊接完成量</div><div class='item jd-title'>已完成量</div><div class='item jd-title'>昨日完成量</div><div class='item jd-title'>周计划量</div><div class='item jd-title'>周完成量</div></div>";
int i = 1;
foreach (var item in quantitys)
{
quantityStr += "<div class='jd-item'><div class='item'>"
+ i + "</div><div class='item'>"
+ item.DeviceName + "</div><div class='item'>"
+ item.DeviceNumber + "</div><div class='item'>"
+ item.UnitName + "</div><div class='item'>"
+ item.ZoneNumber + "</div><div class='item'>"
+ item.InchesDiameterTotal + "</div><div class='item'>"
+ item.InchesDiameterFinish + "</div><div class='item'>"
+ item.YesterdayFinish + "</div><div class='item'>"
+ item.WeekInchesDiameterPlan + "</div><div class='item'>"
+ item.WeekInchesDiameterFinish + "</div></div>";
i++;
}
}
this.hdQuantity.Value = quantityStr;
//无损检测一次合格率
string oneOKRateStr = string.Empty;
var oneOKRates = from x in db.HJGL_FL_OneOKRate where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceCode, x.ZoneCode select x;
if (oneOKRates.Count() > 0)
{
oneOKRateStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>装置名称</div><div class='item jd-title'>装置号</div><div class='item jd-title'>单元号</div><div class='item jd-title'>施工单位</div><div class='item jd-title'>检测焊口数量</div><div class='item jd-title'>一次合格数量</div><div class='item jd-title'>一次检测合格率</div><div class='item jd-title'>一次拍片总量</div><div class='item jd-title'>一次拍片合格量</div><div class='item jd-title'>一次拍片合格率</div></div>";
int i = 1;
foreach (var item in oneOKRates)
{
oneOKRateStr += "<div class='jd-item'><div class='item'>"
+ i + "</div><div class='item'>"
+ item.DeviceName + "</div><div class='item'>"
+ item.DeviceCode + "</div><div class='item'>"
+ item.ZoneCode + "</div><div class='item'>"
+ item.UnitName + "</div><div class='item'>"
+ item.TestWeldAmount + "</div><div class='item'>"
+ item.OnceQualifiedQuantity + "</div><div class='item'>"
+ item.OneOKRate + "</div><div class='item'>"
+ item.OneTimeFilmAmount + "</div><div class='item'>"
+ item.OneTimeFilmQualifiedAmount + "</div><div class='item'>"
+ item.OneOKFilmRate + "</div></div>";
i++;
}
}
this.hdOneOKRate.Value = oneOKRateStr;
//试压包量表
string pressurePackageListStr = string.Empty;
var pressurePackageLists = from x in db.HJGL_FL_PressurePackageList where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceNumber select x;
if (pressurePackageLists.Count() > 0)
{
pressurePackageListStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>装置名称</div><div class='item jd-title'>装置号</div><div class='item jd-title'>施工单位</div><div class='item jd-title'>试压包总量</div><div class='item jd-title'>试压包完成量</div><div class='item jd-title'>水压包总量</div><div class='item jd-title'>水压包完成量</div><div class='item jd-title'>观察包总量</div><div class='item jd-title'>观察包完成量</div><div class='item jd-title'>运行包总量</div><div class='item jd-title'>运行包完成量</div><div class='item jd-title'>替代包总量</div><div class='item jd-title'>替代包完成量</div></div>";
int i = 1;
foreach (var item in pressurePackageLists)
{
pressurePackageListStr += "<div class='jd-item'><div class='item'>"
+ i + "</div><div class='item'>"
+ item.DeviceName + "</div><div class='item'>"
+ item.DeviceNumber + "</div><div class='item'>"
+ item.UnitName + "</div><div class='item'>"
+ item.PressurePackageTotalNum + "</div><div class='item'>"
+ item.CompletePressurePackageNum + "</div><div class='item'>"
+ item.WaterPressurePackageTotalNum + "</div><div class='item'>"
+ item.CompleteWaterPressurePackageCompleteNum + "</div><div class='item'>"
+ item.ObservePackageTotalNum + "</div><div class='item'>"
+ item.CompleteObservePackageNum + "</div><div class='item'>"
+ item.RunPackageTotalNum + "</div><div class='item'>"
+ item.CompleteRunPackageNum + "</div><div class='item'>"
+ item.AlternativePackageTotalNum + "</div><div class='item'>"
+ item.CompleteAlternativePackageNum + "</div></div>";
i++;
}
}
this.hdPressurePackageList.Value = pressurePackageListStr;
//无损检测量表
string ndtListStr = string.Empty;
var ndtLists = from x in db.HJGL_FL_NdtList where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceNumber, x.ZoneCode select x;
if (ndtLists.Count() > 0)
{
ndtListStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>装置名称</div><div class='item jd-title'>装置号</div><div class='item jd-title'>单元号</div><div class='item jd-title'>施工单位</div><div class='item jd-title'>理论检测焊口总量</div><div class='item jd-title'>检测焊口数量</div><div class='item jd-title'>一次合格数量</div><div class='item jd-title'>一次拍片总量</div><div class='item jd-title'>一次拍片合格量</div></div>";
int i = 1;
foreach (var item in ndtLists)
{
ndtListStr += "<div class='jd-item'><div class='item'>"
+ i + "</div><div class='item'>"
+ item.DeviceName + "</div><div class='item'>"
+ item.DeviceNumber + "</div><div class='item'>"
+ item.ZoneCode + "</div><div class='item'>"
+ item.UnitName + "</div><div class='item'>"
+ item.TheoreticalWeldedJointsTotal + "</div><div class='item'>"
+ item.TestWeldAmount + "</div><div class='item'>"
+ item.OnceQualifiedQuantity + "</div><div class='item'>"
+ item.OneTimeFilmAmount + "</div><div class='item'>"
+ item.OneTimeFilmQualifiedAmount + "</div></div>";
i++;
}
}
this.hdNdtList.Value = ndtListStr;
//无损检测量表
string tailItemListStr = string.Empty;
var tailItemLists = from x in db.HJGL_FL_TailItemList where x.ProjectId == this.CurrUser.LoginProjectId orderby x.DeviceName, x.DeviceNumber select x;
if (tailItemLists.Count() > 0)
{
tailItemListStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>装置名称</div><div class='item jd-title'>装置号</div><div class='item jd-title'>施工单位</div><div class='item jd-title'>剩余焊接焊口数</div><div class='item jd-title'>热处理数</div><div class='item jd-title'>硬度检测数</div><div class='item jd-title'>无损检测对接未完数</div><div class='item jd-title'>无损检测角接未完数</div><div class='item jd-title'>无损检测支管未完数</div><div class='item jd-title'>现场检查A类</div><div class='item jd-title'>现场检查B类</div></div>";
int i = 1;
foreach (var item in tailItemLists)
{
tailItemListStr += "<div class='jd-item'><div class='item'>"
+ i + "</div><div class='item'>"
+ item.DeviceName + "</div><div class='item'>"
+ item.DeviceNumber + "</div><div class='item'>"
+ item.UnitName + "</div><div class='item'>"
+ item.RemainingWeldsNumber + "</div><div class='item'>"
+ item.HeatTreatmentsNumber + "</div><div class='item'>"
+ item.HardnessTestsNumber + "</div><div class='item'>"
+ item.UnfinishedButtNumber + "</div><div class='item'>"
+ item.UnfinishedCornerJointNumber + "</div><div class='item'>"
+ item.UnfinishedBranchPipeNumber + "</div><div class='item'>"
+ item.ClassAQuantity + "</div><div class='item'>"
+ item.ClassBQuantity + "</div></div>";
i++;
}
}
this.hdTailItemList.Value = tailItemListStr;
}
}
+54
View File
@@ -57,6 +57,60 @@ namespace FineUIPro.Web.common {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hdMaterialRecords;
/// <summary>
/// hdTotalQuantity 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hdTotalQuantity;
/// <summary>
/// hdQuantity 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hdQuantity;
/// <summary>
/// hdOneOKRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hdOneOKRate;
/// <summary>
/// hdPressurePackageList 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hdPressurePackageList;
/// <summary>
/// hdNdtList 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hdNdtList;
/// <summary>
/// hdTailItemList 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hdTailItemList;
/// <summary>
/// swiper2 控件。
/// </summary>
+3 -2
View File
@@ -331,6 +331,7 @@
</form>
<input id="hdContractQuantitySheets" type="hidden" runat="server" />
<input id="hdMaterialRecords" type="hidden" runat="server" />
<input id="hdTotalQuantity" type="hidden" runat="server" />
</div>
<div class="bw-item-content flex1 pdtb0">
<div class="" style="padding: 0 10px 0; overflow: hidden;">
@@ -427,7 +428,7 @@
<div class="spline"></div>
<div class="t-item ">材料出库情况</div>
<div class="spline"></div>
<div class="t-item">建筑单位工程</div>
<div class="t-item">管道焊接工程</div>
<div class="spline"></div>
<div class="t-item">专业</div>
</div>
@@ -553,7 +554,7 @@
</div>
</div>
</div>
<div class="more js-more-1">更多</div>
<%--<div class="more js-more-1">更多</div>--%>
</div>
</div>
+1 -1
View File
@@ -144,7 +144,7 @@ namespace FineUIPro.Web.common
//材料出库情况
string materialRecordsStr = string.Empty;
var materialRecords = from x in db.CLGL_PickMaterialRecord where x.ProjectId == projectId.ToString() && cnNames.Contains(x.Major) select x;
if (contractQuantitySheets.Count() > 0)
if (materialRecords.Count() > 0)
{
materialRecordsStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>领料单号</div><div class='item jd-title'>领料时间</div><div class='item jd-title'>领料单位</div><div class='item jd-title'>领料截止时间</div><div class='item jd-title'>专业</div><div class='item jd-title'>材料编码</div><div class='item jd-title'>位号</div><div class='item jd-title'>申领量</div><div class='item jd-title'>批准量</div><div class='item jd-title'>实发量</div><div class='item jd-title'>装置号</div><div class='item jd-title'>主项号</div><div class='item jd-title'>发料备注</div></div>";
int i = 1;