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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-13 10:30:51 +08:00
parent 679fb37a8b c8acf0d84e
commit 0a762e7dd5
11 changed files with 72 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
View File

@@ -50,19 +50,34 @@ namespace WMS.Web.Api.Controllers
return result;
}
/// <summary>
/// 移箱保存-PDA
/// 移箱下架保存-PDA
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Save")]
public async Task<Result> Save(SaveMoveBoxRecordRequest dto)
[Route("Down_Save")]
public async Task<Result> Down_Save(SaveMoveBoxRecordRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result.ReFailure(ResultCodes.Token_Invalid_Error);
return await _changeMoveBoxService.MoveBoxSave(dto, loginInfo);
return await _changeMoveBoxService.MoveBoxSave(dto,false, loginInfo);
}
/// <summary>
/// 移箱上架保存-PDA
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Up_Save")]
public async Task<Result> Up_Save(SaveMoveBoxRecordRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result.ReFailure(ResultCodes.Token_Invalid_Error);
return await _changeMoveBoxService.MoveBoxSave(dto,true, loginInfo);
}
}
}

11
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
View File

@@ -213,9 +213,16 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.MoveBoxRecordController.Save(WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest)">
<member name="M:WMS.Web.Api.Controllers.MoveBoxRecordController.Down_Save(WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest)">
<summary>
移箱保存-PDA
移箱下架保存-PDA
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.MoveBoxRecordController.Up_Save(WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest)">
<summary>
移箱上架保存-PDA
</summary>
<param name="dto"></param>
<returns></returns>

14
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -2710,14 +2710,9 @@
箱号ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest.SrcSubStockId">
<member name="P:WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest.SubStockId">
<summary>
原仓位ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest.DestSubStockId">
<summary>
目标仓位ID
仓位ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest.Qty">
@@ -2725,11 +2720,6 @@
数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest.Type">
<summary>
类型：1-整箱移货上级，2-整箱移货下级
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OperateRequest">
<summary>
操作 Id集合

4
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -733,7 +733,7 @@
操作时间
</summary>
</member>
<member name="M:WMS.Web.Domain.Entitys.MoveBoxRecord.Create(System.Int32)">
<member name="M:WMS.Web.Domain.Entitys.MoveBoxRecord.Create(WMS.Web.Domain.Values.MoveBoxType,System.Int32,System.Int32,System.Int32)">
<summary>
创建
</summary>
@@ -2625,7 +2625,7 @@
<param name="loginInfo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.ChangeMoveBoxService.MoveBoxSave(WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
<member name="M:WMS.Web.Domain.Services.ChangeMoveBoxService.MoveBoxSave(WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest,System.Boolean,WMS.Web.Core.Dto.Login.LoginInDto)">
<summary>
移箱保存
</summary>

16
src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs
View File

@@ -16,24 +16,14 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord
[Required(ErrorMessage = "箱号不能为空")]
public int BoxId { get; set; }
/// <summary>
/// 原仓位ID
/// 仓位ID
/// </summary>
[Required(ErrorMessage = "原仓位不能为空")]
public int SrcSubStockId { get; set; }
/// <summary>
/// 目标仓位ID
/// </summary>
[Required(ErrorMessage = "目标仓位不能为空")]
public int DestSubStockId { get; set; }
[Required(ErrorMessage = "仓位不能为空")]
public int SubStockId { get; set; }
/// <summary>
/// 数量
/// </summary>
[Required(ErrorMessage = "数量不能为空")]
public decimal Qty { get; set; }
/// <summary>
/// 类型：1-整箱移货上级，2-整箱移货下级
/// </summary>
[Required(ErrorMessage = "类型不能为空")]
public int Type { get; set; }
}
}

6
src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs
View File

@@ -65,8 +65,12 @@ namespace WMS.Web.Domain.Entitys
/// 创建
/// </summary>
/// <param name="creatorId"></param>
public void Create(int creatorId)
public void Create(MoveBoxType type, int boxId, int subStockId, int creatorId)
{
this.BoxId = boxId;
this.Type = type;
SrcSubStockId = type == MoveBoxType.Up ? 0 : subStockId;//上架 原仓位是0 目标仓位有值
DestSubStockId = type == MoveBoxType.Up ? subStockId : 0; //下架 原仓位有值 目标仓位是0
this.CreatorId = creatorId;
this.CreateTime = DateTime.Now;
}

2
src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs
View File

@@ -19,7 +19,7 @@ namespace WMS.Web.Domain.IService
//改箱保存
Task<Result> ChangeBoxSave(SaveChangeBoxRecordRequest dto, LoginInDto loginInfo, bool isTransaction=true);
//移箱保存
Task<Result> MoveBoxSave(SaveMoveBoxRecordRequest dto, LoginInDto loginInfo);
Task<Result> MoveBoxSave(SaveMoveBoxRecordRequest dto,bool IsUp, LoginInDto loginInfo);
}
}

2
src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs
View File

@@ -12,7 +12,7 @@ namespace WMS.Web.Domain.Mappers
{
public MoveBoxRecordMapper()
{
CreateMap<SaveMoveBoxRecordRequest, MoveBoxRecord>();
//CreateMap<SaveMoveBoxRecordRequest, MoveBoxRecord>();
}
}
}

7
src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
View File

@@ -109,11 +109,10 @@ namespace WMS.Web.Domain.Services
/// <param name="dto"></param>
/// <param name="loginInfo"></param>
/// <returns></returns>
public async Task<Result> MoveBoxSave(SaveMoveBoxRecordRequest dto, LoginInDto loginInfo)
public async Task<Result> MoveBoxSave(SaveMoveBoxRecordRequest dto, bool IsUp, LoginInDto loginInfo)
{
var entity = _mapper.Map<MoveBoxRecord>(dto);
entity.Create(loginInfo.UserInfo.StaffId);
var entity = new MoveBoxRecord();
entity.Create(IsUp == true ? MoveBoxType.Up : MoveBoxType.Down, dto.BoxId, dto.SubStockId, loginInfo.UserInfo.StaffId);
//需要填写规格型号
//需要修改库存

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>();
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);

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

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