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-06-18 14:17:13 +08:00
parent d87ae2dbe1
commit 28cdd60c6d
11 changed files with 213 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ using WMS.Web.Core.Dto.Erp.Supplier;
using WMS.Web.Core.Dto.SingleData;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Options;
using WMS.Web.Domain.Values;
@@ -46,12 +47,14 @@ namespace WMS.Web.Api.Controllers
private readonly ILogger<SysConfigController> _logger;
private ErpOptions _erpOptions;
private readonly IMemoryCache _memoryCache;
private readonly ISerialNumberService _serialNumberService;
public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories, IOptions<ErpOptions> erpOptions,
IBoxRepositories boxRepositories, IErpService erpService, ISingleDataService singleDataService, IMemoryCache memoryCache,
ISerialNumbersRepositories serialNumbersRepositories, IBoxInventoryRepositories boxInventoryRepositories,
IMapper mapper, IErpBasicDataExtendService erpBasicDataExtendService, IOutStockRepositories outStockRepositories,
ILogger<SysConfigController> logger, IMoveBoxRecordRepositories moveBoxRecordRepositories)
ILogger<SysConfigController> logger, IMoveBoxRecordRepositories moveBoxRecordRepositories,
ISerialNumberService serialNumberService)
{
this._erpOptions = erpOptions?.Value;
this._memoryCache = memoryCache;
@@ -67,6 +70,7 @@ namespace WMS.Web.Api.Controllers
_outStockRepositories = outStockRepositories;
_logger = logger;
_moveBoxRecordRepositories = moveBoxRecordRepositories;
_serialNumberService = serialNumberService;
}
/// <summary>
@@ -371,7 +375,7 @@ namespace WMS.Web.Api.Controllers
return Result<List<UcSubStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
var r = await _basicsRepositories.GetSubUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), dto.Name, loginInfo.UserInfo.CompanyId);
if (!string.IsNullOrEmpty(dto.StockCode))
r = r.Where(w => w.StockCode == dto.StockCode && w.ErpOrgCode==dto.OrgCode).ToList();
r = r.Where(w => w.StockCode == dto.StockCode && w.ErpOrgCode == dto.OrgCode).ToList();
return Result<List<UcSubStockResponse>>.ReSuccess(r);
}
/// <summary>
@@ -526,7 +530,12 @@ namespace WMS.Web.Api.Controllers
_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);
//if (res == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
if (res == null)
{
//没有搜索到数据 则去同步供应链系统
return await _serialNumberService.GetBarCodeSerialNumber(serialNumber, orgCode, IsOps, serialStatus ?? 0);
}
/*
以下页面需要判断后提示：如果状态为非冻结的提示：序列号已上架入库 ； 状态为冻结的扫描成功；
不存在的序列号提示：产品信息不存在

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

@@ -5604,6 +5604,41 @@
收货客户
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsRequest">
<summary>
获取没有装过箱的序列码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsRequest.SerialNumber">
<summary>
序列号
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse">
<summary>
wms系统请求序列码返回
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.SerialNumber">
<summary>
序列号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.Creator">
<summary>
创建人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.CreateTime">
<summary>
生成时间
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.IdRequest">
<summary>
ID请求对象

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

@@ -3772,6 +3772,16 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.ISerialNumberService.GetBarCodeSerialNumber(System.String,System.String,System.Boolean,System.Int32)">
<summary>
获取供应链系统序列码
</summary>
<param name="serialNumber"></param>
<param name="orgCode"></param>
<param name="IsOps"></param>
<param name="serialStatus"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.IService.ITakeStockService">
<summary>
盘点单服务
@@ -6121,6 +6131,14 @@
ops服务
</summary>
</member>
<member name="M:WMS.Web.Domain.Services.Public.OpsService.GetSerialNumbers(WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsRequest)">
<summary>
获取序列码
</summary>
<param name="request"></param>
<returns></returns>
<exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="M:WMS.Web.Domain.Services.Public.RedisClientService.SetStringKey(System.String,System.String,System.Nullable{System.TimeSpan})">
<summary>
保存单个key value
@@ -6437,6 +6455,17 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.SerialNumberService.GetBarCodeSerialNumber(System.String,System.String,System.Boolean,System.Int32)">
<summary>
获取供应链系统序列码
</summary>
<param name="serialNumber"></param>
<param name="orgCode"></param>
<param name="IsOps"></param>
<param name="serialStatus"></param>
<returns></returns>
<exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="T:WMS.Web.Domain.Services.TakeStockService">
<summary>
盘点单服务