From ef691687fb6a3d9da7c254c974d526af89f602ff Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 07 三月 2025 21:06:46 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.WMS/Transaction/In_Default.cs | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/In_Default.cs b/Tiger.Business.WMS/Transaction/In_Default.cs
index 75371a2..559029c 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,7 +90,8 @@
{
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;
@@ -98,7 +99,7 @@
return action;
}
var inv = result.Data as Inventory;
-
+ var _inv = inv.Clone();
//楠岃瘉鏉＄爜鏄惁姝ｇ‘
if (new[] { WMS_ITEM.STATUSs.InStore, WMS_ITEM.STATUSs.Loaded, WMS_ITEM.STATUSs.UseUp }.Contains(inv.Status))
{
@@ -161,6 +162,7 @@
inv.Items.Add(Item);
inv.History.Add(his);
inv.Packages.Add(ItemPkgs);
+ _inv = inv.Clone();
}
else if (inv.Items.Count == 1)
{
@@ -186,23 +188,31 @@
item.AUTH_ORG = input.AuthOption.CurOrg;
}
}
+ CurInvItem = inv;
//妫�鏌ョ墿鏂欐暟閲忥紝濡傛灉娌℃湁鍒欐煡璇㈤泤杈炬潯鐮佷富妗ｏ紝鎶婃暟閲忚繑鍥炲墠绔‘璁�
- if (inv.Items.Any(q => q.QTY <= 0))
+ if (CurInvItem.Items.Any(q => q.QTY <= 0))
{
- var qtyList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MaterialBarCode>().Where(q => inv.Items.Select(q => q.SN).Contains(q.Code)).ToList();
- foreach (var qty in qtyList)
+ var qtyList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MaterialBarCode>().Where(q => CurInvItem.Items.Select(q => q.SN).Contains(q.Code)).ToList();
+ if (qtyList.Count == 0)
{
- var item = inv.Items.First(q => q.SN == qty.Code);
- item.QTY = qty.WhQty;
+ var item = CurInvItem.Items.First(q => q.SN == _inv.Barcode.SN);
+ item.QTY = _inv.Items.First(q => q.SN == _inv.Barcode.SN).QTY;
}
- action.Data.Data = inv.Items.Select(q => new { q.SN, q.QTY });
+ else
+ {
+ foreach (var qty in qtyList)
+ {
+ var item = CurInvItem.Items.First(q => q.SN == qty.Code);
+ item.QTY = qty.WhQty;
+ }
+ }
+ 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);
return action;
}
- CurInvItem = inv;
}
//鏇存柊宸茬‘璁ょ墿鏂欐暟閲�
@@ -224,7 +234,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";
}
}
--
Gitblit v1.9.3