18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整日志记录

Browse Source
This commit is contained in:
18942506660
2023-11-13 10:24:54 +08:00
parent 4f6831855e
commit c8acf0d84e
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/WMS.Web.Domain/Services/SerialNumberService.cs
View File

@@ -57,11 +57,11 @@ namespace WMS.Web.Domain.Services
List<SerialNumberOperate> sList = new List<SerialNumberOperate>(); List<SerialNumberOperate> sList = new List<SerialNumberOperate>();
foreach (var entity in entityList) 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() SerialNumberOperate op = new SerialNumberOperate()
{ {
@@ -72,8 +72,14 @@ namespace WMS.Web.Domain.Services
OperateTime = DateTime.Now, OperateTime = DateTime.Now,
OperateType = SerialNumberOperateType.ChangeBox, OperateType = SerialNumberOperateType.ChangeBox,
OperateUser = userName, 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); sList.Add(op);
} }
isSuccess = await _serialNumbersRepositories.EditEntityList(entityList, false); isSuccess = await _serialNumbersRepositories.EditEntityList(entityList, false);
@@ -106,7 +112,7 @@ namespace WMS.Web.Domain.Services
var entityList = await _serialNumbersRepositories.GetEntityListByBoxId(moveBoxRecord.BoxId); var entityList = await _serialNumbersRepositories.GetEntityListByBoxId(moveBoxRecord.BoxId);
var box = await _boxRepositories.Get(moveBoxRecord.BoxId); var box = await _boxRepositories.Get(moveBoxRecord.BoxId);
var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId); var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId);
IDbContextTransaction _transaction = null; IDbContextTransaction _transaction = null;
if (isTransaction) if (isTransaction)
_transaction = _transactionRepositories.GetTransaction(); _transaction = _transactionRepositories.GetTransaction();
@@ -126,10 +132,15 @@ namespace WMS.Web.Domain.Services
OrgId = box.OrgId, OrgId = box.OrgId,
SupplierId = box.SupplierId, SupplierId = box.SupplierId,
OperateTime = DateTime.Now, OperateTime = DateTime.Now,
OperateType = SerialNumberOperateType.MoveBox, OperateType = moveBoxRecord.Type == MoveBoxType.Up ? SerialNumberOperateType.MoveBox_Up : SerialNumberOperateType.MoveBox_Down,
OperateUser = userName, 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); sList.Add(op);
} }
isSuccess = await _serialNumbersRepositories.EditEntityList(entityList, false); isSuccess = await _serialNumbersRepositories.EditEntityList(entityList, false);

13
src/WMS.Web.Domain/Values/SerialNumberOperateType.cs
View File

@@ -19,14 +19,19 @@ namespace WMS.Web.Domain.Values
[EnumRemark("装箱")] [EnumRemark("装箱")]
CompleteCartonBox = 1, CompleteCartonBox = 1,
/// <summary> /// <summary>
/// 移箱 /// 移箱上架
/// </summary> /// </summary>
[EnumRemark("移箱")] [EnumRemark("移箱上架")]
MoveBox = 2, MoveBox_Up = 2,
/// <summary>
/// 移箱下架
/// </summary>
[EnumRemark("移箱下架")]
MoveBox_Down = 3,
/// <summary> /// <summary>
/// 改箱 /// 改箱
/// </summary> /// </summary>
[EnumRemark("改箱")] [EnumRemark("改箱")]
ChangeBox = 3, ChangeBox = 4,
} }
} }