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-19 13:59:01 +08:00
parent 553f3c9b01
commit 21c7b5d599
5 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/BarCode.Web.Domain/Services/BoxService.cs
View File

@@ -17,6 +17,7 @@ using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Npoi.Mapper;
using NPOI.SS.Formula.Functions;
using Quartz;
using System;
using System.Collections.Generic;
using System.ComponentModel.Design;
@@ -294,7 +295,7 @@ namespace BarCode.Web.Domain.Services
return Result.ReFailure(ResultCodes.BoxNoDataError);
if (box.Status == BoxStatus.Complete)
return Result.ReFailure(ResultCodes.CartonCompleteError);
var sList = await _serialNumbersRepositories.GetEntityList(new List<string>() { dto.SerialNumber });
var s = sList.FirstOrDefault(f => f.SerialNumber.Equals(dto.SerialNumber));
if (s == null)
@@ -309,6 +310,24 @@ namespace BarCode.Web.Domain.Services
//sList.ForEach(f => f.UnBox());
s.UnBox();//解绑
if (dto.TwoSerialNumber != null)
{
var TwosList = await _serialNumbersRepositories.GetEntityList(new List<string>() { dto.TwoSerialNumber });
var Twos = sList.FirstOrDefault(f => f.SerialNumber.Equals(dto.TwoSerialNumber));
if (Twos == null)
return Result.ReFailure(ResultCodes.SerialNumberNoDateError);
//判断使用的是数字序列码还是序列码
var TwosStr = s.IsUseNumber == true ? s.TwoNumberCode : s.TwoSerialNumber;
var TworesUn = box.UnSerialNumber(TwosStr, dto.MaterialNumber);
if (!TworesUn.IsSuccess) return TworesUn;
//var sList = await _serialNumbersRepositories.GetEntityListContainNumber(new List<string>() { dto.SerialNumber });
//sList.ForEach(f => f.UnBox());
Twos.UnBox();//解绑
}
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
bool res_Rollback = false;
bool isSuccess = true;