盘料入库页面,层号排序后再分配
添加货架库扫码捡货动作 添加异常出库单据清理任务
This commit is contained in:
1 parent
9bfee8930c
commit
caab84071c
5 files changed
+111
-65
No files matched your search
@@ -89,12 +89,14 @@ public class ShipOutController : BaseController
|
||||
[HttpPost]
|
||||
public ActionResult Pick(string uniqueCode, decimal qty,string station)
|
||||
{
|
||||
var shipment = _unitWork.Find<ShipmentDetail>(x => x.UniqueCode.Equals(uniqueCode))
|
||||
.FirstOrDefault();
|
||||
|
||||
using (var tran = Wtm.DC.Database.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
var shipment = _unitWork.Find<ShipmentDetail>(x => x.UniqueCode.Equals(uniqueCode)
|
||||
&& x.Status != ShipStatusEnum.拣货完成)
|
||||
.FirstOrDefault();
|
||||
if (shipment == null)
|
||||
{
|
||||
return JsonMore(null, 500, "未找到该出库单!");
|
||||
@@ -105,23 +107,11 @@ public class ShipOutController : BaseController
|
||||
shipment.UpdateBy = Wtm.LoginUserInfo?.ITCode??"WMS";
|
||||
_unitWork.Update(shipment);
|
||||
|
||||
var header = _unitWork.Find<ShipmentHeader>(x => x.ID.Equals(shipment.ShipmentHeaderId))
|
||||
.FirstOrDefault();
|
||||
var details = _unitWork.Find<ShipmentDetail>(x => x.ShipmentHeaderId == shipment.ShipmentHeaderId)
|
||||
.ToList();
|
||||
if (details.All(x => x.Status == ShipStatusEnum.拣货完成))
|
||||
{
|
||||
header.FirstStatus = ShipStatusEnum.拣货完成;
|
||||
}
|
||||
else
|
||||
{
|
||||
header.FirstStatus = ShipStatusEnum.拣货中;
|
||||
}
|
||||
header.UpdateTime = DateTime.Now;
|
||||
header.UpdateBy = Wtm.LoginUserInfo?.ITCode??"WMS";
|
||||
_unitWork.Update(header);
|
||||
|
||||
var inv = _unitWork.FindSingle<Inventory>(x => x.UniqueCode.Equals(uniqueCode) && x.LocationCode == station);
|
||||
if (inv == null && string.IsNullOrEmpty(station))
|
||||
{
|
||||
inv = _unitWork.FindSingle<Inventory>(x => x.UniqueCode.Equals(uniqueCode) && x.ZoneCode == ZoneCodeEnum.货架库);
|
||||
}
|
||||
if (inv != null)
|
||||
{
|
||||
//回传MES
|
||||
@@ -182,7 +172,7 @@ public class ShipOutController : BaseController
|
||||
CompanyCode = inv.CompanyCode,
|
||||
LocationCode = inv.LocationCode,
|
||||
SupplierCode = inv.SupplierCode,
|
||||
BillCode = header.Code,
|
||||
BillCode = shipment.ShipmentHeaderId.ToString(),
|
||||
BillDetailId = shipment.ID,
|
||||
ContainerCode = inv.ContainerCode,
|
||||
Qty = inv.Qty,
|
||||
@@ -214,6 +204,23 @@ public class ShipOutController : BaseController
|
||||
}
|
||||
}
|
||||
|
||||
// 更新单据状态
|
||||
var header = _unitWork.Find<ShipmentHeader>(x => x.ID.Equals(shipment.ShipmentHeaderId))
|
||||
.FirstOrDefault();
|
||||
var details = _unitWork.Find<ShipmentDetail>(x => x.ShipmentHeaderId == shipment.ShipmentHeaderId)
|
||||
.ToList();
|
||||
if (details.All(x => x.Status == ShipStatusEnum.拣货完成))
|
||||
{
|
||||
header.FirstStatus = ShipStatusEnum.拣货完成;
|
||||
}
|
||||
else
|
||||
{
|
||||
header.FirstStatus = ShipStatusEnum.拣货中;
|
||||
}
|
||||
header.UpdateTime = DateTime.Now;
|
||||
header.UpdateBy = Wtm.LoginUserInfo?.ITCode??"WMS";
|
||||
_unitWork.Update(header);
|
||||
|
||||
// Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "success");
|
||||
tran.Commit();
|
||||
return JsonMore(null);
|
||||
|
||||
Reference in new issue
Block a user