From fc5b73f8d3f3a37d01057799b298cb90e5955eb2 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期三, 25 十二月 2024 15:25:49 +0800 Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024 --- Tiger.Business.WMS/WMS_ITEM_Biz.cs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tiger.Business.WMS/WMS_ITEM_Biz.cs b/Tiger.Business.WMS/WMS_ITEM_Biz.cs index 4bc1e2f..3f5ae9e 100644 --- a/Tiger.Business.WMS/WMS_ITEM_Biz.cs +++ b/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(); -- Gitblit v1.9.3