Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

2023-11-08 16:24:52 +08:00
parent 7980e342c0 2619a011af
commit 8f00f2b688
2 changed files with 6 additions and 2 deletions
--- a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
@@ -286,7 +286,11 @@ namespace Tnb.QcMgr
            }
        }

-
+        /// <summary>
+        /// WMS出库入库检
+        /// </summary>
+        /// <param name="CreateTaskEntity"></param>
+        /// <returns></returns>
        [HttpPost]
        public async Task CreateWmsTask(CreateTaskEntity entity)
        {
--- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
@@ -44,7 +44,7 @@ namespace Tnb.QcMgr
            {
                { "ok", "合格" },
                { "no", "不合格" },
-                { "barelyok", "让步合格" },
+                { "barelyOk", "让步合格" },
                { "await", "待检" },
                { "temporarily", "暂控" }
            };