解决冲突

bklLiudl

2024-08-23 5423ea50d00ce05c87ba443413037d86d7669638

解决冲突

 HTML/views/SystemSettings/Role.html

@@ -124,7 +124,7 @@
                    });
                    sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
                        $(function () {
                            $("#approvalBtn").hide();
                            $(".approvalBtn").hide();
                        });
                        $(function () {
                            $(".editClass").hide();
@@ -150,7 +150,7 @@
                                }
                                if (res.data[k].MenuName == "添加角色") {
                                    $(function () {
                                        $("#approvalBtn").show();
                                        $(".approvalBtn").show();
                                    });
                                }
                                if (res.data[k].MenuName == "删除角色") {
@@ -177,7 +177,7 @@
                }
                sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
                    $(function() {
                        $("#approvalBtn").hide();
                        $(".approvalBtn").hide();
                    });
                    $(function() {
                        $(".editClass").hide();
@@ -208,7 +208,7 @@
                            if (res.data[k].MenuName == "添加角色")
                            {
                                $(function () {
                                    $("#approvalBtn").show();
                                    $(".approvalBtn").show();
                                });
                            }
                            if (res.data[k].MenuName == "删除角色")

 HTML/views/WareHouseSetting/Area.html

@@ -327,7 +327,8 @@
                                                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                                    }, function() {
                                                        layer.close(index); //关闭弹层
                                                        // refreshTable($("#CategoryName").val(),$("#AreaNo").val());
                                                        refreshTable("", "", "", "");
                                                        //table.reload('LAY-app-content-list');
                                                        doing = true;
                                                    });
                                                }

 Wms/WMS.BLL/SysServer/LogisticsInfoServer.cs

@@ -70,6 +70,12 @@
            return data;
        }

        public async Task<SysLogisticsInfo> GetLogisticsDelInfo(int id)
        {
            var data = await LogisticsInfoRst.GetOneByIdAsync1(id);
            return data;
        }

        public async Task<List<SysLogisticsInfo>> GetLogisticsInfoSelect()
        {
            var data = await LogisticsInfoRst.GetAllAsync();

 Wms/WMS.BLL/SysServer/MaterialsServer.cs

@@ -57,18 +57,20 @@
        {
            return Db.Queryable<SysMaterials>()
                     .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
                     .LeftJoin<SysPackag>((a, b,c) => a.PackagNo == c.PackagNo) 
                     //.Where((a,b,c) => c.IsDel == "0")
                     .LeftJoin<SysPackag>((a, b,c) => a.PackagNo == c.PackagNo)
                     .LeftJoin<SysUnit> ((a,b,c,d)=>a.UnitNo == d.UnitNo)
                     .LeftJoin<SysMaterialCategory>((a,b,c,d,e)=>a.CategoryNo == e.CategoryNo)
                     .Where((a,b,c,d,e) => d.IsDel == "0" && e.IsDel =="0")
                     .WhereIF(!string.IsNullOrEmpty(skuNo), a => a.SkuNo.Contains(skuNo))
                     .WhereIF(!string.IsNullOrEmpty(skuName), a => a.SkuNo.Contains(skuName))
                     .WhereIF(!string.IsNullOrEmpty(skuName), a => a.SkuName.Contains(skuName))
                     .WhereIF(!string.IsNullOrEmpty(auditStatusNo), a => a.AuditStatusNo == auditStatusNo)
                     .WhereIF(!string.IsNullOrEmpty(type), a => a.Type == type)
                     .WhereIF(!string.IsNullOrEmpty(isControlled), a => a.IsControlled == isControlled)
                     .WhereIF(!string.IsNullOrEmpty(isInspect), a => a.IsInspect == isInspect)
                     .WhereIF(!string.IsNullOrEmpty(environment), a => a.Environment == environment)
                     .WhereIF(!string.IsNullOrEmpty(categoryNo), a => a.CategoryNo == categoryNo)
                     .Where(a => a.IsDel == "0")
                     .Select<MaterialsDto>((a, b, c) => new MaterialsDto() { CreateUserName = b.RealName,PackagName = c.PackagName }, true)
                     .Where(a => a.IsDel == "0" )
                     .Select<MaterialsDto>((a, b, c,d,e) => new MaterialsDto() { CreateUserName = b.RealName,PackagName = c.PackagName }, true)
                     .ToListAsync();
        }


 Wms/WMS.BLL/SysServer/PackagServer.cs

@@ -11,12 +11,15 @@
using Model.ModelVm.SysVm;
using System.Threading.Tasks;
using Utility;
using WMS.Entity.Context;

namespace WMS.BLL.SysServer
{
    public class PackagServer : IPackagServer
    {
        public IPackagRepository PackagRst { get; set; }
        public IMaterialsServer materials { get; set; }
        private static readonly SqlSugarScope Db = DataContext.Db;

        public PackagServer(IPackagRepository packagRst)
        {
@@ -301,6 +304,11 @@
            {
                throw Oops.Bah("包装信息不存在！");
            }
            var modMaterial = await Db.Queryable<SysMaterials>().FirstAsync(a => a.IsDel == "0" && a.PackagNo == packagItems.PackagNo);
            if (modMaterial != null)
            {
                throw Oops.Bah("存在正在使用此包装的物料！");
            }

            packagItems.IsDel = "1";
            packagItems.UpdateTime = DateTime.Now;

 Wms/WMS.DAL/BaseRepository.cs

@@ -108,6 +108,12 @@
            return data;
        }

        public async Task<T> GetOneByIdAsync1(int id)
        {
            var data = await _db.Queryable<T>().FirstAsync(m => m.Id == id && m.IsDel == "1");
            return data;
        }

        public List<T> GetModels(string sqlString) 
        {
            var models = _db.Ado.SqlQuery<T>(sqlString);

 Wms/WMS.IBLL/ISysServer/ILogisticsInfoServer.cs

@@ -31,6 +31,12 @@
        /// <returns></returns>
        Task<SysLogisticsInfo> GetLogisticsInfo(int id);
        /// <summary>
        /// 查询单条已删除物流信息
        /// </summary>
        /// <param name="id"></param> 
        /// <returns></returns>
        Task<SysLogisticsInfo> GetLogisticsDelInfo(int id);
        /// <summary>
        /// 查询全部物流信息
        /// </summary> 
        /// <returns></returns>

 Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs

@@ -40,6 +40,13 @@
        Task<int> GetMateByNo(string SkuNo);

        /// <summary>
        /// 根据包装编号查询物料信息
        /// </summary>
        /// <param name="PackagNo">物料编号</param>
        /// <returns></returns>
        Task<int> GetMateByPa(string PackagNo);

        /// <summary>
        /// 新增物料信息
        /// </summary>
        /// <param name="matedto">物料dto</param>

 Wms/WMS.IDAL/IBaseRepository.cs

@@ -32,6 +32,7 @@
        Task<List<T>> GetAllAsync();
        T GetOneById(int id);
        Task<T> GetOneByIdAsync(int id);
        Task<T> GetOneByIdAsync1(int id);

        List<T> GetModels(string sqlString);


 Wms/Wms/Controllers/BasisController.cs

@@ -1043,7 +1043,7 @@
        public async Task DelLogisticsInfo(IdVm model)
        {
            await _logisticsSvc.DelLogisticsInfo(model.Id, _userManager.UserId);
            SysLogisticsInfo logisit = await _logisticsSvc.GetLogisticsInfo(model.Id);
            SysLogisticsInfo logisit = await _logisticsSvc.GetLogisticsDelInfo(model.Id);
            await _operation.InsertOperation("基础信息", "物流管理", logisit.CarrierName, "删除", "删除物流信息 公司名称：" + logisit.CarrierName, _userManager.UserId);
        }
        /// <summary>