From a8fcfbb5e5ed9a07b1a30ef2d7ef9d407e9b04dd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 02 四月 2025 21:44:54 +0800
Subject: [PATCH] 更新ASN实体
---
Tiger.Business.WMS/Transaction/In_Default.cs | 234 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 116 insertions(+), 118 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/In_Default.cs b/Tiger.Business.WMS/Transaction/In_Default.cs
index 5a10dca..cb890a6 100644
--- a/Tiger.Business.WMS/Transaction/In_Default.cs
+++ b/Tiger.Business.WMS/Transaction/In_Default.cs
@@ -11,9 +11,9 @@
using Tiger.IBusiness;
using Tiger.Model.Sharetronic.Shelf;
using Tiger.Business.WMS.Sharetronic.Shelf;
-using Microsoft.IdentityModel.Tokens;
-using Apache.NMS.ActiveMQ.Commands;
+//using Microsoft.IdentityModel.Tokens;
using Tiger.Model.MES.Yada;
+using static IronPython.Modules.PythonThread;
using Tiger.Model.Entitys.MES.Position;
namespace Tiger.Business.WMS.Transaction
@@ -21,25 +21,17 @@
/// <summary>
/// 鏍囧噯涓婃灦浜嬪姟
/// </summary>
- public class In_Default : WMSTransactionBase, IIn_Default
+ public class In_Default : WmsTask, IIn_Default
{
public IIn_Default Init(string id, string userCode, string apiHost, string orgCode)
{
- TransID = id;
- UserCode = userCode;
- ApiHost = apiHost;
- OrgCode = orgCode;
+ base.Init(id, userCode, apiHost, orgCode);
Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
return this;
}
#region Propertys & Variables
- public string UserCode { get; set; }
- public long UserId { get; set; }
- public string OrgCode { get; set; }
- public Inventory CurInvItem { get; set; }
- public ScanShelfInfo CurScanShelf { get; set; }
- public string Command { get; set; } = "Normal";
+
#endregion
#region Functions
@@ -59,7 +51,7 @@
return SetOutPutMqttMsg(action, input.Locale);
}
//鍒ゆ柇鎵弿鐨勬槸鍚﹁揣鏋�
- 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();
+ var whUnit = await MainDB.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))
{
@@ -73,7 +65,7 @@
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetInfo();
+ ResetTrans();
//action.CatchExceptionWithLog(ex, $"鎵弿[{input.SN}]寮傚父");
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
}
@@ -91,88 +83,84 @@
if (CurInvItem.IsNullOrEmpty())
{
//瑙ｆ瀽鏉＄爜
- Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(input.SN, input.AuthOption, true);
+ Result<IInventory> result = GetInventory(input.SN, input.AuthOption, true);
if (!result.IsSuccessed)
{
action.IsSuccessed = false;
action.LocaleMsg = result.LocaleMsg;
- return action;
- }
+ return SetOutPutMqttMsg(action, input.Locale);
+ }
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))
{
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;
+ return SetOutPutMqttMsg(action, input.Locale);
}
//鐗╂枡楠岃瘉
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;
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo?.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
+ return SetOutPutMqttMsg(action, input.Locale);
}
if (inv.Items.Count == 0)
{
- List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
- WMS_ITEM Item;
- WMS_ITEM_PKG ItemPkgs;
-
- Item = new()
+ var newItem = new WMS_ITEM()
{
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(),
+ QTY = inv.Barcode.Qty.ToDouble(),
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()
+ WMS_ITEM_HIS his = new(newItem, $"鏍囧噯涓婃灦鍏ュ簱");
+ var newPkg = new WMS_ITEM_PKG()
{
SN = inv.Barcode.SN,
AUTH_ORG = input.AuthOption.CurOrg,
ITEM_CODE = inv.Barcode.ItemCode,
- QTY = inv.Barcode.Qty.ToDecimal(),
+ QTY = inv.Barcode.Qty.ToDouble(),
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)
+ foreach (var ext in noExt)
{
inv.ItemsExt.Add(new()
{
- SN = item.SN,
+ SN = ext.SN,
META_SN = inv.Barcode.MetaSn,
QR_CODE = inv.Barcode.MetaSn
});
}
- inv.Items.Add(Item);
+ inv.Items.Add(newItem);
inv.History.Add(his);
- inv.Packages.Add(ItemPkgs);
+ inv.Packages.Add(newPkg);
}
- 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;
+ //闆呰揪涓嶄粠鏉＄爜涓婃洿鏂版暟閲�
+ //else if (inv.Items.Count == 1)
+ //{
+ // inv.Items.First().QTY = inv.Barcode.Qty.ToDouble();
+ // 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;
- }
+ // inv.Packages.First().QTY = inv.Barcode.Qty.ToDouble();
+ // inv.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
+ // inv.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
+ //}
//濡傛灉鎵弿澶栫鐨勪笉鑳芥洿鏂版暟閲�
else
{
@@ -190,27 +178,20 @@
CurInvItem = inv;
//妫�鏌ョ墿鏂欐暟閲忥紝濡傛灉娌℃湁鍒欐煡璇㈤泤杈炬潯鐮佷富妗ｏ紝鎶婃暟閲忚繑鍥炲墠绔‘璁�
- if (CurInvItem.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 => CurInvItem.Items.Select(q => q.SN).Contains(q.Code)).ToList();
- if (qtyList.Count == 0)
+ foreach (var qty in qtyList)
{
- var item = CurInvItem.Items.First(q => q.SN == _inv.Barcode.SN);
- item.QTY = _inv.Items.First(q => q.SN == _inv.Barcode.SN).QTY;
- }
- else
- {
- foreach (var qty in qtyList)
- {
- var item = CurInvItem.Items.First(q => q.SN == qty.Code);
- item.QTY = qty.WhQty;
- }
+ var item = CurInvItem.Items.First(q => q.SN == qty.Code);
+ item.QTY = qty.WhQty;
+ item.SUPP_LOTNO = CurInvItem.Barcode.LotNo;
}
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;
+ return SetOutPutMqttMsg(action, input.Locale);
}
}
@@ -224,8 +205,8 @@
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);
- return action;
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ReComfirmQty", input.SN);
+ return SetOutPutMqttMsg(action, input.Locale);
}
else
{
@@ -251,7 +232,7 @@
{
action.IsSuccessed = false;
action.LocaleMsg = Biz.L(shelfApiResult.GetData<string>());
- return action;
+ return SetOutPutMqttMsg(action, input.Locale);
}
var reaultShelf = shelfApiResult.GetData<ShelfChangeModel>();
@@ -261,15 +242,15 @@
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L($"璐ф灦[{0}]涓笉瀛樺湪id涓篬{1}]鐨勫偍浣嶏紝璇峰厛缁存姢璐ф灦淇℃伅");
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationNotExistsInShelf", CurScanShelf.Shelf.SHELF_CODE, reaultShelf.ledAddr);
- return action;
+ return SetOutPutMqttMsg(action, input.Locale);
}
- var locationData = Biz.Db.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == nLocation.ID).First();
+ var locationData = MainDB.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == nLocation.ID).First();
if (!locationData.IsNullOrEmpty())
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]宸插瓨鏈夌墿鏂橻{1}]锛岃妫�鏌ョ郴缁熷簱瀛樹俊鎭�");
action.LocaleMsg = Biz.L($"WMS.Default.ScanShelf.ItemAlreadyExistsInLocation", nLocation.LOCATION_CODE, locationData.SN);
- return action;
+ return SetOutPutMqttMsg(action, input.Locale);
}
CurScanShelf.LocationCode = nLocation.LOCATION_CODE;
}
@@ -280,10 +261,10 @@
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("璇疯緭鍏ユ垨鎵弿鏈夋晥鐨勮揣鏋�/鍌ㄤ綅鐮�");
action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
- return action;
+ return SetOutPutMqttMsg(action, input.Locale);
}
- nLocation = await Biz.Db.Queryable<WMS_LOCATION>().Where(t => t.LOCATION_CODE == CurScanShelf.LocationCode && t.AUTH_ORG == OrgCode).FirstAsync();
+ nLocation = await MainDB.Queryable<WMS_LOCATION>().Where(t => t.LOCATION_CODE == CurScanShelf.LocationCode && t.AUTH_ORG == OrgCode).FirstAsync();
}
//鍒ゆ柇鍌ㄤ綅鏄惁鍗曟斁
@@ -292,70 +273,41 @@
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鍌ㄤ綅[{0}]鍙兘瀛樻斁涓�涓墿鏂�");
action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationSingleFailure", nLocation.LOCATION_CODE);
- CurInvItem = null;
- return action;
+ ResetTrans();
+ return SetOutPutMqttMsg(action, input.Locale);
}
- //鎵ц涓婃灦
+ //鎵ц涓婃灦鏁版嵁澶勭悊
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(CurInvItem, input.AuthOption, nLocation.LOCATION_CODE);
+ foreach (var item in CurInvItem.Packages)
+ {
+ item.TRANS_CODE = "In_Default";
+ item.TRANS_NO = $"In_Default_{DateTime.Now:yyyyMMdd}";
+ }
+ Result putonResult = PutOn(input.AuthOption, nLocation.LOCATION_CODE);
if (!putonResult.IsSuccessed)
{
action.IsSuccessed = false;
action.LocaleMsg = putonResult.LocaleMsg;
- CurInvItem = null;
- return action;
+ ResetTrans();
+ return SetOutPutMqttMsg(action, input.Locale);
}
- PutOnInfo putOnInfo = putonResult.Data;
- //淇濆瓨鍒版暟鎹簱
- var db = Business.Biz.Db;
- var dbTran = db.UseTran(() =>
- {
- //鍏ュ簱
- db.Storageable(putOnInfo.Items, UserCode).ExecuteCommand();
- db.Storageable(putOnInfo.Packages, UserCode).ExecuteCommand();
- db.Insertable(putOnInfo.History, UserCode).ExecuteCommand();
- var x = db.Storageable(putOnInfo.ItemsExt, UserCode).ToStorage();
- x.AsInsertable.ExecuteCommand();//涓嶅瓨鍦ㄦ彃鍏�
- x.AsUpdateable.ExecuteCommand();//瀛樺湪鏇存柊
- });
- if (!dbTran.IsSuccess)
- {
- Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
- throw dbTran.ErrorException;
- }
- // 杩斿洖鍏朵粬鍏ュ簱瀵硅薄
- action.Data.Data = new DefaultInStoreOutput
- {
- 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", CurInvItem.SN, putOnInfo.Location.LOCATION_CODE);
- CurInvItem = null;
+ //瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
+ action = DoIfFinish(action, input.Locale);
}
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetInfo();
+ ResetTrans();
//action.CatchExceptionWithLog(ex, $"鎵弿鏉＄爜[{input.SN}]澶嶆牳寮傚父");
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
}
- return action;
+ return SetOutPutMqttMsg(action, input.Locale);
}
/// <summary>
@@ -377,7 +329,7 @@
CurScanShelf = new ScanShelfInfo();
// 鏌ヨ璐ф灦淇℃伅
- 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());
+ whUnit = whUnit.IsNullOrEmpty(await MainDB.Queryable<V_WH_UNIT>().Where(t => (t.SHELF_CODE.ToUpper() == Code || t.LOCATION_CODE.ToUpper() == Code) && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync());
// 鎵弿璐ф灦浠ｇ爜锛屼笖涓烘櫤鑳借揣鏋�
if (!whUnit.IsNullOrEmpty() && whUnit.SHELF_CODE == Code)
@@ -392,7 +344,7 @@
// 鎵弿搴撲綅浠ｇ爜
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();
+ //var nLocation = await MainDB.Queryable<V_WH_UNIT>().Where(t => t.LOCATION_CODE.ToUpper() == Code.ToUpper() && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
//if (nLocation == null)
//{
// action.IsSuccessed = false;
@@ -409,7 +361,7 @@
}
if (whUnit.Shelf.IsLightShelf || whUnit.Location.IS_SINGLE == "Y")
{
- var locationData = Biz.Db.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == whUnit.LOCATION_ID && q.AUTH_ORG == OrgCode).First();
+ var locationData = MainDB.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == whUnit.LOCATION_ID && q.AUTH_ORG == OrgCode).First();
if (!locationData.IsNullOrEmpty())
{
action.IsSuccessed = false;
@@ -442,24 +394,70 @@
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetInfo();
+ ResetTrans();
//action.CatchExceptionWithLog(ex, $"鎵弿璐ф灦/鍌ㄤ綅[{0}]寮傚父");
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanShelf.ScanException", Code));
}
return action;
}
+ /// <summary>
+ /// 瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
+ /// </summary>
+ /// <param name="action"></param>
+ /// <param name="locale"></param>
+ /// <param name="doAfterSave"></param>
+ /// <returns></returns>
+ public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale, Action doAfterSave = null)
+ {
+ //淇濆瓨鏁版嵁搴�
+ SaveCommitListToDB();
+
+ //淇濆瓨鏁版嵁鎴愬姛鍚庢墽琛�
+ doAfterSave?.Invoke();
+
+ // 杩斿洖鏁版嵁
+ action.Data.Data = new DefaultInStoreOutput
+ {
+ 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 = CurInvItem.Warehouse.WH_CODE,
+ RegionCode = CurInvItem.Region.REGION_CODE,
+ ShelfCode = CurInvItem.Shelf.SHELF_CODE,
+ LocationCode = CurInvItem.Location.LOCATION_CODE,
+ };
+
+ //action.LocaleMsg = Biz.L($"鎵弿鏉＄爜[{0}]涓婃灦鍒板偍浣峓{1}]鎴愬姛");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, CurInvItem.Location.LOCATION_CODE);
+
+ //閲嶇疆鎵爜淇℃伅
+ ResetScanInfo();
+ return SetOutPutMqttMsg(action, locale);
+ }
+
#endregion
/// <summary>
- /// 閲嶇疆褰撳墠鎿嶄綔锛屾湁闇�瑕佸垯閲嶅啓姝ゆ柟娉�
+ /// 閲嶇疆浜嬪姟鏁版嵁锛屾湁闇�瑕佸垯閲嶅啓姝ゆ柟娉�
/// </summary>
- public override void ResetInfo()
+ public override void ResetTrans()
{
- base.ResetInfo();
+ base.ResetTrans();
+ ResetScanInfo();
+ CurScanShelf = null;
+ }
+
+ /// <summary>
+ /// 閲嶇疆鎵爜淇℃伅
+ /// </summary>
+ public void ResetScanInfo()
+ {
Command = null;
CurInvItem = null;
- CurScanShelf = null;
}
public override bool Close(bool needSaveHistoryLog = false)
--
Gitblit v1.9.3