hwh
2024-07-05 8826a713798e645e42381227e9263c16c65c9f97
客户、物流、单位、包装
20个文件已修改
1195 ■■■■ 已修改文件
HTML/views/ASNSetting/ArrivalNoticeDetail.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/ASNSetting/ArrivalReturnsNoticeDetail.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/Archiving/ExportNotice.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/Archiving/WaveMage.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/BaseSetting/Customer.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/BaseSetting/CustomerFrom.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/BaseSetting/LogisticsInfo.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/BaseSetting/LogisticsInfoFrom.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/BaseSetting/Packag.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/BaseSetting/PackagFrom.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/BaseSetting/Unit.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/BaseSetting/UnitFrom.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/SOSetting/ExportNotice.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/SOSetting/ExportNoticeAddFrom.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/SOSetting/ExportNoticeEditFrom.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/SOSetting/WaveMage.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/SOSetting/WaveMageAddInfo.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/SysServer/PackagServer.cs 388 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.IBLL/ISysServer/IPackagServer.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/BasisController.cs 732 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -518,7 +518,7 @@
                    0、2、4、6
                */
                sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function (res) {
                    if (res.code == 0) { //成功
                    if (res.code == 200) { //成功
                        $("#CustomerName").empty();
                        $("#CustomerName").append('<option value =""></option>');
HTML/views/ASNSetting/ArrivalReturnsNoticeDetail.html
@@ -615,7 +615,7 @@
                    0、2、4、6
                */
                sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function (res) {
                    if (res.code == 0) { //成功
                    if (res.code == 200) { //成功
                        $("#CustomerName").empty();
                        $("#CustomerName").append('<option value =""></option>');
HTML/views/Archiving/ExportNotice.html
@@ -361,7 +361,7 @@
            // refreshTablemx(xqid);
            //获取承运商物流
            sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function (res) {
                if (res.code == 0) { //成功
                if (res.code == 200) { //成功
                    $("#LogisticsId").empty();
                    $("#LogisticsId").append('<option value =""></option>');
                    for (var i = 0; i < res.data.length; i++) {
HTML/views/Archiving/WaveMage.html
@@ -191,7 +191,7 @@
            bindTable();
            //获取承运商物流
            sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function (res) {
                if (res.code == 0) { //成功
                if (res.code == 200) { //成功
                    $("#LogisticsId").empty();
                    $("#LogisticsId").append('<option value =""></option>');
                    for (var i = 0; i < res.data.length; i++) {
HTML/views/BaseSetting/Customer.html
@@ -133,6 +133,7 @@
                    height: 'full-95',
                    id: 'LAY-app-content-list',
                    where: param,
                    parseData: FnParseData,
                    contentType: 'application/json',
                    headers:{ToKen:$.cookie('token')},
                    page: true,
@@ -299,7 +300,7 @@
                            };
                            sendData(IP + "/Basis/DelsCustomer", param, 'post', function (res) {
                                console.log(res);
                                if (res.code == 0) { //成功
                                if (res.code == 200) { //成功
                                    layer.msg(res.msg, {
                                        icon: 1,
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
@@ -352,7 +353,7 @@
                                    sendData(IP + "/Basis/AddCustomer", param, 'post',
                                        function (res) {
                                            console.log(res);
                                            if (res.code == 0) { //成功
                                            if (res.code == 200) { //成功
                                                layer.msg(res.msg, {
                                                    icon: 1,
                                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
@@ -402,7 +403,7 @@
                            };
                            sendData(IP + "/Basis/DelCustomer", param, 'post', function (res) {
                                console.log(res);
                                if (res.code == 0) { //成功
                                if (res.code == 200) { //成功
                                    layer.msg(res.msg, {
                                        icon: 1,
                                        time: 1000 //2秒关闭(如果不配置,默认是3秒)
@@ -456,7 +457,7 @@
                                    sendData(IP + "/Basis/EditCustomer", param, 'post',
                                        function (res) {
                                            console.log(res);
                                            if (res.code == 0) { //成功
                                            if (res.code == 200) { //成功
                                                layer.msg(res.msg, {
                                                    icon: 1,
                                                    time: 1000 //2秒关闭(如果不配置,默认是3秒)
HTML/views/BaseSetting/CustomerFrom.html
@@ -117,7 +117,7 @@
                        Id: parseInt(id),
                    };
                    sendData(IP + "/Basis/GetCustomer", param, 'post', function(res) {
                        if (res.code == 0) { //成功
                        if (res.code == 200) { //成功
                            //页面赋值
                            $("input[name='CustomerNo']").val(res.data.CustomerNo);
                            $("input[name='CustomerNo']").attr('disabled', 'true');
HTML/views/BaseSetting/LogisticsInfo.html
@@ -137,6 +137,7 @@
                    height: h1,
                    id: 'LAY-app-content-list',
                    where: param,
                    parseData: FnParseData,
                    contentType: 'application/json',
                    headers:{ToKen:$.cookie('token')},
                    // toolbar:'#toolbarDemo',
@@ -323,7 +324,7 @@
                            sendData(IP + "/Basis/DelsLogisticsInfo", param, 'post', function (res) {
                                console.log(res);
                                if (res.code == 0) { //成功
                                if (res.code == 200) { //成功
                                    layer.msg(res.msg, {
                                        icon: 1,
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
@@ -375,7 +376,7 @@
                                    };
                                    sendData(IP + "/Basis/AddLogisticsInfo", param, 'post', function (res) {
                                        console.log(res);
                                        if (res.code == 0) { //成功
                                        if (res.code == 200) { //成功
                                            layer.msg(res.msg, {
                                                icon: 1,
                                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
@@ -427,7 +428,7 @@
                            };
                            sendData(IP + "/Basis/DelLogisticsInfo", param, 'post', function (res) {
                                console.log(res);
                                if (res.code == 0) { //成功
                                if (res.code == 200) { //成功
                                    layer.msg(res.msg, {
                                        icon: 1,
                                        time: 1000 //2秒关闭(如果不配置,默认是3秒)
@@ -482,7 +483,7 @@
                                    sendData(IP + "/Basis/EditLogisticsInfo", param, 'post',
                                        function (res) {
                                            console.log(res);
                                            if(res.code == 0) { //成功
                                            if(res.code == 200) { //成功
                                                layer.msg(res.msg, {
                                                    icon: 1,
                                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
HTML/views/BaseSetting/LogisticsInfoFrom.html
@@ -113,7 +113,7 @@
                        Id: parseInt(id),
                    };
                    sendData(IP + "/Basis/GetLogisticsInfo", param, 'post', function (res) {
                        if (res.code == 0) { //成功
                        if (res.code == 200) { //成功
                            //页面赋值 
                            $("input[name='CarrierName']").val(res.data.CarrierName);
                            $("input[name='Address']").val(res.data.Address);
HTML/views/BaseSetting/Packag.html
@@ -138,6 +138,7 @@
                url: url,
                method: 'post',
                where: where,
                parseData: FnParseData,
                contentType: 'application/json',
                headers:{ToKen:$.cookie('token')},
                page: true,
@@ -413,7 +414,7 @@
                                    sendData(IP + "/Basis/AddPackag", param, 'post',
                                        function (res) {
                                            if (res.code == 0) { //成功
                                            if (res.code == 200) { //成功
                                                layer.msg(res.msg, {
                                                    icon: 1,
                                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
@@ -470,7 +471,7 @@
                        if (doing) {
                            doing = false;
                            sendData(IP + "/Basis/DelPackag", param, 'post', function (res) {
                                if (res.code == 0) { //成功
                                if (res.code == 200) { //成功
                                    layer.msg(res.msg, {
                                        icon: 1,
                                        time: 1000 //2秒关闭(如果不配置,默认是3秒)
@@ -542,7 +543,7 @@
                                    sendData(IP + "/Basis/EditPackag", param, 'post',
                                        function (res) {
                                            console.log(res);
                                            if (res.code == 0) { //成功
                                            if (res.code == 200) { //成功
                                                layer.msg("修改成功", {
                                                    icon: 1,
                                                    time: 1000 //2秒关闭(如果不配置,默认是3秒)
HTML/views/BaseSetting/PackagFrom.html
@@ -152,7 +152,7 @@
                    sendData(IP + "/Basis/GetPackagById?Id="+id, param, 'get', function(res) {
                        console.log(res);
                        //console.log(res.data.IsValid == 0);
                        if (res.code == 0) { //成功
                        if (res.code == 200) { //成功
                            //包装编码
                            if (res.data.SkuNo != "") {
                                $("input[name='PackCode']").attr("disabled", "disabled")
HTML/views/BaseSetting/Unit.html
@@ -109,6 +109,7 @@
                url: url,
                method: 'post',
                where: where,
                parseData: FnParseData,
                contentType: 'application/json',
                headers:{ToKen:$.cookie('token')},
                page: true,
@@ -245,7 +246,7 @@
                            doing = false;
                            synData(IP + "/Basis/DelsUnit", param, 'post', function (res) {
                                console.log(res);
                                if (res.code == 0) { //成功
                                if (res.code == 200) { //成功
                                    layer.msg(res.msg, {
                                        icon: 1,
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
@@ -303,7 +304,7 @@
                                    sendData(IP + "/Basis/AddUnit", param, 'post',
                                        function (res) {
                                            console.log(res);
                                            if (res.code == 0) { //成功
                                            if (res.code == 200) { //成功
                                                layer.msg(res.msg, {
                                                    icon: 1,
                                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
@@ -404,7 +405,7 @@
                            doing = false;
                            sendData(IP + "/Basis/DelUnit", param, 'post', function (res) {
                                console.log(res);
                                if (res.code == 0) { //成功
                                if (res.code == 200) { //成功
                                    layer.msg(res.msg, {
                                        icon: 1,
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
@@ -462,7 +463,7 @@
                                    sendData(IP + "/Basis/EditUnit", param, 'post',
                                        function (res) {
                                            console.log(res);
                                            if (res.code == 0) { //成功
                                            if (res.code == 200) { //成功
                                                layer.msg("修改成功", {
                                                    icon: 1,
                                                    time: 1000 //2秒关闭(如果不配置,默认是3秒)
HTML/views/BaseSetting/UnitFrom.html
@@ -52,7 +52,7 @@
                    };
                    sendData(IP + "/Basis/GetUnit", param, 'post', function(res) {
                        console.log(res);
                        if (res.code == 0) { //成功
                        if (res.code == 200) { //成功
                            //页面赋值
                            $("input[name='UnitNo']").val(res.data.UnitNo);
                            $("input[name='UnitName']").val(res.data.UnitName);
HTML/views/SOSetting/ExportNotice.html
@@ -472,7 +472,7 @@
            // refreshTablemx(xqid);
            //获取承运商物流
            sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function (res) {
                if (res.code == 0) { //成功
                if (res.code == 200) { //成功
                    $("#LogisticsId").empty();
                    $("#LogisticsId").append('<option value =""></option>');
                    for (var i = 0; i < res.data.length; i++) {
HTML/views/SOSetting/ExportNoticeAddFrom.html
@@ -496,7 +496,7 @@
                //获取客户下拉框信息
                function getCustomerList() {
                    sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function(res) {
                        if (res.code == 0) { //成功
                        if (res.code == 200) { //成功
                            $("#CustomerNo").empty();
                            $("#CustomerNo").append('<option value =""></option>');
                            for (var i = 0; i < res.data.length; i++) {
@@ -561,7 +561,7 @@
                //获取物流承运商下拉框信息
                function getLogisticsInfoList() {
                    sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
                        if (res.code == 0) { //成功
                        if (res.code == 200) { //成功
                            $("#LogisticsId").empty();
                            $("#LogisticsId").append('<option value =""></option>');
                            for (var i = 0; i < res.data.length; i++) {
HTML/views/SOSetting/ExportNoticeEditFrom.html
@@ -501,7 +501,7 @@
                //获取客户下拉框信息
                function getCustomerList(customerNo) {
                    sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function(res) {
                        if (res.code == 0) { //成功
                        if (res.code == 200) { //成功
                            var TypeNum = 0;
                                
                            switch($("#Type").val())
@@ -567,7 +567,7 @@
                //获取物流承运商下拉框信息
                function getLogisticsInfoList(logisticsId) {
                    sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
                        if (res.code == 0) { //成功
                        if (res.code == 200) { //成功
                            $("#LogisticsId").empty();
                            $("#LogisticsId").append('<option value =""></option>');
                            for (var i = 0; i < res.data.length; i++) {
HTML/views/SOSetting/WaveMage.html
@@ -263,7 +263,7 @@
            bindTable();
            //获取承运商物流
            sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
                if (res.code == 0) { //成功
                if (res.code == 200) { //成功
                    $("#LogisticsId").empty();
                    $("#LogisticsId").append('<option value =""></option>');
                    for (var i = 0; i < res.data.length; i++) {
HTML/views/SOSetting/WaveMageAddInfo.html
@@ -62,7 +62,7 @@
                //获取承运商物流
                sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
                    if (res.code == 0) { //成功
                    if (res.code == 200) { //成功
                        $("#LogisticsId").empty();
                        $("#LogisticsId").append('<option value =""></option>');
                        for (var i = 0; i < res.data.length; i++) {
Wms/WMS.BLL/SysServer/PackagServer.cs
@@ -9,6 +9,8 @@
using WMS.IBLL.ISysServer;
using WMS.IDAL.ISysInterface;
using Model.ModelVm.SysVm;
using System.Threading.Tasks;
using Utility;
namespace WMS.BLL.SysServer
{
@@ -29,7 +31,7 @@
        /// <param name="packagName">包装名称</param>
        /// <param name="level">等级</param>
        /// <returns>包装集合</returns>
        public List<PackagDto> GetPackagList(string packagNo, string packagName, int? level, int page, int limit, out int count)
        public async Task<List<PackagDto>> GetPackagList(string packagNo, string packagName, int? level, int page, int limit, RefAsync<int> count)
        {
            try
            {
@@ -39,9 +41,9 @@
                    .AndIF(level != null, it => it.Level.Equals(level))
                    .ToExpression();//注意 这一句 不能少
                var data = PackagRst.GetAllByOrderPage(item, limit, page, out int counts)
                var data = await PackagRst.GetAllByOrderPage(item, limit, page, out int counts)
                    .Includes(x => x.CreateUserInfo)
                    .Includes(x => x.UpdateUserInfo).ToList();
                    .Includes(x => x.UpdateUserInfo).ToListAsync();
                count = counts;
                return data.Select(m => new PackagDto()
@@ -83,10 +85,9 @@
        /// </summary>
        /// <param name="id">包装id</param>
        /// <returns></returns>
        public SysPackag GetPackagById(int id)
        public async Task<SysPackag> GetPackagById(int id)
        {
            SysPackag packag = PackagRst.GetOneById(id);
            return packag;
            return await PackagRst.GetOneByIdAsync(id);
        }
        /// <summary>
@@ -94,101 +95,88 @@
        /// </summary>
        /// <param name="model">包装信息</param>
        /// <returns>true:成功  flase:失败</returns>
        public int AddPackag(AddEditPackagVm model)
        public async Task<int> AddPackag(AddEditPackagVm model)
        {
            try
            var rowCount = await PackagRst.GetAllWhere(m => m.PackagNo == model.PackagNo).CountAsync();
            if (rowCount > 0)
            {
                var rowCount = PackagRst.GetAllWhere(m => m.PackagNo == model.PackagNo).Count();
                if (rowCount > 0)
                {
                    throw new Exception("包装编号已存在!");
                }
                throw Oops.Bah("包装编号已存在!");
            }
                rowCount = PackagRst.GetAllWhere(m => m.PackagName == model.PackagName).Count();
                if (rowCount > 0)
                {
                    throw new Exception("包装名称已存在!");
                }
            rowCount = await PackagRst.GetAllWhere(m => m.PackagName == model.PackagName).CountAsync();
            if (rowCount > 0)
            {
                throw Oops.Bah("包装名称已存在!");
            }
                SysPackag packagModel = new SysPackag();
                packagModel.PackagNo = model.PackagNo;
                packagModel.PackagName = model.PackagName;
                packagModel.Level = 0;
            SysPackag packagModel = new SysPackag();
            packagModel.PackagNo = model.PackagNo;
            packagModel.PackagName = model.PackagName;
            packagModel.Level = 0;
                //判断五级包装是否为空
                if (!string.IsNullOrEmpty(model.L5Num) && !string.IsNullOrEmpty(model.L5Name))
                {
                    packagModel.L5Num = int.Parse(model.L5Num);
                    packagModel.L5Name = model.L5Name;
                    packagModel.Level += 1;
                    //判断四级包装是否为空
                    if (string.IsNullOrEmpty(model.L4Num) && string.IsNullOrEmpty(model.L4Name))
                    {
                        return 2;
                    }
                }
            //判断五级包装是否为空
            if (!string.IsNullOrEmpty(model.L5Num) && !string.IsNullOrEmpty(model.L5Name))
            {
                packagModel.L5Num = int.Parse(model.L5Num);
                packagModel.L5Name = model.L5Name;
                packagModel.Level += 1;
                //判断四级包装是否为空
                if (!string.IsNullOrEmpty(model.L4Num) && !string.IsNullOrEmpty(model.L4Name))
                if (string.IsNullOrEmpty(model.L4Num) && string.IsNullOrEmpty(model.L4Name))
                {
                    packagModel.L4Num = int.Parse(model.L4Num);
                    packagModel.L4Name = model.L4Name;
                    packagModel.Level += 1;
                    //判断三级包装是否为空
                    if (string.IsNullOrEmpty(model.L3Num) && string.IsNullOrEmpty(model.L3Name))
                    {
                        return 2;
                    }
                    throw Oops.Bah("包装等级不可越级添加!");
                }
                //判断三级包装是否为空
                if (!string.IsNullOrEmpty(model.L3Num) && !string.IsNullOrEmpty(model.L3Name))
                {
                    packagModel.L3Num = int.Parse(model.L3Num);
                    packagModel.L3Name = model.L3Name;
                    packagModel.Level += 1;
                    //判断二级包装是否为空
                    if (string.IsNullOrEmpty(model.L2Num) && string.IsNullOrEmpty(model.L2Name))
                    {
                        return 2;
                    }
                }
                //判断二级包装是否为空
                if (!string.IsNullOrEmpty(model.L2Num) && !string.IsNullOrEmpty(model.L2Name))
                {
                    packagModel.L2Num = int.Parse(model.L2Num);
                    packagModel.L2Name = model.L2Name;
                    packagModel.Level += 1;
                    //判断一级包装是否为空
                    if (string.IsNullOrEmpty(model.L1Num) && string.IsNullOrEmpty(model.L1Name))
                    {
                        return 2;
                    }
                }
                //判断一级包装是否为空
                if (!string.IsNullOrEmpty(model.L1Num) && !string.IsNullOrEmpty(model.L1Name))
                {
                    packagModel.L1Num = int.Parse(model.L1Num);
                    packagModel.L1Name = model.L1Name;
                    packagModel.Level += 1;
                }
                else
                {
                    return 2;
                }
                packagModel.CreateUser = (int)model.CreateUser;
                int rowNum = PackagRst.Add(packagModel);
                if (rowNum > 0)
                {
                    return 1;
                }
                return 0;
            }
            catch (Exception e)
            //判断四级包装是否为空
            if (!string.IsNullOrEmpty(model.L4Num) && !string.IsNullOrEmpty(model.L4Name))
            {
                throw new Exception(e.Message);
                packagModel.L4Num = int.Parse(model.L4Num);
                packagModel.L4Name = model.L4Name;
                packagModel.Level += 1;
                //判断三级包装是否为空
                if (string.IsNullOrEmpty(model.L3Num) && string.IsNullOrEmpty(model.L3Name))
                {
                    throw Oops.Bah("包装等级不可越级添加!");
                }
            }
            //判断三级包装是否为空
            if (!string.IsNullOrEmpty(model.L3Num) && !string.IsNullOrEmpty(model.L3Name))
            {
                packagModel.L3Num = int.Parse(model.L3Num);
                packagModel.L3Name = model.L3Name;
                packagModel.Level += 1;
                //判断二级包装是否为空
                if (string.IsNullOrEmpty(model.L2Num) && string.IsNullOrEmpty(model.L2Name))
                {
                    throw Oops.Bah("包装等级不可越级添加!");
                }
            }
            //判断二级包装是否为空
            if (!string.IsNullOrEmpty(model.L2Num) && !string.IsNullOrEmpty(model.L2Name))
            {
                packagModel.L2Num = int.Parse(model.L2Num);
                packagModel.L2Name = model.L2Name;
                packagModel.Level += 1;
                //判断一级包装是否为空
                if (string.IsNullOrEmpty(model.L1Num) && string.IsNullOrEmpty(model.L1Name))
                {
                    throw Oops.Bah("包装等级不可越级添加!");
                }
            }
            //判断一级包装是否为空
            if (!string.IsNullOrEmpty(model.L1Num) && !string.IsNullOrEmpty(model.L1Name))
            {
                packagModel.L1Num = int.Parse(model.L1Num);
                packagModel.L1Name = model.L1Name;
                packagModel.Level += 1;
            }
            else
            {
                throw Oops.Bah("包装等级不可越级添加!");
            }
            packagModel.CreateUser = (int)model.CreateUser;
            return await PackagRst.AddAsync(packagModel);
        }
        /// <summary>
@@ -196,117 +184,109 @@
        /// </summary>
        /// <param name="model">包装信息</param>
        /// <returns>true:成功  flase:失败</returns>
        public int EditPackag(AddEditPackagVm model)
        public async Task<int> EditPackag(AddEditPackagVm model)
        {
            try
            if (string.IsNullOrEmpty(model.PackagName))
            {
                if (string.IsNullOrEmpty(model.PackagName))
                var date = await PackagRst.GetAllWhere(m => m.Id != model.Id && (m.PackagName == model.PackagName)).CountAsync();
                if (date > 0)
                {
                    var date = PackagRst.GetAllWhere(m => m.Id != model.Id && (m.PackagName == model.PackagName)).Count();
                    if (date > 0)
                    {
                        throw new Exception("包装名称已存在!");
                    }
                    throw Oops.Bah("包装名称已存在!");
                }
                var packagItems = PackagRst.GetOneById(model.Id);
                packagItems.Id = model.Id; //id
                packagItems.PackagNo = model.PackagNo; //包装编号
                packagItems.PackagName = model.PackagName; //包装描述
                //packagItems.IsDel = model.IsDel; 原因: 修改时不需要修改IsDel字段
                packagItems.UpdateTime = DateTime.Now; //修改时间
                packagItems.UpdateUser = model.CreateUser; //修改人
                packagItems.Level = 0;
            }
            var packagItems = PackagRst.GetOneById(model.Id);
            packagItems.Id = model.Id; //id
            packagItems.PackagNo = model.PackagNo; //包装编号
            packagItems.PackagName = model.PackagName; //包装描述
                                                       //packagItems.IsDel = model.IsDel; 原因: 修改时不需要修改IsDel字段
            packagItems.UpdateTime = DateTime.Now; //修改时间
            packagItems.UpdateUser = model.CreateUser; //修改人
            packagItems.Level = 0;
                //判断五级包装是否为空
                if (!string.IsNullOrEmpty(model.L5Num) && !string.IsNullOrEmpty(model.L5Name))
                {
                    packagItems.L5Num = int.Parse(model.L5Num);
                    packagItems.L5Name = model.L5Name;
                    packagItems.Level += 1;
                    //判断四级包装是否为空
                    if (string.IsNullOrEmpty(model.L4Num) && string.IsNullOrEmpty(model.L4Name))
                    {
                        return 2;
                    }
                }
                else
                {
                    packagItems.L5Num = null;
                    packagItems.L5Name = null;
                }
            //判断五级包装是否为空
            if (!string.IsNullOrEmpty(model.L5Num) && !string.IsNullOrEmpty(model.L5Name))
            {
                packagItems.L5Num = int.Parse(model.L5Num);
                packagItems.L5Name = model.L5Name;
                packagItems.Level += 1;
                //判断四级包装是否为空
                if (!string.IsNullOrEmpty(model.L4Num) && !string.IsNullOrEmpty(model.L4Name))
                if (string.IsNullOrEmpty(model.L4Num) && string.IsNullOrEmpty(model.L4Name))
                {
                    packagItems.L4Num = int.Parse(model.L4Num);
                    packagItems.L4Name = model.L4Name;
                    packagItems.Level += 1;
                    //判断三级包装是否为空
                    if (string.IsNullOrEmpty(model.L3Num) && string.IsNullOrEmpty(model.L3Name))
                    {
                        return 2;
                    }
                    throw Oops.Bah("包装等级不可越级修改 请重新输入");
                }
                else
                {
                    packagItems.L4Num = null;
                    packagItems.L4Name = null;
                }
                //判断三级包装是否为空
                if (!string.IsNullOrEmpty(model.L3Num) && !string.IsNullOrEmpty(model.L3Name))
                {
                    packagItems.L3Num = int.Parse(model.L3Num);
                    packagItems.L3Name = model.L3Name;
                    packagItems.Level += 1;
                    //判断二级包装是否为空
                    if (string.IsNullOrEmpty(model.L2Num) && string.IsNullOrEmpty(model.L2Name))
                    {
                        return 2;
                    }
                }
                else
                {
                    packagItems.L3Num = null;
                    packagItems.L3Name = null;
                }
                //判断二级包装是否为空
                if (!string.IsNullOrEmpty(model.L2Num) && !string.IsNullOrEmpty(model.L2Name))
                {
                    packagItems.L2Num = int.Parse(model.L2Num);
                    packagItems.L2Name = model.L2Name;
                    packagItems.Level += 1;
                    //判断一级包装是否为空
                    if (string.IsNullOrEmpty(model.L1Num) && string.IsNullOrEmpty(model.L1Name))
                    {
                        return 2;
                    }
                }
                else
                {
                    packagItems.L3Num = null;
                    packagItems.L3Name = null;
                }
                //判断一级包装是否为空
                if (!string.IsNullOrEmpty(model.L1Num) && !string.IsNullOrEmpty(model.L1Name))
                {
                    packagItems.L1Num = int.Parse(model.L1Num);
                    packagItems.L1Name = model.L1Name;
                    packagItems.Level += 1;
                }
                else
                {
                    packagItems.L1Num = null;
                    packagItems.L1Name = null;
                    return 2;
                }
                var rowCount = PackagRst.Edit(packagItems);
                return rowCount;
            }
            catch (Exception e)
            else
            {
                throw new Exception(e.Message);
                packagItems.L5Num = null;
                packagItems.L5Name = null;
            }
            //判断四级包装是否为空
            if (!string.IsNullOrEmpty(model.L4Num) && !string.IsNullOrEmpty(model.L4Name))
            {
                packagItems.L4Num = int.Parse(model.L4Num);
                packagItems.L4Name = model.L4Name;
                packagItems.Level += 1;
                //判断三级包装是否为空
                if (string.IsNullOrEmpty(model.L3Num) && string.IsNullOrEmpty(model.L3Name))
                {
                    throw Oops.Bah("包装等级不可越级修改 请重新输入");
                }
            }
            else
            {
                packagItems.L4Num = null;
                packagItems.L4Name = null;
            }
            //判断三级包装是否为空
            if (!string.IsNullOrEmpty(model.L3Num) && !string.IsNullOrEmpty(model.L3Name))
            {
                packagItems.L3Num = int.Parse(model.L3Num);
                packagItems.L3Name = model.L3Name;
                packagItems.Level += 1;
                //判断二级包装是否为空
                if (string.IsNullOrEmpty(model.L2Num) && string.IsNullOrEmpty(model.L2Name))
                {
                    throw Oops.Bah("包装等级不可越级修改 请重新输入");
                }
            }
            else
            {
                packagItems.L3Num = null;
                packagItems.L3Name = null;
            }
            //判断二级包装是否为空
            if (!string.IsNullOrEmpty(model.L2Num) && !string.IsNullOrEmpty(model.L2Name))
            {
                packagItems.L2Num = int.Parse(model.L2Num);
                packagItems.L2Name = model.L2Name;
                packagItems.Level += 1;
                //判断一级包装是否为空
                if (string.IsNullOrEmpty(model.L1Num) && string.IsNullOrEmpty(model.L1Name))
                {
                    throw Oops.Bah("包装等级不可越级修改 请重新输入");
                }
            }
            else
            {
                packagItems.L3Num = null;
                packagItems.L3Name = null;
            }
            //判断一级包装是否为空
            if (!string.IsNullOrEmpty(model.L1Num) && !string.IsNullOrEmpty(model.L1Name))
            {
                packagItems.L1Num = int.Parse(model.L1Num);
                packagItems.L1Name = model.L1Name;
                packagItems.Level += 1;
            }
            else
            {
                packagItems.L1Num = null;
                packagItems.L1Name = null;
                throw Oops.Bah("包装等级不可越级修改 请重新输入");
            }
            return await PackagRst.EditAsync(packagItems);
        }
        /// <summary>
@@ -314,27 +294,19 @@
        /// </summary>
        /// <param name="packagId">包装信息主键ID</param>
        /// <returns>true:成功  flase:失败</returns>
        public bool DelPackag(int packagId, int userId)
        public async Task<bool> DelPackag(int packagId, int userId)
        {
            try
            var packagItems = await PackagRst.GetOneByIdAsync(packagId);
            if (packagItems == null)
            {
                var packagItems = PackagRst.GetOneById(packagId);
                if (packagItems == null)
                {
                    throw new Exception("包装信息不存在!");
                }
                packagItems.IsDel = "1";
                packagItems.UpdateTime = DateTime.Now;
                packagItems.UpdateUser = userId;
                var rowCount = PackagRst.Edit(packagItems);
                return rowCount > 0;
                throw Oops.Bah("包装信息不存在!");
            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
            packagItems.IsDel = "1";
            packagItems.UpdateTime = DateTime.Now;
            packagItems.UpdateUser = userId;
            return await PackagRst.EditAsync(packagItems) > 0;
        }
    }
}
Wms/WMS.IBLL/ISysServer/IPackagServer.cs
@@ -4,6 +4,7 @@
using System.Threading.Tasks;
using Model.ModelDto.SysDto;
using Model.ModelVm.SysVm;
using SqlSugar;
using WMS.Entity.SysEntity;
namespace WMS.IBLL.ISysServer
@@ -20,35 +21,35 @@
        /// <param name="limit"></param>
        /// <param name="count"></param>
        /// <returns></returns>
        List<PackagDto> GetPackagList(string packagNo, string packagName, int? level, int page, int limit, out int count);
        Task<List<PackagDto>> GetPackagList(string packagNo, string packagName, int? level, int page, int limit, RefAsync<int> count);
        /// <summary>
        /// 根据id获取包装信息
        /// </summary>
        /// <param name="id">包装id</param>
        /// <returns></returns>
        SysPackag GetPackagById(int id);
        Task<SysPackag> GetPackagById(int id);
        /// <summary>
        /// 新增包装信息
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        int AddPackag(AddEditPackagVm model);
        Task<int> AddPackag(AddEditPackagVm model);
        /// <summary>
        /// 修改包装信息
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        int EditPackag(AddEditPackagVm model);
        Task<int> EditPackag(AddEditPackagVm model);
        /// <summary>
        /// 逻辑删除包装信息
        /// </summary>
        /// <param name="packagId">包装主键Id</param>
        /// <returns></returns>
        bool DelPackag(int packagId, int userId);
        Task<bool> DelPackag(int packagId, int userId);
    }
}
Wms/Wms/Controllers/BasisController.cs
@@ -28,6 +28,7 @@
    [Route("api/[controller]/[action]")]
    [ApiController]
    [Authorize]
    [ServiceFilter(typeof(ApiResponseActionFilter))]
    public class BasisController : ControllerBase
    {
        /// <summary>
@@ -93,7 +94,6 @@
        /// <param name="Status">状态</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<UserInfoDto>> GetUserRoleList(string UserName, string DepartmentNo, string RoleNo, string Status)
        {
            return await _userInforServer.GetUserRoleList(UserName, DepartmentNo, RoleNo, Status);
@@ -105,7 +105,6 @@
        /// <param name="id">用户id</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SysUserInfor> GetUserinfoListById(int id)
        {
            return await _userInforServer.GetUserInfoById(id);
@@ -119,7 +118,6 @@
        /// <returns></returns>
        /// <exception cref="System.Exception">捕获异常</exception>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task InsertUserinfo(UserInfoDto UserInfoDto)
        {
@@ -142,7 +140,6 @@
        /// <returns></returns>
        /// <exception cref="System.Exception">异常</exception>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task DeleteUserInfo(int userids)
        {
@@ -167,7 +164,6 @@
        /// <returns></returns>
        /// <exception cref="System.Exception">捕获异常</exception>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task UpdateUserinfo(UserInfoDto userdto)
        {
@@ -197,7 +193,6 @@
        /// <returns></returns>
        /// <exception cref="Exception">捕获异常</exception>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task UptUserPassWord(string pwdOld, string pwdNew, string pwdNewTwo/*, int userId*/)
        {
            pwdOld = Md5Tools.CalcMd5(pwdOld);
@@ -219,7 +214,6 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<int> IsPassWordTime()
        {
            return await _userInforServer.IsPassWordTime(_userManager.UserId);
@@ -237,7 +231,6 @@
        /// <param name="RoleName">角色名称</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<RoleDto>> GetRolesList(string RoleNo, string RoleName)
        {
            return await _rolesServer.GetRoleList(RoleNo, RoleName);
@@ -249,7 +242,6 @@
        /// <param name="roleid">角色id</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SysRoles> GetRolesListById(int roleid)
        {
            return await _rolesServer.GetRoleInfoById(roleid);
@@ -262,7 +254,6 @@
        /// <returns></returns>
        /// <exception cref="System.Exception">捕获异常</exception>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task InsertRoleInfo(RoleDto roledto)
        {
@@ -284,7 +275,6 @@
        /// <returns></returns>
        /// <exception cref="System.Exception"></exception>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task DeleteRoleInfo(int roleids)
        {
@@ -308,7 +298,6 @@
        /// <returns></returns>
        /// <exception cref="System.Exception">捕获异常</exception>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task UpdateRolesInfo(SysRoles role)
        {
@@ -344,10 +333,9 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<FunctionMenuDto>> GetRoleRightRBAC(int id, string MenuNo)
        {
            return await _rBACServer.GetRoleRightRBAC(MenuNo, UserId);
            return await _rBACServer.GetRoleRightRBAC(MenuNo, _userManager.UserId.ToString());
        }
        /// <summary>
@@ -355,7 +343,6 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<RoleRightDto>> GetRoleRightLists(int id)
        {
            return await _rBACServer.GetRoleRightList(id);
@@ -367,7 +354,6 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<RoleRightDto>> GetRoleRightList()
        {
            return await _roleRightServer.GetRoleMenuList();
@@ -379,7 +365,6 @@
        /// <param name="id">角色权限id</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<SysRoleRight>> GetRoleRightOneListById(int id)
        {
            return await _roleRightServer.GetRoleRightOneListById(id);
@@ -393,7 +378,6 @@
        /// <returns></returns>
        /// <exception cref="Exception">捕获异常</exception>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task InsertRoleRight(string MenuNo, int id)
        {
@@ -422,7 +406,6 @@
        /// <param name="DepartmentNo">部门号</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<DepartmentDto>> GetDepartmentList(string DepartmentName, string DepartmentNo)
        {
            return await _department.GetDepartmentList(DepartmentName, DepartmentNo);
@@ -434,7 +417,6 @@
        /// <param name="id">部门id</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SysDepartment> GetDepartmentById(int id)
        {
            return await _department.GetDepartmentById(id);
@@ -447,7 +429,6 @@
        /// <returns></returns>
        /// <exception cref="Exception">捕获异常</exception>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task AddDepartment(DepartmentDto departmentdto)
        {
@@ -469,7 +450,6 @@
        /// <returns></returns>
        /// <exception cref="Exception">捕获异常</exception>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task DelDepartment(int Id)
        {
@@ -492,7 +472,6 @@
        /// <returns></returns>
        /// <exception cref="Exception">捕获异常</exception>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task ExitDepartment(DepartmentDto departmentdto)
        {
@@ -519,7 +498,6 @@
        /// <param name="GroupNo">组号</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<FunSettingDto>> GetFunSettingList(string FunSetName, string IsEnable, string GroupNo)
        {
            return await _setting.GetFunSettingList(FunSetName, IsEnable, GroupNo);
@@ -531,7 +509,6 @@
        /// <param name="id">功能id</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SysFunSetting> GetFunSettingById(int id)
        {
            return await _setting.GetFunSettingById(id);
@@ -543,7 +520,6 @@
        /// <param name="funSetNo">功能编号</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SysFunSetting> GetFunSettingByNo(string funSetNo)
        {
            return await _setting.GetFunSettingByNo(funSetNo);
@@ -555,7 +531,6 @@
        /// <returns></returns>
        /// <exception cref="Exception">捕获异常</exception>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task AddFunSettings(FunSettingDto settingdto)
        {
@@ -577,7 +552,6 @@
        /// <returns></returns>
        /// <exception cref="Exception">捕获异常</exception>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task DelFunSettings(int id)
        {
@@ -600,7 +574,6 @@
        /// <returns></returns>
        /// <exception cref="Exception">捕获异常</exception>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task ExitFunSettings(FunSettingDto settingdto)
        {
@@ -636,7 +609,6 @@
        /// <param name="categoryNo">类别编码</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<MaterialsDto>> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
        {
            return await _mate.GetMateList(skuNo, skuName, auditStatusNo, type, isControlled, isInspect, environment, categoryNo);
@@ -648,7 +620,6 @@
        /// <param name="id">物料id</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SysMaterials> GetMateById(int id)
        {
            return await _mate.GetMateById(id);
@@ -660,7 +631,6 @@
        /// <param name="matedto">物料dto</param>
        /// <returns></returns>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task AddMate(MaterialsDto matedto)
        {
            await _mate.AddMate(matedto);
@@ -681,7 +651,6 @@
        /// <returns></returns>
        /// <exception cref="Exception">捕获异常</exception>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task DelMate(int id)
        {
            SysMaterials mate = await _mate.GetMateById(id);
@@ -703,7 +672,6 @@
        /// <returns></returns>
        /// <exception cref="Exception">捕获异常</exception>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task ExitMate(MaterialsDto matedto)
        {
            await _mate.ExitMate(matedto);
@@ -724,7 +692,6 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<SysUnit>> GetUnitList()
        {
            return await _mate.GetUnitList();
@@ -735,7 +702,6 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<SysPackag>> GetPackagList()
        {
            return await _mate.GetPackagList();
@@ -926,19 +892,11 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> GetCustomerList(GetCustomerVm model)
        public async Task<SqlSugarPagedList<CustomerDto>> GetCustomerList(GetCustomerVm model)
        {
            try
            {
                RefAsync<int> count = new RefAsync<int>();
                var bolls = await _customerSvc.GetCustomerList(model.CustomerNo, model.CustomerName, model.Type, model.LinkMan, model.Phone, model.Page, model.Limit, count);
                return Ok(new { code = 0, count, msg = "客户信息", data = bolls });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            RefAsync<int> count = new RefAsync<int>();
            var bolls = await _customerSvc.GetCustomerList(model.CustomerNo, model.CustomerName, model.Type, model.LinkMan, model.Phone, model.Page, model.Limit, count);
            return new SqlSugarPagedList<CustomerDto>() { Items = bolls, Total = bolls.Count };
        }
        /// <summary>
        /// 查询单条客户信息
@@ -946,36 +904,18 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> GetCustomer(IdVm model)
        public async Task<SysCustomer> GetCustomer(IdVm model)
        {
            try
            {
                var bolls = await _customerSvc.GetCustomer(model.Id);
                return Ok(new { code = 0, count = 0, msg = "客户信息", data = bolls });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            return await _customerSvc.GetCustomer(model.Id);
        }
        /// <summary>
        /// 查询全部客户信息
        /// </summary> 
        /// <returns></returns>
        [HttpGet]
        public async Task<IActionResult> GetCustomerSelect()
        public async Task<List<SysCustomer>> GetCustomerSelect()
        {
            try
            {
                var bolls = await _customerSvc.GetCustomerSelect();
                return Ok(new { code = 0, count = 0, msg = "客户信息", data = bolls });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            return await _customerSvc.GetCustomerSelect();
        }
        /// <summary>
        /// 添加客户信息
@@ -983,38 +923,11 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> AddCustomer(AddCustomerVm model)
        [UnitOfWork]
        public async Task AddCustomer(AddCustomerVm model)
        {
            try
            {
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var bolls = await _customerSvc.AddCustomer(model.CustomerNo, model.CustomerName, model.Type, model.Address, model.LinkMan, model.Phone, model.BankAccount, model.CreditRating, model.Demo, int.Parse(userId));
                if (bolls)
                {
                    await _operation.InsertOperation("基础信息", "客户管理", model.CustomerNo, "添加", "添加客户信息 客户号:" + model.CustomerNo, Convert.ToInt32(userId));
                    return Ok(new { code = 0, msg = "添加成功" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "添加失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            await _customerSvc.AddCustomer(model.CustomerNo, model.CustomerName, model.Type, model.Address, model.LinkMan, model.Phone, model.BankAccount, model.CreditRating, model.Demo, _userManager.UserId);
            await _operation.InsertOperation("基础信息", "客户管理", model.CustomerNo, "添加", "添加客户信息 客户号:" + model.CustomerNo, _userManager.UserId);
        }
        /// <summary>
        /// 编辑客户信息
@@ -1022,38 +935,11 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> EditCustomer(EditCustomerVm model)
        [UnitOfWork]
        public async Task EditCustomer(EditCustomerVm model)
        {
            try
            {
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var bolls = await _customerSvc.EditCustomer(model.Id, model.CustomerNo, model.CustomerName, model.Type, model.Address, model.LinkMan, model.Phone, model.BankAccount, model.CreditRating, model.Demo, int.Parse(userId));
                if (bolls)
                {
                    await _operation.InsertOperation("基础信息", "客户管理", model.CustomerNo, "编辑", "编辑客户信息 客户号:" + model.CustomerNo, Convert.ToInt32(userId));
                    return Ok(new { code = 0, msg = "编辑成功" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "编辑失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            await _customerSvc.EditCustomer(model.Id, model.CustomerNo, model.CustomerName, model.Type, model.Address, model.LinkMan, model.Phone, model.BankAccount, model.CreditRating, model.Demo, _userManager.UserId);
            await _operation.InsertOperation("基础信息", "客户管理", model.CustomerNo, "编辑", "编辑客户信息 客户号:" + model.CustomerNo, _userManager.UserId);
        }
        /// <summary>
        /// 删除客户信息
@@ -1061,38 +947,12 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> DelCustomer(IdVm model)
        [UnitOfWork]
        public async Task DelCustomer(IdVm model)
        {
            try
            {
                SysCustomer customer = await _customerSvc.GetCustomer(model.Id);
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var bolls = await _customerSvc.DelCustomer(model.Id, int.Parse(userId));
                if (bolls)
                {
                    await _operation.InsertOperation("基础信息", "客户管理", customer.CustomerNo, "删除", "删除客户信息 客户号:" + customer.CustomerNo, Convert.ToInt32(userId));
                    return Ok(new { code = 0, msg = "删除成功" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "删除失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            SysCustomer customer = await _customerSvc.GetCustomer(model.Id);
            var bolls = await _customerSvc.DelCustomer(model.Id, _userManager.UserId);
            await _operation.InsertOperation("基础信息", "客户管理", customer.CustomerNo, "删除", "删除客户信息 客户号:" + customer.CustomerNo, _userManager.UserId);
        }
        /// <summary>
        /// 删除客户信息(多删除)
@@ -1100,36 +960,10 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> DelsCustomer(IdVm model)
        [UnitOfWork]
        public async Task DelsCustomer(IdVm model)
        {
            try
            {
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var bolls = await _customerSvc.DelsCustomer(model.Ids, int.Parse(userId));
                if (bolls)
                {
                    return Ok(new { code = 0, msg = "删除成功" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "删除失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            await _customerSvc.DelsCustomer(model.Ids, _userManager.UserId);
        }
        #endregion
@@ -1140,19 +974,11 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> GetLogisticsInfoList(GetLogisticsInfoVm model)
        public async Task<SqlSugarPagedList<LogisticsInfoDto>> GetLogisticsInfoList(GetLogisticsInfoVm model)
        {
            try
            {
                RefAsync<int> count = new RefAsync<int>();
                var bolls = await _logisticsSvc.GetLogisticsInfoList(model.CarrierName, model.LinkMan, model.Phone, model.LicensePlate, model.Type, model.Page, model.Limit, count);
                return Ok(new { code = 0, count, msg = "物流信息", data = bolls });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            RefAsync<int> count = new RefAsync<int>();
            var list = await _logisticsSvc.GetLogisticsInfoList(model.CarrierName, model.LinkMan, model.Phone, model.LicensePlate, model.Type, model.Page, model.Limit, count);
            return new SqlSugarPagedList<LogisticsInfoDto>() { Items = list, Total = count };
        }
        /// <summary>
        /// 查询单条物流信息
@@ -1160,36 +986,18 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> GetLogisticsInfo(IdVm model)
        public async Task<SysLogisticsInfo> GetLogisticsInfo(IdVm model)
        {
            try
            {
                var bolls = await _logisticsSvc.GetLogisticsInfo(model.Id);
                return Ok(new { code = 0, data = bolls });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            return await _logisticsSvc.GetLogisticsInfo(model.Id);
        }
        /// <summary>
        /// 查询全部物流信息
        /// </summary> 
        /// <returns></returns>
        [HttpGet]
        public async Task<IActionResult> GetLogisticsInfoSelect()
        public async Task<List<SysLogisticsInfo>> GetLogisticsInfoSelect()
        {
            try
            {
                var bolls = await _logisticsSvc.GetLogisticsInfoSelect();
                return Ok(new { code = 0, data = bolls });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            return await _logisticsSvc.GetLogisticsInfoSelect();
        }
        /// <summary>
@@ -1198,38 +1006,11 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> AddLogisticsInfo(AddLogisticsInfoVm model)
        [UnitOfWork]
        public async Task AddLogisticsInfo(AddLogisticsInfoVm model)
        {
            try
            {
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var bolls = await _logisticsSvc.AddLogisticsInfo(model, int.Parse(userId));
                if (bolls)
                {
                    await _operation.InsertOperation("基础信息", "物流管理", model.CarrierName, "添加", "添加物流信息 公司名称:" + model.CarrierName, Convert.ToInt32(userId));
                    return Ok(new { code = 0, msg = "添加成功" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "添加失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            await _logisticsSvc.AddLogisticsInfo(model, _userManager.UserId);
            await _operation.InsertOperation("基础信息", "物流管理", model.CarrierName, "添加", "添加物流信息 公司名称:" + model.CarrierName, _userManager.UserId);
        }
        /// <summary>
        /// 编辑物流信息
@@ -1237,38 +1018,11 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> EditLogisticsInfo(EditLogisticsInfoVm model)
        [UnitOfWork]
        public async Task EditLogisticsInfo(EditLogisticsInfoVm model)
        {
            try
            {
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var bolls = await _logisticsSvc.EditLogisticsInfo(model, int.Parse(userId));
                if (bolls)
                {
                    await _operation.InsertOperation("基础信息", "物流管理", model.CarrierName, "编辑", "编辑物流信息 公司名称:" + model.CarrierName, Convert.ToInt32(userId));
                    return Ok(new { code = 0, msg = "编辑成功" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "编辑失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            await _logisticsSvc.EditLogisticsInfo(model, _userManager.UserId);
            await _operation.InsertOperation("基础信息", "物流管理", model.CarrierName, "编辑", "编辑物流信息 公司名称:" + model.CarrierName, _userManager.UserId);
        }
        /// <summary>
        /// 删除物流信息
@@ -1276,39 +1030,12 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> DelLogisticsInfo(IdVm model)
        [UnitOfWork]
        public async Task DelLogisticsInfo(IdVm model)
        {
            try
            {
                SysLogisticsInfo logisit = await _logisticsSvc.GetLogisticsInfo(model.Id);
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var bolls = await _logisticsSvc.DelLogisticsInfo(model.Id, int.Parse(userId));
                if (bolls)
                {
                    await _operation.InsertOperation("基础信息", "物流管理", logisit.CarrierName, "删除", "删除物流信息 公司名称:" + logisit.CarrierName, Convert.ToInt32(userId));
                    return Ok(new { code = 0, msg = "删除成功" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "删除失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            await _logisticsSvc.DelLogisticsInfo(model.Id, _userManager.UserId);
            SysLogisticsInfo logisit = await _logisticsSvc.GetLogisticsInfo(model.Id);
            await _operation.InsertOperation("基础信息", "物流管理", logisit.CarrierName, "删除", "删除物流信息 公司名称:" + logisit.CarrierName, _userManager.UserId);
        }
        /// <summary>
        /// 删除物流信息(多条信息)
@@ -1316,36 +1043,10 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> DelsLogisticsInfo(IdVm model)
        [UnitOfWork]
        public async Task DelsLogisticsInfo(IdVm model)
        {
            try
            {
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var bolls = await _logisticsSvc.DelsLogisticsInfo(model.Ids, int.Parse(userId));
                if (bolls)
                {
                    return Ok(new { code = 0, msg = "删除成功" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "删除失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            await _logisticsSvc.DelsLogisticsInfo(model.Ids, _userManager.UserId);
        }
        #endregion
@@ -1357,19 +1058,11 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> GetUnitList(GetUnitVm model)
        public async Task<SqlSugarPagedList<UnitDto>> GetUnitList(GetUnitVm model)
        {
            try
            {
                RefAsync<int> count = new RefAsync<int>();
                var list = await _unitSvc.GetUnitList(model.UnitNo, model.UnitName, model.Page, model.Limit, count);
                return Ok(new { code = 0, count, msg = "物流信息", data = list });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            RefAsync<int> count = new RefAsync<int>();
            var list = await _unitSvc.GetUnitList(model.UnitNo, model.UnitName, model.Page, model.Limit, count);
            return new SqlSugarPagedList<UnitDto>() { Items = list, Total = count };
        }
        /// <summary>
        /// 查询单条单位信息
@@ -1377,24 +1070,9 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> GetUnit(IdVm model)
        public async Task<SysUnit> GetUnit(IdVm model)
        {
            try
            {
                var data = await _unitSvc.GetUnit(model.Id);
                if (data != null)
                {
                    return Ok(new { code = 0, data });
                }
                else
                {
                    return Ok(new { code = 1, data = "未查询到物流信息" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            return await _unitSvc.GetUnit(model.Id);
        }
        /// <summary>
        /// 添加计量信息
@@ -1402,43 +1080,16 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> AddUnit(AddEditUnitVm model)
        [UnitOfWork]
        public async Task AddUnit(AddEditUnitVm model)
        {
            if (ModelState.IsValid)
            {
                try
                {
                    //获取当前登录的用户ID
                    var claimsIdentity = this.User.Identity as ClaimsIdentity;
                    if (claimsIdentity == null)
                    {
                        return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                    }
                    var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                    if (string.IsNullOrWhiteSpace(userId))
                    {
                        return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                    }
                    var bolls = await _unitSvc.AddUnit(model.UnitName, model.Abbrev, int.Parse(userId));
                    if (bolls)
                    {
                        return Ok(new { code = 0, msg = "添加成功" });
                    }
                    else
                    {
                        return Ok(new { code = 1, msg = "添加失败" });
                    }
                }
                catch (Exception e)
                {
                    return Ok(new { code = 1, msg = e.Message });
                }
                await _unitSvc.AddUnit(model.UnitName, model.Abbrev, _userManager.UserId);
            }
            else
            {
                return Ok(new { code = 1, msg = "数据格式错误" });
                throw Oops.Bah("数据格式错误");
            }
        }
@@ -1448,45 +1099,18 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> EditUnit(AddEditUnitVm model)
        [UnitOfWork]
        public async Task EditUnit(AddEditUnitVm model)
        {
            if (ModelState.IsValid)
            {
                try
                {
                    //获取当前登录的用户ID
                    var claimsIdentity = this.User.Identity as ClaimsIdentity;
                    if (claimsIdentity == null)
                    {
                        return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                    }
                    var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                    if (string.IsNullOrWhiteSpace(userId))
                    {
                        return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                    }
                    var bolls = await _unitSvc.EditUnit(model.Id, model.UnitName, model.Abbrev, int.Parse(userId));
                    if (bolls)
                    {
                        SysUnit unit = await _unitSvc.GetUnit(model.Id);
                        await _operation.InsertOperation("基础信息", "计量单位", unit.UnitNo, "编辑", "编辑计量单位 单位名称:" + unit.UnitNo, Convert.ToInt32(userId));
                        return Ok(new { code = 0, msg = "编辑成功" });
                    }
                    else
                    {
                        return Ok(new { code = 1, msg = "编辑失败" });
                    }
                }
                catch (Exception e)
                {
                    return Ok(new { code = 1, msg = e.Message });
                }
                await _unitSvc.EditUnit(model.Id, model.UnitName, model.Abbrev, _userManager.UserId);
                SysUnit unit = await _unitSvc.GetUnit(model.Id);
                await _operation.InsertOperation("基础信息", "计量单位", unit.UnitNo, "编辑", "编辑计量单位 单位名称:" + unit.UnitNo, _userManager.UserId);
            }
            else
            {
                return Ok(new { code = 1, msg = "数据格式错误" });
                throw Oops.Bah("数据格式错误");
            }
        }
@@ -1496,35 +1120,10 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> DelUnit(IdVm model)
        [UnitOfWork]
        public async Task DelUnit(IdVm model)
        {
            try
            {
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var bolls = await _unitSvc.DelUnit(model.Id, int.Parse(userId));
                if (bolls)
                {
                    return Ok(new { code = 0, msg = "删除成功" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "删除失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            await _unitSvc.DelUnit(model.Id, _userManager.UserId);
        }
        /// <summary>
        /// 删除计量单位信息(多删除)
@@ -1532,53 +1131,14 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<IActionResult> DelsUnit(IdVm model)
        [UnitOfWork]
        public async Task DelsUnit(IdVm model)
        {
            try
            {
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
                }
                var bolls = await _unitSvc.DelsUnit(model.Ids, int.Parse(userId));
                if (bolls)
                {
                    return Ok(new { code = 0, msg = "删除成功" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "删除失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            var bolls = await _unitSvc.DelsUnit(model.Ids, _userManager.UserId);
        }
        #endregion
        #region 包装管理
        private string UserId;
        //public BasisController()
        //{
        //    var claimsIdentity = this.User.Identity as ClaimsIdentity;
        //    if (claimsIdentity == null)
        //    {
        //        throw new Exception("未获取到用户信息");
        //    }
        //    UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
        //    if (string.IsNullOrWhiteSpace(UserId))
        //    {
        //        throw new Exception("未获取到用户信息");
        //    }
        //}
        /// <summary>
        /// 查询包装信息
@@ -1586,18 +1146,11 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult GetPackagList(GetPackagVm model)
        public async Task<SqlSugarPagedList<PackagDto>> GetPackagList(GetPackagVm model)
        {
            try
            {
                var list = _packagSvc.GetPackagList(model.PackagNo, model.PackagName, model.Level, model.Page, model.Limit, out int count);
                return Ok(new { code = 0, count, msg = "物流信息", data = list });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            RefAsync<int> count = new RefAsync<int>();
            var list = await _packagSvc.GetPackagList(model.PackagNo, model.PackagName, model.Level, model.Page, model.Limit, count);
            return new SqlSugarPagedList<PackagDto> { Items = list, Total = count };
        }
        /// <summary>
@@ -1606,15 +1159,9 @@
        /// <param name="id">包装id</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetPackagById(int id)
        public async Task<SysPackag> GetPackagById(int id)
        {
            SysPackag packag = _packagSvc.GetPackagById(id);
            return Ok(new
            {
                data = packag,
                code = 0,
                msg = "成功"
            });
            return await _packagSvc.GetPackagById(id);
        }
        /// <summary>
@@ -1623,47 +1170,11 @@
        /// <param name="model">包装信息</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult AddPackag(AddEditPackagVm model)
        [UnitOfWork]
        public async Task AddPackag(AddEditPackagVm model)
        {
            try
            {
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    throw new Exception("未获取到用户信息");
                }
                UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(UserId))
                {
                    throw new Exception("未获取到用户信息");
                }
                model.CreateUser = int.Parse(UserId);
                int i = _packagSvc.AddPackag(model);
                if (i == 1)
                {
                    _operation.InsertOperation("基础信息", "包装管理", model.PackagNo, "添加", "添加包装信息 包装编号:" + model.PackagNo, Convert.ToInt32(UserId));
                    return Ok(new { code = 0, msg = "添加成功" });
                }
                else if (i > 1)
                {
                    return Ok(new { code = i, msg = "包装等级不可越级添加" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "添加失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new
                {
                    code = 1,
                    msg = e.Message
                });
            }
            await _packagSvc.AddPackag(model);
            await _operation.InsertOperation("基础信息", "包装管理", model.PackagNo, "添加", "添加包装信息 包装编号:" + model.PackagNo, _userManager.UserId);
        }
        /// <summary>
@@ -1672,42 +1183,11 @@
        /// <param name="model">包装信息</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult EditPackag(AddEditPackagVm model)
        [UnitOfWork]
        public async Task EditPackag(AddEditPackagVm model)
        {
            try
            {
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    throw new Exception("未获取到用户信息");
                }
                UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(UserId))
                {
                    throw new Exception("未获取到用户信息");
                }
                model.CreateUser = int.Parse(UserId);
                int i = _packagSvc.EditPackag(model);
                if (i == 1)
                {
                    _operation.InsertOperation("基础信息", "包装管理", model.PackagNo, "编辑", "编辑包装信息 包装编号:" + model.PackagNo, Convert.ToInt32(UserId));
                    return Ok(new { code = 0, msg = "编辑成功" });
                }
                if (i == 2)
                {
                    return Ok(new { code = i, msg = "包装等级不可越级修改 请重新输入" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "编辑失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            await _packagSvc.EditPackag(model);
            await _operation.InsertOperation("基础信息", "包装管理", model.PackagNo, "编辑", "编辑包装信息 包装编号:" + model.PackagNo, _userManager.UserId);
        }
        /// <summary>
@@ -1716,37 +1196,11 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult DelPackag(AddEditPackagVm model)
        [UnitOfWork]
        public async Task DelPackag(AddEditPackagVm model)
        {
            try
            {
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    throw new Exception("未获取到用户信息");
                }
                UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(UserId))
                {
                    throw new Exception("未获取到用户信息");
                }
                var bolls = _packagSvc.DelPackag(model.Id, int.Parse(UserId));
                if (bolls)
                {
                    _operation.InsertOperation("基础信息", "包装管理", model.PackagNo, "删除", "删除包装信息 包装编号:" + model.PackagNo, Convert.ToInt32(UserId));
                    return Ok(new { code = 0, msg = "删除成功" });
                }
                else
                {
                    return Ok(new { code = 1, msg = "删除失败" });
                }
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
            await _packagSvc.DelPackag(model.Id, _userManager.UserId);
            await _operation.InsertOperation("基础信息", "包装管理", model.PackagNo, "删除", "删除包装信息 包装编号:" + model.PackagNo, _userManager.UserId);
        }
        #endregion
@@ -1784,7 +1238,6 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SqlSugarPagedList<InterfaceDto>> GetInterfaceList(InterfaceVm model)
        {
            return await _interface.GetInterfaceList(model);
@@ -1796,7 +1249,6 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SqlSugarPagedList<InterfaceDetailDto>> GetInterfaceDetailList(InterfaceDetailVm model)
        {
            return await _interface.GetInterfaceDetailList(model);
@@ -1808,7 +1260,6 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task AddInterface(InterfaceVm model)
        {
@@ -1829,7 +1280,6 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task EditInterface(InterfaceVm model)
        {
@@ -1850,7 +1300,6 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task DelInterface(InterfaceVm model)
        {
@@ -1871,7 +1320,6 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        [UnitOfWork]
        public async Task DelInterfaceDetail(InterfaceDetailVm model)
        {