日志分表 任务日志 操作日志 接口日志

添加对应的日志文件
修改主子表的表结构信息
删除无关字段信息
测试添加数据到历史表中
This commit is contained in:
zhougf committed 2024-03-15 18:45:10 +08:00
1 parent ebdd40c518
commit 4f2ba2a3ee
101 files changed
+1004 -418

No files matched your search

@@ -89,7 +89,7 @@ namespace HHWMS.Web.Controllers
public ActionResult Create2(int id)
{
var vm = Wtm.CreateVM<ReceiptDetailVM>(passInit: true);
vm.Entity.ReceiptHeaderId = id;
vm.Entity.HeaderId = id;
vm.Entity.ReceiptHeader = new ReceiptHeader();
//vm.Entity.ReceiptHeader.Code = vm.DC.Set<ReceiptHeader>().Find(id).Code;
return PartialView(vm);
@@ -234,47 +234,5 @@ namespace HHWMS.Web.Controllers
}
#endregion
#region 点数
[ActionDescription("ReceiptHeader.Count")]
public ActionResult Count(string id)
{
var vm = Wtm.CreateVM<ReceiptHeaderVM>(id);
return PartialView(vm);
}
/// <summary>
/// 查所有新建的明细,已开始收货明细不允许点数
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public ActionResult SelectReceiptDetailsByCode(int id)
{
var data = _unitwork.Find<ReceiptHeader>(x => x.ID == id)
.Include(x => x.ReceiptDetails).ToList();
return JsonMore(data.FirstOrDefault().ReceiptDetails.Where(x => x.Status == ReceiptStatusEnum.新建));
}
/// <summary>
/// 修改明细的数量
/// </summary>
/// <param name="code"></param>
/// <param name="uniqueCode"></param>
/// <param name="qty"></param>
/// <returns></returns>
public ActionResult CountCommit(string code, string uniqueCode, int qty)
{
var receiptDetail = _unitwork.FindSingle<ReceiptDetail>(x => x.UniqueCode.Equals(uniqueCode));
if (receiptDetail != null)
{
receiptDetail.Qty = qty;
receiptDetail.UpdateTime = DateTime.Now;
receiptDetail.UpdateBy = Wtm.LoginUserInfo.ITCode;
_unitwork.Update(receiptDetail);
return JsonMore(null);
}
return JsonMore(null, 500, $"未找到唯一码{uniqueCode}的单据!");
}
#endregion
}
}
@@ -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")]
@@ -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,
@@ -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,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();
@@ -1,9 +1,9 @@
@model HHWMS.Web.ReceiptDetailVM
@model HHWMS.Web.ReceiptDetailVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:combobox field="Entity.ReceiptHeaderId" items="AllReceiptHeaders"/>
<wt:combobox field="Entity.HeaderId" items="AllReceiptHeaders" />
<wt:textbox field="Entity.ZoneCode" />
<wt:textbox field="Entity.MaterialCode" />
<wt:textbox field="Entity.MaterialType" />
@@ -20,7 +20,7 @@
<wt:textbox field="Entity.InventoryStatus" />
<wt:combobox field="Entity.Status" />
</wt:row>
<wt:hidden field="Entity.ReceiptHeaderId" />
<wt:hidden field="Entity.HeaderId" />
<wt:row align="AlignEnum.Right">
<wt:submitbutton />
<wt:closebutton />
@@ -6,7 +6,7 @@
<wt:textarea field="Entity.MaterialCode" label-text="盘料"/>
<wt:textarea field="Entity.Lot" label-text="散料" />
</wt:row>
<wt:hidden field="Entity.ReceiptHeaderId" />
<wt:hidden field="Entity.HeaderId" />
<wt:row align="AlignEnum.Right">
<wt:submitbutton />
<wt:closebutton />
@@ -1,9 +1,9 @@
@model HHWMS.Web.ReceiptDetailVM
@model HHWMS.Web.ReceiptDetailVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:combobox field="Entity.ReceiptHeaderId" items="AllReceiptHeaders"/>
<wt:combobox field="Entity.HeaderId" items="AllReceiptHeaders" />
<wt:textbox field="Entity.ZoneCode" />
<wt:textbox field="Entity.MaterialCode" />
<wt:textbox field="Entity.MaterialType" />
@@ -1,9 +1,9 @@
@model HHWMS.Web.ReceiptDetailListVM
@model HHWMS.Web.ReceiptDetailListVM
@inject IStringLocalizer<Program> Localizer;
<wt:searchpanel vm="@Model" reset-btn="true">
<wt:row items-per-row="ItemsPerRowEnum.Three">
<wt:combobox field="Searcher.ReceiptHeaderId" items="Searcher.AllReceiptHeaders" empty-text="@Localizer["Sys.All"]" />
<wt:combobox field="Searcher.HeaderId" items="Searcher.AllReceiptHeaders" empty-text="@Localizer["Sys.All"]" />
<wt:textbox field="Searcher.ZoneCode" />
<wt:textbox field="Searcher.MaterialCode" />
<wt:textbox field="Searcher.MaterialType" />
@@ -1,9 +1,9 @@
@model HHWMS.Web.ReceiptDetailHistoryVM
@model HHWMS.Web.ReceiptDetailHistoryVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:combobox field="Entity.ReceiptHeaderHistoryId" items="AllReceiptHeaderHistorys"/>
<wt:combobox field="Entity.HeaderId" items="AllReceiptHeaderHistorys"/>
<wt:textbox field="Entity.ZoneCode" />
<wt:textbox field="Entity.MaterialCode" />
<wt:textbox field="Entity.MaterialType" />
@@ -1,10 +1,10 @@
@model HHWMS.Web.ReceiptDetailHistoryVM
@model HHWMS.Web.ReceiptDetailHistoryVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:quote>@Localizer["Sys.DeleteConfirm"]</wt:quote>
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.ReceiptHeaderHistory.Code" />
<wt:display field="Entity.ID" />
<wt:display field="Entity.ZoneCode" />
<wt:display field="Entity.MaterialCode" />
<wt:display field="Entity.MaterialType" />
@@ -1,9 +1,9 @@
@model HHWMS.Web.ReceiptDetailHistoryVM
@model HHWMS.Web.ReceiptDetailHistoryVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:display field="Entity.ReceiptHeaderHistory.Code" />
<wt:display field="Entity.HeaderId" />
<wt:display field="Entity.ZoneCode" />
<wt:display field="Entity.MaterialCode" />
<wt:display field="Entity.MaterialType" />
@@ -1,9 +1,9 @@
@model HHWMS.Web.ReceiptDetailHistoryVM
@model HHWMS.Web.ReceiptDetailHistoryVM
@inject IStringLocalizer<Program> Localizer;
<wt:form vm="@Model">
<wt:row items-per-row="ItemsPerRowEnum.Two">
<wt:combobox field="Entity.ReceiptHeaderHistoryId" items="AllReceiptHeaderHistorys"/>
<wt:combobox field="Entity.HeaderId" items="AllReceiptHeaderHistorys" />
<wt:textbox field="Entity.ZoneCode" />
<wt:textbox field="Entity.MaterialCode" />
<wt:textbox field="Entity.MaterialType" />
@@ -1,9 +1,9 @@
@model HHWMS.Web.ReceiptDetailHistoryListVM
@model HHWMS.Web.ReceiptDetailHistoryListVM
@inject IStringLocalizer<Program> Localizer;
<wt:searchpanel vm="@Model" reset-btn="true">
<wt:row items-per-row="ItemsPerRowEnum.Three">
<wt:combobox field="Searcher.ReceiptHeaderHistoryId" items="Searcher.AllReceiptHeaderHistorys" empty-text="@Localizer["Sys.All"]" />
<wt:combobox field="Searcher.HeaderId" items="Searcher.AllReceiptHeaderHistorys" empty-text="@Localizer["Sys.All"]" />
<wt:textbox field="Searcher.ZoneCode" />
<wt:textbox field="Searcher.MaterialCode" />
<wt:textbox field="Searcher.MaterialType" />
@@ -17,7 +17,7 @@
var headerId = 0;
function details(id) {
headerId = id;
layui.table.reload('ReceiptDetail', { where: { "Searcher.ReceiptHeaderId": id } });
layui.table.reload('ReceiptDetail', { where: { "Searcher.HeaderId": id } });
}
function CreateDetail() {