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

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CLGL/TwInOutplandetailService.cs
+12 -13
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
@@ -11,7 +10,7 @@ namespace BLL
public static class TwInOutplandetailService
{
#region 获取列表
/// <summary>
/// 记录数
@@ -30,14 +29,14 @@ namespace BLL
from mat in mm.DefaultIfEmpty()
join master in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals master.Id into masters
from master in masters.DefaultIfEmpty()
join stock in Funs.DB.Tw_MaterialStock on new { x.MaterialCode, master.WarehouseCode,master.ProjectId } equals new { MaterialCode = stock.PipeLineMatCode, stock.WarehouseCode, stock .ProjectId} into st
join stock in Funs.DB.Tw_MaterialStock on new { x.MaterialCode, master.WarehouseCode, master.ProjectId } equals new { MaterialCode = stock.PipeLineMatCode, stock.WarehouseCode, stock.ProjectId } into st
from stock in st.DefaultIfEmpty()
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.InOutPlanMasterId) || x.InOutPlanMasterId.Contains(table.InOutPlanMasterId)) &&
(string.IsNullOrEmpty(table.PipelineComponentId) || x.PipelineComponentId.Contains(table.PipelineComponentId)) &&
(string.IsNullOrEmpty(table.MaterialCode) || x.MaterialCode.Contains(table.MaterialCode))
orderby x.SortIndex
(string.IsNullOrEmpty(table.MaterialCode) || x.MaterialCode.Contains(table.MaterialCode))
orderby x.SortIndex
select new Model.Tw_InOutDetailOutput
{
Id = x.Id,
@@ -48,9 +47,9 @@ namespace BLL
ActNum = x.ActNum,
PipelineComponentCode = y.PipelineComponentCode,
MaterialName = mat.MaterialName,
MaterialDef= mat.MaterialDef,
MaterialDef = mat.MaterialDef,
StockNum = stock.StockNum ?? 0,
}
}
;
return q;
@@ -73,7 +72,7 @@ namespace BLL
q = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize);
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in q
select x;
select x;
}
#endregion
@@ -100,7 +99,7 @@ namespace BLL
Funs.DB.Tw_InOutPlanDetail.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
}
/// <summary>
/// 批量添加计划明细
/// </summary>
@@ -111,8 +110,8 @@ namespace BLL
int sortIndex = 1;
foreach (var item in list)
{
item.Id= SQLHelper.GetNewID();
item.SortIndex= sortIndex;
item.Id = SQLHelper.GetNewID();
item.SortIndex = sortIndex;
item.InOutPlanMasterId = inoutPlanMasterId;
Add(item);
sortIndex++;
@@ -130,7 +129,7 @@ namespace BLL
table.MaterialCode = newtable.MaterialCode;
table.PlanNum = newtable.PlanNum;
table.ActNum = newtable.ActNum;
table.SortIndex= newtable.SortIndex;
table.SortIndex = newtable.SortIndex;
Funs.DB.SubmitChanges();
}
@@ -146,7 +145,7 @@ namespace BLL
}
}
public static void DeleteByInOutPlanMasterId (string inoutPlanMasterId)
public static void DeleteByInOutPlanMasterId(string inoutPlanMasterId)
{
var list = Funs.DB.Tw_InOutPlanDetail.Where(x => x.InOutPlanMasterId == inoutPlanMasterId);
if (list != null)