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

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

Browse Source
This commit is contained in:
tongfei
2024-04-09 15:16:53 +08:00
parent beb0c8732a 55721d7630
commit 9a03233328
8 changed files with 69 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/WMS.Web.Api/Controllers/SysConfigController.cs
View File

@@ -491,18 +491,24 @@ namespace WMS.Web.Api.Controllers
/// <param name="serialNumber">序列号或规格型号或物料编码</param>
/// <param name="orgCode">组织编码</param>
/// <param name="IsOps">是否需要支持老ops条码查询</param>
/// <param name="IsIncludeDelete">出库回退上架 true 其他false或不传</param>
/// <param name="serialStatus">
/// 盘点 所有的序列号 0或者不传
/// 非采购上架 改箱 (非激活的或者(激活被冻结)) 1
/// 出库回退上架 (激活被冻结) 2
/// 入库回退下架 (激活非冻结) 3
/// 出库 (激活非冻结) 3
/// </param>
/// <returns></returns>
[HttpGet]
[Route("GetMaterial")]
public async Task<Result<MaterialResponse>> GetMaterial([FromQuery] string serialNumber, [FromQuery] string orgCode = null, [FromQuery] bool IsOps = false, [FromQuery] bool IsIncludeDelete = false)
public async Task<Result<MaterialResponse>> GetMaterial([FromQuery] string serialNumber, [FromQuery] string orgCode = null, [FromQuery] bool IsOps = false, [FromQuery] int? serialStatus = 0)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<MaterialResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
_logger.LogInformation($"请求序列号信息:{serialNumber} 组织:{orgCode} 是否Ops:{IsOps} 是否包含冻结 {IsIncludeDelete}");
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, IsIncludeDelete);
_logger.LogInformation($"请求序列号信息:{serialNumber} 组织:{orgCode} 是否Ops:{IsOps} 查询状态 {serialStatus}");
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, serialStatus ?? 0);
if (res == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
_logger.LogInformation($"请求序列号信息结果:{res.MaterialNumber}");

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

@@ -670,14 +670,20 @@
<param name="boxBillNo">必填</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetMaterial(System.String,System.String,System.Boolean,System.Boolean)">
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetMaterial(System.String,System.String,System.Boolean,System.Nullable{System.Int32})">
<summary>
根据序列号或规格型号,物料编码搜索物料信息-PDA
</summary>
<param name="serialNumber">序列号或规格型号或物料编码</param>
<param name="orgCode">组织编码</param>
<param name="IsOps">是否需要支持老ops条码查询</param>
<param name="IsIncludeDelete">出库回退上架 true 其他false或不传</param>
<param name="serialStatus">
盘点 所有的序列号 0或者不传
非采购上架 改箱 (非激活的或者(激活被冻结)) 1
出库回退上架 (激活被冻结) 2
入库回退下架 (激活非冻结) 3
出库 (激活非冻结) 3
</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetMaterialList(System.String)">

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

@@ -2142,6 +2142,11 @@
是否删除
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.SerialNumbers.IsActivate">
<summary>
是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
</summary>
</member>
<member name="M:WMS.Web.Domain.Entitys.SerialNumbers.Bind(System.Int32,System.DateTime)">
<summary>
操作(绑定箱信息)
@@ -2178,7 +2183,7 @@
<param name="type"></param>
<param name="boxId"></param>
</member>
<member name="M:WMS.Web.Domain.Entitys.SerialNumbers.TakeStock(System.Int32)">
<member name="M:WMS.Web.Domain.Entitys.SerialNumbers.TakeStock(System.Int32,WMS.Web.Domain.Values.TakeStockType)">
<summary>
盘点
</summary>
@@ -2258,6 +2263,11 @@
是否出库
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.SerialNumbers_Ops.IsActivate">
<summary>
是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
</summary>
</member>
<member name="T:WMS.Web.Domain.Entitys.SubscribeNotification">
<summary>
订阅通知信息

13
src/WMS.Web.Domain/Entitys/SerialNumbers.cs
View File

@@ -97,6 +97,11 @@ namespace WMS.Web.Domain.Entitys
///</summary>
[Column("IsDelete")]
public bool? IsDelete { get; set; } = false;
/// <summary>
/// 是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
///</summary>
[Column("IsActivate")]
public bool? IsActivate { get; set; } = false;
/// <summary>
/// 操作(绑定箱信息)
@@ -140,6 +145,7 @@ namespace WMS.Web.Domain.Entitys
/// <param name="inStockBillNo">出库单号</param>
public void InStock(string inStockBillNo, InstockType type)
{
this.IsActivate = true;
if (type == InstockType.Purchase)
{
this.PurchaseBillNo = inStockBillNo;
@@ -168,6 +174,7 @@ namespace WMS.Web.Domain.Entitys
//盘点, 整箱移货上架, 出库回退上架----序列号正常可用
if (BackRecordType.OutstockOn == type)
{
this.IsActivate = true;
this.BoxId = boxId;
this.IsDelete = false;
}
@@ -177,12 +184,14 @@ namespace WMS.Web.Domain.Entitys
/// <summary>
/// 盘点
/// </summary>
public void TakeStock(int boxId)
public void TakeStock(int boxId, TakeStockType type)
{
//拣货出库, 整箱移货下架, 入库回退下架---- 序列号状态失效
//盘点, 整箱移货上架, 出库回退上架----序列号正常可用
this.BoxId = boxId;
this.IsDelete = false;
//盘亏被冻结 盘盈反冻结
this.IsDelete = type == TakeStockType.Profit ? true : false;
this.IsActivate = true;
}
}

5
src/WMS.Web.Domain/Entitys/SerialNumbers_Ops.cs
View File

@@ -86,5 +86,10 @@ namespace WMS.Web.Domain.Entitys
///</summary>
[Column("IsDelete")]
public bool? IsDelete { get; set; } = false;
/// <summary>
/// 是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
///</summary>
[Column("IsActivate")]
public bool? IsActivate { get; set; } = false;
}
}

2
src/WMS.Web.Domain/Infrastructure/ISerialNumbersRepositories.cs
View File

@@ -21,7 +21,7 @@ namespace WMS.Web.Domain.Infrastructure
/// <returns></returns>
Task<bool> AddRange(List<SerialNumbers> entitys, bool isTransaction = true);
//根据序列号模糊搜索信息
Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, bool IsIncludeDelete = false);
Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0);
//根据序列号搜索信息
Task<SerialNumbersResponse> Get(string serialNumber);
/// 查询实体集合

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

@@ -461,7 +461,9 @@ namespace WMS.Web.Domain.Services
foreach (var s in serialNumbers)
{
var takeStockDetail = takeStocks.SelectMany(s => s.Details).FirstOrDefault(w => w.SerialNumbers.Contains(s));
if (takeStockDetail == null) continue;
var box = boxList.FirstOrDefault(f => f.Id == takeStockDetail.BoxId);
var s_entity = entityList.FirstOrDefault(f => f.SerialNumber.Equals(s));
if (box != null && box.Details.FirstOrDefault(f => f.MaterialNumber == takeStockDetail.MaterialNumber) == null)
@@ -479,10 +481,11 @@ namespace WMS.Web.Domain.Services
}
else
{
s_entity.TakeStock(takeStockDetail.BoxId);
var takeStock = takeStocks.FirstOrDefault(w => w.Details.FirstOrDefault(w => w.SerialNumbers.Contains(s)) != null);
s_entity.TakeStock(takeStockDetail.BoxId, takeStock.ResultType);
if (s_entity.BoxId == takeStockDetail.BoxId) continue;
var takeStock = takeStocks.FirstOrDefault(w => w.Details.FirstOrDefault(w => w.SerialNumbers.Contains(s)) != null);
//记录序列号操作日志
SerialNumberOperate op = new SerialNumberOperate()
{

23
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -224,7 +224,7 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
public async Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, bool IsIncludeDelete = false)
public async Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0)
{
MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial();
@@ -249,12 +249,19 @@ namespace WMS.Web.Repositories
.GroupJoin(_context.Box, s => s.serial.BoxId, box => box.Id, (s, box) => new { s.serial, s.boxInventory, box })
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box })
.Where(w => serialNumber.Equals(w.serial.SerialNumber));
if (IsIncludeDelete == false) res = res.Where(w => w.serial.IsDelete != true);
//0:所有 1 非激活的或者(激活被冻结) 2 激活被冻结 3 激活非冻结
if (serialStatus == 1)
res = res.Where(w => w.serial.IsActivate != true || (w.serial.IsActivate == true && w.serial.IsDelete == true));
else if (serialStatus == 2)
res = res.Where(w => w.serial.IsActivate == true && w.serial.IsDelete == true);
else if (serialStatus == 3)
res = res.Where(w => w.serial.IsActivate == true && w.serial.IsDelete != true);
var entity = await res.FirstOrDefaultAsync();
if (entity == null || entity.serial == null)
{
if (IsOps)
return await GetSerialNumber_Ops(serialNumber, IsIncludeDelete);
return await GetSerialNumber_Ops(serialNumber, serialStatus);
else
return null;
}
@@ -279,7 +286,7 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
private async Task<MaterialResponse> GetSerialNumber_Ops(string serialNumber, bool IsIncludeDelete = false)
private async Task<MaterialResponse> GetSerialNumber_Ops(string serialNumber, int serialStatus = 0)
{
MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial();
@@ -293,7 +300,13 @@ namespace WMS.Web.Repositories
.GroupJoin(_context.Box, s => s.serial.BoxId, box => box.Id, (s, box) => new { s.serial, s.boxInventory, box })
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box })
.Where(w => serialNumber.Equals(w.serial.SerialNumber));
if (IsIncludeDelete == false) res = res.Where(w => w.serial.IsDelete != true);
//0:所有 1 非激活的或者(激活被冻结) 2 激活被冻结 3 激活非冻结
if (serialStatus == 1)
res = res.Where(w => w.serial.IsActivate != true || (w.serial.IsActivate == true && w.serial.IsDelete == true));
else if (serialStatus == 2)
res = res.Where(w => w.serial.IsActivate == true && w.serial.IsDelete == true);
else if (serialStatus == 3)
res = res.Where(w => w.serial.IsActivate == true && w.serial.IsDelete != true);
var entity = await res.FirstOrDefaultAsync();
if (entity == null) return null;
response.IsOldOps = true;