入库上架更新

Ben Lin

2024-12-24 40a55e90e5b9b8afff04860ca1ae845cb7bd96e3

入库上架更新

 Tiger.Business.WMS/Transaction/In_Default.cs

@@ -73,8 +73,8 @@
                }
                var inv = result.Data as Inventory;

                //验证条码是否正确
                if (!inv.isNormalStatus || inv.Status.GetValue() != WMS_ITEM.STATUSs.NotExists.GetValue() && inv.Status.GetValue() <= WMS_ITEM.STATUSs.InStore.GetValue())
                //验证条码是否正确!inv.isNormalStatus || inv.Status.GetValue() != WMS_ITEM.STATUSs.NotExists.GetValue() && 
                if (inv.Status.GetValue() == WMS_ITEM.STATUSs.InStore.GetValue())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("状态[{0}]异常，请重新扫描");
@@ -304,14 +304,13 @@
                    CurScanShelf.WarehouseCode = whUnit.WH_CODE;
                    CurScanShelf.RegionCode = whUnit.REGION_CODE;
                    CurScanShelf.ShelfCode = whUnit.SHELF_CODE;
                    CurScanShelf.LocationCode = whUnit.LOCATION_CODE;
                    CurScanShelf.ShelfType = whUnit.SHELF_TYPE;
                    CurScanShelf.IsSmartRack = true;
                }
                // 扫描库位代码
                else
                {
                    var nLocation = await Biz.Db.Queryable<V_WH_UNIT>().Where(t => t.LOCATION_CODE.ToUpper() == Code.ToUpper() && t.AUTH_ORG == OrgCode).FirstAsync();
                    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;
@@ -337,6 +336,7 @@
                            return action;
                        }
                    }
                    CurScanShelf.Shelf = nLocation.Shelf;
                    CurScanShelf.Location = nLocation.Location;
                    CurScanShelf.WarehouseCode = nLocation.WH_CODE;
                    CurScanShelf.RegionCode = nLocation.REGION_CODE;

 Tiger.Business.WMS/Transaction/Old/OtherInLocation.cs

@@ -159,7 +159,7 @@
                                    inv.ItemsExt.Add(new()
                                    {
                                        SN = item.SN,
                                        SUPP_ITEM_CODE = inv.Barcode.OEMItemCode,
                                        //SUPP_ITEM_CODE = inv.Barcode.OEMItemCode,
                                        META_SN = inv.Barcode.MetaSn,
                                        QR_CODE = inv.Barcode.MetaSn
                                    });

 Tiger.Business.WMS/WMS_ITEM_Biz.cs

@@ -53,11 +53,11 @@
                        result.Flag = Result.Flags.Failed;
                        result.LocaleMsg = new("WMS.WmsItem.Barcode.IllegalFailure");
                    }
                    else if (barcode.Qty <= 0)
                    {
                        result.Flag = Result.Flags.Failed;
                        result.LocaleMsg = new("数量不能小于等于零，请检查二维码！");
                    }
                    //else if (barcode.Qty <= 0)
                    //{
                    //    result.Flag = Result.Flags.Failed;
                    //    result.LocaleMsg = new("数量不能小于等于零，请检查二维码！");
                    //}
                    else
                    {
                        var query = Biz.Db.Queryable<WMS_ITEM_PKG>().ByAuth(option).Where(q => q.SN == barcode.SN).IncludesAllFirstLayer().First();
@@ -86,7 +86,6 @@
                                    inv.ItemsExt.Add(new()
                                    {
                                        SN = item.SN,
                                        SUPP_ITEM_CODE = barcode.OEMItemCode,
                                        META_SN = barcode.MetaSn,
                                        QR_CODE = barcode.MetaSn
                                    });
@@ -199,7 +198,6 @@
                                    inv.ItemsExt.Add(new()
                                    {
                                        SN = item.SN,
                                        SUPP_ITEM_CODE = barcode.OEMItemCode,
                                        META_SN = barcode.MetaSn,
                                        QR_CODE = barcode.MetaSn
                                    });
@@ -293,7 +291,6 @@
                        {
                            item.AUTH_ORG = option.OrgCode;
                            item.SN = inv.Barcode.SN;
                            item.SUPP_ITEM_CODE = inv.Barcode.OEMItemCode;
                        }

                        result.Data.Items = inventory.Items;

 Tiger.Model.Net/Entitys/WMS/WMS_ITEM_EXT.cs

@@ -38,10 +38,6 @@
        /// MAC地址
        /// </summary>
        public string MAC { get; set; }
        /// <summary>
        /// 供应商料号
        /// </summary>
        public string SUPP_ITEM_CODE { get; set; }
        #endregion

        #region 虚拟属性