diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index a6c52ebb..d6100ad1 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index d98ba6cc..8a56a981 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -518,7 +518,7 @@ namespace WMS.Web.Api.Controllers */ if (serialStatus == 1 || serialStatus == 2) { - if (res.IsDelete != true) + if (res.IsActivate == true && res.IsDelete != true) return Result.ReFailure(ResultCodes.SerialNumbersIsShelf); }