diff --git a/src/WMS.Web.Domain/Entitys/SubscribeNotification.cs b/src/WMS.Web.Domain/Entitys/SubscribeNotification.cs
index 007ae926..96306539 100644
--- a/src/WMS.Web.Domain/Entitys/SubscribeNotification.cs
+++ b/src/WMS.Web.Domain/Entitys/SubscribeNotification.cs
@@ -63,7 +63,7 @@ namespace WMS.Web.Domain.Entitys
/// 操作时间
///
[Column("OperateTime")]
- public DateTime OperateTime { get; set; }
+ public DateTime OperateTime { get; set; } = DateTime.Now;
///
/// 新增
///
@@ -72,6 +72,7 @@ namespace WMS.Web.Domain.Entitys
{
this.CreatorId = creatorId;
this.CreateTime = DateTime.Now;
+ this.OperateTime = DateTime.Now;
}
///
/// 修改
diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
index 59e880b6..a54f9690 100644
--- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
+++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
@@ -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);
diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs
index ef38c481..8414f443 100644
--- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs
@@ -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.ReSuccess(response);
diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs
index 8ee4de32..c28042e0 100644
--- a/src/WMS.Web.Domain/Values/ResultCodes.cs
+++ b/src/WMS.Web.Domain/Values/ResultCodes.cs
@@ -45,6 +45,7 @@ namespace WMS.Web.Domain.Values
public static ValueTuple BoxIsTrueShelf = (80000, "箱号已上架入库");
public static ValueTuple BoxNoData = (80000, "系统找不到该箱号");
public static ValueTuple InStockTaskBoxIsHaveData = (80000, "该箱已收货");
+ public static ValueTuple BoxBillNoError = (80000, "请扫描箱码作为箱号");
public static ValueTuple BoxMateriaNoData = (800010, "箱对应物料信息不存在");
public static ValueTuple MateriaNoData = (800011, "产品信息不存在");
public static ValueTuple BoxInventorySerialNumbersNoData = (800012, "序列号不存在于箱库存数据中");
diff --git a/src/WMS.Web.Repositories/SubscribeNotificationRepositories.cs b/src/WMS.Web.Repositories/SubscribeNotificationRepositories.cs
index 4c43be6c..0667b906 100644
--- a/src/WMS.Web.Repositories/SubscribeNotificationRepositories.cs
+++ b/src/WMS.Web.Repositories/SubscribeNotificationRepositories.cs
@@ -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))