新增货架出入库 和打印操作
This commit is contained in:
1 parent
c27a357771
commit
6a1329d74e
17 files changed
+620
-9
No files matched your search
@@ -9,6 +9,8 @@ using System.Reflection;
|
||||
using HHWMS.Web.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Linq;
|
||||
using NPOI.SS.Formula.Functions;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace HHWMS.Web.Controllers
|
||||
{
|
||||
@@ -250,7 +252,7 @@ namespace HHWMS.Web.Controllers
|
||||
{
|
||||
var data = _unitwork.Find<ShipmentHeader>(x => x.ID == id)
|
||||
.Include(x => x.ShipmentDetails).ToList();
|
||||
var details = data.FirstOrDefault().ShipmentDetails.Where(x => x.Status < ShipStatusEnum.拣货完成);
|
||||
var details = data.FirstOrDefault().ShipmentDetails.Where(x => x.Status < ShipStatusEnum.分配完成);
|
||||
foreach (var item in details)
|
||||
{
|
||||
var invQty = _unitwork.Find<Inventory>(x => x.UniqueCode.Equals(item.UniqueCode))
|
||||
@@ -260,6 +262,99 @@ namespace HHWMS.Web.Controllers
|
||||
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);
|
||||
}
|
||||
|
||||
[ActionDescription("ShipmentHeader.Pick")]
|
||||
[HttpPost]
|
||||
public ActionResult Pick(List<Binding> data, int shipId)
|
||||
{
|
||||
var shipment = _unitwork.Find<ShipmentHeader>(x => x.ID.Equals(shipId))
|
||||
.Include(x => x.ShipmentDetails)
|
||||
.FirstOrDefault();
|
||||
if(shipment == null)
|
||||
{
|
||||
return JsonMore(null, 500, "未找到该出库单!");
|
||||
}
|
||||
foreach(var detail in shipment.ShipmentDetails
|
||||
.Where(x => data.Select(x => x.UniqueCode).Contains(x.UniqueCode)))
|
||||
{
|
||||
detail.Status = ShipStatusEnum.拣货完成;
|
||||
}
|
||||
if (!shipment.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.拣货完成))
|
||||
{
|
||||
shipment.FirstStatus = ShipStatusEnum.拣货完成;
|
||||
}
|
||||
else
|
||||
{
|
||||
shipment.FirstStatus = ShipStatusEnum.拣货中;
|
||||
}
|
||||
shipment.UpdateBy = Wtm.LoginUserInfo.ITCode;
|
||||
shipment.UpdateTime = DateTime.Now;
|
||||
|
||||
var ids = data.Select(x => x.ID).ToList();
|
||||
var invList = _unitwork.Find<Inventory>(x => ids.Contains(x.ID))
|
||||
.ToList();
|
||||
|
||||
|
||||
// 加入交易表
|
||||
var listInvtran = new List<InventoryTransaction>();
|
||||
foreach (var inv in invList)
|
||||
{
|
||||
listInvtran.Add(new InventoryTransaction
|
||||
{
|
||||
BillType = "out",
|
||||
ZoneCode = inv.ZoneCode,
|
||||
BillCode = shipment.Code,
|
||||
Type = inv.UniqueCode,
|
||||
MaterialCode = inv.MaterialCode,
|
||||
MaterialName = inv.MaterialName,
|
||||
MaterialSpec = inv.MaterialSpec,
|
||||
MaterialUnit = inv.MaterialUnit,
|
||||
MaterialType = inv.MaterialType,
|
||||
Batch = inv.Batch,
|
||||
Lot = inv.Lot,
|
||||
CompanyCode = inv.CompanyCode,
|
||||
LocationCode = inv.LocationCode,
|
||||
SupplierCode = inv.SupplierCode,
|
||||
Qty = inv.Qty,
|
||||
CreateTime = DateTime.Now
|
||||
});
|
||||
}
|
||||
_unitwork.BatchAdd(listInvtran.ToArray());
|
||||
|
||||
// 删除库存
|
||||
_unitwork.BatchDelete<Inventory>(x => data.Select(u => u.ID).Contains(x.ID));
|
||||
return JsonMore(null);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取库存数据
|
||||
/// </summary>
|
||||
|
||||
Reference in new issue
Block a user