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

改了查询

Browse Source
This commit is contained in:
18923810322
2025-07-24 11:52:36 +08:00
parent 66f2a9b86f
commit 506f653f44
10 changed files with 295 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/BarCode.Web.Api/Controllers/SerialNumberController.cs
View File

@@ -118,12 +118,21 @@ namespace BarCode.Web.Api.Controllers
SerialNumbersExportRequest request = new SerialNumbersExportRequest();
request.Ids = dto.Ids;
request.IsTwo = dto.IsTwo;
if (request.IsTwo == 2)
{
Task.Run(async () =>
{
await _exportExcelService.ExportList<SerialNumbersExportReponse2, SerialNumbersExportRequest>(request, fileName, loginInfo.UserInfo.UcId, loginInfo, FileDownLoadOrderType.SerialNumbers, orgCode);
});
}
else
{
Task.Run(async () =>
{
await _exportExcelService.ExportList<SerialNumbersExportReponse, SerialNumbersExportRequest>(request, fileName, loginInfo.UserInfo.UcId, loginInfo, FileDownLoadOrderType.SerialNumbers, orgCode);
});
}
return Task.FromResult(Result<string>.ReSuccess(res));
}
/// <summary>

90
src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
View File

@@ -2434,6 +2434,11 @@
操作 Id集合
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.OperateRequest.IsTwo">
<summary>
两件装
</summary>
</member>
<member name="T:BarCode.Web.Core.Dto.OperatePagedRequest">
<summary>
操作 Id集合
@@ -2604,6 +2609,11 @@
物料编码
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SecurityNumbers.SecurityGenerateRecordQueryRequest.CreateUser">
<summary>
生成人
</summary>
</member>
<member name="T:BarCode.Web.Core.Dto.SecurityNumbers.SecurityNumberInfoResponse">
<summary>
防伪码列表
@@ -3259,6 +3269,11 @@
供应商或组织
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse.PurchaseBillNo">
<summary>
采购订单号
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse.MaterialNumber">
<summary>
物料编码
@@ -3294,6 +3309,76 @@
数量
</summary>
</member>
<member name="T:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2">
<summary>
序列码导出数据
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.SupplierOrOrg">
<summary>
供应商或组织
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.PurchaseBillNo">
<summary>
采购订单号
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.BarCode">
<summary>
物料条码
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.SerialNumber">
<summary>
序列码
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.SuitNumber">
<summary>
序列码
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.TwoSerialNumber">
<summary>
两件装
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.SerialNumber2">
<summary>
序列码2
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.NumberCode">
<summary>
数字序列码
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.NumberCode2">
<summary>
数字序列码2
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportReponse2.Number">
<summary>
数量
</summary>
</member>
<member name="T:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportRequest">
<summary>
序列码导出参数
@@ -3304,6 +3389,11 @@
生成记录Ids
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExportRequest.IsTwo">
<summary>
两件装
</summary>
</member>
<member name="T:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersExternalResponse">
<summary>
序列码信息

4
src/BarCode.Web.Core/Dto/OperateRequest.cs
View File

@@ -10,6 +10,10 @@ namespace BarCode.Web.Core.Dto
public class OperateRequest
{
public List<int> Ids { get; set; } = new List<int>();
/// <summary>
/// 两件装
/// </summary>
public int IsTwo { get; set; }
}
/// <summary>

4
src/BarCode.Web.Core/Dto/SecurityNumbers/SecurityGenerateRecordQueryRequest.cs
View File

@@ -41,5 +41,9 @@ namespace BarCode.Web.Core.Dto.SecurityNumbers
/// 物料编码
/// </summary>
public string MaterialNumber { get; set; } = string.Empty;
/// <summary>
/// 生成人
/// </summary>
public string CreateUser { get; set; } = string.Empty;
}
}

94
src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersExportReponse.cs
View File

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
namespace BarCode.Web.Core.Dto.SerialNumbers
{
/// <summary>
/// 序列码导出数据
/// </summary>
@@ -17,6 +18,12 @@ namespace BarCode.Web.Core.Dto.SerialNumbers
/// </summary>
[Column("供应商")]
public string SupplierOrOrg { get; set; } = string.Empty;
/// <summary>
/// 采购订单号
/// </summary>
[Column("采购订单号")]
public string PurchaseBillNo { get; set; } = string.Empty;
/// <summary>
/// 物料编码
/// </summary>
@@ -42,11 +49,98 @@ namespace BarCode.Web.Core.Dto.SerialNumbers
/// </summary>
[Column("序列码")]
public string SerialNumber { get; set; } = string.Empty;
/// <summary>
/// 数字序列码
/// </summary>
[Column("数字序列码")]
public string NumberCode { get; set; } = string.Empty;
/// <summary>
/// 数量
/// </summary>
[Column("数量")]
public int Number { get; set; } = 0;
}
/// <summary>
/// 序列码导出数据
/// </summary>
public class SerialNumbersExportReponse2
{
/// <summary>
/// 供应商或组织
/// </summary>
[Column("供应商")]
public string SupplierOrOrg { get; set; } = string.Empty;
/// <summary>
/// 采购订单号
/// </summary>
[Column("采购订单号")]
public string PurchaseBillNo { get; set; } = string.Empty;
/// <summary>
/// 物料编码
/// </summary>
[Column("物料编码")]
public string MaterialNumber { get; set; } = string.Empty;
/// <summary>
/// 物料名称
/// </summary>
[Column("物料名称")]
public string MaterialName { get; set; } = string.Empty;
/// <summary>
/// 物料规格型号
/// </summary>
[Column("规格型号")]
public string Specifications { get; set; } = string.Empty;
/// <summary>
/// 物料条码
/// </summary>
[Column("条码")]
public string BarCode { get; set; } = string.Empty;
/// <summary>
/// 序列码
/// </summary>
[Column("序列码")]
public string SerialNumber { get; set; } = string.Empty;
/// <summary>
/// 序列码
/// </summary>
[Ignore]
public string SuitNumber { get; set; } = string.Empty;
/// <summary>
/// 两件装
/// </summary>
[Ignore]
public string TwoSerialNumber { get; set; } = string.Empty;
/// <summary>
/// 序列码2
/// </summary>
[Column("序列码2")]
public string SerialNumber2 { get; set; } = string.Empty;
/// <summary>
/// 数字序列码
/// </summary>
[Column("数字序列码")]
public string NumberCode { get; set; } = string.Empty;
/// <summary>
/// 数字序列码2
/// </summary>
[Column("数字序列码2")]
public string NumberCode2 { get; set; } = string.Empty;
/// <summary>
/// 数量
/// </summary>

4
src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersExportRequest.cs
View File

@@ -15,5 +15,9 @@ namespace BarCode.Web.Core.Dto.SerialNumbers
/// 生成记录Ids
/// </summary>
public List<int> Ids { get; set; } = new List<int>();
/// <summary>
/// 两件装
/// </summary>
public int IsTwo { get; set; }
}
}

7
src/BarCode.Web.Domain/Entitys/SerialNumbers.cs
View File

@@ -1,4 +1,5 @@
using BarCode.Web.Core;
using AutoMapper.Configuration.Annotations;
using BarCode.Web.Core;
using BarCode.Web.Core.Help;
using BarCode.Web.Core.Internal.Results;
using BarCode.Web.Domain.Services.Public;
@@ -61,12 +62,12 @@ namespace BarCode.Web.Domain.Entitys
/// <summary>
/// 序列号
/// </summary>
[Column("SuitNumber")]
[Ignore]
public string SuitNumber { get; set; } = string.Empty;
/// <summary>
/// 产生第二个
/// </summary>
[Column("TwoSerialNumber")]
[Ignore]
public string TwoSerialNumber { get; set; } = string.Empty;
/// <summary>
/// 物料Id

4
src/BarCode.Web.Domain/Services/SerialNumberService.cs
View File

@@ -133,6 +133,10 @@ namespace BarCode.Web.Domain.Services
List<SerialNumberGenerateRecord> sgList = new List<SerialNumberGenerateRecord>();
foreach (var d in dto.Details)
{
if(d.Number>1000)
{
d.Number = 1000;
}
if (d.isTwo == 0)//如果套装数为0，那么自动变成1
{
d.isTwo = 1;

8
src/BarCode.Web.Repositories/SecurityGenerateRecordRepositories.cs
View File

@@ -203,6 +203,11 @@ namespace BarCode.Web.Repositories
|| w.Specifications.Contains(dto.MaterialNumber)
).Select(s => s.MaterialNumber).ToList();
}
List<int> cr_ids = new List<int>();
if (!string.IsNullOrEmpty(dto.CreateUser))
{
cr_ids = await _basicsRepositories.GetUserIdsAsync(dto.CreateUser, loginInfo.UserInfo.CompanyId);
}
List<int> sIds = new List<int>();
if (dto.SecurityNumbers != null && dto.SecurityNumbers.Count() > 0)
{
@@ -210,6 +215,7 @@ namespace BarCode.Web.Repositories
.GroupBy(g => g.GenerateRecordId).Select(s => s.Key).ToListAsync();
}
////供应商
//var supplier_result = await _erpService.BillQueryForSupplier();
//List<ErpSupplierDto> suppliers = new List<ErpSupplierDto>();
@@ -252,6 +258,8 @@ namespace BarCode.Web.Repositories
if (dto.SecurityNumbers != null && dto.SecurityNumbers.Count() > 0)
query = query.Where(w => sIds.Contains(w.Id));
if (!string.IsNullOrEmpty(dto.CreateUser))
query = query.Where(w => cr_ids.Contains(w.CreatorId));
int total = await query.CountAsync();
var list = await query.Select(s => new SecurityGenerateRecordInfoResponse()

59
src/BarCode.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -509,7 +509,7 @@ namespace BarCode.Web.Repositories
IsTwo = s.serial.IsTwo,
SuitNumber=s.serial.SuitNumber,
TwoSerialNumber = s.serial.TwoSerialNumber.Replace(s.serial.SerialNumber, "").Replace(",", "")
}).ToListAsync();
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
List<SerialNumberInfoResponse2> returnList= new List<SerialNumberInfoResponse2>();
for (int i = 0; i < list.Count; i++)
@@ -635,8 +635,61 @@ namespace BarCode.Web.Repositories
.Where(f => dto.Ids.Contains(f.serial.GenerateRecordId));
int total = await query.CountAsync();
if (dto.IsTwo == 2)
{
List<SerialNumbersExportReponse2> returnList = new List<SerialNumbersExportReponse2>();
var list = await query.Select(s => new SerialNumbersExportReponse2()
{
PurchaseBillNo = s.sg == null ? "" : s.sg.PurchaseBillNo,
SuitNumber=s.serial.SuitNumber,
TwoSerialNumber=s.serial.TwoSerialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
MaterialNumber = s.serial.MaterialNumber,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
SerialNumber = s.serial.SerialNumber,
NumberCode = s.serial.NumberCode,
Number = s.sg == null ? 0 : s.sg.Number,
SupplierOrOrg = string.IsNullOrEmpty(s.sg.SupplierCode) ? _erpBasicDataExtendService.GetOrgName(orgs, s.sg.OrgCode)
: _erpBasicDataExtendService.GetSupplierName(suppliers, s.sg.SupplierCode)
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
for (int i = 0; i < list.Count; i++)
{
SerialNumbersExportReponse2 list2 = new SerialNumbersExportReponse2();
if (list[i] != null)
{
if (list[i].SuitNumber == list[i].SerialNumber)
{
List<string> sn = new List<string>();
sn.Add(list[i].TwoSerialNumber.Replace(list[i].SuitNumber, "").Replace(",", ""));
var serialNumbers = await GetEntityList(sn);
list2.PurchaseBillNo = list[i].PurchaseBillNo;
list2.Specifications = list[i].Specifications;
list2.MaterialNumber = list[i].MaterialNumber;
list2.MaterialName = list[i].MaterialName;
list2.BarCode = list[i].BarCode;
list2.SerialNumber = list[i].SerialNumber;
list2.SerialNumber2 = serialNumbers[0].SerialNumber;
list2.NumberCode = list[i].NumberCode;
list2.NumberCode2 = serialNumbers[0].NumberCode;
list2.Number = list[i].Number;
list2.SupplierOrOrg = list[i].SupplierOrOrg;
returnList.Add(list2);
}
}
}
return (returnList, total);
}
else
{
var list = await query.Select(s => new SerialNumbersExportReponse()
{
PurchaseBillNo= s.sg == null ? "" : s.sg.PurchaseBillNo,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
MaterialNumber = s.serial.MaterialNumber,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
@@ -649,6 +702,10 @@ namespace BarCode.Web.Repositories
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total);
}
}
/// <summary>
/// 根据箱Id来搜索序列号
/// </summary>