From 2ae1f6e97c54202fc7053598da7e59e3d14d316c Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 27 Mar 2024 14:58:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs | 6 ++++++ src/WMS.Web.Domain/Values/ResultCodes.cs | 1 + 2 files changed, 7 insertions(+) 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/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, "序列号不存在于箱库存数据中"); From 7c6c1f7c0d144300ee21c7cec43dfe24bb93405b Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 27 Mar 2024 15:09:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Services/OutStockTaskService.cs | 1 + 1 file changed, 1 insertion(+) 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); From a032edb05944923d42229ec34826936597277eeb Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 27 Mar 2024 16:39:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Entitys/SubscribeNotification.cs | 3 ++- src/WMS.Web.Repositories/SubscribeNotificationRepositories.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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.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))