From c6e130459cc51c33d371b4b2dccd04331b258616 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 12 三月 2025 00:11:09 +0800
Subject: [PATCH] 雅达-优化LotNo赋值逻辑，更新引用和注释代码
---
Tiger.Business.WMS/Transaction/Out_Default.cs | 104 ++++++++++++++++++++++++---------------------------
1 files changed, 49 insertions(+), 55 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Out_Default.cs b/Tiger.Business.WMS/Transaction/Out_Default.cs
index bd176e8..77518d0 100644
--- a/Tiger.Business.WMS/Transaction/Out_Default.cs
+++ b/Tiger.Business.WMS/Transaction/Out_Default.cs
@@ -9,34 +9,23 @@
using System.Threading.Tasks;
using Tiger.Model;
using Tiger.IBusiness;
-using Org.BouncyCastle.Ocsp;
-using Tiger.Model.MES.Yada;
namespace Tiger.Business.WMS.Transaction
{
/// <summary>
/// 鏍囧噯涓嬫灦浜嬪姟
/// </summary>
- public class Out_Default : WMSTransactionBase, IOut_Default
+ public class Out_Default : WmsTask, IOut_Default
{
public IOut_Default Init(string id, string userCode, string apiHost, string orgCode)
{
- TransID = id;
- UserCode = userCode;
- ApiHost = apiHost;
- OrgCode = orgCode;
-
+ base.Init(id, apiHost, userCode, 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
@@ -45,7 +34,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())
@@ -63,7 +52,7 @@
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetInfo();
+ ResetScan();
//action.CatchExceptionWithLog(ex, $"鎵弿[{input.SN}]寮傚父");
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
}
@@ -127,7 +116,7 @@
}
}
- Dictionary<string, decimal> downDic = null;
+ Dictionary<string, double> downDic = null;
//鏇存柊涓嬫灦鍚庣殑鐗╂枡鏁伴噺
if (Command == "ComfirmQty")
{
@@ -163,14 +152,14 @@
item.TRANS_CODE = "Out_Default";
item.TRANS_NO = $"Out_Default_{DateTime.Now:yyyyMMdd}";
}
- Result<TakeDownInfo> downResult = WMS_ITEM_Biz.WmsItem.TakeDown(CurInvItem, downDic, input.AuthOption, WMS_ITEM.STATUSs.OffShelf);
+ Result downResult = TakeDown(downDic, input.AuthOption, WMS_ITEM.STATUSs.OffShelf);
if (!downResult.IsSuccessed)
{
action.IsSuccessed = false;
action.LocaleMsg = downResult.LocaleMsg;
+ ResetScan();
return action;
}
- TakeDownInfo downInfo = downResult.Data;
//鐏伅
if (CurInvItem.Shelf.IsLightShelf)
@@ -178,39 +167,12 @@
await Share.Shelf.DownSingle(TransID, CurInvItem.Location);
}
- //淇濆瓨鏁版嵁搴�
- var db = Business.Biz.Db;
- var dbTran = db.UseTran(() =>
- {
- //涓嬫灦
- db.Updateable(downInfo.Items, UserCode).ExecuteCommand();
- db.Insertable(downInfo.History, UserCode).ExecuteCommand();
- db.Updateable(downInfo.Packages, UserCode).ExecuteCommand();
- });
- if (!dbTran.IsSuccess)
- {
- Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
- throw dbTran.ErrorException;
- }
-
- action.Data.Data = new DefaultScanItemOutput()
- {
- SN = CurInvItem.SN,
- ItemCode = CurInvItem.ItemInfo.ITEM_CODE,
- MaterialName = CurInvItem.ItemInfo.ITEM_NAME,
- Qty = CurInvItem.CurPkg.QTY,
- Unit = CurInvItem.CurPkg.UNIT,
- regionCode = CurInvItem.Region.REGION_CODE,
- locationCode = CurInvItem.Location?.LOCATION_CODE,
- DateCode = CurInvItem.Items[0].PROD_DATE,
- ScanAfCut = CurInvItem.Warehouse.SCAN_AF_CUT
- };
- //action.LocaleMsg = Biz.L($"鎵弿鏉＄爜[{0}]浠庡偍浣峓{1}]涓嬫灦鎴愬姛");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.TakeDownSucceeded", CurInvItem.SN, CurInvItem.Location?.LOCATION_CODE);
+ //瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
+ action = DoIfFinish(action, input.Locale);
}
catch (Exception ex)
{
- ResetInfo();
+ ResetScan();
//action.CatchExceptionWithLog(ex, $"鎵弿鏉＄爜[{input.SN}]澶嶆牳寮傚父");
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
}
@@ -236,7 +198,7 @@
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();
+ var whUnit = await MainDB.Queryable<V_WH_UNIT>().Where(t => t.SHELF_CODE.ToUpper() == Code.ToUpper() && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
// 鎵弿璐ф灦浠ｇ爜锛屼笖涓烘櫤鑳借揣鏋�
if (whUnit != null && whUnit.SHELF_TYPE == WMS_SHELF.SHELF_TYPEs.Smart.GetValue())
@@ -251,7 +213,7 @@
// 鎵弿搴撲綅浠ｇ爜
else
{
- 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;
@@ -268,7 +230,7 @@
}
//if (nLocation.Shelf.IsLightShelf || nLocation.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 = MainDB.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == nLocation.LOCATION_ID && q.AUTH_ORG == OrgCode).First();
// if (!locationData.IsNullOrEmpty())
// {
// action.IsSuccessed = false;
@@ -294,10 +256,42 @@
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetInfo();
+ ResetScan();
//action.CatchExceptionWithLog(ex, $"鎵弿璐ф灦/鍌ㄤ綅[{0}]寮傚父");
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanShelf.ScanException", Code));
}
+ return action;
+ }
+
+ /// <summary>
+ /// 瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale)
+ {
+ //淇濆瓨鏁版嵁搴�
+ SaveCommitListToDB();
+
+ // 杩斿洖鏁版嵁
+ action.Data.Data = new DefaultScanItemOutput()
+ {
+ SN = CurInvItem.SN,
+ ItemCode = CurInvItem.ItemInfo.ITEM_CODE,
+ MaterialName = CurInvItem.ItemInfo.ITEM_NAME,
+ Qty = CurInvItem.CurPkg.QTY,
+ Unit = CurInvItem.CurPkg.UNIT,
+ regionCode = CurInvItem.Region.REGION_CODE,
+ locationCode = CurInvItem.Location?.LOCATION_CODE,
+ DateCode = CurInvItem.Items[0].PROD_DATE,
+ ScanAfCut = CurInvItem.Warehouse.SCAN_AF_CUT
+ };
+
+ //action.LocaleMsg = Biz.L($"鎵弿鏉＄爜[{0}]浠庡偍浣峓{1}]涓嬫灦鎴愬姛");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.TakeDownSucceeded", CurInvItem.SN, CurInvItem.Location?.LOCATION_CODE);
+
+ //閲嶇疆宸ュ簭
+ ResetScan();
return action;
}
@@ -306,9 +300,9 @@
/// <summary>
/// 閲嶇疆褰撳墠鎿嶄綔锛屾湁闇�瑕佸垯閲嶅啓姝ゆ柟娉�
/// </summary>
- public override void ResetInfo()
+ public override void ResetScan()
{
- base.ResetInfo();
+ base.ResetScan();
Command = null;
CurInvItem = null;
CurScanShelf = null;
--
Gitblit v1.9.3