Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 Wms/WMS.BLL/BllCheckServer/WarehouseOutsidePalletsServer.cs

@@ -1,5 +1,6 @@
using Model.ModelDto.DataDto;
using Model.ModelDto.SysDto;
using Model.ModelVm.LogVm;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -14,6 +15,7 @@
using WMS.Entity.LogEntity;
using WMS.Entity.SysEntity;
using WMS.IBLL.IBllCheckServer;
using WMS.IBLL.ILogServer;

namespace WMS.BLL.BllCheckServer
{
@@ -21,9 +23,11 @@
    {
        private static readonly SqlSugarScope Db = DataContext.Db;
        private readonly UserManager _userManager;
        public WarehouseOutsidePalletsServer(UserManager userManager) : base(Db)
        private readonly IOperationCRServer _operation;
        public WarehouseOutsidePalletsServer(UserManager userManager, IOperationCRServer operation) : base(Db)
        {
            _userManager = userManager;
            _operation = operation;
        }

        /// <summary>
@@ -178,8 +182,14 @@
                    await Db.Updateable(bindModel).ExecuteCommandAsync();
                }
                // 插入操作日志
                new OperationASNServer().AddLogOperationAsn("库内作业", "库外托盘", stockDetail.PalletNo, "编辑",
                        $"指定了储位：{locate.LocatNo}、单据号：{stockDetail.ASNNo}、托盘码：{stockDetail.PalletNo}的信息", _userManager.UserId);
                await _operation.AddLogOperationCr(new OperationInputVm()
                {
                    ParentName = "库内作业",
                    MenuName = "库外托盘",
                    FkNo = stockDetail.PalletNo,
                    TypeName = "编辑",
                    Msg = $"指定了储位：{locate.LocatNo}、单据号：{stockDetail.ASNNo}、托盘码：{stockDetail.PalletNo}的信息"
                });
                //提交事务
                Db.CommitTran();
            }