From cd8182d8fefc55c245400936b6330a00e866adbd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 24 十二月 2024 21:25:06 +0800
Subject: [PATCH] 优化标准上下架
---
Tiger.Business.WMS/Transaction/In_Default.cs | 285 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 174 insertions(+), 111 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/In_Default.cs b/Tiger.Business.WMS/Transaction/In_Default.cs
index c7aebea..f83e6fb 100644
--- a/Tiger.Business.WMS/Transaction/In_Default.cs
+++ b/Tiger.Business.WMS/Transaction/In_Default.cs
@@ -12,6 +12,9 @@
using Tiger.Model.Sharetronic.Shelf;
using Tiger.Business.WMS.Sharetronic.Shelf;
using Microsoft.IdentityModel.Tokens;
+using Apache.NMS.ActiveMQ.Commands;
+using Tiger.Model.MES.Yada;
+using Tiger.Model.Entitys.MES.Position;
namespace Tiger.Business.WMS.Transaction
{
@@ -36,15 +39,16 @@
public string OrgCode { get; set; }
public Inventory CurInvItem { get; set; }
public ScanShelfInfo CurScanShelf { get; set; }
+ public string Command { get; set; } = "Normal";
#endregion
#region Functions
/// <summary>
- /// 鎵弿鐗╂枡骞跺鏍革紝濡傛灉鐗╂枡宸茬粡瀹屾垚绉诲簱鍒欒揣鏋朵笂浜伅鎻愰啋鍌ㄤ綅
+ /// 鎵弿鍏ュ彛
/// </summary>
- public async Task<ApiAction> ScanItem(BaseInput input)
+ public async Task<ApiAction<ScanOutput>> Scan(BaseInput input)
{
- var action = new ApiAction();
+ var action = new ApiAction<ScanOutput>();
try
{
if (input.SN.IsNullOrEmpty())
@@ -52,115 +56,173 @@
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鏉＄爜涓嶈兘涓虹┖");
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
- return action;
+ return SetOutPutMqttMsg(action, input.Locale);
}
//璐ф灦涓虹┖鍒欐壂鎻忕殑璁や负鏄揣鏋�
- if (string.IsNullOrEmpty(CurScanShelf?.RackCode))
+ if (string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
{
- var _action = await ScanShelf(input.SN);
- action.LocaleMsg = _action.LocaleMsg;
- action.IsSuccessed = _action.IsSuccessed;
- action.Data = _action.Data;
- return action;
+ action = await ScanShelf(input.SN);
}
+ //鎵弿鐗╂枡骞跺鏍�
+ {
+ action = await ScanItem(input);
+ }
+ }
+ catch (Exception ex)
+ {
+ //鍙栨秷褰撳墠鎿嶄綔
+ ResetInfo();
+ //action.CatchExceptionWithLog(ex, $"鎵弿[{input.SN}]寮傚父");
+ action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
+ }
+ return SetOutPutMqttMsg(action, input.Locale);
+ }
- Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(input.SN, input.AuthOption, true);
- if (!result.IsSuccessed)
+ /// <summary>
+ /// 鎵弿鐗╂枡骞跺鏍革紝濡傛灉鐗╂枡宸茬粡瀹屾垚绉诲簱鍒欒揣鏋朵笂浜伅鎻愰啋鍌ㄤ綅
+ /// </summary>
+ public async Task<ApiAction<ScanOutput>> ScanItem(BaseInput input)
+ {
+ var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
+ try
+ {
+ if (CurInvItem.IsNullOrEmpty())
{
- action.IsSuccessed = false;
- action.LocaleMsg = result.LocaleMsg;
- return action;
- }
- var inv = result.Data as Inventory;
+ 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;
- //楠岃瘉鏉＄爜鏄惁姝ｇ‘!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}]寮傚父锛岃閲嶆柊鎵弿");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', inv.StatusList.Select(q => q.GetDesc())));
- return action;
- }
- //鐗╂枡楠岃瘉
- 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", inv.ItemInfo.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
- return action;
- }
-
- if (!inv.IsNullOrEmpty())
- {
- if (inv.Items.Count == 0)
+ //楠岃瘉鏉＄爜鏄惁姝ｇ‘
+ if (new[] { WMS_ITEM.STATUSs.InStore, WMS_ITEM.STATUSs.Loaded, WMS_ITEM.STATUSs.UseUp }.Contains(CurInvItem.Status))
{
- List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
- WMS_ITEM Item;
- WMS_ITEM_PKG ItemPkgs;
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鐘舵�乕{0}]寮傚父锛岃閲嶆柊鎵弿");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', CurInvItem.StatusList.Select(q => q.GetDesc())));
+ return action;
+ }
+ //鐗╂枡楠岃瘉
+ if (CurInvItem.ItemInfo.IsNullOrEmpty() || CurInvItem.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));
+ return action;
+ }
- Item = new()
+ //妫�鏌ョ墿鏂欐暟閲忥紝濡傛灉娌℃湁鍒欐煡璇㈤泤杈炬潯鐮佷富妗ｏ紝鎶婃暟閲忚繑鍥炲墠绔‘璁�
+ 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)
{
- 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
- });
+ var item = CurInvItem.Items.First(q => q.SN == qty.Code);
+ item.QTY = qty.WhQty;
}
-
- inv.Items.Add(Item);
- inv.History.Add(his);
- inv.Packages.Add(ItemPkgs);
+ action.Data.Data = CurInvItem.Items.ToDictionary(k => k.SN, v => v.QTY);
+ action.Data.Command = Command = "ComfirmQty";
+ //action.LocaleMsg = Biz.L("璇风‘璁ゆ潯鐮乕{0}]鐨勬暟閲忔槸鍚︽纭�");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ComfirmQty", input.SN);
+ return action;
}
- else if (inv.Items.Count == 1)
+ }
+
+ //鏇存柊宸茬‘璁ょ墿鏂欐暟閲�
+ if (Command == "ComfirmQty")
+ {
+ var qtyList = (input.Data ?? "").JsonToObject<Dictionary<string, decimal>>() ?? new Dictionary<string, decimal>();
+ if (qtyList.Any(q => q.Value <= 0))
{
- 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;
- }
- //濡傛灉鎵弿澶栫鐨勪笉鑳芥洿鏂版暟閲�
+ action.IsSuccessed = false;
+ action.Data.Data = CurInvItem.Items.ToDictionary(k => k.SN, v => v.QTY);
+ action.Data.Command = Command = "ComfirmQty";
+ //action.LocaleMsg = Biz.L("鏁伴噺涓嶈兘灏忎簬绛変簬闆讹紝璇烽噸鏂扮‘璁ゆ潯鐮乕{0}]鐨勬暟閲�");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ReComfirmQty", input.SN);
+ return action;
+ }
else
{
- foreach (var item in inv.Items)
+ foreach (var qty in qtyList)
+ {
+ var item = CurInvItem.Items.First(q => q.SN == qty.Key);
+ item.QTY = qty.Value;
+ }
+ 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()
{
- 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;
- }
+ 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;
}
}
@@ -168,7 +230,7 @@
// 鍒ゆ柇鏄惁鏅鸿兘璐ф灦
if (CurScanShelf.Shelf.IsLightShelf)
{
- ShelfApiResult shelfApiResult = await Share.Shelf.PutOn(TransID, CurScanShelf.Shelf, inv.Items[0]);
+ ShelfApiResult shelfApiResult = await Share.Shelf.PutOn(TransID, CurScanShelf.Shelf, CurInvItem.Items[0]);
if (!shelfApiResult.IsSuccess)
{
action.IsSuccessed = false;
@@ -209,7 +271,7 @@
}
//鍒ゆ柇鍌ㄤ綅鏄惁鍗曟斁
- if (nLocation.IS_SINGLE == "Y" && inv.Items.Count > 1)
+ if (nLocation.IS_SINGLE == "Y" && CurInvItem.Items.Count > 1)
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]鍙兘瀛樻斁涓�涓墿鏂�");
@@ -218,12 +280,12 @@
}
//鎵ц涓婃灦
- foreach (var item in inv.Items)
+ foreach (var item in CurInvItem.Items)
{
item.TRANS_CODE = "In_Default";
item.TRANS_NO = $"In_Default_{DateTime.Now:yyyyMMdd}";
}
- Result<PutOnInfo> putonResult = WMS_ITEM_Biz.WmsItem.PutOn(inv, input.AuthOption, nLocation.LOCATION_CODE);
+ Result<PutOnInfo> putonResult = WMS_ITEM_Biz.WmsItem.PutOn(CurInvItem, input.AuthOption, nLocation.LOCATION_CODE);
if (!putonResult.IsSuccessed)
{
action.IsSuccessed = false;
@@ -250,21 +312,21 @@
throw dbTran.ErrorException;
}
// 杩斿洖鍏朵粬鍏ュ簱瀵硅薄
- action.Data = new DefaultInStoreOutput
+ action.Data.Data = new DefaultInStoreOutput
{
- Barcode = inv.SN,
- MaterialCode = inv.ItemInfo.ITEM_CODE,
- MaterialName = inv.ItemInfo.ITEM_NAME,
- CurrentQty = inv.Items[0].QTY,
- Unit = inv.Items[0].UNIT,
- DateCode = inv.Items[0].PROD_DATE,
+ Barcode = CurInvItem.SN,
+ MaterialCode = CurInvItem.ItemInfo.ITEM_CODE,
+ MaterialName = CurInvItem.ItemInfo.ITEM_NAME,
+ CurrentQty = CurInvItem.Items[0].QTY,
+ Unit = CurInvItem.Items[0].UNIT,
+ DateCode = CurInvItem.Items[0].PROD_DATE,
WarehouseCode = putOnInfo.Warehouse.WH_CODE,
RegionCode = putOnInfo.Region.REGION_CODE,
ShelfCode = putOnInfo.Shelf.SHELF_CODE,
LocationCode = putOnInfo.Location.LOCATION_CODE,
};
//action.LocaleMsg = Biz.L($"鎵弿鏉＄爜[{0}]涓婃灦鍒板偍浣峓{1}]鎴愬姛");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", inv.SN, putOnInfo.Location.LOCATION_CODE);
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, putOnInfo.Location.LOCATION_CODE);
}
catch (Exception ex)
{
@@ -279,9 +341,9 @@
/// <summary>
/// 鎵弿璐ф灦鎴栬�呭偍浣�
/// </summary>
- public async Task<ApiAction<ScanShelfInfo>> ScanShelf(string Code)
+ public async Task<ApiAction<ScanOutput>> ScanShelf(string Code)
{
- var action = new ApiAction<ScanShelfInfo>();
+ var action = new ApiAction<ScanOutput>();
try
{
if (Code.IsNullOrEmpty())
@@ -348,7 +410,7 @@
CurScanShelf.IsScanShelf = true;
//action.LocaleMsg = Biz.L("鎵弿璐ф灦/鍌ㄤ綅[{0}]鎴愬姛");
action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ScanSucceeded", Code);
- action.Data = CurScanShelf;
+ action.Data.Data = CurScanShelf;
}
catch (Exception ex)
{
@@ -368,6 +430,7 @@
public override void ResetInfo()
{
base.ResetInfo();
+ Command = null;
CurInvItem = null;
CurScanShelf = null;
}
--
Gitblit v1.9.3