Merge branch 'master' into wxw

Administrator

2024-01-31 a7e2f8fa6c29b536af890bcab03335fb6d881ea4

Merge branch 'master' into wxw

 Wms/Wms/Controllers/SysController.cs

@@ -1651,6 +1651,8 @@

                var list = _category.InsertMaterialCategories(category);

                _operation.InsertOperation("基础信息", "物料类别", category.CategoryNo, "新增", "新增类别信息 类别号：" + category.CategoryNo, Convert.ToInt32(userId));

                return Ok(new
                {
                    data = list,
@@ -1697,6 +1699,8 @@

                var list = _category.ExitMaterialCategories(category);

                _operation.InsertOperation("基础信息", "物料类别", category.CategoryNo, "编辑", "编辑类别信息 类别号：" + category.CategoryNo, Convert.ToInt32(userId));

                return Ok(new
                {
                    data = list,
@@ -1743,6 +1747,8 @@

                var list = _category.DeleteMaterialCategories(category);

                _operation.InsertOperation("基础信息", "物料类别", category.CategoryNo, "删除", "删除类别信息 类别号：" + category.CategoryNo, Convert.ToInt32(userId));

                return Ok(new
                {
                    data = list,