优化标准上下架

Rodney Chen

2024-12-24 cd8182d8fefc55c245400936b6330a00e866adbd

 Tiger.Business.WMS/Transaction/In_Default.cs

@@ -12,6 +12,9 @@
using Tiger.Model.Sharetronic.Shelf;
using Tiger.Business.WMS.Sharetronic.Shelf;
using Microsoft.IdentityModel.Tokens;
using Apache.NMS.ActiveMQ.Commands;
using Tiger.Model.MES.Yada;
using Tiger.Model.Entitys.MES.Position;

namespace Tiger.Business.WMS.Transaction
{
@@ -36,15 +39,16 @@
        public string OrgCode { get; set; }
        public Inventory CurInvItem { get; set; }
        public ScanShelfInfo CurScanShelf { get; set; }
        public string Command { get; set; } = "Normal";
        #endregion

        #region Functions
        /// <summary>
        /// 扫描物料并复核，如果物料已经完成移库则货架上亮灯提醒储位
        /// 扫描入口
        /// </summary>
        public async Task<ApiAction> ScanItem(BaseInput input)
        public async Task<ApiAction<ScanOutput>> Scan(BaseInput input)
        {
            var action = new ApiAction();
            var action = new ApiAction<ScanOutput>();
            try
            {
                if (input.SN.IsNullOrEmpty())
@@ -52,18 +56,38 @@
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("条码不能为空");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
                    return action;
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                //货架为空则扫描的认为是货架
                if (string.IsNullOrEmpty(CurScanShelf?.RackCode))
                if (string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
                {
                    var _action = await ScanShelf(input.SN);
                    action.LocaleMsg = _action.LocaleMsg;
                    action.IsSuccessed = _action.IsSuccessed;
                    action.Data = _action.Data;
                    return action;
                    action = await ScanShelf(input.SN);
                }
                //扫描物料并复核
                {
                    action = await ScanItem(input);
                }
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetInfo();
                //action.CatchExceptionWithLog(ex, $"扫描[{input.SN}]异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
                }

        /// <summary>
        /// 扫描物料并复核，如果物料已经完成移库则货架上亮灯提醒储位
        /// </summary>
        public async Task<ApiAction<ScanOutput>> ScanItem(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
            try
            {
                if (CurInvItem.IsNullOrEmpty())
                {
                Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(input.SN, input.AuthOption, true);
                if (!result.IsSuccessed)
                {
@@ -71,28 +95,67 @@
                    action.LocaleMsg = result.LocaleMsg;
                    return action;
                }
                var inv = result.Data as Inventory;
                   CurInvItem = result.Data as Inventory;

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

                if (!inv.IsNullOrEmpty())
                    //检查物料数量，如果没有则查询雅达条码主档，把数量返回前端确认
                    if (CurInvItem.Items.Any(q => q.QTY <= 0))
                {
                    if (inv.Items.Count == 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;
                        }
                        action.Data.Data = CurInvItem.Items.ToDictionary(k => k.SN, v => v.QTY);
                        action.Data.Command = Command = "ComfirmQty";
                        //action.LocaleMsg = Biz.L("请确认条码[{0}]的数量是否正确");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ComfirmQty", input.SN);
                        return action;
                    }
                }

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

                if (CurInvItem.Items.Count == 0)
                    {
                        List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
                        WMS_ITEM Item;
@@ -100,67 +163,66 @@

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

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

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

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

                        inv.Packages.First().QTY = inv.Barcode.Qty.ToDecimal();
                        inv.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
                        inv.Packages.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 inv.Items)
                    foreach (var item in CurInvItem.Items)
                        {
                            item.ERP_WH = CurScanShelf.WarehouseCode;
                            item.AUTH_ORG = input.AuthOption.CurOrg;
                        }
                        foreach (var item in inv.Packages)
                    foreach (var item in CurInvItem.Packages)
                        {
                            item.ERP_WH = CurScanShelf.WarehouseCode;
                            item.AUTH_ORG = input.AuthOption.CurOrg;
                        }
                    }
                }

@@ -168,7 +230,7 @@
                // 判断是否智能货架
                if (CurScanShelf.Shelf.IsLightShelf)
                {
                    ShelfApiResult shelfApiResult = await Share.Shelf.PutOn(TransID, CurScanShelf.Shelf, inv.Items[0]);
                    ShelfApiResult shelfApiResult = await Share.Shelf.PutOn(TransID, CurScanShelf.Shelf, CurInvItem.Items[0]);
                    if (!shelfApiResult.IsSuccess)
                    {
                        action.IsSuccessed = false;
@@ -209,7 +271,7 @@
                }

                //判断储位是否单放
                if (nLocation.IS_SINGLE == "Y" && inv.Items.Count > 1)
                if (nLocation.IS_SINGLE == "Y" && CurInvItem.Items.Count > 1)
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("储位[{0}]只能存放一个物料");
@@ -218,12 +280,12 @@
                }

                //执行上架
                foreach (var item in inv.Items)
                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(inv, input.AuthOption, nLocation.LOCATION_CODE);
                Result<PutOnInfo> putonResult = WMS_ITEM_Biz.WmsItem.PutOn(CurInvItem, input.AuthOption, nLocation.LOCATION_CODE);
                if (!putonResult.IsSuccessed)
                {
                    action.IsSuccessed = false;
@@ -250,21 +312,21 @@
                    throw dbTran.ErrorException;
                }
                // 返回其他入库对象
                action.Data = new DefaultInStoreOutput
                action.Data.Data = new DefaultInStoreOutput
                {
                    Barcode = inv.SN,
                    MaterialCode = inv.ItemInfo.ITEM_CODE,
                    MaterialName = inv.ItemInfo.ITEM_NAME,
                    CurrentQty = inv.Items[0].QTY,
                    Unit = inv.Items[0].UNIT,
                    DateCode = inv.Items[0].PROD_DATE,
                    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", inv.SN, putOnInfo.Location.LOCATION_CODE);
                action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, putOnInfo.Location.LOCATION_CODE);
            }
            catch (Exception ex)
            {
@@ -279,9 +341,9 @@
        /// <summary>
        /// 扫描货架或者储位
        /// </summary>
        public async Task<ApiAction<ScanShelfInfo>> ScanShelf(string Code)
        public async Task<ApiAction<ScanOutput>> ScanShelf(string Code)
        {
            var action = new ApiAction<ScanShelfInfo>();
            var action = new ApiAction<ScanOutput>();
            try
            {
                if (Code.IsNullOrEmpty())
@@ -348,7 +410,7 @@
                CurScanShelf.IsScanShelf = true;
                //action.LocaleMsg = Biz.L("扫描货架/储位[{0}]成功");
                action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ScanSucceeded", Code);
                action.Data = CurScanShelf;
                action.Data.Data = CurScanShelf;
            }
            catch (Exception ex)
            {
@@ -368,6 +430,7 @@
        public override void ResetInfo()
        {
            base.ResetInfo();
            Command = null;
            CurInvItem = null;
            CurScanShelf = null;
        }