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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-12-14 17:19:01 +08:00
parent 7f190985d2 da7a45d941
commit 9273c9d06a
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WMS.Web.Domain/Services/BoxService.cs
View File

@@ -50,7 +50,7 @@ namespace WMS.Web.Domain.Services
if (list == null || list.Count() <= 0) if (list == null || list.Count() <= 0)
{ {
DateTime begin = await _erpOpsSyncDateRepositories.Get(ErpOpsSyncType.Ops); DateTime begin = await _erpOpsSyncDateRepositories.Get(ErpOpsSyncType.Ops);
begin = begin.AddYears(-1); begin = begin.AddMinutes(-10);
OpsBoxRequest request = new OpsBoxRequest(begin, DateTime.Now); OpsBoxRequest request = new OpsBoxRequest(begin, DateTime.Now);
list = await _opsService.GetBox(request); list = await _opsService.GetBox(request);
} }

12
src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
View File

@@ -78,6 +78,14 @@ namespace WMS.Web.Domain.Services
if (sCount > 0) if (sCount > 0)
return Result.ReFailure(ResultCodes.SerialNumbersBoxError); return Result.ReFailure(ResultCodes.SerialNumbersBoxError);
} }
else
{
//有原箱的情况下验证序列号和原箱是否一致
var s = d.Details.SelectMany(s => s.SerialNumbers).ToList();
var boxCount = serialNumberList.Where(w => s.Contains(w.SerialNumber)).GroupBy(s => s.BoxId).Select(s => s.Key).ToList();
if (boxCount.Count() > 1 || boxCount[0] != d.SrcBoxId)
return Result.ReFailure(ResultCodes.SerialNumbersSrcBoxError);
}
var box = boxs.FirstOrDefault(f => f.BoxId == d.SrcBoxId); var box = boxs.FirstOrDefault(f => f.BoxId == d.SrcBoxId);
//原箱在库存中的话 进行验证 //原箱在库存中的话 进行验证
if (box != null) if (box != null)
@@ -266,7 +274,7 @@ namespace WMS.Web.Domain.Services
var d = dtoList.FirstOrDefault(f => f.DestBoxId == detailClone.BoxId && f.SrcBoxId == s.BoxId); var d = dtoList.FirstOrDefault(f => f.DestBoxId == detailClone.BoxId && f.SrcBoxId == s.BoxId);
if (d == null) if (d == null)
{ {
d = new SaveChangeBoxRecordRequest(0, detailClone.BoxId); d = new SaveChangeBoxRecordRequest(s.BoxId, detailClone.BoxId);
d.Details.Add(new SaveChangeBoxRecordDetailsRequest(detailClone.MaterialId, 1, s.SerialNumber)); d.Details.Add(new SaveChangeBoxRecordDetailsRequest(detailClone.MaterialId, 1, s.SerialNumber));
} }
else else
@@ -340,7 +348,7 @@ namespace WMS.Web.Domain.Services
var d = dtoList.FirstOrDefault(f => f.DestBoxId == detailClone.BoxId && f.SrcBoxId == s.BoxId); var d = dtoList.FirstOrDefault(f => f.DestBoxId == detailClone.BoxId && f.SrcBoxId == s.BoxId);
if (d == null) if (d == null)
{ {
d = new SaveChangeBoxRecordRequest(0, detailClone.BoxId); d = new SaveChangeBoxRecordRequest(s.BoxId, detailClone.BoxId);
d.Details.Add(new SaveChangeBoxRecordDetailsRequest(detailClone.MaterialId, 1, s.SerialNumber)); d.Details.Add(new SaveChangeBoxRecordDetailsRequest(detailClone.MaterialId, 1, s.SerialNumber));
} }
else else

1
src/WMS.Web.Domain/Values/ResultCodes.cs
View File

@@ -69,6 +69,7 @@ namespace WMS.Web.Domain.Values
public static ValueTuple<int, string> SerialNumbersNoData = (610000, "序列号不存在"); public static ValueTuple<int, string> SerialNumbersNoData = (610000, "序列号不存在");
public static ValueTuple<int, string> SerialNumbersBoxError = (610002, "序列号已经绑定箱"); public static ValueTuple<int, string> SerialNumbersBoxError = (610002, "序列号已经绑定箱");
public static ValueTuple<int, string> SerialNumbersSrcBoxError = (610003, "序列号不在原有箱号内");
public static ValueTuple<int, string> TakeStockStockError = (610001, "一次不能盘多个仓库"); public static ValueTuple<int, string> TakeStockStockError = (610001, "一次不能盘多个仓库");
} }
} }