日志分表 任务日志 操作日志 接口日志
添加对应的日志文件 修改主子表的表结构信息 删除无关字段信息 测试添加数据到历史表中
This commit is contained in:
1 parent
ebdd40c518
commit
4f2ba2a3ee
101 files changed
+1004
-418
No files matched your search
@@ -66,32 +66,6 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
else
|
||||
{
|
||||
if (string.IsNullOrEmpty(vm.Entity.UniqueCode))
|
||||
{
|
||||
return FFResult().Alert($"唯一码不能为空!");
|
||||
}
|
||||
var header = _unitwork.FindSingle<ShipmentHeader>(x => x.ID == vm.Entity.ShipmentHeaderId);
|
||||
if (header != null && header.FirstStatus != ShipStatusEnum.新建)
|
||||
{
|
||||
return FFResult().Alert($"非新建状态的出库单,无法新建明细!");
|
||||
}
|
||||
var inv = _unitwork.FindSingle<Inventory>(x => x.UniqueCode == vm.Entity.UniqueCode
|
||||
&& x.TaskStatus != InventoryTaskStatus.任务中);
|
||||
if(inv == null)
|
||||
{
|
||||
return FFResult().Alert($"{vm.Entity.UniqueCode}不存在或已有任务,检查后重新添加!");
|
||||
}
|
||||
if(_unitwork.IsExit<ShipmentDetail>(x => x.UniqueCode == vm.Entity.UniqueCode))
|
||||
{
|
||||
return FFResult().Alert($"{vm.Entity.UniqueCode}已在出库单内,请勿重复添加!");
|
||||
}
|
||||
vm.Entity.MaterialCode = inv.MaterialCode;
|
||||
vm.Entity.MaterialName = inv.MaterialName;
|
||||
vm.Entity.MaterialSpec = inv.MaterialSpec;
|
||||
vm.Entity.MaterialUnit = inv.MaterialUnit;
|
||||
vm.Entity.MaterialType = inv.MaterialType;
|
||||
vm.Entity.Batch = inv.Batch;
|
||||
vm.Entity.Qty = inv.Qty;
|
||||
vm.Entity.Status = ShipStatusEnum.新建;
|
||||
vm.DoAdd();
|
||||
if (!ModelState.IsValid)
|
||||
|
||||
@@ -231,82 +231,7 @@ namespace HHWMS.Web.Controllers
|
||||
return vm.GetExportData();
|
||||
}
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// 库位分析
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <returns></returns>
|
||||
[ActionDescription("ShipmentHeader.Analyse")]
|
||||
public ActionResult Analyse(string id)
|
||||
{
|
||||
var vm = Wtm.CreateVM<ShipmentHeaderVM>(id);
|
||||
return PartialView(vm);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 返回分析数据
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <returns></returns>
|
||||
[ActionDescription("ShipmentHeader.Analyse")]
|
||||
[HttpPost]
|
||||
public ActionResult AnalyseData(int id)
|
||||
{
|
||||
var data = _unitwork.Find<ShipmentHeader>(x => x.ID == id)
|
||||
.Include(x => x.ShipmentDetails).ToList();
|
||||
var details = data.FirstOrDefault().ShipmentDetails.Where(x => x.Status < ShipStatusEnum.分配完成);
|
||||
foreach (var item in details)
|
||||
{
|
||||
var invQty = _unitwork.FindSingle<Inventory>(x =>
|
||||
x.UniqueCode.Equals(item.UniqueCode)
|
||||
&& x.TaskStatus == InventoryTaskStatus.无任务);
|
||||
item.InventoryStatus = invQty != null ? "满足" : "不足";
|
||||
}
|
||||
return JsonMore(details);
|
||||
}
|
||||
|
||||
[ActionDescription("ShipmentHeader.ShelfInv")]
|
||||
public ActionResult ShelfInv(string id)
|
||||
{
|
||||
var vm = Wtm.CreateVM<ShipmentHeaderVM>(id);
|
||||
return PartialView(vm);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 货架库存
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <returns></returns>
|
||||
[ActionDescription("ShipmentHeader.ShelfInv")]
|
||||
public ActionResult ShelfInvData(int id)
|
||||
{
|
||||
var data = _unitwork.Find<ShipmentHeader>(x => x.ID == id)
|
||||
.Include(x => x.ShipmentDetails)
|
||||
.FirstOrDefault();
|
||||
var details = data.ShipmentDetails.Where(x => x.Status < ShipStatusEnum.分配完成)
|
||||
.Select(x => x.UniqueCode)
|
||||
.ToList();
|
||||
|
||||
var invList = _unitwork.Find<Inventory>(x => x.ZoneCode.Equals(ZoneCodeEnum.货架库)
|
||||
&& x.TaskStatus.Equals(InventoryTaskStatus.无任务)
|
||||
&& details.Contains(x.UniqueCode))
|
||||
.ToList();
|
||||
//var details = data.ShipmentDetails.Where(x => invList.Contains(x.UniqueCode));
|
||||
return JsonMore(invList);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取库存数据
|
||||
/// </summary>
|
||||
/// <param name="uniqueCode"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public ActionResult GetInvData(string uniqueCode)
|
||||
{
|
||||
var data = _unitwork.Find<Inventory>(x => x.UniqueCode == uniqueCode).ToList();
|
||||
return JsonMore(data);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 启动出库
|
||||
|
||||
+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 ShipmentDetailHistoryTemplateVM : BaseTemplateVM
|
||||
{
|
||||
public ExcelPropety ShipmentHeaderHistory_Excel = ExcelPropety.CreateProperty<ShipmentDetailHistory>(x => x.ShipmentHeaderHistoryId);
|
||||
public ExcelPropety ShipmentHeaderHistory_Excel = ExcelPropety.CreateProperty<ShipmentDetailHistory>(x => x.HeaderId);
|
||||
[Display(Name = "Task.ZoneCode")]
|
||||
public ExcelPropety ZoneCode_Excel = ExcelPropety.CreateProperty<ShipmentDetailHistory>(x => x.ZoneCode);
|
||||
[Display(Name = "Inventory.MaterialCode")]
|
||||
|
||||
+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<ShipmentDetailHistory_View>> InitGridHeader()
|
||||
{
|
||||
return new List<GridColumn<ShipmentDetailHistory_View>>{
|
||||
this.MakeGridHeader(x => x.Code_view),
|
||||
this.MakeGridHeader(x => x.HeaderId),
|
||||
this.MakeGridHeader(x => x.ZoneCode),
|
||||
this.MakeGridHeader(x => x.MaterialCode),
|
||||
this.MakeGridHeader(x => x.MaterialType),
|
||||
@@ -57,7 +57,7 @@ namespace HHWMS.Web
|
||||
public override IOrderedQueryable<ShipmentDetailHistory_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<ShipmentDetailHistory>()
|
||||
.CheckEqual(Searcher.ShipmentHeaderHistoryId, x=>x.ShipmentHeaderHistoryId)
|
||||
.CheckEqual(Searcher.ShipmentHeaderHistoryId, x=>x.HeaderId)
|
||||
.CheckContain(Searcher.ZoneCode, x=>x.ZoneCode)
|
||||
.CheckContain(Searcher.MaterialCode, x=>x.MaterialCode)
|
||||
.CheckContain(Searcher.MaterialType, x=>x.MaterialType)
|
||||
@@ -72,7 +72,7 @@ namespace HHWMS.Web
|
||||
.Select(x => new ShipmentDetailHistory_View
|
||||
{
|
||||
ID = x.ID,
|
||||
Code_view = x.ShipmentHeaderHistory.Code,
|
||||
HeaderId = x.HeaderId,
|
||||
ZoneCode = x.ZoneCode,
|
||||
MaterialCode = x.MaterialCode,
|
||||
MaterialType = x.MaterialType,
|
||||
@@ -98,8 +98,6 @@ namespace HHWMS.Web
|
||||
}
|
||||
|
||||
public class ShipmentDetailHistory_View : ShipmentDetailHistory{
|
||||
[Display(Name = "Inventory.ShipCode")]
|
||||
public String Code_view { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
+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 ShipmentDetailHistoryVM()
|
||||
{
|
||||
SetInclude(x => x.ShipmentHeaderHistory);
|
||||
}
|
||||
|
||||
protected override void InitVM()
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class ShipmentDetailTemplateVM : BaseTemplateVM
|
||||
{
|
||||
public ExcelPropety ShipmentHeader_Excel = ExcelPropety.CreateProperty<ShipmentDetail>(x => x.ShipmentHeaderId);
|
||||
public ExcelPropety ShipmentHeader_Excel = ExcelPropety.CreateProperty<ShipmentDetail>(x => x.HeaderId);
|
||||
|
||||
[Display(Name = "Task.ZoneCode")]
|
||||
public ExcelPropety ZoneCode_Excel = ExcelPropety.CreateProperty<ShipmentDetail>(x => x.ZoneCode);
|
||||
|
||||
@@ -41,7 +41,6 @@ namespace HHWMS.Web
|
||||
if (SearcherMode == ListVMSearchModeEnum.MasterDetail)
|
||||
{
|
||||
return new List<GridColumn<ShipmentDetail_View>>{
|
||||
this.MakeGridHeader(x => x.UniqueCode).SetWidth(220),
|
||||
this.MakeGridHeader(x => x.MaterialCode),
|
||||
this.MakeGridHeader(x => x.Batch),
|
||||
this.MakeGridHeader(x => x.Qty),
|
||||
@@ -51,7 +50,6 @@ namespace HHWMS.Web
|
||||
else if (SearcherMode == ListVMSearchModeEnum.Custom1)
|
||||
{
|
||||
return new List<GridColumn<ShipmentDetail_View>>{
|
||||
this.MakeGridHeader(x => x.UniqueCode).SetWidth(220),
|
||||
this.MakeGridHeader(x => x.MaterialCode),
|
||||
this.MakeGridHeader(x => x.Batch),
|
||||
this.MakeGridHeader(x => x.Qty),
|
||||
@@ -87,31 +85,24 @@ namespace HHWMS.Web
|
||||
InitVM();
|
||||
if (SearcherMode == ListVMSearchModeEnum.Custom1) {
|
||||
var tt = DC.Set<ShipmentDetail>()
|
||||
.CheckEqual(Searcher.ShipmentHeaderId, x => x.ShipmentHeaderId)
|
||||
.CheckEqual(Searcher.HeaderId, x => x.HeaderId)
|
||||
.Select(x => new ShipmentDetail_View
|
||||
{
|
||||
ID = x.ID,
|
||||
UniqueCode = x.UniqueCode,
|
||||
MaterialCode = x.MaterialCode,
|
||||
Batch = x.Batch,
|
||||
Qty = x.Qty,
|
||||
InventoryStatus = x.InventoryStatus,
|
||||
Status = x.Status
|
||||
}).ToList();
|
||||
foreach(var item in tt.Where(x => x.Status < ShipStatusEnum.分配完成))
|
||||
{
|
||||
var invQty = _unitWork.Find<Inventory>(x => x.UniqueCode.Equals(item.UniqueCode))
|
||||
.Sum(x => x.Qty);
|
||||
item.InventoryStatus = invQty >= (item.Qty - item.DividedQty) ? "true" : "false";
|
||||
}
|
||||
|
||||
return (IOrderedQueryable<ShipmentDetail_View>)tt.OrderBy(x => x.ID);
|
||||
}
|
||||
else
|
||||
{
|
||||
var query = DC.Set<ShipmentDetail>()
|
||||
.CheckEqual(Searcher.ShipmentHeaderId, x => x.ShipmentHeaderId)
|
||||
.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)
|
||||
@@ -125,7 +116,6 @@ namespace HHWMS.Web
|
||||
{
|
||||
ID = x.ID,
|
||||
Code_view = x.ShipmentHeader.Code,
|
||||
UniqueCode = x.UniqueCode,
|
||||
ZoneCode = x.ZoneCode,
|
||||
MaterialCode = x.MaterialCode,
|
||||
MaterialType = x.MaterialType,
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace HHWMS.Web
|
||||
public List<ComboSelectListItem> AllShipmentHeaders { get; set; }
|
||||
|
||||
[Display(Name = "Inventory.ShipCode")]
|
||||
public int? ShipmentHeaderId { get; set; }
|
||||
public int? HeaderId { get; set; }
|
||||
|
||||
[Display(Name = "Task.ZoneCode")]
|
||||
public String ZoneCode { get; set; }
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace HHWMS.Web
|
||||
protected override void InitVM()
|
||||
{
|
||||
Details.CopyContext(this);
|
||||
Details.Searcher.ShipmentHeaderId = Entity.ID;
|
||||
Details.Searcher.HeaderId = Entity.ID;
|
||||
|
||||
var CurrentCulture = Wtm.CurrentCulture;
|
||||
var dictDatas = DC.Set<SysDictData>().ToList();
|
||||
|
||||
@@ -3,8 +3,7 @@
|
||||
|
||||
<wt:form vm="@Model">
|
||||
<wt:row items-per-row="ItemsPerRowEnum.Two">
|
||||
<wt:combobox field="Entity.ShipmentHeaderId" items="AllShipmentHeaders"/>
|
||||
<wt:textbox field="Entity.UniqueCode" />
|
||||
<wt:combobox field="Entity.HeaderId" items="AllShipmentHeaders" />
|
||||
@* <wt:textbox field="Entity.ZoneCode" />
|
||||
<wt:textbox field="Entity.MaterialCode" />
|
||||
<wt:textbox field="Entity.MaterialType" />
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
@model HHWMS.Web.ShipmentDetailVM
|
||||
@model HHWMS.Web.ShipmentDetailVM
|
||||
@inject IStringLocalizer<Program> Localizer;
|
||||
|
||||
<wt:form vm="@Model">
|
||||
<wt:row items-per-row="ItemsPerRowEnum.Two">
|
||||
<wt:combobox field="Entity.ShipmentHeaderId" items="AllShipmentHeaders"/>
|
||||
<wt:combobox field="Entity.HeaderId" items="AllShipmentHeaders" />
|
||||
<wt:textbox field="Entity.ZoneCode" />
|
||||
<wt:textbox field="Entity.MaterialCode" />
|
||||
<wt:textbox field="Entity.MaterialType" />
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
<wt:searchpanel vm="@Model" reset-btn="true">
|
||||
<wt:row items-per-row="ItemsPerRowEnum.Three">
|
||||
<wt:combobox field="Searcher.ShipmentHeaderId" items="Searcher.AllShipmentHeaders" empty-text="@Localizer["Sys.All"]" />
|
||||
<wt:combobox field="Searcher.HeaderId" items="Searcher.AllShipmentHeaders" 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.ShipmentDetailHistoryVM
|
||||
@model HHWMS.Web.ShipmentDetailHistoryVM
|
||||
@inject IStringLocalizer<Program> Localizer;
|
||||
|
||||
<wt:form vm="@Model">
|
||||
<wt:row items-per-row="ItemsPerRowEnum.Two">
|
||||
<wt:combobox field="Entity.ShipmentHeaderHistoryId" items="AllShipmentHeaderHistorys"/>
|
||||
<wt:combobox field="Entity.HeaderId" items="AllShipmentHeaderHistorys" />
|
||||
<wt:textbox field="Entity.ZoneCode" />
|
||||
<wt:textbox field="Entity.MaterialCode" />
|
||||
<wt:textbox field="Entity.MaterialType" />
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
@model HHWMS.Web.ShipmentDetailHistoryVM
|
||||
@model HHWMS.Web.ShipmentDetailHistoryVM
|
||||
@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.ShipmentHeaderHistory.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.ShipmentDetailHistoryVM
|
||||
@model HHWMS.Web.ShipmentDetailHistoryVM
|
||||
@inject IStringLocalizer<Program> Localizer;
|
||||
|
||||
<wt:form vm="@Model">
|
||||
<wt:row items-per-row="ItemsPerRowEnum.Two">
|
||||
<wt:display field="Entity.ShipmentHeaderHistory.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.ShipmentDetailHistoryVM
|
||||
@model HHWMS.Web.ShipmentDetailHistoryVM
|
||||
@inject IStringLocalizer<Program> Localizer;
|
||||
|
||||
<wt:form vm="@Model">
|
||||
<wt:row items-per-row="ItemsPerRowEnum.Two">
|
||||
<wt:combobox field="Entity.ShipmentHeaderHistoryId" items="AllShipmentHeaderHistorys"/>
|
||||
<wt:combobox field="Entity.HeaderId" items="AllShipmentHeaderHistorys" />
|
||||
<wt:textbox field="Entity.ZoneCode" />
|
||||
<wt:textbox field="Entity.MaterialCode" />
|
||||
<wt:textbox field="Entity.MaterialType" />
|
||||
|
||||
Reference in new issue
Block a user