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

班前会日期 物质管理过滤

This commit is contained in:
杨家亮 2025-06-05 14:49:02 +08:00
parent a6d41b44f5
commit fcb9ebe8db
3 changed files with 76 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -7372,3 +7372,54 @@ IP地址:::1
出错时间:05/14/2025 17:37:21
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.HSSE.Meeting.ClassMeeting.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\HSSE\Meeting\ClassMeeting.aspx.cs:行号 40
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:06/04/2025 09:55:34
出错文件:http://localhost:4528/HSSE/Meeting/ClassMeeting.aspx
IP地址:::1
出错时间:06/04/2025 09:55:34
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.HSSE.Meeting.ClassMeeting.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\HSSE\Meeting\ClassMeeting.aspx.cs:行号 40
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:06/04/2025 10:21:52
出错文件:http://localhost:4528/HSSE/Meeting/ClassMeeting.aspx
IP地址:::1
出错时间:06/04/2025 10:21:52
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.HSSE.Meeting.ClassMeeting.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\HSSE\Meeting\ClassMeeting.aspx.cs:行号 40
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:06/05/2025 14:16:02
出错文件:http://localhost:4528/HSSE/Meeting/ClassMeeting.aspx
IP地址:::1
出错时间:06/05/2025 14:16:02

6
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs
View File

@ -89,12 +89,12 @@ namespace FineUIPro.Web.HSSE.Meeting
}
if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
{
strSql += " AND ClassMeeting.CompileDate >= @StartTime";
strSql += " AND ClassMeeting.ClassMeetingDate >= @StartTime";
listStr.Add(new SqlParameter("@StartTime", string.Format("{0} {1}", this.txtStartTime.Text.Trim(), "00:00:00")));
}
if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
{
strSql += " AND ClassMeeting.CompileDate <= @EndTime ORDER BY TeamGroupId ASC";
strSql += " AND ClassMeeting.ClassMeetingDate <= @EndTime ORDER BY TeamGroupId ASC";
listStr.Add(new SqlParameter("@EndTime", string.Format("{0} {1}", this.txtEndTime.Text.Trim(), "23:59:59")));
}
SqlParameter[] parameter = listStr.ToArray();
@ -216,7 +216,7 @@ namespace FineUIPro.Web.HSSE.Meeting
DateTime end = DateTime.Parse(string.Format("{0} 23:59:59", this.txtEndTime.Text.Trim()));
try
{
str = Funs.DB.Meeting_ClassMeeting.Where(x => x.TeamGroupId == groupId && x.CompileDate >= start && x.CompileDate <= end && x.ProjectId == this.CurrUser.LoginProjectId).Sum(p => p.AttentPersonNum).ToString();
str = Funs.DB.Meeting_ClassMeeting.Where(x => x.TeamGroupId == groupId && x.ClassMeetingDate >= start && x.ClassMeetingDate <= end && x.ProjectId == this.CurrUser.LoginProjectId).Sum(p => p.AttentPersonNum).ToString();
}
catch (Exception ex)
{

23
SGGL/WebAPI/Controllers/MaterialsBasicsController.cs
View File

@ -137,17 +137,14 @@ namespace WebAPI.Controllers
Model.ResponeData responeData = new Model.ResponeData();
try
{
var list = (
from cl in Funs.DB.Cl_w_comp
join bm in Funs.DB.CL_B_Material on cl.MaterialID equals bm.MaterialID
join bi in Funs.DB.Cl_b_Installation on cl.InstallationId equals bi.InstallationId
where cl.ProjectId == ProjectId && cl.InstallationId == InstallationId && cl.Ghfs == ghfs && cl.TAreaMaterialMID == area
var list = (from bm in Funs.DB.CL_B_Material
where bm.ProjectId == ProjectId
select new
{
ProjectId = cl.ProjectId, // 项目ID
InstallationId = cl.InstallationId, // 专业ID
Installationname = bi.InstallationName, // 专业名称
ghfs = cl.Ghfs, // 采购方类别
ProjectId = bm.ProjectId, // 项目ID
InstallationId = Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).InstallationId, // 专业ID
Installationname = Funs.DB.Cl_b_Installation.FirstOrDefault(x => x.InstallationId == InstallationId).InstallationName, // 专业名称
ghfs = Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).Ghfs, // 采购方类别
MaterialID = bm.MaterialID, // 物资ID
MaterialName = bm.MaterialName, // 物资名称
Specificationtype = bm.Specificationtype, // 规格
@ -156,10 +153,10 @@ namespace WebAPI.Controllers
MaterialQuality = bm.MaterialQuality,
Unit = bm.Unit, // 单位
SystemCode = bm.SystemCode, // 编号
AreaCode = cl.TAreaMaterialMID, // 工区
jh_quantity = cl.Pquantity, // 计划量
ck_quantity = cl.Pquantity - cl.OQuantity, // 最大允许出库量
kc_quantity = cl.SQuantity - cl.OQuantity + cl.RQuantity - cl.HQuantity // 库存量
AreaCode = Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).TAreaMaterialMID, // 工区
jh_quantity = Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).Pquantity, // 计划量
ck_quantity = Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).Pquantity - Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).OQuantity, // 最大允许出库量
kc_quantity = Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).SQuantity - Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).OQuantity + Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).RQuantity - Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).HQuantity // 库存量
}
).ToList();
responeData.data = list;