优化了备料逻辑

Rodney Chen

4 天以前 36746596927952a6b860129a62eec9059bf083a7

 Tiger.Business.WMS/Transaction/In_Default.cs

@@ -11,9 +11,9 @@
using Tiger.IBusiness;
using Tiger.Model.Sharetronic.Shelf;
using Tiger.Business.WMS.Sharetronic.Shelf;
using Microsoft.IdentityModel.Tokens;
using Apache.NMS.ActiveMQ.Commands;
//using Microsoft.IdentityModel.Tokens;
using Tiger.Model.MES.Yada;
using static IronPython.Modules.PythonThread;
using Tiger.Model.Entitys.MES.Position;

namespace Tiger.Business.WMS.Transaction
@@ -21,25 +21,17 @@
    /// <summary>
    /// 标准上架事务
    /// </summary>
    public class In_Default : WMSTransactionBase, IIn_Default
    public class In_Default : WmsTask, IIn_Default
    {
        public IIn_Default Init(string id, string userCode, string apiHost, string orgCode)
        {
            TransID = id;
            UserCode = userCode;
            ApiHost = apiHost;
            OrgCode = orgCode;
            base.Init(id, userCode, apiHost, orgCode);
            Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
            return this;
        }

        #region Propertys & Variables
        public string UserCode { get; set; }
        public long UserId { get; set; }
        public string OrgCode { get; set; }
        public Inventory CurInvItem { get; set; }
        public ScanShelfInfo CurScanShelf { get; set; }
        public string Command { get; set; } = "Normal";
        
        #endregion

        #region Functions
@@ -48,7 +40,7 @@
        /// </summary>
        public async Task<ApiAction<ScanOutput>> Scan(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>();
            var action = new ApiAction<ScanOutput>(new ScanOutput());
            try
            {
                if (input.SN.IsNullOrEmpty())
@@ -58,12 +50,14 @@
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                //货架为空则扫描的认为是货架
                if (string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
                //判断扫描的是否货架
                var whUnit = await MainDB.Queryable<V_WH_UNIT>().Where(t => (t.SHELF_CODE.ToUpper() == input.SN || t.LOCATION_CODE.ToUpper() == input.SN) && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
                //if (string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
                if (!whUnit.IsNullOrEmpty() || string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
                {
                    action = await ScanShelf(input.SN);
                    action = await ScanShelf(input.SN, whUnit);
                }
                //扫描物料并复核
                else//扫描物料并复核
                {
                    action = await ScanItem(input);
                }
@@ -71,7 +65,7 @@
            catch (Exception ex)
            {
                //取消当前操作
                ResetInfo();
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"扫描[{input.SN}]异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
@@ -88,141 +82,144 @@
            {
                if (CurInvItem.IsNullOrEmpty())
                {
                   Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(input.SN, input.AuthOption, true);
                    //解析条码
                    Result<IInventory> result = GetInventory(input.SN, input.AuthOption, true);
                   if (!result.IsSuccessed)
                   {
                       action.IsSuccessed = false;
                       action.LocaleMsg = result.LocaleMsg;
                       return action;
                   }
                   CurInvItem = result.Data as Inventory;
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                   var inv = result.Data as Inventory;

                    //验证条码是否正确
                    if (new[] { WMS_ITEM.STATUSs.InStore, WMS_ITEM.STATUSs.Loaded, WMS_ITEM.STATUSs.UseUp }.Contains(CurInvItem.Status))
                    if (new[] { WMS_ITEM.STATUSs.InStore, WMS_ITEM.STATUSs.Loaded, WMS_ITEM.STATUSs.UseUp }.Contains(inv.Status))
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("状态[{0}]异常，请重新扫描");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', CurInvItem.StatusList.Select(q => q.GetDesc())));
                        return action;
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', inv.StatusList.Select(q => q.GetDesc())));
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    //物料验证
                    if (CurInvItem.ItemInfo.IsNullOrEmpty() || CurInvItem.ItemInfo.IS_ACTIVE == "N")
                    if (inv.ItemInfo.IsNullOrEmpty() || inv.ItemInfo.IS_ACTIVE == "N")
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("物料编码[{0}]不存在或者该物料未启用");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", CurInvItem.ItemInfo.ITEM_CODE.IsNullOrEmpty(CurInvItem.Barcode.ItemCode));
                        return action;
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo?.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
                        return SetOutPutMqttMsg(action, input.Locale);
                    }

                    if (inv.Items.Count == 0)
                    {
                        var newItem = new WMS_ITEM()
                        {
                            SN = inv.Barcode.SN,
                            ITEM_CODE = inv.Barcode.ItemCode,
                            AUTH_ORG = input.AuthOption.CurOrg,
                            STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
                            QTY = inv.Barcode.Qty.ToDouble(),
                            PROD_DATE = inv.Barcode.DateCode.ToDateTime(),
                            ERP_WH = CurScanShelf.WarehouseCode,
                            UNIT = inv.Barcode.Unit,
                        };

                        WMS_ITEM_HIS his = new(newItem, $"标准上架入库");
                        var newPkg = new WMS_ITEM_PKG()
                        {
                            SN = inv.Barcode.SN,
                            AUTH_ORG = input.AuthOption.CurOrg,
                            ITEM_CODE = inv.Barcode.ItemCode,
                            QTY = inv.Barcode.Qty.ToDouble(),
                            ERP_WH = CurScanShelf.WarehouseCode,
                            UNIT = inv.Barcode.Unit,
                        };

                        var noExt = inv.Items.Where(q => !inv.ItemsExt.Any(s => s.SN == q.SN)).ToList();
                        //扩展表不存在时新建
                        foreach (var ext in noExt)
                        {
                            inv.ItemsExt.Add(new()
                            {
                                SN = ext.SN,
                                META_SN = inv.Barcode.MetaSn,
                                QR_CODE = inv.Barcode.MetaSn
                            });
                        }

                        inv.Items.Add(newItem);
                        inv.History.Add(his);
                        inv.Packages.Add(newPkg);
                    }
                    //雅达不从条码上更新数量
                    //else if (inv.Items.Count == 1)
                    //{
                    //    inv.Items.First().QTY = inv.Barcode.Qty.ToDouble();
                    //    inv.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
                    //    inv.Items.First().AUTH_ORG = input.AuthOption.CurOrg;

                    //    inv.Packages.First().QTY = inv.Barcode.Qty.ToDouble();
                    //    inv.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
                    //    inv.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
                    //}
                    //如果扫描外箱的不能更新数量
                    else
                    {
                        foreach (var item in inv.Items)
                        {
                            item.ERP_WH = CurScanShelf.WarehouseCode;
                            item.AUTH_ORG = input.AuthOption.CurOrg;
                        }
                        foreach (var item in inv.Packages)
                        {
                            item.ERP_WH = CurScanShelf.WarehouseCode;
                            item.AUTH_ORG = input.AuthOption.CurOrg;
                        }
                    }
                    CurInvItem = inv;

                    //检查物料数量，如果没有则查询雅达条码主档，把数量返回前端确认
                    if (CurInvItem.Items.Any(q => q.QTY <= 0))
                    //if (CurInvItem.Items.Any(q => q.QTY <= 0))
                    {
                        var qtyList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MaterialBarCode>().Where(q => CurInvItem.Items.Select(q => q.SN).Contains(q.Code)).ToList();
                        foreach (var qty in qtyList)
                        {
                            var item = CurInvItem.Items.First(q => q.SN == qty.Code);
                            item.QTY = qty.WhQty;
                            item.SUPP_LOTNO = CurInvItem.Barcode.LotNo;
                        }
                        action.Data.Data = CurInvItem.Items.ToDictionary(k => k.SN, v => v.QTY);
                        action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
                        action.Data.Command = Command = "ComfirmQty";
                        //action.LocaleMsg = Biz.L("请确认条码[{0}]的数量是否正确");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ComfirmQty", input.SN);
                        return action;
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                }

                //更新已确认物料数量
                if (Command == "ComfirmQty")
                {
                    var qtyList = (input.Data ?? "").JsonToObject<Dictionary<string, decimal>>() ?? new Dictionary<string, decimal>();
                    if (qtyList.Any(q => q.Value <= 0))
                    var qtyList = (input.Data ?? "").JsonToObject<List<WMS_ITEM>>() ?? new List<WMS_ITEM>();
                    if (!qtyList.Any() || qtyList.Any(q => q.QTY <= 0))
                    {
                        action.IsSuccessed = false;
                        action.Data.Data = CurInvItem.Items.ToDictionary(k => k.SN, v => v.QTY);
                        action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
                        action.Data.Command = Command = "ComfirmQty";
                        //action.LocaleMsg = Biz.L("数量不能小于等于零，请重新确认条码[{0}]的数量");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ReComfirmQty", input.SN); 
                        return action;
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ReComfirmQty", input.SN);
                        return SetOutPutMqttMsg(action, input.Locale);
                    } 
                    else
                    {
                       foreach (var qty in qtyList)
                       {
                           var item = CurInvItem.Items.First(q => q.SN == qty.Key);
                           item.QTY = qty.Value;
                       }
                           var item = CurInvItem.Items.First(q => q.SN == qty.SN);
                           item.QTY = qty.QTY;
                            var pkg = CurInvItem.Packages.First(q => q.SN == qty.SN);
                            pkg.QTY = qty.QTY;
                        }
                        CurInvItem.UpdatePkgQty();

                        Command = "Normal";
                    }
                }

                if (CurInvItem.Items.Count == 0)
                {
                    List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
                    WMS_ITEM Item;
                    WMS_ITEM_PKG ItemPkgs;

                    Item = new()
                    {
                        SN = CurInvItem.Barcode.SN,
                        ITEM_CODE = CurInvItem.Barcode.ItemCode,
                        AUTH_ORG = input.AuthOption.CurOrg,
                        STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
                        QTY = CurInvItem.Barcode.Qty.ToDecimal(),
                        PROD_DATE = CurInvItem.Barcode.DateCode.ToDateTime(),
                        ERP_WH = CurScanShelf.WarehouseCode,
                        UNIT = CurInvItem.Barcode.Unit,
                    };

                    WMS_ITEM_HIS his = new(Item, $"标准上架入库");
                    ItemHistorys.Add(his);
                    ItemPkgs = new()
                    {
                        SN = CurInvItem.Barcode.SN,
                        AUTH_ORG = input.AuthOption.CurOrg,
                        ITEM_CODE = CurInvItem.Barcode.ItemCode,
                        QTY = CurInvItem.Barcode.Qty.ToDecimal(),
                        ERP_WH = CurScanShelf.WarehouseCode,
                        UNIT = CurInvItem.Barcode.Unit,
                    };

                    var noExt = CurInvItem.Items.Where(q => !CurInvItem.ItemsExt.Any(s => s.SN == q.SN)).ToList();
                    //扩展表不存在时新建
                    foreach (var item in noExt)
                    {
                        CurInvItem.ItemsExt.Add(new()
                        {
                            SN = item.SN,
                            META_SN = CurInvItem.Barcode.MetaSn,
                            QR_CODE = CurInvItem.Barcode.MetaSn
                        });
                    }

                    CurInvItem.Items.Add(Item);
                    CurInvItem.History.Add(his);
                    CurInvItem.Packages.Add(ItemPkgs);
                }
                else if (CurInvItem.Items.Count == 1)
                {
                    CurInvItem.Items.First().QTY = CurInvItem.Barcode.Qty.ToDecimal();
                    CurInvItem.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
                    CurInvItem.Items.First().AUTH_ORG = input.AuthOption.CurOrg;

                    CurInvItem.Packages.First().QTY = CurInvItem.Barcode.Qty.ToDecimal();
                    CurInvItem.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
                    CurInvItem.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
                }
                //如果扫描外箱的不能更新数量
                else
                {
                    foreach (var item in CurInvItem.Items)
                    {
                        item.ERP_WH = CurScanShelf.WarehouseCode;
                        item.AUTH_ORG = input.AuthOption.CurOrg;
                    }
                    foreach (var item in CurInvItem.Packages)
                    {
                        item.ERP_WH = CurScanShelf.WarehouseCode;
                        item.AUTH_ORG = input.AuthOption.CurOrg;
                    }
                }

@@ -235,7 +232,7 @@
                    {
                        action.IsSuccessed = false;
                        action.LocaleMsg = Biz.L(shelfApiResult.GetData<string>());
                        return action;
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    var reaultShelf = shelfApiResult.GetData<ShelfChangeModel>();

@@ -245,15 +242,15 @@
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L($"货架[{0}]中不存在id为[{1}]的储位，请先维护货架信息");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationNotExistsInShelf", CurScanShelf.Shelf.SHELF_CODE, reaultShelf.ledAddr);
                        return action;
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    var locationData = Biz.Db.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == nLocation.ID).First();
                    var locationData = MainDB.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == nLocation.ID).First();
                    if (!locationData.IsNullOrEmpty())
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("储位[{0}]已存有物料[{1}]，请检查系统库存信息");
                        action.LocaleMsg = Biz.L($"WMS.Default.ScanShelf.ItemAlreadyExistsInLocation", nLocation.LOCATION_CODE, locationData.SN);
                        return action;
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    CurScanShelf.LocationCode = nLocation.LOCATION_CODE;
                }
@@ -264,10 +261,10 @@
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("请输入或扫描有效的货架/储位码");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
                        return action;
                        return SetOutPutMqttMsg(action, input.Locale);
                    }

                    nLocation = await Biz.Db.Queryable<WMS_LOCATION>().Where(t => t.LOCATION_CODE == CurScanShelf.LocationCode && t.AUTH_ORG == OrgCode).FirstAsync();
                    nLocation = await MainDB.Queryable<WMS_LOCATION>().Where(t => t.LOCATION_CODE == CurScanShelf.LocationCode && t.AUTH_ORG == OrgCode).FirstAsync();
                }

                //判断储位是否单放
@@ -276,72 +273,47 @@
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("储位[{0}]只能存放一个物料");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationSingleFailure", nLocation.LOCATION_CODE);
                    return action;
                    ResetTrans();
                    return SetOutPutMqttMsg(action, input.Locale);
                }

                //执行上架
                //执行上架数据处理
                foreach (var item in CurInvItem.Items)
                {
                    item.TRANS_CODE = "In_Default";
                    item.TRANS_NO = $"In_Default_{DateTime.Now:yyyyMMdd}";
                }
                Result<PutOnInfo> putonResult = WMS_ITEM_Biz.WmsItem.PutOn(CurInvItem, input.AuthOption, nLocation.LOCATION_CODE);
                foreach (var item in CurInvItem.Packages)
                {
                    item.TRANS_CODE = "In_Default";
                    item.TRANS_NO = $"In_Default_{DateTime.Now:yyyyMMdd}";
                }
                Result putonResult = PutOn(input.AuthOption, nLocation.LOCATION_CODE);
                if (!putonResult.IsSuccessed)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = putonResult.LocaleMsg;
                    return action;
                    ResetTrans();
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                PutOnInfo putOnInfo = putonResult.Data;

                //保存到数据库
                var db = Business.Biz.Db;
                var dbTran = db.UseTran(() =>
                {
                    //入库
                    db.Storageable(putOnInfo.Items, UserCode).ExecuteCommand();
                    db.Storageable(putOnInfo.Packages, UserCode).ExecuteCommand();
                    db.Insertable(putOnInfo.History, UserCode).ExecuteCommand();
                    var x = db.Storageable(putOnInfo.ItemsExt, UserCode).ToStorage();
                    x.AsInsertable.ExecuteCommand();//不存在插入
                    x.AsUpdateable.ExecuteCommand();//存在更新
                });
                if (!dbTran.IsSuccess)
                {
                    Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
                    throw dbTran.ErrorException;
                }
                // 返回其他入库对象
                action.Data.Data = new DefaultInStoreOutput
                {
                    Barcode = CurInvItem.SN,
                    MaterialCode = CurInvItem.ItemInfo.ITEM_CODE,
                    MaterialName = CurInvItem.ItemInfo.ITEM_NAME,
                    CurrentQty = CurInvItem.Items[0].QTY,
                    Unit = CurInvItem.Items[0].UNIT,
                    DateCode = CurInvItem.Items[0].PROD_DATE,
                    WarehouseCode = putOnInfo.Warehouse.WH_CODE,
                    RegionCode = putOnInfo.Region.REGION_CODE,
                    ShelfCode = putOnInfo.Shelf.SHELF_CODE,
                    LocationCode = putOnInfo.Location.LOCATION_CODE,
                };
                //action.LocaleMsg = Biz.L($"扫描条码[{0}]上架到储位[{1}]成功");
                action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, putOnInfo.Location.LOCATION_CODE);
                //完成所有处理后使用事务保存数据
                action = DoIfFinish(action, input.Locale);
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetInfo();
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"扫描条码[{input.SN}]复核异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
            }
            return action;
            return SetOutPutMqttMsg(action, input.Locale);
        }

        /// <summary>
        /// 扫描货架或者储位
        /// </summary>
        public async Task<ApiAction<ScanOutput>> ScanShelf(string Code)
        public async Task<ApiAction<ScanOutput>> ScanShelf(string Code, V_WH_UNIT whUnit)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
            try
@@ -357,10 +329,10 @@
                CurScanShelf = new ScanShelfInfo();

                // 查询货架信息
                var whUnit = await Biz.Db.Queryable<V_WH_UNIT>().Where(t => t.SHELF_CODE.ToUpper() == Code.ToUpper() && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
                whUnit = whUnit.IsNullOrEmpty(await MainDB.Queryable<V_WH_UNIT>().Where(t => (t.SHELF_CODE.ToUpper() == Code || t.LOCATION_CODE.ToUpper() == Code) && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync());

                // 扫描货架代码，且为智能货架
                if (whUnit != null && whUnit.SHELF_TYPE == WMS_SHELF.SHELF_TYPEs.Smart.GetValue())
                if (!whUnit.IsNullOrEmpty() && whUnit.SHELF_CODE  == Code)
                {
                    CurScanShelf.Shelf = whUnit.Shelf;
                    CurScanShelf.WarehouseCode = whUnit.WH_CODE;
@@ -370,26 +342,26 @@
                    CurScanShelf.IsSmartRack = true;
                }
                // 扫描库位代码
                else
                else if (!whUnit.IsNullOrEmpty() && whUnit.LOCATION_CODE == Code)
                {
                    var nLocation = await Biz.Db.Queryable<V_WH_UNIT>().Where(t => t.LOCATION_CODE.ToUpper() == Code.ToUpper() && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
                    if (nLocation == null)
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("储位[{0}]不存在");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.LocationNotExist", Code);
                        return action;
                    }
                    if (nLocation.IS_ACTIVE == "N")
                    //var nLocation = await MainDB.Queryable<V_WH_UNIT>().Where(t => t.LOCATION_CODE.ToUpper() == Code.ToUpper() && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
                    //if (nLocation == null)
                    //{
                    //    action.IsSuccessed = false;
                    //    //action.LocaleMsg = Biz.L("储位[{0}]不存在");
                    //    action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.LocationNotExist", Code);
                    //    return action;
                    //}
                    if (whUnit.IS_ACTIVE == "N")
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("扫描的储位[{0}]未启用");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfOrLocationDisabled", Code);
                        return action;
                    }
                    if (nLocation.Shelf.IsLightShelf || nLocation.Location.IS_SINGLE == "Y")
                    if (whUnit.Shelf.IsLightShelf || whUnit.Location.IS_SINGLE == "Y")
                    {
                        var locationData = Biz.Db.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == nLocation.LOCATION_ID && q.AUTH_ORG == OrgCode).First();
                        var locationData = MainDB.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == whUnit.LOCATION_ID && q.AUTH_ORG == OrgCode).First();
                        if (!locationData.IsNullOrEmpty())
                        {
                            action.IsSuccessed = false;
@@ -398,13 +370,20 @@
                            return action;
                        }
                    }
                    CurScanShelf.Shelf = nLocation.Shelf;
                    CurScanShelf.Location = nLocation.Location;
                    CurScanShelf.WarehouseCode = nLocation.WH_CODE;
                    CurScanShelf.RegionCode = nLocation.REGION_CODE;
                    CurScanShelf.ShelfCode = nLocation.SHELF_CODE;
                    CurScanShelf.LocationCode = nLocation.LOCATION_CODE;
                    CurScanShelf.Shelf = whUnit.Shelf;
                    CurScanShelf.Location = whUnit.Location;
                    CurScanShelf.WarehouseCode = whUnit.WH_CODE;
                    CurScanShelf.RegionCode = whUnit.REGION_CODE;
                    CurScanShelf.ShelfCode = whUnit .SHELF_CODE;
                    CurScanShelf.LocationCode = whUnit.LOCATION_CODE;
                    CurScanShelf.IsSmartRack = false;
                }
                else
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("请输入或扫描有效的货架/储位码");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
                    return action;
                }

                CurScanShelf.IsScanShelf = true;
@@ -415,24 +394,70 @@
            catch (Exception ex)
            {
                //取消当前操作
                ResetInfo();
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"扫描货架/储位[{0}]异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanShelf.ScanException", Code));
            }
            return action;
        }

        /// <summary>
        /// 完成所有处理后使用事务保存数据
        /// </summary>
        /// <param name="action"></param>
        /// <param name="locale"></param>
        /// <param name="doAfterSave"></param>
        /// <returns></returns>
        public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale, Action doAfterSave = null)
        {
            //保存数据库
            SaveCommitListToDB();

            //保存数据成功后执行
            doAfterSave?.Invoke();

            // 返回数据
            action.Data.Data = new DefaultInStoreOutput
            {
                Barcode = CurInvItem.SN,
                MaterialCode = CurInvItem.ItemInfo.ITEM_CODE,
                MaterialName = CurInvItem.ItemInfo.ITEM_NAME,
                CurrentQty = CurInvItem.Items[0].QTY,
                Unit = CurInvItem.Items[0].UNIT,
                DateCode = CurInvItem.Items[0].PROD_DATE,
                WarehouseCode = CurInvItem.Warehouse.WH_CODE,
                RegionCode = CurInvItem.Region.REGION_CODE,
                ShelfCode = CurInvItem.Shelf.SHELF_CODE,
                LocationCode = CurInvItem.Location.LOCATION_CODE,
            };

            //action.LocaleMsg = Biz.L($"扫描条码[{0}]上架到储位[{1}]成功");
            action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, CurInvItem.Location.LOCATION_CODE);

            //重置扫码信息
            ResetScanInfo();
            return SetOutPutMqttMsg(action, locale);
        }

        #endregion

        /// <summary>
        /// 重置当前操作，有需要则重写此方法
        /// 重置事务数据，有需要则重写此方法
        /// </summary>
        public override void ResetInfo()
        public override void ResetTrans()
        {
            base.ResetInfo();
            base.ResetTrans();
            ResetScanInfo();
            CurScanShelf = null;
        }

        /// <summary>
        /// 重置扫码信息
        /// </summary>
        public void ResetScanInfo()
        {
            Command = null;
            CurInvItem = null;
            CurScanShelf = null;
        }

        public override bool Close(bool needSaveHistoryLog = false)