diff --git a/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs b/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
index cc0df698..51fcbeca 100644
--- a/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
+++ b/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
@@ -50,19 +50,34 @@ namespace WMS.Web.Api.Controllers
return result;
}
///
- /// 移箱保存-PDA
+ /// 移箱下架保存-PDA
///
///
///
[HttpPost]
- [Route("Save")]
- public async Task Save(SaveMoveBoxRecordRequest dto)
+ [Route("Down_Save")]
+ public async Task 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);
+ }
+ ///
+ /// 移箱上架保存-PDA
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("Up_Save")]
+ public async Task 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);
}
}
}
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 41905ed7..27d75896 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -213,9 +213,16 @@
-
+
- 移箱保存-PDA
+ 移箱下架保存-PDA
+
+
+
+
+
+
+ 移箱上架保存-PDA
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index e6cbb44e..fd52ca1d 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -2710,14 +2710,9 @@
箱号ID
-
+
- 原仓位ID
-
-
-
-
- 目标仓位ID
+ 仓位ID
@@ -2725,11 +2720,6 @@
数量
-
-
- 类型：1-整箱移货上级，2-整箱移货下级
-
-
操作 Id集合
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index e44115fd..75bce319 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -733,7 +733,7 @@
操作时间
-
+
创建
@@ -2625,7 +2625,7 @@
-
+
移箱保存
diff --git a/src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs b/src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs
index 55ea7fd2..674bfb59 100644
--- a/src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs
+++ b/src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs
@@ -16,24 +16,14 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord
[Required(ErrorMessage = "箱号不能为空")]
public int BoxId { get; set; }
///
- /// 原仓位ID
+ /// 仓位ID
///
- [Required(ErrorMessage = "原仓位不能为空")]
- public int SrcSubStockId { get; set; }
- ///
- /// 目标仓位ID
- ///
- [Required(ErrorMessage = "目标仓位不能为空")]
- public int DestSubStockId { get; set; }
+ [Required(ErrorMessage = "仓位不能为空")]
+ public int SubStockId { get; set; }
///
/// 数量
///
[Required(ErrorMessage = "数量不能为空")]
public decimal Qty { get; set; }
- ///
- /// 类型：1-整箱移货上级，2-整箱移货下级
- ///
- [Required(ErrorMessage = "类型不能为空")]
- public int Type { get; set; }
}
}
diff --git a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs
index 10454ccf..30679fcf 100644
--- a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs
+++ b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs
@@ -65,8 +65,12 @@ namespace WMS.Web.Domain.Entitys
/// 创建
///
///
- 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;
}
diff --git a/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs b/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs
index db52e99c..0241c94f 100644
--- a/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs
+++ b/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs
@@ -19,7 +19,7 @@ namespace WMS.Web.Domain.IService
//改箱保存
Task ChangeBoxSave(SaveChangeBoxRecordRequest dto, LoginInDto loginInfo, bool isTransaction=true);
//移箱保存
- Task MoveBoxSave(SaveMoveBoxRecordRequest dto, LoginInDto loginInfo);
+ Task MoveBoxSave(SaveMoveBoxRecordRequest dto,bool IsUp, LoginInDto loginInfo);
}
}
diff --git a/src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs b/src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs
index ebcd5e1d..8b3f44db 100644
--- a/src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs
@@ -12,7 +12,7 @@ namespace WMS.Web.Domain.Mappers
{
public MoveBoxRecordMapper()
{
- CreateMap();
+ //CreateMap();
}
}
}
diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
index accb5e9b..c71fd02b 100644
--- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
+++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
@@ -109,11 +109,10 @@ namespace WMS.Web.Domain.Services
///
///
///
- public async Task MoveBoxSave(SaveMoveBoxRecordRequest dto, LoginInDto loginInfo)
+ public async Task MoveBoxSave(SaveMoveBoxRecordRequest dto, bool IsUp, LoginInDto loginInfo)
{
- var entity = _mapper.Map(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);
//需要填写规格型号
//需要修改库存