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