diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index 73adc4c5..3d65c963 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -57,11 +57,11 @@ namespace WMS.Web.Domain.Services List sList = new List(); foreach (var entity in entityList) { - var destBoxId = changeBoxRecords.FirstOrDefault(f => f.SerialNumbers.Contains(entity.SerialNumber)).DestBoxId; + var destBox = changeBoxRecords.FirstOrDefault(f => f.SerialNumbers.Contains(entity.SerialNumber)); //修改序列号和箱绑定关系 - entity.Operate(destBoxId); + entity.Operate(destBox.DestBoxId); - var box = boxList.FirstOrDefault(f=>f.Id==destBoxId); + var box = boxList.FirstOrDefault(f => f.Id == destBox.DestBoxId); //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() { @@ -72,8 +72,14 @@ namespace WMS.Web.Domain.Services OperateTime = DateTime.Now, OperateType = SerialNumberOperateType.ChangeBox, OperateUser = userName, - Remark = "箱号:" + box.BoxBillNo + Remark = "单号:" + destBox.BillNo + "\r\n" + "箱号:" + box.BoxBillNo }; + //取目标箱子仓位 记录目标箱仓位号 + //if (moveBoxRecord.Type == MoveBoxType.Up) + //{ + //var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockId); + //op.Remark += "\r\n" + "仓位:" + srcSubStock; + //} sList.Add(op); } isSuccess = await _serialNumbersRepositories.EditEntityList(entityList, false); @@ -106,7 +112,7 @@ namespace WMS.Web.Domain.Services var entityList = await _serialNumbersRepositories.GetEntityListByBoxId(moveBoxRecord.BoxId); var box = await _boxRepositories.Get(moveBoxRecord.BoxId); var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId); - + IDbContextTransaction _transaction = null; if (isTransaction) _transaction = _transactionRepositories.GetTransaction(); @@ -126,10 +132,15 @@ namespace WMS.Web.Domain.Services OrgId = box.OrgId, SupplierId = box.SupplierId, OperateTime = DateTime.Now, - OperateType = SerialNumberOperateType.MoveBox, + OperateType = moveBoxRecord.Type == MoveBoxType.Up ? SerialNumberOperateType.MoveBox_Up : SerialNumberOperateType.MoveBox_Down, OperateUser = userName, - Remark = "箱号:" + box.BoxBillNo + Remark = "单号:" + moveBoxRecord.BillNo + "\r\n" + "箱号:" + box.BoxBillNo }; + if (moveBoxRecord.Type == MoveBoxType.Up) + { + var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockId); + op.Remark += "\r\n" + "仓位:" + srcSubStock; + } sList.Add(op); } isSuccess = await _serialNumbersRepositories.EditEntityList(entityList, false); diff --git a/src/WMS.Web.Domain/Values/SerialNumberOperateType.cs b/src/WMS.Web.Domain/Values/SerialNumberOperateType.cs index be3b4231..5198ad40 100644 --- a/src/WMS.Web.Domain/Values/SerialNumberOperateType.cs +++ b/src/WMS.Web.Domain/Values/SerialNumberOperateType.cs @@ -19,14 +19,19 @@ namespace WMS.Web.Domain.Values [EnumRemark("装箱")] CompleteCartonBox = 1, /// - /// 移箱 + /// 移箱上架 /// - [EnumRemark("移箱")] - MoveBox = 2, + [EnumRemark("移箱上架")] + MoveBox_Up = 2, + /// + /// 移箱下架 + /// + [EnumRemark("移箱下架")] + MoveBox_Down = 3, /// /// 改箱 /// [EnumRemark("改箱")] - ChangeBox = 3, + ChangeBox = 4, } }