任务添加zoneid
添加物料打印 添加物料工序 添加库存出库 修改状态返回接口 wcs请求添加 重量和入口
This commit is contained in:
1 parent
42c26b2800
commit
b12ed2d5e5
54 files changed
+1442
-393
No files matched your search
-2
@@ -12,8 +12,6 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class TaskHeaderHistoryTemplateVM : BaseTemplateVM
|
||||
{
|
||||
[Display(Name = "Task.ZoneCode")]
|
||||
public ExcelPropety ZoneCode_Excel = ExcelPropety.CreateProperty<TaskHeaderHistory>(x => x.ZoneCode);
|
||||
[Display(Name = "Task.TaskNo")]
|
||||
public ExcelPropety TaskNo_Excel = ExcelPropety.CreateProperty<TaskHeaderHistory>(x => x.TaskNo);
|
||||
[Display(Name = "Task.TaskType")]
|
||||
|
||||
+8
-5
@@ -32,7 +32,7 @@ namespace HHWMS.Web
|
||||
protected override IEnumerable<IGridColumn<TaskHeaderHistory_View>> InitGridHeader()
|
||||
{
|
||||
return new List<GridColumn<TaskHeaderHistory_View>>{
|
||||
this.MakeGridHeader(x => x.ZoneCode),
|
||||
this.MakeGridHeader(x => x.Name_view),
|
||||
this.MakeGridHeader(x => x.TaskNo),
|
||||
this.MakeGridHeader(x => x.TaskType),
|
||||
this.MakeGridHeader(x => x.FromLocation),
|
||||
@@ -50,7 +50,7 @@ namespace HHWMS.Web
|
||||
public override IOrderedQueryable<TaskHeaderHistory_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<TaskHeaderHistory>()
|
||||
.CheckContain(Searcher.ZoneCode, x=>x.ZoneCode)
|
||||
.CheckEqual(Searcher.ZoneId, x=>x.ZoneId)
|
||||
.CheckContain(Searcher.TaskNo, x=>x.TaskNo)
|
||||
.CheckEqual(Searcher.TaskType, x=>x.TaskType)
|
||||
.CheckContain(Searcher.FromLocation, x=>x.FromLocation)
|
||||
@@ -58,10 +58,11 @@ namespace HHWMS.Web
|
||||
.CheckContain(Searcher.ContainerCode, x=>x.ContainerCode)
|
||||
.CheckEqual(Searcher.RoadWay, x=>x.RoadWay)
|
||||
.CheckEqual(Searcher.Status, x=>x.Status)
|
||||
.DPWhere(Wtm,x => x.ZoneId)
|
||||
.Select(x => new TaskHeaderHistory_View
|
||||
{
|
||||
ID = x.ID,
|
||||
ZoneCode = x.ZoneCode,
|
||||
Name_view = x.Zone.Name,
|
||||
TaskNo = x.TaskNo,
|
||||
TaskType = x.TaskType,
|
||||
FromLocation = x.FromLocation,
|
||||
@@ -79,7 +80,9 @@ namespace HHWMS.Web
|
||||
|
||||
}
|
||||
|
||||
public class TaskHeaderHistory_View : TaskHeaderHistory{
|
||||
|
||||
public class TaskHeaderHistory_View : TaskHeaderHistory
|
||||
{
|
||||
[Display(Name = "Location.ZoneName")]
|
||||
public String Name_view { get; set; }
|
||||
}
|
||||
}
|
||||
+5
-2
@@ -12,8 +12,9 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class TaskHeaderHistorySearcher : BaseSearcher
|
||||
{
|
||||
[Display(Name = "Task.ZoneCode")]
|
||||
public String ZoneCode { get; set; }
|
||||
public List<ComboSelectListItem> AllZones { get; set; }
|
||||
[Display(Name = "Location.ZoneName")]
|
||||
public int? ZoneId { get; set; }
|
||||
[Display(Name = "Task.TaskNo")]
|
||||
public String TaskNo { get; set; }
|
||||
[Display(Name = "Task.TaskType")]
|
||||
@@ -29,8 +30,10 @@ namespace HHWMS.Web
|
||||
[Display(Name = "Task.Status")]
|
||||
public TaskStatusEnum? Status { get; set; }
|
||||
|
||||
|
||||
protected override void InitVM()
|
||||
{
|
||||
AllZones = DC.Set<LocationZone>().GetSelectListItems(Wtm, y => y.Name);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -12,13 +12,15 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class TaskHeaderHistoryVM : BaseCRUDVM<TaskHeaderHistory>
|
||||
{
|
||||
|
||||
public List<ComboSelectListItem> AllZones { get; set; }
|
||||
public TaskHeaderHistoryVM()
|
||||
{
|
||||
SetInclude(x => x.Zone);
|
||||
}
|
||||
|
||||
protected override void InitVM()
|
||||
{
|
||||
AllZones = DC.Set<LocationZone>().GetSelectListItems(Wtm, y => y.Name);
|
||||
}
|
||||
|
||||
public override void DoAdd()
|
||||
|
||||
@@ -12,8 +12,6 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class TaskHeaderTemplateVM : BaseTemplateVM
|
||||
{
|
||||
[Display(Name = "Task.ZoneCode")]
|
||||
public ExcelPropety ZoneCode_Excel = ExcelPropety.CreateProperty<TaskHeader>(x => x.ZoneCode);
|
||||
[Display(Name = "Task.TaskNo")]
|
||||
public ExcelPropety TaskNo_Excel = ExcelPropety.CreateProperty<TaskHeader>(x => x.TaskNo);
|
||||
[Display(Name = "Task.TaskType")]
|
||||
|
||||
@@ -12,13 +12,11 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class TaskHeaderListVM : BasePagedListVM<TaskHeader_View, TaskHeaderSearcher>
|
||||
{
|
||||
public List<ComboSelectListItem> ZoneCodes { get; set; }
|
||||
public TaskDetailListVM2 TaskDetails { get; set; } = new TaskDetailListVM2();
|
||||
|
||||
protected override void InitVM()
|
||||
{
|
||||
var vm = Wtm.CreateVM<TaskHeaderVM>();
|
||||
ZoneCodes = vm.ZoneCodes;
|
||||
|
||||
TaskDetails.CopyContext(this);
|
||||
}
|
||||
@@ -46,12 +44,7 @@ namespace HHWMS.Web
|
||||
{
|
||||
InitVM();
|
||||
return new List<GridColumn<TaskHeader_View>>{
|
||||
this.MakeGridHeader(x => x.ZoneCode)
|
||||
.SetFormat((a, b) =>
|
||||
{
|
||||
var data = ZoneCodes.FirstOrDefault(x => x.Value.ToString() == a.ZoneCode);
|
||||
return data?.Text ?? a.ZoneCode;
|
||||
}).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.Name_view).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.TaskNo)
|
||||
.SetFormat((a,b) =>
|
||||
{
|
||||
@@ -75,7 +68,7 @@ namespace HHWMS.Web
|
||||
public override IOrderedQueryable<TaskHeader_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<TaskHeader>()
|
||||
.CheckContain(Searcher.ZoneCode, x=>x.ZoneCode)
|
||||
.CheckEqual(Searcher.ZoneId, x=>x.ZoneId)
|
||||
.CheckContain(Searcher.TaskNo, x=>x.TaskNo)
|
||||
.CheckEqual(Searcher.TaskType, x=>x.TaskType)
|
||||
.CheckContain(Searcher.FromLocation, x=>x.FromLocation)
|
||||
@@ -83,10 +76,11 @@ namespace HHWMS.Web
|
||||
.CheckContain(Searcher.ContainerCode, x=>x.ContainerCode)
|
||||
.CheckEqual(Searcher.RoadWay, x=>x.RoadWay)
|
||||
.CheckEqual(Searcher.Status, x=>x.Status)
|
||||
.DPWhere(Wtm,x => x.ZoneId)
|
||||
.Select(x => new TaskHeader_View
|
||||
{
|
||||
ID = x.ID,
|
||||
ZoneCode = x.ZoneCode,
|
||||
Name_view = x.Zone.Name,
|
||||
TaskNo = x.TaskNo,
|
||||
TaskType = x.TaskType,
|
||||
FromLocation = x.FromLocation,
|
||||
@@ -105,6 +99,7 @@ namespace HHWMS.Web
|
||||
}
|
||||
|
||||
public class TaskHeader_View : TaskHeader{
|
||||
|
||||
[Display(Name = "Location.ZoneName")]
|
||||
public String Name_view { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -12,8 +12,9 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class TaskHeaderSearcher : BaseSearcher
|
||||
{
|
||||
[Display(Name = "Task.ZoneCode")]
|
||||
public String ZoneCode { get; set; }
|
||||
public List<ComboSelectListItem> AllZones { get; set; }
|
||||
[Display(Name = "Location.ZoneName")]
|
||||
public int? ZoneId { get; set; }
|
||||
[Display(Name = "Task.TaskNo")]
|
||||
public String TaskNo { get; set; }
|
||||
[Display(Name = "Task.TaskType")]
|
||||
@@ -31,6 +32,7 @@ namespace HHWMS.Web
|
||||
|
||||
protected override void InitVM()
|
||||
{
|
||||
AllZones = DC.Set<LocationZone>().GetSelectListItems(Wtm, y => y.Name);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -12,15 +12,17 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class TaskHeaderVM : BaseCRUDVM<TaskHeader>
|
||||
{
|
||||
public List<ComboSelectListItem> ZoneCodes { get; set; }
|
||||
public List<ComboSelectListItem> AllZones { get; set; }
|
||||
private IUnitWork _unitWork { get; set; }
|
||||
|
||||
public TaskHeaderVM()
|
||||
{
|
||||
SetInclude(x => x.Zone);
|
||||
}
|
||||
|
||||
protected override void InitVM()
|
||||
{
|
||||
AllZones = DC.Set<LocationZone>().GetSelectListItems(Wtm, y => y.Name);
|
||||
}
|
||||
|
||||
public override void DoAdd()
|
||||
|
||||
Reference in new issue
Block a user