lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

Browse Source
This commit is contained in:
李超
2025-09-28 12:59:13 +08:00
parent 3e98402069 e8cdc5c4b7
commit d7a11fdce3
9 changed files with 72 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json
+1 -1
View File
File diff suppressed because one or more lines are too long
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+23 -12
View File
@@ -4125,20 +4125,31 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
string Quantity2Sum = String.Empty;//累计检查合格点数/累计检查点数
var inspectionUnits = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
from u in unitJoin.DefaultIfEmpty()
select new
{
c.InspectionDate,
c.ProjectId,
u.UnitId,
u.UnitName,
c.IsOnceQualified
};
//var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail
// join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
// from u in unitJoin.DefaultIfEmpty()
// select new
// {
// c.InspectionDate,
// c.ProjectId,
// u.UnitId,
// u.UnitName,
// c.IsOnceQualified
// };
var cqmsList = from c in db.ProcessControl_InspectionManagement
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
from u in unitJoin.DefaultIfEmpty()
select new
{
c.InspectionDate,
c.ProjectId,
u.UnitId,
u.UnitName,
c.IsOnceQualified
};
foreach (var item in inspectionUnits)
{
var query = from x in cqmsDetail
var query = from x in cqmsList
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId
select new
{
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+23 -12
View File
@@ -1562,20 +1562,31 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
// orderby y.UnitCode
// select new { x.UnitId, y.UnitName };
var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
from u in unitJoin.DefaultIfEmpty()
select new
{
c.CheckDate,
c.ProjectId,
u.UnitId,
u.UnitName,
c.IsOnceQualified
};
//var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail
// join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
// from u in unitJoin.DefaultIfEmpty()
// select new
// {
// c.CheckDate,
// c.ProjectId,
// u.UnitId,
// u.UnitName,
// c.IsOnceQualified
// };
var cqmsList = from c in db.ProcessControl_InspectionManagement
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
from u in unitJoin.DefaultIfEmpty()
select new
{
c.CheckDate,
c.ProjectId,
u.UnitId,
u.UnitName,
c.IsOnceQualified
};
foreach (var item in unitLists)
{
var query = from x in cqmsDetail
var query = from x in cqmsList
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId
select new
{
SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
+1
View File
@@ -95,6 +95,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
if (attachFile != null)
{
CNCECPath = !string.IsNullOrWhiteSpace(CNCECPath) ? CNCECPath : "https://qhse.cncecoa.com/QHSE/";
url = BLL.UploadAttachmentService.ShowImage(CNCECPath, attachFile.AttachUrl);
}
}
SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs
+3 -3
View File
@@ -165,7 +165,7 @@ namespace FineUIPro.Web.DataShow
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue)
{
@@ -187,7 +187,7 @@ namespace FineUIPro.Web.DataShow
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
if (datetime1.HasValue)
{
@@ -209,7 +209,7 @@ namespace FineUIPro.Web.DataShow
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue)
SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx
+2 -7
View File
@@ -101,13 +101,8 @@
<f:Tab ID="Tab2" Title="下周计划" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" TitleToolTip="下周计划"
runat="server">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="周进度计划" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="WeekPlanId" AllowCellEditing="true" ForceFit="true" Height="500px"
ClicksToEdit="1" DataIDField="WeekPlanId" AllowSorting="true" SortField="SortIndex"
SortDirection="ASC" EnableColumnLines="true"
PageSize="1000"
AllowFilters="true" EnableTextSelection="True">
<f:Grid ID="Grid1" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false" Height="500px" PageSize="1000"
DataKeyNames="WeekPlanId" DataIDField="WeekPlanId" EnableColumnLines="true" ForceFit="true" AllowCellEditing="true" ClicksToEdit="1">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">