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

2024-04-12 17:16:36 +08:00
parent f2b53a7e0a 5d334a58bb
commit 2e036bb6ac
2 changed files with 1 additions and 1 deletions
--- a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
+++ b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
--- 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<MaterialResponse>.ReFailure(ResultCodes.SerialNumbersIsShelf);
            }