入库操作修改
This commit is contained in:
1 parent
2097bffabb
commit
8de4bc26cd
8 files changed
+348
-25
No files matched your search
@@ -17,10 +17,10 @@ namespace HHWMS.Web.Controllers
|
||||
[ActionDescription("盘料操作")]
|
||||
public partial class ReceiptInController : BaseController
|
||||
{
|
||||
private readonly IUnitWork _unitwork;
|
||||
private readonly IUnitWork _unitWork;
|
||||
public ReceiptInController(IUnitWork unitwork)
|
||||
{
|
||||
_unitwork = unitwork;
|
||||
_unitWork = unitwork;
|
||||
}
|
||||
#region Search
|
||||
[ActionDescription("Sys.Search")]
|
||||
@@ -32,7 +32,7 @@ namespace HHWMS.Web.Controllers
|
||||
[HttpPost]
|
||||
public ActionResult<dynamic> SelectReceiptCode()
|
||||
{
|
||||
var data = _unitwork.Find<ReceiptHeader>(x => x.FirstStatus < ReceiptStatusEnum.回传)
|
||||
var data = _unitWork.Find<ReceiptHeader>(x => x.FirstStatus <= ReceiptStatusEnum.收完)
|
||||
.Select(x => new { label = x.Code, value = x.Code });
|
||||
return JsonMore(data);
|
||||
}
|
||||
@@ -40,10 +40,12 @@ namespace HHWMS.Web.Controllers
|
||||
[HttpPost]
|
||||
public ActionResult<dynamic> SelectReceipt(string Code)
|
||||
{
|
||||
var data = _unitwork.Find<ReceiptHeader>(x => x.Code == Code).Include(x => x.ReceiptDetails).FirstOrDefault();
|
||||
var data = _unitWork.Find<ReceiptHeader>(x => x.Code == Code)
|
||||
.Include(x => x.ReceiptDetails.Where(a => a.Status < ReceiptStatusEnum.收完))
|
||||
.FirstOrDefault();
|
||||
if(data != null)
|
||||
{
|
||||
var result = data.ReceiptDetails.Select(x => new { name = x.MaterialCode });
|
||||
var result = data.ReceiptDetails.Select(x => new { name = x.UniqueCode });
|
||||
return JsonMore(result);
|
||||
}
|
||||
else
|
||||
@@ -57,10 +59,46 @@ namespace HHWMS.Web.Controllers
|
||||
/// <param name="data"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public dynamic BindingData(List<Binding> data)
|
||||
public ActionResult BindingData(List<Binding> data)
|
||||
{
|
||||
// 查找明细,修改对应状态,并且 绑定物料周转箱
|
||||
return new ApiJsonResult<object> { Success = true };
|
||||
var receiptHeaderList = _unitWork.Find<ReceiptHeader>(x =>
|
||||
data.Select(x => x.ReceiptCode).ToList().Contains(x.Code))
|
||||
.Include(x => x.ReceiptDetails).ToList();
|
||||
// 查找明细,修改对应状态,并且 绑定物料周转箱
|
||||
foreach (Binding item in data)
|
||||
{
|
||||
// 更新入库单明细状态
|
||||
var header = receiptHeaderList.First(x => x.Code.Equals(item.ReceiptCode));
|
||||
var receipt = header.ReceiptDetails.First(x => x.UniqueCode.Equals(item.UniqueCode));
|
||||
//var receipt = _unitWork.FindSingle<ReceiptDetail>(x => x.UniqueCode == item.UniqueCode);
|
||||
if (receipt != null)
|
||||
{
|
||||
if (receipt.Status == ReceiptStatusEnum.收完) continue;
|
||||
receipt.CompletedQty += item.BindQty;
|
||||
}
|
||||
if (receipt.CompletedQty == receipt.Qty)
|
||||
{
|
||||
receipt.Status = ReceiptStatusEnum.收完;
|
||||
if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完))
|
||||
{
|
||||
header.FirstStatus = ReceiptStatusEnum.收完;
|
||||
_unitWork.Update(header);
|
||||
}
|
||||
}
|
||||
// 新建库存
|
||||
var inventory = new Inventory
|
||||
{
|
||||
ZoneCode = ZoneCodeEnum.盘料库,
|
||||
UniqueCode = item.UniqueCode,
|
||||
Flag = item.Index,
|
||||
Qty = receipt.Qty,
|
||||
Lot = item.Size.ToString(),
|
||||
ContainerCode = item.BoxCode,
|
||||
TaskStatus = InventoryTaskStatus.任务中
|
||||
};
|
||||
_unitWork.Add(inventory);
|
||||
}
|
||||
return JsonMore(null);
|
||||
}
|
||||
|
||||
#endregion
|
||||
@@ -69,9 +107,11 @@ namespace HHWMS.Web.Controllers
|
||||
|
||||
public class Binding
|
||||
{
|
||||
public string ReceiptCode { get; set; }
|
||||
public string UniqueCode { get; set; }
|
||||
public string BoxCode { get; set; }
|
||||
public int Index { get; set; }
|
||||
public int Size { get; set; }
|
||||
public int BindQty { get; set; }
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user