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-05-16 14:51:31 +08:00
parent 0e44b7d2ec
commit 553f3c9b01
11 changed files with 215 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ namespace BarCode.Web.Domain.Entitys
///当次序号，用来记录当次所产生时所处的序列号
/// </summary>
[Column("thisNumber")]
public int thisNumber { get; set; } = 1;
public int? thisNumber { get; set; } = 1;
/// <summary>
/// 序列号
@@ -210,6 +210,18 @@ namespace BarCode.Web.Domain.Entitys
this.SuitNumber = sn;
}
/// <summary>
/// 设置thisNumber
/// </summary>
/// <param name="sn"></param>
public void SetThisNumber(int sn)
{
this.thisNumber = sn;
}
/// <summary>
/// 产生第二个序列号
/// </summary>

7
src/BarCode.Web.Domain/IService/ISerialNumberService.cs
View File

@@ -34,6 +34,13 @@ namespace BarCode.Web.Domain.IService
/// <param name="dto"></param>
/// <returns></returns>
Task<Result> DownLoad(OperateSerialNumberRequest dto);
/// <summary>
/// 更新错的序列号（内部使用）
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
Task<Result> UpdateSn(OperateSerialNumberRequest dto);
/// <summary>
/// 装箱后反写使用数
/// </summary>

2
src/BarCode.Web.Domain/Infrastructure/ISGenerateRecordRepositories.cs
View File

@@ -27,7 +27,7 @@ namespace BarCode.Web.Domain.Infrastructure
/// 修改实体集合
Task<bool> EditEntityList(List<SerialNumberGenerateRecord> entitys, bool isTransaction = true);
/// 查询实体集合
Task<List<SerialNumberGenerateRecord?>> GetEntityList(List<int> ids);
Task<List<SerialNumberGenerateRecord?>> GetEntityList(List<int> ids,string strUpdate);
/// 查询实体
Task<SerialNumberGenerateRecord?> GetEntity(int id);
}

14
src/BarCode.Web.Domain/Infrastructure/ISerialNumbersRepositories.cs
View File

@@ -62,5 +62,19 @@ namespace BarCode.Web.Domain.Infrastructure
/// <param name="serialNumber"></param>
/// <returns></returns>
Task<SerialNumbersExternalResponse> GetExternal(string serialNumber);
/// <summary>
/// 得到两件装
/// </summary>
/// <param name="entitys"></param>
/// <param name="SuitNumber"></param>
/// <returns></returns>
public string GetTwoSerialNumber(List<SerialNumbers> entitys, string SuitNumber);
/// <summary>
/// 得到数字两件装
/// </summary>
/// <param name="entitys"></param>
/// <param name="SuitNumber"></param>
/// <returns></returns>
public string GetTwoNumberCode(List<SerialNumbers> entitys, string SuitNumber);
}
}

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

@@ -10,11 +10,14 @@ using BarCode.Web.Domain.IService.Public;
using BarCode.Web.Domain.Services.Public;
using BarCode.Web.Domain.Values;
using BarCode.Web.Domain.Values.Single;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using NPOI.HPSF;
using NPOI.OpenXmlFormats.Wordprocessing;
using Org.BouncyCastle.Crypto;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -280,7 +283,7 @@ namespace BarCode.Web.Domain.Services
public async Task<Result> DownLoad(OperateSerialNumberRequest dto)
{
//取出所有的生成记录
var generateRecords = await _sGenerateRecordRepositories.GetEntityList(dto.GenerateRecordIds);
var generateRecords = await _sGenerateRecordRepositories.GetEntityList(dto.GenerateRecordIds,"0");
if (generateRecords.Count() != dto.GenerateRecordIds.Count())
return Result.ReFailure(ResultCodes.NoDateError);
var snGRList = await _serialNumbersRepositories.GetEntityListByGRIds(dto.GenerateRecordIds);
@@ -315,6 +318,86 @@ namespace BarCode.Web.Domain.Services
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
return Result.ReSuccess();
}
/// <summary>
/// 更新错的Sn
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public async Task<Result> UpdateSn(OperateSerialNumberRequest dto)
{
//取出所有的生成记录
var generateRecords = await _sGenerateRecordRepositories.GetEntityList(dto.GenerateRecordIds,"1");
List<SerialNumbers> olist = new List<SerialNumbers>();
bool res_Rollback = false;
for (int i=0;i< generateRecords.Count;i++)
{
List<int> s = [];
string newSuitNumber = "";
string oldSuitNumber = "";
int ids = generateRecords[i].Id;
s.Add(ids);
olist = await _serialNumbersRepositories.GetEntityListByGRIds(s);
//修改序列号下载数
int m=0;
foreach (var item in olist)
{
m++;
//自动生成序列码
string sn = item.SerialNumber;
if (m % 2 == 0)
{
newSuitNumber = oldSuitNumber;
}
else
{
oldSuitNumber = sn;
newSuitNumber = sn;
}
item.GenerateSuitNumber(newSuitNumber);
// item.GenerateTwoSerialNumber(newSuitNumber);
item.SetThisNumber(m);
item.IsTwo = 2;
}
foreach (var item in olist)
{
string ss = _serialNumbersRepositories.GetTwoSerialNumber(olist, item.SuitNumber);
item.GenerateTwoSerialNumber(ss);
string sNumberCode = _serialNumbersRepositories.GetTwoNumberCode(olist, item.SuitNumber);
item.GenerateTwoNumberCode(sNumberCode);
}
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
var isSuccess = await _serialNumbersRepositories.EditEntityList(olist, false);
if (!isSuccess) res_Rollback = true;
generateRecords[i].IsTwo = 2;
isSuccess = _transactionRepositories.CommitTransaction(res_Rollback, _transaction);
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
//return Result.ReSuccess();
}
if (!res_Rollback)
{
var res = await _sGenerateRecordRepositories.EditEntityList(generateRecords, false);
if (!res) res_Rollback = true;
}
return Result.ReSuccess();
}
/// <summary>
/// 打印
/// </summary>
@@ -324,7 +407,7 @@ namespace BarCode.Web.Domain.Services
public async Task<Result> Print(OperateSerialNumberRequest dto)
{
//取出所有的生成记录
var generateRecords = await _sGenerateRecordRepositories.GetEntityList(dto.GenerateRecordIds);
var generateRecords = await _sGenerateRecordRepositories.GetEntityList(dto.GenerateRecordIds,"");
if (generateRecords.Count() != dto.GenerateRecordIds.Count())
return Result.ReFailure(ResultCodes.NoDateError);
var snGRList = await _serialNumbersRepositories.GetEntityListByGRIds(dto.GenerateRecordIds);
@@ -366,7 +449,7 @@ namespace BarCode.Web.Domain.Services
/// <returns></returns>
public async Task<Result> Use(List<int> sGIds)
{
var sGList = await _sGenerateRecordRepositories.GetEntityList(sGIds);
var sGList = await _sGenerateRecordRepositories.GetEntityList(sGIds,"");
var sGSNumberList = await _serialNumbersRepositories.GetEntityListByGRIds(sGIds);
foreach (var sg in sGList)