From dc203bafb60dc9985c805c6a4ec5f8018f3d3cf6 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 10 一月 2025 11:37:00 +0800
Subject: [PATCH] 更新 Scan 方法和 ReprintLabel 相关逻辑
---
Tiger.Business.WMS/Transaction/In_Default.cs | 80 ++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/In_Default.cs b/Tiger.Business.WMS/Transaction/In_Default.cs
index dbcca40..f8ab470 100644
--- a/Tiger.Business.WMS/Transaction/In_Default.cs
+++ b/Tiger.Business.WMS/Transaction/In_Default.cs
@@ -48,7 +48,7 @@
/// </summary>
public async Task<ApiAction<ScanOutput>> Scan(BaseInput input)
{
- var action = new ApiAction<ScanOutput>();
+ var action = new ApiAction<ScanOutput>(new ScanOutput());
try
{
if (input.SN.IsNullOrEmpty())
@@ -61,7 +61,7 @@
//鍒ゆ柇鎵弿鐨勬槸鍚﹁揣鏋�
var whUnit = await Biz.Db.Queryable<V_WH_UNIT>().Where(t => (t.SHELF_CODE.ToUpper() == input.SN || t.LOCATION_CODE.ToUpper() == input.SN) && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
//if (string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
- if (!whUnit.IsNullOrEmpty())
+ if (!whUnit.IsNullOrEmpty() || string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
{
action = await ScanShelf(input.SN, whUnit);
}
@@ -90,33 +90,34 @@
{
if (CurInvItem.IsNullOrEmpty())
{
- Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(input.SN, input.AuthOption, true);
+ //瑙ｆ瀽鏉＄爜
+ Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(input.SN, input.AuthOption, true);
if (!result.IsSuccessed)
{
action.IsSuccessed = false;
action.LocaleMsg = result.LocaleMsg;
return action;
}
- CurInvItem = result.Data as Inventory;
+ var inv = result.Data as Inventory;
//楠岃瘉鏉＄爜鏄惁姝ｇ‘
- if (new[] { WMS_ITEM.STATUSs.InStore, WMS_ITEM.STATUSs.Loaded, WMS_ITEM.STATUSs.UseUp }.Contains(CurInvItem.Status))
+ if (new[] { WMS_ITEM.STATUSs.InStore, WMS_ITEM.STATUSs.Loaded, WMS_ITEM.STATUSs.UseUp }.Contains(inv.Status))
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鐘舵�乕{0}]寮傚父锛岃閲嶆柊鎵弿");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', CurInvItem.StatusList.Select(q => q.GetDesc())));
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', inv.StatusList.Select(q => q.GetDesc())));
return action;
}
//鐗╂枡楠岃瘉
- if (CurInvItem.ItemInfo.IsNullOrEmpty() || CurInvItem.ItemInfo.IS_ACTIVE == "N")
+ if (inv.ItemInfo.IsNullOrEmpty() || inv.ItemInfo.IS_ACTIVE == "N")
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鐗╂枡缂栫爜[{0}]涓嶅瓨鍦ㄦ垨鑰呰鐗╂枡鏈惎鐢�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", CurInvItem.ItemInfo.ITEM_CODE.IsNullOrEmpty(CurInvItem.Barcode.ItemCode));
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
return action;
}
- if (CurInvItem.Items.Count == 0)
+ if (inv.Items.Count == 0)
{
List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
WMS_ITEM Item;
@@ -124,68 +125,69 @@
Item = new()
{
- SN = CurInvItem.Barcode.SN,
- ITEM_CODE = CurInvItem.Barcode.ItemCode,
+ SN = inv.Barcode.SN,
+ ITEM_CODE = inv.Barcode.ItemCode,
AUTH_ORG = input.AuthOption.CurOrg,
STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
- QTY = CurInvItem.Barcode.Qty.ToDecimal(),
- PROD_DATE = CurInvItem.Barcode.DateCode.ToDateTime(),
+ QTY = inv.Barcode.Qty.ToDecimal(),
+ PROD_DATE = inv.Barcode.DateCode.ToDateTime(),
ERP_WH = CurScanShelf.WarehouseCode,
- UNIT = CurInvItem.Barcode.Unit,
+ UNIT = inv.Barcode.Unit,
};
WMS_ITEM_HIS his = new(Item, $"鏍囧噯涓婃灦鍏ュ簱");
ItemHistorys.Add(his);
ItemPkgs = new()
{
- SN = CurInvItem.Barcode.SN,
+ SN = inv.Barcode.SN,
AUTH_ORG = input.AuthOption.CurOrg,
- ITEM_CODE = CurInvItem.Barcode.ItemCode,
- QTY = CurInvItem.Barcode.Qty.ToDecimal(),
+ ITEM_CODE = inv.Barcode.ItemCode,
+ QTY = inv.Barcode.Qty.ToDecimal(),
ERP_WH = CurScanShelf.WarehouseCode,
- UNIT = CurInvItem.Barcode.Unit,
+ UNIT = inv.Barcode.Unit,
};
- var noExt = CurInvItem.Items.Where(q => !CurInvItem.ItemsExt.Any(s => s.SN == q.SN)).ToList();
+ var noExt = inv.Items.Where(q => !inv.ItemsExt.Any(s => s.SN == q.SN)).ToList();
//鎵╁睍琛ㄤ笉瀛樺湪鏃舵柊寤�
foreach (var item in noExt)
{
- CurInvItem.ItemsExt.Add(new()
+ inv.ItemsExt.Add(new()
{
SN = item.SN,
- META_SN = CurInvItem.Barcode.MetaSn,
- QR_CODE = CurInvItem.Barcode.MetaSn
+ META_SN = inv.Barcode.MetaSn,
+ QR_CODE = inv.Barcode.MetaSn
});
}
- CurInvItem.Items.Add(Item);
- CurInvItem.History.Add(his);
- CurInvItem.Packages.Add(ItemPkgs);
+ inv.Items.Add(Item);
+ inv.History.Add(his);
+ inv.Packages.Add(ItemPkgs);
}
- else if (CurInvItem.Items.Count == 1)
+ else if (inv.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;
+ inv.Items.First().QTY = inv.Barcode.Qty.ToDecimal();
+ inv.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
+ inv.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;
+ inv.Packages.First().QTY = inv.Barcode.Qty.ToDecimal();
+ inv.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
+ inv.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
}
//濡傛灉鎵弿澶栫鐨勪笉鑳芥洿鏂版暟閲�
else
{
- foreach (var item in CurInvItem.Items)
+ foreach (var item in inv.Items)
{
item.ERP_WH = CurScanShelf.WarehouseCode;
item.AUTH_ORG = input.AuthOption.CurOrg;
}
- foreach (var item in CurInvItem.Packages)
+ foreach (var item in inv.Packages)
{
item.ERP_WH = CurScanShelf.WarehouseCode;
item.AUTH_ORG = input.AuthOption.CurOrg;
}
}
+ CurInvItem = inv;
//妫�鏌ョ墿鏂欐暟閲忥紝濡傛灉娌℃湁鍒欐煡璇㈤泤杈炬潯鐮佷富妗ｏ紝鎶婃暟閲忚繑鍥炲墠绔‘璁�
if (CurInvItem.Items.Any(q => q.QTY <= 0))
@@ -208,7 +210,7 @@
if (Command == "ComfirmQty")
{
var qtyList = (input.Data ?? "").JsonToObject<List<WMS_ITEM>>() ?? new List<WMS_ITEM>();
- if (qtyList.Any(q => q.QTY <= 0))
+ if (!qtyList.Any() || qtyList.Any(q => q.QTY <= 0))
{
action.IsSuccessed = false;
action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
@@ -223,7 +225,11 @@
{
var item = CurInvItem.Items.First(q => q.SN == qty.SN);
item.QTY = qty.QTY;
- }
+ var pkg = CurInvItem.Packages.First(q => q.SN == qty.SN);
+ pkg.QTY = qty.QTY;
+ }
+ CurInvItem.UpdatePkgQty();
+
Command = "Normal";
}
}
@@ -278,6 +284,7 @@
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]鍙兘瀛樻斁涓�涓墿鏂�");
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationSingleFailure", nLocation.LOCATION_CODE);
+ CurInvItem = null;
return action;
}
@@ -292,6 +299,7 @@
{
action.IsSuccessed = false;
action.LocaleMsg = putonResult.LocaleMsg;
+ CurInvItem = null;
return action;
}
PutOnInfo putOnInfo = putonResult.Data;
--
Gitblit v1.9.3