增加新的barcode规则验证

Rodney Chen

2024-12-27 083d4e94b5fb490b40fb6b7d534b7fed6da2aa60

 Tiger.Business.WMS/WMS_ITEM_Biz.cs

@@ -53,18 +53,18 @@
                        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();
                        //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();
@@ -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;