日志分表 任务日志 操作日志 接口日志
添加对应的日志文件 修改主子表的表结构信息 删除无关字段信息 测试添加数据到历史表中
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 ReceiptDetailHistoryTemplateVM : BaseTemplateVM
|
||||
{
|
||||
public ExcelPropety ReceiptHeaderHistory_Excel = ExcelPropety.CreateProperty<ReceiptDetailHistory>(x => x.ReceiptHeaderHistoryId);
|
||||
public ExcelPropety ReceiptHeaderHistory_Excel = ExcelPropety.CreateProperty<ReceiptDetailHistory>(x => x.HeaderId);
|
||||
[Display(Name = "Task.ZoneCode")]
|
||||
public ExcelPropety ZoneCode_Excel = ExcelPropety.CreateProperty<ReceiptDetailHistory>(x => x.ZoneCode);
|
||||
[Display(Name = "Inventory.MaterialCode")]
|
||||
|
||||
+2
-2
@@ -56,7 +56,7 @@ namespace HHWMS.Web
|
||||
public override IOrderedQueryable<ReceiptDetailHistory_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<ReceiptDetailHistory>()
|
||||
.CheckEqual(Searcher.ReceiptHeaderHistoryId, x=>x.ReceiptHeaderHistoryId)
|
||||
.CheckEqual(Searcher.HeaderId, x=>x.HeaderId)
|
||||
.CheckContain(Searcher.ZoneCode, x=>x.ZoneCode)
|
||||
.CheckContain(Searcher.MaterialCode, x=>x.MaterialCode)
|
||||
.CheckContain(Searcher.MaterialType, x=>x.MaterialType)
|
||||
@@ -71,7 +71,7 @@ namespace HHWMS.Web
|
||||
.Select(x => new ReceiptDetailHistory_View
|
||||
{
|
||||
ID = x.ID,
|
||||
Code_view = x.ReceiptHeaderHistory.Code,
|
||||
HeaderId = x.HeaderId,
|
||||
ZoneCode = x.ZoneCode,
|
||||
MaterialCode = x.MaterialCode,
|
||||
MaterialType = x.MaterialType,
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ namespace HHWMS.Web
|
||||
{
|
||||
public List<ComboSelectListItem> AllReceiptHeaderHistorys { get; set; }
|
||||
[Display(Name = "Inventory.ReceiptCode")]
|
||||
public int? ReceiptHeaderHistoryId { get; set; }
|
||||
public int? HeaderId { get; set; }
|
||||
[Display(Name = "Task.ZoneCode")]
|
||||
public String ZoneCode { get; set; }
|
||||
[Display(Name = "Inventory.MaterialCode")]
|
||||
|
||||
+1
-2
@@ -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 ReceiptDetailHistoryVM()
|
||||
{
|
||||
SetInclude(x => x.ReceiptHeaderHistory);
|
||||
}
|
||||
|
||||
protected override void InitVM()
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class ReceiptDetailTemplateVM : BaseTemplateVM
|
||||
{
|
||||
public ExcelPropety ReceiptHeader_Excel = ExcelPropety.CreateProperty<ReceiptDetail>(x => x.ReceiptHeaderId);
|
||||
public ExcelPropety ReceiptHeader_Excel = ExcelPropety.CreateProperty<ReceiptDetail>(x => x.HeaderId);
|
||||
|
||||
[Display(Name = "Task.ZoneCode")]
|
||||
public ExcelPropety ZoneCode_Excel = ExcelPropety.CreateProperty<ReceiptDetail>(x => x.ZoneCode);
|
||||
|
||||
@@ -52,9 +52,8 @@ namespace HHWMS.Web
|
||||
public override IOrderedQueryable<ReceiptDetail_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<ReceiptDetail>()
|
||||
.CheckEqual(Searcher.ReceiptHeaderId, x => x.ReceiptHeaderId)
|
||||
.CheckEqual(Searcher.HeaderId, x => x.HeaderId)
|
||||
.CheckContain(Searcher.ZoneCode, x => x.ZoneCode)
|
||||
.CheckContain(Searcher.UniqueCode, x => x.UniqueCode)
|
||||
.CheckContain(Searcher.MaterialCode, x => x.MaterialCode)
|
||||
.CheckContain(Searcher.MaterialType, x => x.MaterialType)
|
||||
.CheckContain(Searcher.MaterialName, x => x.MaterialName)
|
||||
@@ -69,7 +68,6 @@ namespace HHWMS.Web
|
||||
ID = x.ID,
|
||||
Code_view = x.ReceiptHeader.Code,
|
||||
ZoneCode = x.ZoneCode,
|
||||
UniqueCode = x.UniqueCode,
|
||||
MaterialCode = x.MaterialCode,
|
||||
MaterialType = x.MaterialType,
|
||||
MaterialName = x.MaterialName,
|
||||
|
||||
@@ -32,7 +32,6 @@ namespace HHWMS.Web
|
||||
var result = new List<GridColumn<ReceiptDetail_View>>{
|
||||
//this.MakeGridHeader(x => x.Code_view),
|
||||
//this.MakeGridHeader(x => x.ZoneCode),
|
||||
this.MakeGridHeader(x => x.UniqueCode).SetWidth(230),
|
||||
this.MakeGridHeader(x => x.MaterialCode),
|
||||
//this.MakeGridHeader(x => x.MaterialType),
|
||||
this.MakeGridHeader(x => x.MaterialName),
|
||||
@@ -60,13 +59,12 @@ namespace HHWMS.Web
|
||||
public override IOrderedQueryable<ReceiptDetail_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<ReceiptDetail>()
|
||||
.Where(x => x.ReceiptHeaderId == Searcher.ReceiptHeaderId)
|
||||
.Where(x => x.HeaderId == Searcher.HeaderId)
|
||||
.Select(x => new ReceiptDetail_View
|
||||
{
|
||||
ID = x.ID,
|
||||
Code_view = x.ReceiptHeader.Code,
|
||||
ZoneCode = x.ZoneCode,
|
||||
UniqueCode = x.UniqueCode,
|
||||
MaterialCode = x.MaterialCode,
|
||||
MaterialType = x.MaterialType,
|
||||
MaterialName = x.MaterialName,
|
||||
|
||||
@@ -11,14 +11,11 @@ namespace HHWMS.Web
|
||||
{
|
||||
public List<ComboSelectListItem> AllReceiptHeaders { get; set; }
|
||||
[Display(Name = "Inventory.ReceiptCode")]
|
||||
public int? ReceiptHeaderId { get; set; }
|
||||
public int? HeaderId { get; set; }
|
||||
|
||||
[Display(Name = "Task.ZoneCode")]
|
||||
public String ZoneCode { get; set; }
|
||||
|
||||
[Display(Name = "Inventory.UniqueCode")]
|
||||
public String UniqueCode { get; set; }
|
||||
|
||||
[Display(Name = "Inventory.MaterialCode")]
|
||||
public String MaterialCode { get; set; }
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace HHWMS.Web
|
||||
protected override void InitVM()
|
||||
{
|
||||
Details.CopyContext(this);
|
||||
Details.Searcher.ReceiptHeaderId = Entity.ID;
|
||||
Details.Searcher.HeaderId = Entity.ID;
|
||||
|
||||
var CurrentCulture = Wtm.CurrentCulture;
|
||||
var dictDatas = DC.Set<SysDictData>().ToList();
|
||||
|
||||
Reference in new issue
Block a user