diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml index 6deca40..e578c11 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml @@ -266,11 +266,11 @@ }, }); - + // 重新扫描箱号后,待绑定列表清空 _this.bindingData = []; _this.changeselect(_this.value); - + // _this.$refs.uniqueCode.focus(); }, // 选择尺寸后 @@ -323,7 +323,7 @@ this.bindingData.push({ receiptCode: this.form.code, boxCode: this.form.boxCode, - index: this.dataIndex.shift(), + index: this.dataIndex.sort(function(a,b){return a-b}).shift(), uniqueCode: data, size: this.form.size }) diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs index 201fb87..7ff0dbb 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs @@ -89,12 +89,14 @@ public class ShipOutController : BaseController [HttpPost] public ActionResult Pick(string uniqueCode, decimal qty,string station) { - var shipment = _unitWork.Find(x => x.UniqueCode.Equals(uniqueCode)) - .FirstOrDefault(); + using (var tran = Wtm.DC.Database.BeginTransaction()) { try { + var shipment = _unitWork.Find(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(x => x.ID.Equals(shipment.ShipmentHeaderId)) - .FirstOrDefault(); - var details = _unitWork.Find(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(x => x.UniqueCode.Equals(uniqueCode) && x.LocationCode == station); + if (inv == null && string.IsNullOrEmpty(station)) + { + inv = _unitWork.FindSingle(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(x => x.ID.Equals(shipment.ShipmentHeaderId)) + .FirstOrDefault(); + var details = _unitWork.Find(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); diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs index f643900..e22eb2f 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs @@ -291,6 +291,7 @@ namespace HHWMS.Web.Controllers var invList = _unitwork.Find(x => x.ZoneCode.Equals(ZoneCodeEnum.货架库) && x.TaskStatus.Equals(InventoryTaskStatus.无任务) && details.Contains(x.UniqueCode)) + .OrderBy(x => x.LocationCode) .ToList(); //var details = data.ShipmentDetails.Where(x => invList.Contains(x.UniqueCode)); return JsonMore(invList); @@ -325,7 +326,7 @@ namespace HHWMS.Web.Controllers _unitwork.Update(shipment); var ids = data.Select(x => x.ID).ToList(); - if(ids.Count > 0) { + if(ids.Count > 0) { var invList = _unitwork.Find(x => ids.Contains(x.ID)) .ToList(); diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml index 19e7bf6..8ee872e 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml @@ -2,7 +2,7 @@ - + (x => x.FirstStatus == ShipStatusEnum.拣货完成); } + // 清理当前之前的状态不正确的出库单 + var errorShip = _unitwork.Find(x => + x.FirstStatus < ShipStatusEnum.拣货完成 + && x.FirstStatus > ShipStatusEnum.新建 + && x.CreateTime < DateTime.Now.AddDays(-1)) + .Include(u => u.ShipmentDetails) + .ToList(); + foreach (var ship in errorShip) + { + if (ship.ShipmentDetails.All(x => x.Status != ShipStatusEnum.新建)) + { + var invs = _unitwork.Find(x => + ship.ShipmentDetails.Select(y => y.UniqueCode).ToList() + .Contains(x.UniqueCode)) + .Count(); + if (invs == 0) + { + _unitwork.Delete(errorShip); + } + } + } + + Wtm.DoLog("清理过期单据", ActionLogTypesEnum.Job, "TestJob"); #region 更新时间