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

调整序列码状态

Browse Source
This commit is contained in:
18942506660
2024-04-09 15:01:47 +08:00
parent dfe652edc0
commit 55721d7630
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>
订阅通知信息