From 04e1b952e93439afa33c07ea900939bef500ccb0 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期六, 22 三月 2025 21:01:00 +0800 Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024 --- Tiger.Business.WMS/Common/Barcode/BarcodeAnalysis.Yada.cs | 3 +-- Tiger.Business.WMS/Transaction/In_Default.cs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Tiger.Business.WMS/Common/Barcode/BarcodeAnalysis.Yada.cs b/Tiger.Business.WMS/Common/Barcode/BarcodeAnalysis.Yada.cs index 33a3a72..308c4eb 100644 --- a/Tiger.Business.WMS/Common/Barcode/BarcodeAnalysis.Yada.cs +++ b/Tiger.Business.WMS/Common/Barcode/BarcodeAnalysis.Yada.cs @@ -59,8 +59,7 @@ Barcode.OrderNo = parts[0]; Barcode.OrderLine = parts[1]; Barcode.ItemCode = parts[2]; - Barcode.LotNo = parts[3]; - Barcode.LotNo = parts[4].StartsWith("ASN") ? parts[4] + parts[2] : parts[4]; + Barcode.LotNo = parts[3].StartsWith("ASN") ? parts[3] + parts[1] : parts[3]; Barcode.Type = Types.MiniPackage; Barcode.ItemType = ItemTypes.RawMaterial; diff --git a/Tiger.Business.WMS/Transaction/In_Default.cs b/Tiger.Business.WMS/Transaction/In_Default.cs index a5ad68b..2b7aee8 100644 --- a/Tiger.Business.WMS/Transaction/In_Default.cs +++ b/Tiger.Business.WMS/Transaction/In_Default.cs @@ -190,7 +190,7 @@ { var item = CurInvItem.Items.First(q => q.SN == qty.Code); item.QTY = qty.WhQty; - item.SUPP_LOTNO = qty.Segment7; + item.SUPP_LOTNO = CurInvItem.Barcode.LotNo; } action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY }); action.Data.Command = Command = "ComfirmQty"; -- Gitblit v1.9.3