fix:永丰售后修复BUG,
1,物料库存获取不到ERP:重新调整触发查询逻辑 2,工序变更导致物料无法出库:配置旧工序 3,测试出库订单ERP推送,任务下发
This commit is contained in:
1 parent
b2a9a38f38
commit
c76e7bb681
69 files changed
+5510
-157
No files matched your search
@@ -0,0 +1,69 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
using WalkingTec.Mvvm.Core.Extensions;
|
||||
using HHWMS.Web.Models.Agv;
|
||||
|
||||
namespace HHWMS.Web
|
||||
{
|
||||
/// <summary>
|
||||
/// AGV 任务场景配置列表(方案 5.6:映射上游任务类型 → AGV 场景)
|
||||
/// </summary>
|
||||
public partial class AgvTaskSceneConfigListVM : BasePagedListVM<AgvTaskSceneConfig_View, AgvTaskSceneConfigSearcher>
|
||||
{
|
||||
protected override List<GridAction> InitGridAction()
|
||||
{
|
||||
return new List<GridAction>
|
||||
{
|
||||
this.MakeStandardAction("AgvTaskSceneConfig", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"], "agv", dialogWidth: 800),
|
||||
this.MakeStandardAction("AgvTaskSceneConfig", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "agv", dialogWidth: 800),
|
||||
this.MakeStandardAction("AgvTaskSceneConfig", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "agv", dialogWidth: 800),
|
||||
this.MakeStandardAction("AgvTaskSceneConfig", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "agv", dialogWidth: 800),
|
||||
};
|
||||
}
|
||||
|
||||
protected override IEnumerable<IGridColumn<AgvTaskSceneConfig_View>> InitGridHeader()
|
||||
{
|
||||
return new List<GridColumn<AgvTaskSceneConfig_View>>
|
||||
{
|
||||
this.MakeGridHeader(x => x.SourceTaskType).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.AgvTaskType).SetWidth(130),
|
||||
this.MakeGridHeader(x => x.SceneId).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.SceneName).SetWidth(180),
|
||||
this.MakeGridHeader(x => x.BinTaskLoad).SetWidth(100),
|
||||
this.MakeGridHeader(x => x.BinTaskUnload).SetWidth(100),
|
||||
this.MakeGridHeader(x => x.Remark),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
}
|
||||
|
||||
public override IOrderedQueryable<AgvTaskSceneConfig_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<AgvTaskSceneConfig>()
|
||||
.CheckContain(Searcher.SourceTaskType, x => x.SourceTaskType)
|
||||
.CheckEqual(Searcher.AgvTaskType, x => x.AgvTaskType)
|
||||
.CheckContain(Searcher.SceneId, x => x.SceneId)
|
||||
.Select(x => new AgvTaskSceneConfig_View
|
||||
{
|
||||
ID = x.ID,
|
||||
SourceTaskType = x.SourceTaskType,
|
||||
AgvTaskType = x.AgvTaskType,
|
||||
SceneId = x.SceneId,
|
||||
SceneName = x.SceneName,
|
||||
BinTaskLoad = x.BinTaskLoad,
|
||||
BinTaskUnload = x.BinTaskUnload,
|
||||
Remark = x.Remark
|
||||
})
|
||||
.OrderByDescending(x => x.ID);
|
||||
return query;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 场景配置列表行视图
|
||||
/// </summary>
|
||||
public class AgvTaskSceneConfig_View : AgvTaskSceneConfig
|
||||
{
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user