增加序列号接口
This commit is contained in:
50
src/WMS.Web.Api/Controllers/SerialNumberController.cs
Normal file
50
src/WMS.Web.Api/Controllers/SerialNumberController.cs
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
using AutoMapper;
|
||||||
|
using Microsoft.AspNetCore.Http;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using WMS.Web.Core.Dto.SerialNumbers;
|
||||||
|
using WMS.Web.Core.Internal.Results;
|
||||||
|
using WMS.Web.Domain.Infrastructure;
|
||||||
|
using WMS.Web.Domain.IService.Public;
|
||||||
|
using WMS.Web.Domain.Values;
|
||||||
|
|
||||||
|
namespace WMS.Web.Api.Controllers
|
||||||
|
{
|
||||||
|
[Route("api/[controller]")]
|
||||||
|
[ApiController]
|
||||||
|
public class SerialNumberController : ControllerBase
|
||||||
|
{
|
||||||
|
private readonly IMapper _mapper;
|
||||||
|
private readonly ILoginService _loginService;
|
||||||
|
private readonly ISerialNumbersRepositories _serialNumbersRepositories;
|
||||||
|
public SerialNumberController(IMapper mapper, ILoginService loginService, ISerialNumbersRepositories serialNumbersRepositories)
|
||||||
|
{
|
||||||
|
_mapper = mapper;
|
||||||
|
_loginService = loginService;
|
||||||
|
_serialNumbersRepositories = serialNumbersRepositories;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取序列号信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="serialNumber">序列号</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpGet]
|
||||||
|
[Route("Get/{serialNumber}")]
|
||||||
|
public async Task<Result<SerialNumbersResponse>> Get([FromRoute] string serialNumber)
|
||||||
|
{
|
||||||
|
//var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
|
||||||
|
//if (loginInfo == null || loginInfo.UserInfo == null)
|
||||||
|
// return Result<SerialNumbersResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
|
||||||
|
if (string.IsNullOrEmpty(serialNumber))
|
||||||
|
return Result<SerialNumbersResponse>.ReFailure(ResultCodes.SerialNumbersNoData);
|
||||||
|
|
||||||
|
var serial = await _serialNumbersRepositories.Get(serialNumber);
|
||||||
|
if (serial == null)return Result<SerialNumbersResponse>.ReFailure(ResultCodes.SerialNumbersNoData);
|
||||||
|
return Result<SerialNumbersResponse>.ReSuccess(serial);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -430,6 +430,13 @@
|
|||||||
<param name="dto"></param>
|
<param name="dto"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:WMS.Web.Api.Controllers.SerialNumberController.Get(System.String)">
|
||||||
|
<summary>
|
||||||
|
获取序列号信息
|
||||||
|
</summary>
|
||||||
|
<param name="serialNumber">序列号</param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="T:WMS.Web.Api.Controllers.SysConfigController">
|
<member name="T:WMS.Web.Api.Controllers.SysConfigController">
|
||||||
<summary>
|
<summary>
|
||||||
系统配置
|
系统配置
|
||||||
|
|||||||
@@ -4241,6 +4241,66 @@
|
|||||||
每页条数 不传默认每页10 条
|
每页条数 不传默认每页10 条
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="T:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersResponse">
|
||||||
|
<summary>
|
||||||
|
序列号信息
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersResponse.SerialNumber">
|
||||||
|
<summary>
|
||||||
|
序列号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersResponse.MaterialName">
|
||||||
|
<summary>
|
||||||
|
物料名称
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersResponse.MaterialNumber">
|
||||||
|
<summary>
|
||||||
|
物料编码
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersResponse.Specifications">
|
||||||
|
<summary>
|
||||||
|
物料规格型号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersResponse.CompleteCartonTime">
|
||||||
|
<summary>
|
||||||
|
完成装箱时间
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersResponse.SalBillNo">
|
||||||
|
<summary>
|
||||||
|
出库单对应销售订单号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersResponse.OutStockTime">
|
||||||
|
<summary>
|
||||||
|
出库时间
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersResponse.ProduceBillNo">
|
||||||
|
<summary>
|
||||||
|
生产单号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersResponse.PurchaseBillNo">
|
||||||
|
<summary>
|
||||||
|
采购单号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersResponse.InStockTime">
|
||||||
|
<summary>
|
||||||
|
入库时间
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersResponse.Customer">
|
||||||
|
<summary>
|
||||||
|
收货客户
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="T:WMS.Web.Core.Dto.SingleData.IdRequest">
|
<member name="T:WMS.Web.Core.Dto.SingleData.IdRequest">
|
||||||
<summary>
|
<summary>
|
||||||
ID请求对象
|
ID请求对象
|
||||||
|
|||||||
57
src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersResponse.cs
Normal file
57
src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersResponse.cs
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace WMS.Web.Core.Dto.SerialNumbers
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 序列号信息
|
||||||
|
/// </summary>
|
||||||
|
public class SerialNumbersResponse
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 序列号
|
||||||
|
/// </summary>
|
||||||
|
public string SerialNumber { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 物料名称
|
||||||
|
/// </summary>
|
||||||
|
public string MaterialName { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 物料编码
|
||||||
|
/// </summary>
|
||||||
|
public string MaterialNumber { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 物料规格型号
|
||||||
|
/// </summary>
|
||||||
|
public string Specifications { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 完成装箱时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? CompleteCartonTime { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 出库单对应销售订单号
|
||||||
|
/// </summary>
|
||||||
|
public string SalBillNo { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 出库时间
|
||||||
|
/// </summary>
|
||||||
|
public string OutStockTime { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 生产单号
|
||||||
|
///</summary>
|
||||||
|
public string ProduceBillNo { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 采购单号
|
||||||
|
///</summary>
|
||||||
|
public string PurchaseBillNo { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 入库时间
|
||||||
|
/// </summary>
|
||||||
|
public string InStockTime { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 收货客户
|
||||||
|
///</summary>
|
||||||
|
public string Customer { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using WMS.Web.Core.Dto;
|
using WMS.Web.Core.Dto;
|
||||||
|
using WMS.Web.Core.Dto.SerialNumbers;
|
||||||
using WMS.Web.Domain.Entitys;
|
using WMS.Web.Domain.Entitys;
|
||||||
|
|
||||||
namespace WMS.Web.Domain.Infrastructure
|
namespace WMS.Web.Domain.Infrastructure
|
||||||
@@ -21,6 +22,8 @@ namespace WMS.Web.Domain.Infrastructure
|
|||||||
Task<bool> AddRange(List<SerialNumbers> entitys, bool isTransaction = true);
|
Task<bool> AddRange(List<SerialNumbers> entitys, bool isTransaction = true);
|
||||||
//根据序列号模糊搜索信息
|
//根据序列号模糊搜索信息
|
||||||
Task<MaterialResponse> GetSerialNumber(string serialNumber);
|
Task<MaterialResponse> GetSerialNumber(string serialNumber);
|
||||||
|
//根据序列号搜索信息
|
||||||
|
Task<SerialNumbersResponse> Get(string serialNumber);
|
||||||
/// 查询实体集合
|
/// 查询实体集合
|
||||||
Task<List<SerialNumbers>> GetEntityList(List<string> serialNumbers);
|
Task<List<SerialNumbers>> GetEntityList(List<string> serialNumbers);
|
||||||
/// 根据箱Id查询集合
|
/// 根据箱Id查询集合
|
||||||
|
|||||||
@@ -66,6 +66,6 @@ namespace WMS.Web.Domain.Values
|
|||||||
public static ValueTuple<int, string> InventoryInOutDetailsWriteError = (800014, "写入物料收发明细失败!");
|
public static ValueTuple<int, string> InventoryInOutDetailsWriteError = (800014, "写入物料收发明细失败!");
|
||||||
public static ValueTuple<int, string> InventoryDetailsWriteError = (800014, "写入即时库存明细失败!");
|
public static ValueTuple<int, string> InventoryDetailsWriteError = (800014, "写入即时库存明细失败!");
|
||||||
|
|
||||||
|
public static ValueTuple<int, string> SerialNumbersNoData = (610000, "序列号不存在");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using WMS.Web.Core.Dto;
|
using WMS.Web.Core.Dto;
|
||||||
|
using WMS.Web.Core.Dto.SerialNumbers;
|
||||||
using WMS.Web.Core.Help;
|
using WMS.Web.Core.Help;
|
||||||
using WMS.Web.Domain.Entitys;
|
using WMS.Web.Domain.Entitys;
|
||||||
using WMS.Web.Domain.Infrastructure;
|
using WMS.Web.Domain.Infrastructure;
|
||||||
@@ -91,6 +92,42 @@ namespace WMS.Web.Repositories
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 根据序列号搜索信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="serialNumber"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<SerialNumbersResponse> Get(string serialNumber)
|
||||||
|
{
|
||||||
|
var materials_result = await _erpService.BillQueryForMaterial();
|
||||||
|
if (!materials_result.IsSuccess)
|
||||||
|
return null;
|
||||||
|
var materials = materials_result.Data.ToList();
|
||||||
|
|
||||||
|
var customer_result = await _erpService.BillQueryForCustomer();
|
||||||
|
if (!customer_result.IsSuccess)
|
||||||
|
return null;
|
||||||
|
var customers = customer_result.Data.ToList();
|
||||||
|
|
||||||
|
var s = await _context.SerialNumbers
|
||||||
|
.FirstOrDefaultAsync(f => serialNumber.Equals(f.SerialNumber));
|
||||||
|
if (s == null) return null;
|
||||||
|
SerialNumbersResponse respone = new SerialNumbersResponse()
|
||||||
|
{
|
||||||
|
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
|
||||||
|
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
|
||||||
|
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
|
||||||
|
CompleteCartonTime = s.CompleteCartonTime,
|
||||||
|
InStockTime = s.InStockTime.DateToStringSeconds(),
|
||||||
|
OutStockTime = s.OutStockTime.DateToStringSeconds(),
|
||||||
|
PurchaseBillNo = s.PurchaseBillNo,
|
||||||
|
SalBillNo = s.SalBillNo,
|
||||||
|
Customer = _erpBasicDataExtendService.GetCustomerName(customers, s.CustomerId),
|
||||||
|
SerialNumber = s.SerialNumber
|
||||||
|
};
|
||||||
|
return respone;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 根据序列号查询
|
/// 根据序列号查询
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user