日志分表 任务日志 操作日志 接口日志
添加对应的日志文件 修改主子表的表结构信息 删除无关字段信息 测试添加数据到历史表中
This commit is contained in:
1 parent
ebdd40c518
commit
4f2ba2a3ee
101 files changed
+1004
-418
No files matched your search
+2
-2
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
@@ -12,7 +12,7 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class TaskDetailHistoryTemplateVM : BaseTemplateVM
|
||||
{
|
||||
public ExcelPropety TaskHeader_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.TaskHeaderId);
|
||||
public ExcelPropety TaskHeader_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.HeaderId);
|
||||
[Display(Name = "Inventory.ReceiptCode")]
|
||||
public ExcelPropety OrderCode_Excel = ExcelPropety.CreateProperty<TaskDetailHistory>(x => x.OrderCode);
|
||||
[Display(Name = "Inventory.ReceiptDetailId")]
|
||||
|
||||
+4
-6
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
@@ -32,7 +32,7 @@ namespace HHWMS.Web
|
||||
protected override IEnumerable<IGridColumn<TaskDetailHistory_View>> InitGridHeader()
|
||||
{
|
||||
return new List<GridColumn<TaskDetailHistory_View>>{
|
||||
this.MakeGridHeader(x => x.TaskNo_view),
|
||||
this.MakeGridHeader(x => x.HeaderId),
|
||||
this.MakeGridHeader(x => x.OrderCode),
|
||||
this.MakeGridHeader(x => x.OrderDetailId),
|
||||
this.MakeGridHeader(x => x.MaterialCode),
|
||||
@@ -52,7 +52,7 @@ namespace HHWMS.Web
|
||||
public override IOrderedQueryable<TaskDetailHistory_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<TaskDetailHistory>()
|
||||
.CheckEqual(Searcher.TaskHeaderId, x=>x.TaskHeaderId)
|
||||
.CheckEqual(Searcher.TaskHeaderId, x=>x.HeaderId)
|
||||
.CheckContain(Searcher.MaterialCode, x=>x.MaterialCode)
|
||||
.CheckContain(Searcher.MaterialName, x=>x.MaterialName)
|
||||
.CheckContain(Searcher.MaterialSpec, x=>x.MaterialSpec)
|
||||
@@ -63,7 +63,7 @@ namespace HHWMS.Web
|
||||
.Select(x => new TaskDetailHistory_View
|
||||
{
|
||||
ID = x.ID,
|
||||
TaskNo_view = x.TaskHeader.TaskNo,
|
||||
HeaderId = x.HeaderId,
|
||||
OrderCode = x.OrderCode,
|
||||
OrderDetailId = x.OrderDetailId,
|
||||
MaterialCode = x.MaterialCode,
|
||||
@@ -84,8 +84,6 @@ namespace HHWMS.Web
|
||||
}
|
||||
|
||||
public class TaskDetailHistory_View : TaskDetailHistory{
|
||||
[Display(Name = "Task.TaskNo")]
|
||||
public String TaskNo_view { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
@@ -16,7 +16,6 @@ namespace HHWMS.Web
|
||||
|
||||
public TaskDetailHistoryVM()
|
||||
{
|
||||
SetInclude(x => x.TaskHeader);
|
||||
}
|
||||
|
||||
protected override void InitVM()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
@@ -12,13 +12,11 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class TaskDetailTemplateVM : BaseTemplateVM
|
||||
{
|
||||
public ExcelPropety TaskHeader_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.TaskHeaderId);
|
||||
public ExcelPropety TaskHeader_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.HeaderId);
|
||||
[Display(Name = "Inventory.ReceiptCode")]
|
||||
public ExcelPropety OrderCode_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.OrderCode);
|
||||
[Display(Name = "Inventory.ReceiptDetailId")]
|
||||
public ExcelPropety OrderDetailId_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.OrderDetailId);
|
||||
[Display(Name = "Inventory.UniqueCode")]
|
||||
public ExcelPropety UniqueCode_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.UniqueCode);
|
||||
[Display(Name = "Inventory.MaterialCode")]
|
||||
public ExcelPropety MaterialCode_Excel = ExcelPropety.CreateProperty<TaskDetail>(x => x.MaterialCode);
|
||||
[Display(Name = "Inventory.MaterialName")]
|
||||
|
||||
@@ -35,7 +35,6 @@ namespace HHWMS.Web
|
||||
this.MakeGridHeader(x => x.TaskNo_view),
|
||||
this.MakeGridHeader(x => x.OrderCode).SetHide(),
|
||||
this.MakeGridHeader(x => x.OrderDetailId).SetHide(),
|
||||
this.MakeGridHeader(x => x.UniqueCode),
|
||||
this.MakeGridHeader(x => x.MaterialCode),
|
||||
this.MakeGridHeader(x => x.MaterialName).SetHide(),
|
||||
this.MakeGridHeader(x => x.MaterialSpec).SetHide(),
|
||||
@@ -55,7 +54,6 @@ namespace HHWMS.Web
|
||||
public override IOrderedQueryable<TaskDetail_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<TaskDetail>()
|
||||
.CheckContain(Searcher.UniqueCode, x=>x.UniqueCode)
|
||||
.CheckContain(Searcher.MaterialCode, x=>x.MaterialCode)
|
||||
.CheckContain(Searcher.FromLocation, x=>x.FromLocation)
|
||||
.CheckContain(Searcher.ToLocation, x=>x.ToLocation)
|
||||
@@ -65,7 +63,6 @@ namespace HHWMS.Web
|
||||
TaskNo_view = x.TaskHeader.TaskNo,
|
||||
OrderCode = x.OrderCode,
|
||||
OrderDetailId = x.OrderDetailId,
|
||||
UniqueCode = x.UniqueCode,
|
||||
MaterialCode = x.MaterialCode,
|
||||
MaterialName = x.MaterialName,
|
||||
MaterialSpec = x.MaterialSpec,
|
||||
|
||||
@@ -28,7 +28,6 @@ namespace HHWMS.Web
|
||||
this.MakeGridHeader(x => x.TaskNo_view),
|
||||
this.MakeGridHeader(x => x.OrderCode).SetHide(),
|
||||
this.MakeGridHeader(x => x.OrderDetailId).SetHide(),
|
||||
this.MakeGridHeader(x => x.UniqueCode),
|
||||
this.MakeGridHeader(x => x.MaterialCode),
|
||||
this.MakeGridHeader(x => x.MaterialName).SetHide(),
|
||||
this.MakeGridHeader(x => x.MaterialSpec).SetHide(),
|
||||
@@ -47,14 +46,13 @@ namespace HHWMS.Web
|
||||
public override IOrderedQueryable<TaskDetail_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<TaskDetail>()
|
||||
.Where(x => x.TaskHeaderId == Searcher.TaskHeaderId)
|
||||
.Where(x => x.HeaderId == Searcher.HeaderId)
|
||||
.Select(x => new TaskDetail_View
|
||||
{
|
||||
ID = x.ID,
|
||||
TaskNo_view = $"{x.TaskHeader.TaskNo}-{x.FromLocation}",
|
||||
OrderCode = x.OrderCode,
|
||||
OrderDetailId = x.OrderDetailId,
|
||||
UniqueCode = x.UniqueCode,
|
||||
MaterialCode = x.MaterialCode,
|
||||
MaterialName = x.MaterialName,
|
||||
MaterialSpec = x.MaterialSpec,
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace HHWMS.Web
|
||||
public String UniqueCode { get; set; }
|
||||
|
||||
[Display(Name = "Task.TaskNo")]
|
||||
public int? TaskHeaderId { get; set; }
|
||||
public int? HeaderId { get; set; }
|
||||
|
||||
[Display(Name = "Inventory.MaterialCode")]
|
||||
public String MaterialCode { get; set; }
|
||||
|
||||
Reference in new issue
Block a user