Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Serve...

Rodney Chen

2024-12-25 fc5b73f8d3f3a37d01057799b298cb90e5955eb2

Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024

 Tiger.Business.WMS/Transaction/In_Default.cs

@@ -116,6 +116,77 @@
                        return action;
                    }

                    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;
                        }
                    }

                    //检查物料数量，如果没有则查询雅达条码主档，把数量返回前端确认
                    if (CurInvItem.Items.Any(q => q.QTY <= 0))
                    {
@@ -125,7 +196,7 @@
                            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.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);
@@ -136,11 +207,11 @@
                //更新已确认物料数量
                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(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); 
@@ -150,81 +221,10 @@
                    {
                        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;
                        }
                        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;
                    }
                }

@@ -327,8 +327,10 @@
                    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);
                CurInvItem = null;
            }
            catch (Exception ex)
            {

 Tiger.Business.WMS/WMS_ITEM_Biz.cs

@@ -64,7 +64,7 @@
                        //var query = Biz.Db.Queryable<WMS_ITEM_PKG>().Where(q => q.SN == barcode.SN).IncludesAllFirstLayer().First();//.ByAuth(option)

                        //包装表中找到条码
                        if (!query.IsNullOrEmpty() && query.QTY > 0)
                        if (!query.IsNullOrEmpty())// && query.QTY > 0)
                        {
                            inv.SN = barcode.SN;
                            inv.Barcode = barcode;
@@ -74,8 +74,8 @@
                            inv.Region = query.Region;
                            inv.Shelf = query.Shelf;
                            inv.Location = query.Location;
                            inv.Packages = Biz.Db.Ado.UseStoredProcedure().SqlQuery<WMS_ITEM_PKG>("pkg_wms_get_item_pkg", new SugarParameter("root", barcode.SN));
                            inv.Items = Biz.Db.Ado.UseStoredProcedure().SqlQuery<WMS_ITEM>("pkg_wms_get_items", new SugarParameter("root", barcode.SN));
                            inv.Packages = Biz.Db.Ado.UseStoredProcedure().SqlQuery<WMS_ITEM_PKG>("sp_wms_get_item_pkg", new SugarParameter("root", barcode.SN));
                            inv.Items = Biz.Db.Ado.UseStoredProcedure().SqlQuery<WMS_ITEM>("sp_wms_get_items", new SugarParameter("root", barcode.SN));
                            inv.ItemsExt = Biz.Db.Queryable<WMS_ITEM_EXT>().Where(q => inv.Items.Any(s => s.SN == q.SN)).ToList();
                            //var data = inv.Items.Select(i => i.SN).ToList().Except(inv.ItemsExt.Select(i => i.SN).ToList());
                            var data = inv.Items.Where(q => !inv.ItemsExt.Any(s => s.SN == q.SN)).ToList();