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

改回了序列码,不使用List

Browse Source
This commit is contained in:
18923810322
2025-05-13 16:40:50 +08:00
parent c609fb7327
commit e0074faba1
8 changed files with 375 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/WMS.Web.Domain/IService/ISerialNumberService.cs
View File

@@ -42,6 +42,8 @@ namespace WMS.Web.Domain.IService
/// <param name="IsOps"></param>
/// <param name="serialStatus"></param>
/// <returns></returns>
Task<Result<List<MaterialResponse>>> GetBarCodeSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0);
//Task<Result<List<MaterialResponse>>> GetBarCodeSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0);
Task<Result<MaterialResponse>> GetBarCodeSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0);
}
}

3
src/WMS.Web.Domain/IService/Public/IOpsService.cs
View File

@@ -13,6 +13,7 @@ namespace WMS.Web.Domain.IService.Public
public interface IOpsService
{
Task<List<OpsBoxResponse>> GetBox(OpsBoxRequest request);
Task<Result<List<SerialNumbersWmsResponse>>> GetSerialNumbers(SerialNumbersWmsRequest request);
// Task<Result<List<SerialNumbersWmsResponse>>> GetSerialNumbers(SerialNumbersWmsRequest request);
Task<Result<SerialNumbersWmsResponse>> GetSerialNumbers(SerialNumbersWmsRequest request);
}
}

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

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

21
src/WMS.Web.Domain/Services/Public/OpsService.cs
View File

@@ -54,22 +54,39 @@ namespace WMS.Web.Domain.Services.Public
var list = JsonConvert.DeserializeObject<List<OpsBoxResponse>>(res.data.date);
return list;
}
/// <summary>
/// 获取序列码
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public async Task<Result<List<SerialNumbersWmsResponse>>> GetSerialNumbers(SerialNumbersWmsRequest request)
public async Task<Result<SerialNumbersWmsResponse>> GetSerialNumbers(SerialNumbersWmsRequest request)
{
string endStr = "api/WmsBox/GetSerialNumber";
Dictionary<string, string> dicHeaders = new Dictionary<string, string>();
//dicHeaders.Add("Authorization", "Bearer " + token);
//_httpClientService.BuildHttpClient(contentHeaders);
var res = await _httpClientService.PostAsync<Result<List<SerialNumbersWmsResponse>>>(_option.Url + endStr, JsonConvert.SerializeObject(request), dicHeaders);
var res = await _httpClientService.PostAsync<Result<SerialNumbersWmsResponse>>(_option.Url + endStr, JsonConvert.SerializeObject(request), dicHeaders);
return res;
}
///// <summary>
///// 获取序列码
///// </summary>
///// <param name="request"></param>
///// <returns></returns>
///// <exception cref="NotImplementedException"></exception>
//public async Task<Result<List<SerialNumbersWmsResponse>>> GetSerialNumbers(SerialNumbersWmsRequest request)
//{
// string endStr = "api/WmsBox/GetSerialNumber";
// Dictionary<string, string> dicHeaders = new Dictionary<string, string>();
// //dicHeaders.Add("Authorization", "Bearer " + token);
// //_httpClientService.BuildHttpClient(contentHeaders);
// var res = await _httpClientService.PostAsync<Result<List<SerialNumbersWmsResponse>>>(_option.Url + endStr, JsonConvert.SerializeObject(request), dicHeaders);
// return res;
//}
private async Task<string> GetToken()
{
OpsLogin login = new OpsLogin()

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

@@ -14,6 +14,7 @@ using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Values;
using WMS.Web.Domain.Values.Erp;
using WMS.Web.Domain.Values.Single;
namespace WMS.Web.Domain.Services
@@ -570,6 +571,7 @@ namespace WMS.Web.Domain.Services
if (!res.Success) return Result.ReFailure(ResultCodes.DateWriteError);
return Result.ReSuccess();
}
/// <summary>
/// 获取供应链系统序列码
/// </summary>
@@ -579,29 +581,42 @@ namespace WMS.Web.Domain.Services
/// <param name="serialStatus"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public async Task<Result<List<MaterialResponse>>> GetBarCodeSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0)
public async Task<Result<MaterialResponse>> GetBarCodeSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0)
{
//外层方法没有调到数据是null 如果这里查询到序列码
var list = await _serialNumbersRepositories.GetEntityList(new List<string>() { serialNumber });
if (list.FirstOrDefault(f => f.SerialNumber.Equals(serialNumber)) != null)
return Result<List<MaterialResponse>>.ReFailure(ResultCodes.MateriaNoData);
return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
//进入供应链系统调数据
_logger.LogInformation($"拉取供应链系统条码->{serialNumber}");
var res = await _opsService.GetSerialNumbers(new Core.Dto.SerialNumbers.SerialNumbersWmsRequest() { SerialNumber = serialNumber });
if (!res.IsSuccess)
return Result<List<MaterialResponse>>.ReFailure(ResultCodes.MateriaNoData);
return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
_logger.LogInformation($"拉取供应链系统条码结果:->{JsonConvert.SerializeObject(res)}");
//插入序列码信息
for (int j = 0; j < res.Data.Count; j++)
if (res.Data.IsTwo > 1)
{
SerialNumbers entity = new SerialNumbers(res.Data[j].SerialNumber, res.Data[j].MaterialNumber
, 0, 0, res.Data[j].Creator, res.Data[j].CreateTime, null, res.Data[j].IsTwo, res.Data[j].TwoSerialNumber, res.Data[j].IsNotCount);
var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
if (!isSuccess) return Result<List<MaterialResponse>>.ReFailure(ResultCodes.DateWriteError);
}
var res_s = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, serialStatus);
if (res_s == null) return Result<List<MaterialResponse>>.ReFailure(ResultCodes.MateriaNoData);
string[]serial= res.Data.TwoSerialNumber.Split(',');
for(int j=0;j<serial.Length;j++)
{
string isNotCount = "0";
if (serial[j] != serialNumber)
{
isNotCount = "1";
}
else
{
isNotCount = "0";
}
SerialNumbers entity = new SerialNumbers(serial[j], res.Data.MaterialNumber
, 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, isNotCount);
var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);
}
var res_s = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, serialStatus);
if (res_s == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
/*
以下页面需要判断后提示：如果状态为非冻结的提示：序列号已上架入库 ； 状态为冻结的扫描成功；
不存在的序列号提示：产品信息不存在
@@ -610,11 +625,126 @@ namespace WMS.Web.Domain.Services
*/
if (serialStatus == 1 || serialStatus == 2)
{
if (res_s[0].IsActivate == true && res_s[0].IsDelete != true)
return Result<List<MaterialResponse>>.ReFailure(ResultCodes.SerialNumbersIsShelf);
if (res_s.IsActivate == true && res_s.IsDelete != true)
return Result<MaterialResponse>.ReFailure(ResultCodes.SerialNumbersIsShelf);
}
return Result<List<MaterialResponse>>.ReSuccess(res_s);
return Result<MaterialResponse>.ReSuccess(res_s);
}
else
{
SerialNumbers entity = new SerialNumbers(res.Data.SerialNumber, res.Data.MaterialNumber
, 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, res.Data.IsNotCount);
var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);
var res_s = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, serialStatus);
if (res_s == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
/*
以下页面需要判断后提示：如果状态为非冻结的提示：序列号已上架入库 ； 状态为冻结的扫描成功；
不存在的序列号提示：产品信息不存在
非采购上架 改箱 (非激活的或者(激活被冻结)) 1
出库回退上架 (激活被冻结) 2
*/
if (serialStatus == 1 || serialStatus == 2)
{
if (res_s.IsActivate == true && res_s.IsDelete != true)
return Result<MaterialResponse>.ReFailure(ResultCodes.SerialNumbersIsShelf);
}
return Result<MaterialResponse>.ReSuccess(res_s);
}
}
///// <summary>
///// 获取供应链系统序列码
///// </summary>
///// <param name="serialNumber"></param>
///// <param name="orgCode"></param>
///// <param name="IsOps"></param>
///// <param name="serialStatus"></param>
///// <returns></returns>
///// <exception cref="NotImplementedException"></exception>
//public async Task<Result<MaterialResponse>> GetBarCodeSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0)
//{
// //外层方法没有调到数据是null 如果这里查询到序列码
// var list = await _serialNumbersRepositories.GetEntityList(new List<string>() { serialNumber });
// if (list.FirstOrDefault(f => f.SerialNumber.Equals(serialNumber)) != null)
// return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
// //进入供应链系统调数据
// _logger.LogInformation($"拉取供应链系统条码->{serialNumber}");
// var res = await _opsService.GetSerialNumbers(new Core.Dto.SerialNumbers.SerialNumbersWmsRequest() { SerialNumber = serialNumber });
// if (!res.IsSuccess)
// return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
// _logger.LogInformation($"拉取供应链系统条码结果:->{JsonConvert.SerializeObject(res)}");
// //插入序列码信息
// SerialNumbers entity = new SerialNumbers(res.Data.SerialNumber, res.Data.MaterialNumber
// , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, res.Data.IsNotCount);
// var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
// if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);
// var res_s = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, serialStatus);
// if (res_s == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
// /*
// 以下页面需要判断后提示：如果状态为非冻结的提示：序列号已上架入库 ； 状态为冻结的扫描成功；
// 不存在的序列号提示：产品信息不存在
// 非采购上架 改箱 (非激活的或者(激活被冻结)) 1
// 出库回退上架 (激活被冻结) 2
// */
// if (serialStatus == 1 || serialStatus == 2)
// {
// if (res_s.IsActivate == true && res_s.IsDelete != true)
// return Result<MaterialResponse>.ReFailure(ResultCodes.SerialNumbersIsShelf);
// }
// return Result<MaterialResponse>.ReSuccess(res_s);
//}
///// <summary>
///// 获取供应链系统序列码
///// </summary>
///// <param name="serialNumber"></param>
///// <param name="orgCode"></param>
///// <param name="IsOps"></param>
///// <param name="serialStatus"></param>
///// <returns></returns>
///// <exception cref="NotImplementedException"></exception>
//public async Task<Result<List<MaterialResponse>>> GetBarCodeSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0)
//{
// //外层方法没有调到数据是null 如果这里查询到序列码
// var list = await _serialNumbersRepositories.GetEntityList(new List<string>() { serialNumber });
// if (list.FirstOrDefault(f => f.SerialNumber.Equals(serialNumber)) != null)
// return Result<List<MaterialResponse>>.ReFailure(ResultCodes.MateriaNoData);
// //进入供应链系统调数据
// _logger.LogInformation($"拉取供应链系统条码->{serialNumber}");
// var res = await _opsService.GetSerialNumbers(new Core.Dto.SerialNumbers.SerialNumbersWmsRequest() { SerialNumber = serialNumber });
// if (!res.IsSuccess)
// return Result<List<MaterialResponse>>.ReFailure(ResultCodes.MateriaNoData);
// _logger.LogInformation($"拉取供应链系统条码结果:->{JsonConvert.SerializeObject(res)}");
// //插入序列码信息
// for (int j = 0; j < res.Data.Count; j++)
// {
// SerialNumbers entity = new SerialNumbers(res.Data[j].SerialNumber, res.Data[j].MaterialNumber
// , 0, 0, res.Data[j].Creator, res.Data[j].CreateTime, null, res.Data[j].IsTwo, res.Data[j].TwoSerialNumber, res.Data[j].IsNotCount);
// var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
// if (!isSuccess) return Result<List<MaterialResponse>>.ReFailure(ResultCodes.DateWriteError);
// }
// var res_s = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, serialStatus);
// if (res_s == null) return Result<List<MaterialResponse>>.ReFailure(ResultCodes.MateriaNoData);
// /*
// 以下页面需要判断后提示：如果状态为非冻结的提示：序列号已上架入库 ； 状态为冻结的扫描成功；
// 不存在的序列号提示：产品信息不存在
// 非采购上架 改箱 (非激活的或者(激活被冻结)) 1
// 出库回退上架 (激活被冻结) 2
// */
// if (serialStatus == 1 || serialStatus == 2)
// {
// if (res_s[0].IsActivate == true && res_s[0].IsDelete != true)
// return Result<List<MaterialResponse>>.ReFailure(ResultCodes.SerialNumbersIsShelf);
// }
// return Result<List<MaterialResponse>>.ReSuccess(res_s);
//}
}
}