From 09afa6099b919a3a33cf4e1796dc5f6e66b4993b Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 21 二月 2025 01:27:38 +0800
Subject: [PATCH] 雅达-新增打印标签和接收报告相关类和接口
---
Tiger.Business.WMS/Transaction/In_Default.cs | 257 ++++++++++++++++++++++++++++-----------------------
1 files changed, 142 insertions(+), 115 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/In_Default.cs b/Tiger.Business.WMS/Transaction/In_Default.cs
index f83e6fb..5a10dca 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())
@@ -58,12 +58,14 @@
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
return SetOutPutMqttMsg(action, input.Locale);
}
- //璐ф灦涓虹┖鍒欐壂鎻忕殑璁や负鏄揣鏋�
- if (string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
+ //鍒ゆ柇鎵弿鐨勬槸鍚﹁揣鏋�
+ 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() || string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
{
- action = await ScanShelf(input.SN);
+ action = await ScanShelf(input.SN, whUnit);
}
- //鎵弿鐗╂枡骞跺鏍�
+ else//鎵弿鐗╂枡骞跺鏍�
{
action = await ScanItem(input);
}
@@ -88,42 +90,123 @@
{
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;
+ var _inv = inv.Clone();
//楠岃瘉鏉＄爜鏄惁姝ｇ‘
- 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 (inv.Items.Count == 0)
+ {
+ List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
+ WMS_ITEM Item;
+ WMS_ITEM_PKG ItemPkgs;
+
+ Item = new()
+ {
+ SN = inv.Barcode.SN,
+ ITEM_CODE = inv.Barcode.ItemCode,
+ AUTH_ORG = input.AuthOption.CurOrg,
+ STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
+ QTY = inv.Barcode.Qty.ToDecimal(),
+ PROD_DATE = inv.Barcode.DateCode.ToDateTime(),
+ ERP_WH = CurScanShelf.WarehouseCode,
+ UNIT = inv.Barcode.Unit,
+ };
+
+ WMS_ITEM_HIS his = new(Item, $"鏍囧噯涓婃灦鍏ュ簱");
+ ItemHistorys.Add(his);
+ ItemPkgs = new()
+ {
+ SN = inv.Barcode.SN,
+ AUTH_ORG = input.AuthOption.CurOrg,
+ ITEM_CODE = inv.Barcode.ItemCode,
+ QTY = inv.Barcode.Qty.ToDecimal(),
+ ERP_WH = CurScanShelf.WarehouseCode,
+ UNIT = inv.Barcode.Unit,
+ };
+
+ var noExt = inv.Items.Where(q => !inv.ItemsExt.Any(s => s.SN == q.SN)).ToList();
+ //鎵╁睍琛ㄤ笉瀛樺湪鏃舵柊寤�
+ foreach (var item in noExt)
+ {
+ inv.ItemsExt.Add(new()
+ {
+ SN = item.SN,
+ META_SN = inv.Barcode.MetaSn,
+ QR_CODE = inv.Barcode.MetaSn
+ });
+ }
+
+ inv.Items.Add(Item);
+ inv.History.Add(his);
+ inv.Packages.Add(ItemPkgs);
+ }
+ else if (inv.Items.Count == 1)
+ {
+ inv.Items.First().QTY = inv.Barcode.Qty.ToDecimal();
+ inv.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
+ inv.Items.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 inv.Items)
+ {
+ item.ERP_WH = CurScanShelf.WarehouseCode;
+ item.AUTH_ORG = input.AuthOption.CurOrg;
+ }
+ 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))
{
var qtyList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MaterialBarCode>().Where(q => CurInvItem.Items.Select(q => q.SN).Contains(q.Code)).ToList();
- foreach (var qty in qtyList)
+ if (qtyList.Count == 0)
{
- var item = CurInvItem.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 = CurInvItem.Items.ToDictionary(k => k.SN, v => v.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);
@@ -134,11 +217,11 @@
//鏇存柊宸茬‘璁ょ墿鏂欐暟閲�
if (Command == "ComfirmQty")
{
- var qtyList = (input.Data ?? "").JsonToObject<Dictionary<string, decimal>>() ?? new Dictionary<string, decimal>();
- if (qtyList.Any(q => q.Value <= 0))
+ var qtyList = (input.Data ?? "").JsonToObject<List<WMS_ITEM>>() ?? new List<WMS_ITEM>();
+ if (!qtyList.Any() || qtyList.Any(q => q.QTY <= 0))
{
action.IsSuccessed = false;
- action.Data.Data = CurInvItem.Items.ToDictionary(k => k.SN, v => v.QTY);
+ 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.ReComfirmQty", input.SN);
@@ -148,81 +231,14 @@
{
foreach (var qty in qtyList)
{
- var item = CurInvItem.Items.First(q => q.SN == qty.Key);
- item.QTY = qty.Value;
- }
+ 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";
- }
- }
-
- if (CurInvItem.Items.Count == 0)
- {
- List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
- WMS_ITEM Item;
- WMS_ITEM_PKG ItemPkgs;
-
- Item = new()
- {
- SN = CurInvItem.Barcode.SN,
- ITEM_CODE = CurInvItem.Barcode.ItemCode,
- AUTH_ORG = input.AuthOption.CurOrg,
- STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
- QTY = CurInvItem.Barcode.Qty.ToDecimal(),
- PROD_DATE = CurInvItem.Barcode.DateCode.ToDateTime(),
- ERP_WH = CurScanShelf.WarehouseCode,
- UNIT = CurInvItem.Barcode.Unit,
- };
-
- WMS_ITEM_HIS his = new(Item, $"鏍囧噯涓婃灦鍏ュ簱");
- ItemHistorys.Add(his);
- ItemPkgs = new()
- {
- SN = CurInvItem.Barcode.SN,
- AUTH_ORG = input.AuthOption.CurOrg,
- ITEM_CODE = CurInvItem.Barcode.ItemCode,
- QTY = CurInvItem.Barcode.Qty.ToDecimal(),
- ERP_WH = CurScanShelf.WarehouseCode,
- UNIT = CurInvItem.Barcode.Unit,
- };
-
- var noExt = CurInvItem.Items.Where(q => !CurInvItem.ItemsExt.Any(s => s.SN == q.SN)).ToList();
- //鎵╁睍琛ㄤ笉瀛樺湪鏃舵柊寤�
- foreach (var item in noExt)
- {
- CurInvItem.ItemsExt.Add(new()
- {
- SN = item.SN,
- META_SN = CurInvItem.Barcode.MetaSn,
- QR_CODE = CurInvItem.Barcode.MetaSn
- });
- }
-
- CurInvItem.Items.Add(Item);
- CurInvItem.History.Add(his);
- CurInvItem.Packages.Add(ItemPkgs);
- }
- else if (CurInvItem.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;
-
- CurInvItem.Packages.First().QTY = CurInvItem.Barcode.Qty.ToDecimal();
- CurInvItem.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
- CurInvItem.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
- }
- //濡傛灉鎵弿澶栫鐨勪笉鑳芥洿鏂版暟閲�
- else
- {
- foreach (var item in CurInvItem.Items)
- {
- item.ERP_WH = CurScanShelf.WarehouseCode;
- item.AUTH_ORG = input.AuthOption.CurOrg;
- }
- foreach (var item in CurInvItem.Packages)
- {
- item.ERP_WH = CurScanShelf.WarehouseCode;
- item.AUTH_ORG = input.AuthOption.CurOrg;
}
}
@@ -276,6 +292,7 @@
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]鍙兘瀛樻斁涓�涓墿鏂�");
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationSingleFailure", nLocation.LOCATION_CODE);
+ CurInvItem = null;
return action;
}
@@ -290,6 +307,7 @@
{
action.IsSuccessed = false;
action.LocaleMsg = putonResult.LocaleMsg;
+ CurInvItem = null;
return action;
}
PutOnInfo putOnInfo = putonResult.Data;
@@ -325,8 +343,10 @@
ShelfCode = putOnInfo.Shelf.SHELF_CODE,
LocationCode = putOnInfo.Location.LOCATION_CODE,
};
+
//action.LocaleMsg = Biz.L($"鎵弿鏉＄爜[{0}]涓婃灦鍒板偍浣峓{1}]鎴愬姛");
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, putOnInfo.Location.LOCATION_CODE);
+ CurInvItem = null;
}
catch (Exception ex)
{
@@ -341,9 +361,9 @@
/// <summary>
/// 鎵弿璐ф灦鎴栬�呭偍浣�
/// </summary>
- public async Task<ApiAction<ScanOutput>> ScanShelf(string Code)
+ public async Task<ApiAction<ScanOutput>> ScanShelf(string Code, V_WH_UNIT whUnit)
{
- var action = new ApiAction<ScanOutput>();
+ var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
try
{
if (Code.IsNullOrEmpty())
@@ -357,10 +377,10 @@
CurScanShelf = new ScanShelfInfo();
// 鏌ヨ璐ф灦淇℃伅
- var whUnit = await Biz.Db.Queryable<V_WH_UNIT>().Where(t => t.SHELF_CODE.ToUpper() == Code.ToUpper() && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
+ whUnit = whUnit.IsNullOrEmpty(await Biz.Db.Queryable<V_WH_UNIT>().Where(t => (t.SHELF_CODE.ToUpper() == Code || t.LOCATION_CODE.ToUpper() == Code) && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync());
// 鎵弿璐ф灦浠ｇ爜锛屼笖涓烘櫤鑳借揣鏋�
- if (whUnit != null && whUnit.SHELF_TYPE == WMS_SHELF.SHELF_TYPEs.Smart.GetValue())
+ if (!whUnit.IsNullOrEmpty() && whUnit.SHELF_CODE == Code)
{
CurScanShelf.Shelf = whUnit.Shelf;
CurScanShelf.WarehouseCode = whUnit.WH_CODE;
@@ -370,26 +390,26 @@
CurScanShelf.IsSmartRack = true;
}
// 鎵弿搴撲綅浠ｇ爜
- else
+ else if (!whUnit.IsNullOrEmpty() && whUnit.LOCATION_CODE == Code)
{
- 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;
- //action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]涓嶅瓨鍦�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.LocationNotExist", Code);
- return action;
- }
- if (nLocation.IS_ACTIVE == "N")
+ //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;
+ // //action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]涓嶅瓨鍦�");
+ // action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.LocationNotExist", Code);
+ // return action;
+ //}
+ if (whUnit.IS_ACTIVE == "N")
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鎵弿鐨勫偍浣峓{0}]鏈惎鐢�");
action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfOrLocationDisabled", Code);
return action;
}
- if (nLocation.Shelf.IsLightShelf || nLocation.Location.IS_SINGLE == "Y")
+ if (whUnit.Shelf.IsLightShelf || whUnit.Location.IS_SINGLE == "Y")
{
- var locationData = Biz.Db.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == nLocation.LOCATION_ID && q.AUTH_ORG == OrgCode).First();
+ var locationData = Biz.Db.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == whUnit.LOCATION_ID && q.AUTH_ORG == OrgCode).First();
if (!locationData.IsNullOrEmpty())
{
action.IsSuccessed = false;
@@ -398,14 +418,21 @@
return action;
}
}
- CurScanShelf.Shelf = nLocation.Shelf;
- CurScanShelf.Location = nLocation.Location;
- CurScanShelf.WarehouseCode = nLocation.WH_CODE;
- CurScanShelf.RegionCode = nLocation.REGION_CODE;
- CurScanShelf.ShelfCode = nLocation.SHELF_CODE;
- CurScanShelf.LocationCode = nLocation.LOCATION_CODE;
+ CurScanShelf.Shelf = whUnit.Shelf;
+ CurScanShelf.Location = whUnit.Location;
+ CurScanShelf.WarehouseCode = whUnit.WH_CODE;
+ CurScanShelf.RegionCode = whUnit.REGION_CODE;
+ CurScanShelf.ShelfCode = whUnit .SHELF_CODE;
+ CurScanShelf.LocationCode = whUnit.LOCATION_CODE;
CurScanShelf.IsSmartRack = false;
}
+ else
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("璇疯緭鍏ユ垨鎵弿鏈夋晥鐨勮揣鏋�/鍌ㄤ綅鐮�");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
+ return action;
+ }
CurScanShelf.IsScanShelf = true;
//action.LocaleMsg = Biz.L("鎵弿璐ф灦/鍌ㄤ綅[{0}]鎴愬姛");
--
Gitblit v1.9.3