From 40a55e90e5b9b8afff04860ca1ae845cb7bd96e3 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 24 十二月 2024 09:16:29 +0800
Subject: [PATCH] 入库上架更新
---
Tiger.Model.Net/Entitys/WMS/WMS_ITEM_EXT.cs | 4 ----
Tiger.Business.WMS/Transaction/Old/OtherInLocation.cs | 2 +-
Tiger.Business.WMS/Transaction/In_Default.cs | 8 ++++----
Tiger.Business.WMS/WMS_ITEM_Biz.cs | 13 +++++--------
4 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/In_Default.cs b/Tiger.Business.WMS/Transaction/In_Default.cs
index 2fc3bcb..c7aebea 100644
--- a/Tiger.Business.WMS/Transaction/In_Default.cs
+++ b/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;
diff --git a/Tiger.Business.WMS/Transaction/Old/OtherInLocation.cs b/Tiger.Business.WMS/Transaction/Old/OtherInLocation.cs
index 55ec6e4..7148c89 100644
--- a/Tiger.Business.WMS/Transaction/Old/OtherInLocation.cs
+++ b/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
});
diff --git a/Tiger.Business.WMS/WMS_ITEM_Biz.cs b/Tiger.Business.WMS/WMS_ITEM_Biz.cs
index 624e351..4bc1e2f 100644
--- a/Tiger.Business.WMS/WMS_ITEM_Biz.cs
+++ b/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;
diff --git a/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_EXT.cs b/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_EXT.cs
index bb9794e..e9484ae 100644
--- a/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_EXT.cs
+++ b/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 虚拟属性
--
Gitblit v1.9.3