日志分表 任务日志 操作日志 接口日志
添加对应的日志文件 修改主子表的表结构信息 删除无关字段信息 测试添加数据到历史表中
This commit is contained in:
1 parent
ebdd40c518
commit
4f2ba2a3ee
101 files changed
+1004
-418
No files matched your search
@@ -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,
|
||||
|
||||
Reference in new issue
Block a user