fix:材料匹配取消隐藏已出库过的管线
This commit is contained in:
@@ -328,17 +328,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
/// <returns>符合材料匹配入口条件的管线列表。</returns>
|
||||
private List<Model.HJGL_Pipeline> GetTestPackagePipelineList(string ptpId)
|
||||
{
|
||||
var completeInOutPlanDetailRelationList = from x in Funs.DB.Tw_InOutPlanDetail_Relation
|
||||
join y in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id
|
||||
where y.State == (int)TwConst.State.已完成 && y.WarehouseId == drpWarehouse.SelectedValue
|
||||
select x;
|
||||
//var completeInOutPlanDetailRelationList = from x in Funs.DB.Tw_InOutPlanDetail_Relation
|
||||
// join y in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id
|
||||
// where y.State == (int)TwConst.State.已完成 && y.WarehouseId == drpWarehouse.SelectedValue
|
||||
// select x;
|
||||
|
||||
var pipeline = (from x in Funs.DB.HJGL_Pipeline
|
||||
join p in Funs.DB.PTP_PipelineList on x.PipelineId equals p.PipelineId
|
||||
join y in completeInOutPlanDetailRelationList on x.PipelineId equals y.PipelineId into temp
|
||||
from y in temp.DefaultIfEmpty()
|
||||
where y == null
|
||||
&& p.PTP_ID == ptpId
|
||||
join p in Funs.DB.PTP_PipelineList on x.PipelineId equals p.PipelineId
|
||||
where p.PTP_ID == ptpId
|
||||
&& x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
|
||||
&& x.WarehouseId == WarehouseId
|
||||
|
||||
Reference in New Issue
Block a user