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

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

Browse Source
This commit is contained in:
tongfei
2024-03-27 16:43:07 +08:00
parent 04cd982b75 a032edb059
commit e246d3800e
5 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/WMS.Web.Domain/Entitys/SubscribeNotification.cs
View File

@@ -63,7 +63,7 @@ namespace WMS.Web.Domain.Entitys
/// 操作时间
/// </summary>
[Column("OperateTime")]
public DateTime OperateTime { get; set; }
public DateTime OperateTime { get; set; } = DateTime.Now;
/// <summary>
/// 新增
/// </summary>
@@ -72,6 +72,7 @@ namespace WMS.Web.Domain.Entitys
{
this.CreatorId = creatorId;
this.CreateTime = DateTime.Now;
this.OperateTime = DateTime.Now;
}
/// <summary>
/// 修改

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

@@ -75,6 +75,12 @@ namespace WMS.Web.Domain.Services
var dBox = await _boxRepositories.GetByNo(d.DestBoxBillNo);
if (dBox == null)
{
//V01.05.00如果扫的内容不是CTN开头则提示"请扫描箱码作为箱号"
if (string.IsNullOrEmpty(d.DestBoxBillNo) || d.DestBoxBillNo.Length <= 3)
return Result.ReFailure(ResultCodes.BoxBillNoError);
if (d.DestBoxBillNo.Substring(0, 3) != "CTN")
return Result.ReFailure(ResultCodes.BoxBillNoError);
var res = await CreateBox(d);
if (!res.IsSuccess) return res;
dBox = await _boxRepositories.GetByNo(d.DestBoxBillNo);

1
src/WMS.Web.Domain/Services/OutStockTaskService.cs
View File

@@ -507,6 +507,7 @@ namespace WMS.Web.Domain.Services
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialNumber),
AccruedQty = entity.Details.FirstOrDefault(f => f.MaterialNumber == detail.MaterialNumber)?.AccruedQty ?? 0
};
response.Details.Add(infoDetail);
}
return Result<OutStockTaskInfoResponse>.ReSuccess(response);

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

@@ -45,6 +45,7 @@ namespace WMS.Web.Domain.Values
public static ValueTuple<int, string> BoxIsTrueShelf = (80000, "箱号已上架入库");
public static ValueTuple<int, string> BoxNoData = (80000, "系统找不到该箱号");
public static ValueTuple<int, string> InStockTaskBoxIsHaveData = (80000, "该箱已收货");
public static ValueTuple<int, string> BoxBillNoError = (80000, "请扫描箱码作为箱号");
public static ValueTuple<int, string> BoxMateriaNoData = (800010, "箱对应物料信息不存在");
public static ValueTuple<int, string> MateriaNoData = (800011, "产品信息不存在");
public static ValueTuple<int, string> BoxInventorySerialNumbersNoData = (800012, "序列号不存在于箱库存数据中");

2
src/WMS.Web.Repositories/SubscribeNotificationRepositories.cs
View File

@@ -174,7 +174,7 @@ namespace WMS.Web.Repositories
}
var query = _context.SubscribeNotification
.OrderByDescending(o => o.Id)
.OrderByDescending(o => o.OperateTime)
.Where(adv => 1 == 1 && adv.IsDelete != true);
if (!string.IsNullOrEmpty(dto.Creator))