代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -1,9 +1,7 @@
|
||||
using FineUIPro;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
|
||||
namespace BLL
|
||||
@@ -35,7 +33,7 @@ namespace BLL
|
||||
(string.IsNullOrEmpty(table.InputMasterId) || x.InputMasterId.Contains(table.InputMasterId)) &&
|
||||
(string.IsNullOrEmpty(table.PipelineComponentId) || x.PipelineComponentId.Contains(table.PipelineComponentId)) &&
|
||||
(string.IsNullOrEmpty(table.MaterialCode) || x.MaterialCode.Contains(table.MaterialCode))
|
||||
orderby x.SortIndex
|
||||
orderby x.SortIndex
|
||||
select new Model.Tw_InOutDetailOutput
|
||||
{
|
||||
Id = x.Id,
|
||||
@@ -128,20 +126,20 @@ namespace BLL
|
||||
public static IEnumerable GePrintListByInputMasterIds(List<string> inputMasterIds)
|
||||
{
|
||||
var q = from x in Funs.DB.Tw_InputDetail
|
||||
join mat in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals mat.MaterialCode into mm
|
||||
from mat in mm.DefaultIfEmpty()
|
||||
join y in Funs.DB.Tw_InputMaster on x.InputMasterId equals y.Id
|
||||
where inputMasterIds.Contains(x.InputMasterId)
|
||||
orderby y.CusBillCode,x.SortIndex
|
||||
select new
|
||||
{
|
||||
入库单编号 = y.CusBillCode,
|
||||
材料编码 = x.MaterialCode,
|
||||
材料名称 = mat.MaterialName,
|
||||
材料描述 = mat.MaterialDef,
|
||||
计划数量 = x.PlanNum,
|
||||
实际数量 = x.ActNum,
|
||||
};
|
||||
join mat in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals mat.MaterialCode into mm
|
||||
from mat in mm.DefaultIfEmpty()
|
||||
join y in Funs.DB.Tw_InputMaster on x.InputMasterId equals y.Id
|
||||
where inputMasterIds.Contains(x.InputMasterId)
|
||||
orderby y.CusBillCode, x.SortIndex
|
||||
select new
|
||||
{
|
||||
入库单编号 = y.CusBillCode,
|
||||
材料编码 = x.MaterialCode,
|
||||
材料名称 = mat.MaterialName,
|
||||
材料描述 = mat.MaterialDef,
|
||||
计划数量 = x.PlanNum,
|
||||
实际数量 = x.ActNum,
|
||||
};
|
||||
return q;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user