lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

预制组件编号不能为空,无损监测委托单排序混乱,散件出库时对于已出散件需要过滤，新增时不再显示。

Browse Source
This commit is contained in:
李超
2025-02-07 16:01:49 +08:00
parent 7eb0c0d59c
commit 012194002e
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
+1
View File
@@ -376,6 +376,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
pointManages = pointManages.Where(x => x.UnitId == this.drpUnit.SelectedValue);
}
pointManages = pointManages.OrderBy(x => x.StartDate);
foreach (var item in pointManages)
{
SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
+6 -3
View File
@@ -225,10 +225,13 @@ namespace FineUIPro.Web.HJGL.PointTrust
{
pointManages = pointManages.Where(x => x.UnitId == this.drpUnit.SelectedValue);
}
pointManages = pointManages.OrderBy(x => x.StartDate);
foreach (var item in pointManages)
{
var pipeline = PointBatchService.GetPointBatchById(item.PointBatchId);
string startdate = string.Format("{0:yyyy-MM-dd}", pipeline.StartDate);
TreeNode newNode = new TreeNode
{
@@ -240,12 +243,12 @@ namespace FineUIPro.Web.HJGL.PointTrust
// 未委托批次红色显示
if (BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(item.PointBatchId) == null)
{
newNode.Text = "<font color='#EE0000'>" + code + "【" + item.UnitName + "】" + "</font>";
newNode.Text = "<font color='#EE0000'>" + code + "【" + startdate + "】" + "【" + item.UnitName + "】" + "</font>";
newNode.ToolTip = "未委托";
}
else
{
newNode.Text = code + "【" + item.UnitName + "】";
newNode.Text = code + "【" + startdate + "】" + "【" + item.UnitName + "】";
}
e.Node.Nodes.Add(newNode);
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs
+1 -1
View File
@@ -425,7 +425,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
else
{
// result.Add((i + 2) + "Line, [预制组件] 不能为空</br>");
// result.Add((i + 2) + "Line, [预制组件] 不能为空</br>");
}
}
var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode && x.PrefabricatedComponents == item.PrefabricatedComponents);